diff options
Diffstat (limited to 'svtools/source')
339 files changed, 10323 insertions, 10323 deletions
diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx index 4262c4f1a6a3..ea459daab3a7 100644 --- a/svtools/source/brwbox/brwbox1.cxx +++ b/svtools/source/brwbox/brwbox1.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -655,7 +655,7 @@ void BrowseBox::SetColumnTitle( USHORT nItemId, const String& rTitle ) if ( isAccessibleAlive() ) { - commitTableEvent( TABLE_COLUMN_DESCRIPTION_CHANGED, + commitTableEvent( TABLE_COLUMN_DESCRIPTION_CHANGED, makeAny( sNew ), makeAny( sOld ) ); @@ -849,7 +849,7 @@ void BrowseBox::RemoveColumn( USHORT nItemId ) { commitTableEvent( TABLE_MODEL_CHANGED, - makeAny( AccessibleTableModelChange( DELETE, + makeAny( AccessibleTableModelChange( DELETE, 0, GetRowCount(), nPos, @@ -1439,7 +1439,7 @@ void BrowseBox::RowRemoved( long nRow, long nNumRows, BOOL bDoPaint ) uRow.nSel = BROWSER_ENDOFSELECTION; // adjust the cursor - if ( nRowCount == 0 ) // don't compare nRowCount with nNumRows as nNumRows already was subtracted from nRowCount + if ( nRowCount == 0 ) // don't compare nRowCount with nNumRows as nNumRows already was subtracted from nRowCount nCurRow = BROWSER_ENDOFSELECTION; else if ( nRow < nCurRow ) { @@ -1930,13 +1930,13 @@ void BrowseBox::SelectRow( long nRow, BOOL _bSelect, BOOL bExpand ) } // set new selection - if ( !bHideSelect - && ( ( bMultiSelection - && uRow.pSel->GetTotalRange().Max() >= nRow - && uRow.pSel->Select( nRow, _bSelect ) + if ( !bHideSelect + && ( ( bMultiSelection + && uRow.pSel->GetTotalRange().Max() >= nRow + && uRow.pSel->Select( nRow, _bSelect ) ) - || ( !bMultiSelection - && ( uRow.nSel = nRow ) != BROWSER_ENDOFSELECTION ) + || ( !bMultiSelection + && ( uRow.nSel = nRow ) != BROWSER_ENDOFSELECTION ) ) ) { @@ -2142,12 +2142,12 @@ sal_Bool BrowseBox::IsAllSelected() const BOOL BrowseBox::MakeFieldVisible ( - long nRow, // Zeilen-Nr des Feldes (beginnend mit 0) - USHORT nColId, // Spalten-Id des Feldes - BOOL bComplete // (== FALSE), TRUE => vollst"andig sichtbar machen + long nRow, // Zeilen-Nr des Feldes (beginnend mit 0) + USHORT nColId, // Spalten-Id des Feldes + BOOL bComplete // (== FALSE), TRUE => vollst"andig sichtbar machen ) -/* [Beschreibung] +/* [Beschreibung] Macht das durch 'nRow' und 'nColId' beschriebene Feld durch entsprechendes scrollen sichtbar. Ist 'bComplete' gesetzt, dann wird @@ -2155,7 +2155,7 @@ BOOL BrowseBox::MakeFieldVisible [R"uckgabewert] - BOOL TRUE + BOOL TRUE Das angegebene Feld wurde sichtbar gemacht, bzw. war bereits sichtbar. @@ -2416,21 +2416,21 @@ void BrowseBox::SetMode( BrowserMode nMode ) #ifdef DBG_MIx Sound::Beep(); nMode = -// BROWSER_COLUMNSELECTION | -// BROWSER_MULTISELECTION | +// BROWSER_COLUMNSELECTION | +// BROWSER_MULTISELECTION | BROWSER_THUMBDRAGGING | BROWSER_KEEPHIGHLIGHT | BROWSER_HLINES | BROWSER_VLINES | -// BROWSER_HIDECURSOR | -// BROWSER_NO_HSCROLL | -// BROWSER_NO_SCROLLBACK | +// BROWSER_HIDECURSOR | +// BROWSER_NO_HSCROLL | +// BROWSER_NO_SCROLLBACK | BROWSER_AUTO_VSCROLL | BROWSER_AUTO_HSCROLL | BROWSER_TRACKING_TIPS | -// BROWSER_HIGHLIGHT_NONE | +// BROWSER_HIGHLIGHT_NONE | BROWSER_HEADERBAR_NEW | -// BROWSER_AUTOSIZE_LASTCOL | +// BROWSER_AUTOSIZE_LASTCOL | 0; #endif @@ -2472,7 +2472,7 @@ void BrowseBox::SetMode( BrowserMode nMode ) bHideCursor = NO_CURSOR_HIDE; if ( BROWSER_SMART_HIDECURSOR == ( nMode & BROWSER_SMART_HIDECURSOR ) ) - { // smart cursor hide overrules hard cursor hide + { // smart cursor hide overrules hard cursor hide bHideCursor = SMART_CURSOR_HIDE; } else if ( BROWSER_HIDECURSOR == ( nMode & BROWSER_HIDECURSOR ) ) @@ -2579,7 +2579,7 @@ void BrowseBox::VisibleRowsChanged( long, USHORT ) sal_Bool BrowseBox::IsCursorMoveAllowed( long, USHORT ) const -/* [Beschreibung] +/* [Beschreibung] Diese virtuelle Methode wird immer gerufen bevor der Cursor direkt bewegt werden soll. Durch 'return FALSE' kann verhindert werden, da\s diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx index 45fc1834ef25..cec50fc811e4 100644 --- a/svtools/source/brwbox/brwbox2.cxx +++ b/svtools/source/brwbox/brwbox2.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -217,13 +217,13 @@ void BrowseBox::StateChanged( StateChangedType nStateChange ) else if (STATE_CHANGE_ENABLE == nStateChange) { // do we have a handle column? - sal_Bool bHandleCol = pCols->Count() && (0 == pCols->GetObject(0)->GetId()); + sal_Bool bHandleCol = pCols->Count() && (0 == pCols->GetObject(0)->GetId()); // do we have a header bar sal_Bool bHeaderBar = (NULL != static_cast<BrowserDataWin&>(GetDataWindow()).pHeaderBar); - if ( nTitleLines - && ( !bHeaderBar - || bHandleCol + if ( nTitleLines + && ( !bHeaderBar + || bHandleCol ) ) // we draw the text in our header bar in a color dependent on the enabled state. So if this state changed @@ -680,7 +680,7 @@ void BrowseBox::Paint( const Rectangle& rRect ) return; BrowserColumn *pFirstCol = pCols->GetObject(0); - BOOL bHandleCol = pFirstCol && pFirstCol->GetId() == 0; + BOOL bHandleCol = pFirstCol && pFirstCol->GetId() == 0; BOOL bHeaderBar = getDataWindow()->pHeaderBar != NULL; // draw delimitational lines @@ -1000,7 +1000,7 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, BOOL nCol = nFirstCol; pCol = pCols->GetObject(nCol); if (!pCol) - { // FS - 21.05.99 - 66325 + { // FS - 21.05.99 - 66325 // ist zwar eigentlich woanders (an der richtigen Stelle) gefixt, aber sicher ist sicher ... DBG_ERROR("BrowseBox::PaintData : nFirstCol is probably invalid !"); break; @@ -1008,9 +1008,9 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, BOOL } // prepare Column-AutoHighlight - BOOL bColAutoHighlight = _bDrawSelections - && bColumnCursor - && IsColumnSelected( pCol->GetId() ); + BOOL bColAutoHighlight = _bDrawSelections + && bColumnCursor + && IsColumnSelected( pCol->GetId() ); if ( bColAutoHighlight ) { _rOut.SetClipRegion(); @@ -1031,7 +1031,7 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, BOOL { // clip the column's output to the field area if (_bForeignDevice) - { // (not neccessary if painting onto the data window) + { // (not neccessary if painting onto the data window) Size aFieldSize(pCol->Width(), nDataRowHeigt); if (aPos.X() + aFieldSize.Width() > aOverallAreaBRPos.X()) @@ -1084,7 +1084,7 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, BOOL _rOut.SetLineColor( aDelimiterLineColor ); long nY = aPos.Y() + nDataRowHeigt - 1; if (nY <= aOverallAreaBRPos.Y()) - _rOut.DrawLine( Point( nHLineX, nY ), + _rOut.DrawLine( Point( nHLineX, nY ), Point( bVLines ? std::min(long(long(aPos.X()) - 1), aOverallAreaBRPos.X()) : aOverallAreaBRPos.X(), @@ -2016,7 +2016,7 @@ void BrowseBox::Dispatch( USHORT nId ) { USHORT nNewPos = GetColumnPos( GetCurColumnId() ) + 1; USHORT nNewId = GetColumnId( nNewPos ); - if (nNewId != 0) // Am Zeilenende ? + if (nNewId != 0) // Am Zeilenende ? bDone = GoToColumnId( nNewId ); else { diff --git a/svtools/source/brwbox/brwbox3.cxx b/svtools/source/brwbox/brwbox3.cxx index 18c169d0c44a..5779afbfa896 100644 --- a/svtools/source/brwbox/brwbox3.cxx +++ b/svtools/source/brwbox/brwbox3.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 svt using namespace ::com::sun::star::lang; using namespace utl; - Reference< XAccessible > getHeaderCell( BrowseBoxImpl::THeaderCellMap& _raHeaderCells, + Reference< XAccessible > getHeaderCell( BrowseBoxImpl::THeaderCellMap& _raHeaderCells, sal_Int32 _nPos, AccessibleBrowseBoxObjType _eType, const Reference< XAccessible >& _rParent, @@ -107,7 +107,7 @@ Reference< XAccessible > BrowseBox::CreateAccessible() Reference< XAccessible > xAccParent = pParent->GetAccessible(); if( xAccParent.is() ) { - m_pImpl->m_pAccessible = getAccessibleFactory().createAccessibleBrowseBox( + m_pImpl->m_pAccessible = getAccessibleFactory().createAccessibleBrowseBox( xAccParent, *this ); } @@ -193,7 +193,7 @@ sal_Bool BrowseBox::ConvertPointToCellAddress( sal_Bool BrowseBox::ConvertPointToRowHeader( sal_Int32& rnRow, const Point& rPoint ) { rnRow = GetRowAtYPosPixel(rPoint.Y()); - // USHORT nColumnId = GetColumnAtXPosPixel(rPoint.X()); + // USHORT nColumnId = GetColumnAtXPosPixel(rPoint.X()); return rnRow != BROWSER_INVALIDID;// && nColumnId == 0; } // ----------------------------------------------------------------------------- @@ -245,7 +245,7 @@ OUString BrowseBox::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType e aRetText += OUString( RTL_CONSTASCII_USTRINGPARAM( "," ) ); aRetText += OUString::valueOf(sal_Int32(GetCurColumnId())); aRetText += OUString( RTL_CONSTASCII_USTRINGPARAM( "]" ) ); -#endif +#endif break; case ::svt::BBTYPE_ROWHEADERCELL: aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "RowHeaderCell" ) ); @@ -283,22 +283,22 @@ OUString BrowseBox::GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxOb aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "BrowseBox description" ) ); break; case ::svt::BBTYPE_TABLE: - // aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "TABLE description" ) ); + // aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "TABLE description" ) ); break; case ::svt::BBTYPE_ROWHEADERBAR: - // aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "ROWHEADERBAR description" ) ); + // aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "ROWHEADERBAR description" ) ); break; case ::svt::BBTYPE_COLUMNHEADERBAR: - // aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "COLUMNHEADERBAR description" ) ); + // aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "COLUMNHEADERBAR description" ) ); break; case ::svt::BBTYPE_TABLECELL: - // aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "TABLECELL description" ) ); + // aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "TABLECELL description" ) ); break; case ::svt::BBTYPE_ROWHEADERCELL: - // aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "ROWHEADERCELL description" ) ); + // aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "ROWHEADERCELL description" ) ); break; case ::svt::BBTYPE_COLUMNHEADERCELL: - // aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "COLUMNHEADERCELL description" ) ); + // aRetText = OUString( RTL_CONSTASCII_USTRINGPARAM( "COLUMNHEADERCELL description" ) ); break; case ::svt::BBTYPE_CHECKBOXCELL: break; diff --git a/svtools/source/brwbox/brwhead.cxx b/svtools/source/brwbox/brwhead.cxx index d1fcaec5e9be..d6c2fc28483d 100644 --- a/svtools/source/brwbox/brwhead.cxx +++ b/svtools/source/brwbox/brwhead.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ void BrowserHeader::EndDrag() USHORT nOldPos = _pBrowseBox->GetColumnPos(nId), nNewPos = GetItemPos( nId ); - if (!_pBrowseBox->GetColumnId(0)) // Handle + if (!_pBrowseBox->GetColumnId(0)) // Handle nNewPos++; if (nOldPos != nNewPos) diff --git a/svtools/source/brwbox/brwimpl.hxx b/svtools/source/brwbox/brwimpl.hxx index d14716aa6b7b..70f45974ba37 100644 --- a/svtools/source/brwbox/brwimpl.hxx +++ b/svtools/source/brwbox/brwimpl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ namespace svt typedef ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > AccessibleRef; typedef ::std::map< sal_Int32, AccessibleRef > THeaderCellMap; - struct THeaderCellMapFunctorDispose : ::std::unary_function<THeaderCellMap::value_type,void> + struct THeaderCellMapFunctorDispose : ::std::unary_function<THeaderCellMap::value_type,void> { inline void operator()(const THeaderCellMap::value_type& _aType) { @@ -72,7 +72,7 @@ namespace svt BrowseBoxImpl() : m_pAccessible(NULL) { } - + /// @see AccessibleBrowseBox::getHeaderBar ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx index 36a70672f7e3..c0b8352a5cdb 100644 --- a/svtools/source/brwbox/datwin.cxx +++ b/svtools/source/brwbox/datwin.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ void ButtonFrame::Draw( OutputDevice& rDev ) BrowserColumn::BrowserColumn( USHORT nItemId, const class Image &rImage, const String& rTitle, ULONG nWidthPixel, const Fraction& rCurrentZoom, HeaderBarItemBits nFlags ) -: _nId( nItemId ), +: _nId( nItemId ), _nWidth( nWidthPixel ), _aImage( rImage ), _aTitle( rTitle ), diff --git a/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx index 006ebe8a1433..2e655130427f 100644 --- a/svtools/source/brwbox/datwin.hxx +++ b/svtools/source/brwbox/datwin.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ DECLARE_LIST( RectangleList, Rectangle* ) class ButtonFrame { - Rectangle aRect; - Rectangle aInnerRect; - String aText; - BOOL bPressed; - BOOL bCurs; - BOOL bAbbr; - BOOL m_bDrawDisabled; + Rectangle aRect; + Rectangle aInnerRect; + String aText; + BOOL bPressed; + BOOL bCurs; + BOOL bAbbr; + BOOL m_bDrawDisabled; public: ButtonFrame( const Point& rPt, const Size& rSz, @@ -80,13 +80,13 @@ public: class BrowserColumn { - USHORT _nId; - ULONG _nOriginalWidth; - ULONG _nWidth; - Image _aImage; - String _aTitle; - BOOL _bFrozen; - HeaderBarItemBits _nFlags; + USHORT _nId; + ULONG _nOriginalWidth; + ULONG _nWidth; + Image _aImage; + String _aTitle; + BOOL _bFrozen; + HeaderBarItemBits _nFlags; public: BrowserColumn( USHORT nItemId, const Image &rImage, @@ -94,21 +94,21 @@ public: HeaderBarItemBits nFlags ); virtual ~BrowserColumn(); - USHORT GetId() const { return _nId; } + USHORT GetId() const { return _nId; } - ULONG Width() { return _nWidth; } - Image& GetImage() { return _aImage; } - String& Title() { return _aTitle; } - HeaderBarItemBits& Flags() { return _nFlags; } + ULONG Width() { return _nWidth; } + Image& GetImage() { return _aImage; } + String& Title() { return _aTitle; } + HeaderBarItemBits& Flags() { return _nFlags; } - BOOL IsFrozen() const { return _bFrozen; } - void Freeze( BOOL bFreeze = TRUE ) { _bFrozen = bFreeze; } + BOOL IsFrozen() const { return _bFrozen; } + void Freeze( BOOL bFreeze = TRUE ) { _bFrozen = bFreeze; } - virtual void Draw( BrowseBox& rBox, OutputDevice& rDev, + virtual void Draw( BrowseBox& rBox, OutputDevice& rDev, const Point& rPos, BOOL bCurs ); - void SetWidth(ULONG nNewWidthPixel, const Fraction& rCurrentZoom); - void ZoomChanged(const Fraction& rNewZoom); + void SetWidth(ULONG nNewWidthPixel, const Fraction& rCurrentZoom); + void ZoomChanged(const Fraction& rNewZoom); }; //=================================================================== @@ -119,15 +119,15 @@ class BrowserDataWin ,public DropTargetHelper { public: - BrowserHeader* pHeaderBar; // only for BROWSER_HEADERBAR_NEW - Window* pEventWin; // Window of forwarded events - ScrollBarBox* pCornerWin; // Window in the corner btw the ScrollBars - BOOL* pDtorNotify; + BrowserHeader* pHeaderBar; // only for BROWSER_HEADERBAR_NEW + Window* pEventWin; // Window of forwarded events + ScrollBarBox* pCornerWin; // Window in the corner btw the ScrollBars + BOOL* pDtorNotify; AutoTimer aMouseTimer; // recalls MouseMove on dragging out MouseEvent aRepeatEvt; // a MouseEvent to repeat - Point aLastMousePos; // verhindert pseudo-MouseMoves + Point aLastMousePos; // verhindert pseudo-MouseMoves - String aRealRowCount; // zur Anzeige im VScrollBar + String aRealRowCount; // zur Anzeige im VScrollBar RectangleList aInvalidRegion; // invalidated Rectangles during !UpdateMode bool bInPaint; // TRUE while in Paint @@ -145,8 +145,8 @@ public: bool bHadRecursion; // Rekursion war aufgetreten bool bOwnDataChangedHdl; // dont change colors in DataChanged bool bCallingDropCallback; // we're in a callback to AcceptDrop or ExecuteDrop curently - USHORT nUpdateLock; // lock count, dont call Control::Update()! - short nCursorHidden; // new conuter for DoHide/ShowCursor + USHORT nUpdateLock; // lock count, dont call Control::Update()! + short nCursorHidden; // new conuter for DoHide/ShowCursor long m_nDragRowDividerLimit; long m_nDragRowDividerOffset; @@ -155,9 +155,9 @@ public: BrowserDataWin( BrowseBox* pParent ); ~BrowserDataWin(); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); virtual void Paint( const Rectangle& rRect ); - virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void RequestHelp( const HelpEvent& rHEvt ); virtual void Command( const CommandEvent& rEvt ); virtual void MouseButtonDown( const MouseEvent& rEvt ); virtual void MouseMove( const MouseEvent& rEvt ); @@ -172,19 +172,19 @@ public: virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); // DragSourceHelper overridables - virtual void StartDrag( sal_Int8 _nAction, const Point& _rPosPixel ); + virtual void StartDrag( sal_Int8 _nAction, const Point& _rPosPixel ); - BrowseEvent CreateBrowseEvent( const Point& rPosPixel ); + BrowseEvent CreateBrowseEvent( const Point& rPosPixel ); void Repaint(); BrowseBox* GetParent() const { return (BrowseBox*) Window::GetParent(); } - const String& GetRealRowCount() const { return aRealRowCount; } + const String& GetRealRowCount() const { return aRealRowCount; } void SetUpdateMode( BOOL bMode ); bool GetUpdateMode() const { return bUpdateMode; } - void EnterUpdateLock() { ++nUpdateLock; } - void LeaveUpdateLock(); + void EnterUpdateLock() { ++nUpdateLock; } + void LeaveUpdateLock(); void Update(); void DoOutstandingInvalidations(); void Invalidate( USHORT nFlags = 0 ); @@ -210,14 +210,14 @@ inline void BrowserDataWin::Repaint() class BrowserScrollBar: public ScrollBar { - ULONG _nTip; - ULONG _nLastPos; - BrowserDataWin* _pDataWin; + ULONG _nTip; + ULONG _nLastPos; + BrowserDataWin* _pDataWin; public: BrowserScrollBar( Window* pParent, WinBits nStyle, BrowserDataWin *pDataWin ) - : ScrollBar( pParent, nStyle ), + : ScrollBar( pParent, nStyle ), _nTip( 0 ), _nLastPos( ULONG_MAX ), _pDataWin( pDataWin ) @@ -225,7 +225,7 @@ public: //ScrollBar( Window* pParent, const ResId& rResId ); virtual void Tracking( const TrackingEvent& rTEvt ); - virtual void EndScroll(); + virtual void EndScroll(); }; //=================================================================== diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx index 4dbf729de3ae..aeb03c2f28c4 100644 --- a/svtools/source/brwbox/ebbcontrols.cxx +++ b/svtools/source/brwbox/ebbcontrols.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -189,7 +189,7 @@ namespace svt if (nPos >= GetEntryCount()) nPos = GetEntryCount() - 1; SelectEntryPos(sal::static_int_cast< USHORT >(nPos)); - Select(); // for calling Modify + Select(); // for calling Modify return 1; } else if (GetParent()->PreNotify(rNEvt)) @@ -450,13 +450,13 @@ namespace svt { Selection aSel = m_pEditImplementation->GetSelection(); bResult = !aSel && aSel.Max() == m_pEditImplementation->GetText( LINEEND_LF ).Len(); - } break; + } break; case KEY_HOME: case KEY_LEFT: { Selection aSel = m_pEditImplementation->GetSelection(); bResult = !aSel && aSel.Min() == 0; - } break; + } break; default: bResult = sal_True; } @@ -507,13 +507,13 @@ namespace svt { Selection aSel = GetSpinWindow().GetSelection(); bResult = !aSel && aSel.Max() == GetSpinWindow().GetText().Len(); - } break; + } break; case KEY_HOME: case KEY_LEFT: { Selection aSel = GetSpinWindow().GetSelection(); bResult = !aSel && aSel.Min() == 0; - } break; + } break; default: bResult = sal_True; } @@ -623,7 +623,7 @@ namespace svt } // ....................................................................... -} // namespace svt +} // namespace svt // ....................................................................... diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx index d9dac2ece56b..05b3bd6e7b32 100644 --- a/svtools/source/brwbox/editbrowsebox.cxx +++ b/svtools/source/brwbox/editbrowsebox.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ namespace svt sal_Bool isHiContrast(Window* _pWindow) { OSL_ENSURE(_pWindow,"Window must be not null!"); - return _pWindow && _pWindow->GetSettings().GetStyleSettings().GetHighContrastMode(); + return _pWindow && _pWindow->GetSettings().GetStyleSettings().GetHighContrastMode(); } //.............................................................. @@ -81,7 +81,7 @@ namespace svt using com::sun::star::accessibility::XAccessible; //================================================================== - #define HANDLE_ID 0 + #define HANDLE_ID 0 //================================================================== //= EditBrowserHeader @@ -167,7 +167,7 @@ namespace svt { DBG_CTOR(EditBrowseBox,NULL); - impl_construct(); + impl_construct(); } //================================================================== @@ -262,7 +262,7 @@ namespace svt nPaintRow = nRow; return sal_True; } - + //------------------------------------------------------------------------------ IMPL_LINK(EditBrowseBox, StartEditHdl, void*, EMPTYARG) { @@ -496,7 +496,7 @@ namespace svt void EditBrowseBox::MouseButtonDown(const BrowserMouseEvent& rEvt) { sal_uInt16 nColPos = GetColumnPos( rEvt.GetColumnId() ); - long nRow = rEvt.GetRow(); + long nRow = rEvt.GetRow(); // absorb double clicks if (rEvt.GetClicks() > 1 && rEvt.GetRow() >= 0) @@ -520,7 +520,7 @@ namespace svt } if (0 == rEvt.GetColumnId()) - { // it was the handle column. save the current cell content if necessary + { // it was the handle column. save the current cell content if necessary // (clicking on the handle column results in selecting the current row) // 23.01.2001 - 82797 - FS if (IsEditing() && aController->IsModified()) @@ -567,7 +567,7 @@ namespace svt AsynchGetFocus(); if (IsEditing() && aController->GetWindow().IsEnabled() && aController->WantMouseEvent()) - { // forwards the event to the control + { // forwards the event to the control // If the field has been moved previously, we have to adjust the position @@ -610,7 +610,7 @@ namespace svt void EditBrowseBox::Dispatch( sal_uInt16 _nId ) { if ( _nId == BROWSER_ENHANCESELECTION ) - { // this is a workaround for the bug in the base class: + { // this is a workaround for the bug in the base class: // if the row selection is to be extended (which is what BROWSER_ENHANCESELECTION tells us) // then the base class does not revert any column selections, while, for doing a "simple" // selection (BROWSER_SELECT), it does. In fact, it does not only revert the col selection then, @@ -636,18 +636,18 @@ namespace svt switch (rEvt.GetType()) { case EVENT_KEYINPUT: - if ( (IsEditing() && Controller()->GetWindow().HasChildPathFocus()) - || rEvt.GetWindow() == &GetDataWindow() - || (!IsEditing() && HasChildPathFocus()) + if ( (IsEditing() && Controller()->GetWindow().HasChildPathFocus()) + || rEvt.GetWindow() == &GetDataWindow() + || (!IsEditing() && HasChildPathFocus()) ) { - const KeyEvent* pKeyEvent = rEvt.GetKeyEvent(); + const KeyEvent* pKeyEvent = rEvt.GetKeyEvent(); sal_uInt16 nCode = pKeyEvent->GetKeyCode().GetCode(); sal_Bool bShift = pKeyEvent->GetKeyCode().IsShift(); sal_Bool bCtrl = pKeyEvent->GetKeyCode().IsMod1(); - sal_Bool bAlt = pKeyEvent->GetKeyCode().IsMod2(); - sal_Bool bLocalSelect= sal_False; - sal_Bool bNonEditOnly = sal_False; + sal_Bool bAlt = pKeyEvent->GetKeyCode().IsMod2(); + sal_Bool bLocalSelect= sal_False; + sal_Bool bNonEditOnly = sal_False; sal_uInt16 nId = BROWSER_NONE; if (!bAlt && !bCtrl && !bShift ) @@ -701,7 +701,7 @@ namespace svt if ( !bAlt && bCtrl && bShift ) switch ( nCode ) { - case KEY_SPACE: nId = BROWSER_SELECTCOLUMN; bLocalSelect = sal_True; break; + case KEY_SPACE: nId = BROWSER_SELECTCOLUMN; bLocalSelect = sal_True; break; } @@ -718,10 +718,10 @@ namespace svt } - if ( ( nId != BROWSER_NONE ) - && ( !IsEditing() - || ( !bNonEditOnly - && aController->MoveAllowed( *pKeyEvent ) + if ( ( nId != BROWSER_NONE ) + && ( !IsEditing() + || ( !bNonEditOnly + && aController->MoveAllowed( *pKeyEvent ) ) ) ) @@ -824,13 +824,13 @@ namespace svt { BrowseBox::DataChanged( rDCEvt ); - if ((( rDCEvt.GetType() == DATACHANGED_SETTINGS ) || - ( rDCEvt.GetType() == DATACHANGED_DISPLAY )) && - ( rDCEvt.GetFlags() & SETTINGS_STYLE )) + if ((( rDCEvt.GetType() == DATACHANGED_SETTINGS ) || + ( rDCEvt.GetType() == DATACHANGED_DISPLAY )) && + ( rDCEvt.GetFlags() & SETTINGS_STYLE )) { ImplInitSettings( sal_True, sal_True, sal_True ); Invalidate(); - } + } } //------------------------------------------------------------------------------ @@ -898,7 +898,7 @@ namespace svt if (!nInfo && nNewColId != nEditCol) nInfo |= COLCHANGE; - if (nInfo == 0) // nothing happened + if (nInfo == 0) // nothing happened return sal_True; // save the cell content @@ -940,9 +940,9 @@ namespace svt { Window& rWindow = GetDataWindow(); // don't paint too much - // update the status immediatly if possible + // update the status immediatly if possible if ((nEditRow >= 0) && (GetBrowserFlags() & EBBF_NO_HANDLE_COLUMN_CONTENT) == 0) - { + { Rectangle aRect = GetFieldRectPixel(nEditRow, 0, sal_False ); // status cell should be painted if and only if text is displayed // note: bPaintStatus is mutable, but Solaris has problems with assigning @@ -950,16 +950,16 @@ namespace svt pTHIS->bPaintStatus = static_cast< sal_Bool > (( GetBrowserFlags() & EBBF_HANDLE_COLUMN_TEXT ) == EBBF_HANDLE_COLUMN_TEXT ); rWindow.Paint(aRect); - pTHIS->bPaintStatus = sal_True; - } - + pTHIS->bPaintStatus = sal_True; + } + // don't paint during row change - rWindow.EnablePaint(sal_False); + rWindow.EnablePaint(sal_False); // the last veto chance for derived classes if (!pTHIS->CursorMoving(nNewRow, nNewColId)) { - pTHIS->InvalidateStatusCell(nEditRow); + pTHIS->InvalidateStatusCell(nEditRow); rWindow.EnablePaint(sal_True); return sal_False; } @@ -968,7 +968,7 @@ namespace svt rWindow.EnablePaint(sal_True); return sal_True; } - } + } else return pTHIS->CursorMoving(nNewRow, nNewColId); } @@ -1006,7 +1006,7 @@ namespace svt if (nEditRow != nNewRow) { if ((GetBrowserFlags() & EBBF_NO_HANDLE_COLUMN_CONTENT) == 0) - InvalidateStatusCell(nNewRow); + InvalidateStatusCell(nNewRow); nEditRow = nNewRow; } ActivateCell(); @@ -1132,8 +1132,8 @@ namespace svt ReleaseController(aOldController, nOldEditRow, nOldEditCol); aOldController = CellControllerRef(); - nOldEditRow = -1; - nOldEditCol = 0; + nOldEditRow = -1; + nOldEditCol = 0; return 0; } @@ -1269,17 +1269,17 @@ namespace svt sal_uInt32 EditBrowseBox::GetAutoColumnWidth(sal_uInt16 nColId) { sal_uInt32 nCurColWidth = GetColumnWidth(nColId); - sal_uInt32 nMinColWidth = CalcZoom(20); // minimum + sal_uInt32 nMinColWidth = CalcZoom(20); // minimum sal_uInt32 nNewColWidth = nMinColWidth; - long nMaxRows = Min(long(GetVisibleRows()), GetRowCount()); + long nMaxRows = Min(long(GetVisibleRows()), GetRowCount()); long nLastVisRow = GetTopRow() + nMaxRows - 1; - if (GetTopRow() <= nLastVisRow) // calc the column with using the cell contents + if (GetTopRow() <= nLastVisRow) // calc the column with using the cell contents { for (long i = GetTopRow(); i <= nLastVisRow; ++i) nNewColWidth = std::max(nNewColWidth,GetTotalCellWidth(i,nColId) + 12); - if (nNewColWidth == nCurColWidth) // size has not changed + if (nNewColWidth == nCurColWidth) // size has not changed nNewColWidth = GetDefaultColumnWidth(GetColumnTitle(nColId)); } else @@ -1312,7 +1312,7 @@ namespace svt // an update for the parent is done (because it's in the queue already) // which may lead to hiding this window immediately // #95598# comment out OJ -/* if (pCheckBoxPaint->GetParent()) +/* if (pCheckBoxPaint->GetParent()) pCheckBoxPaint->GetParent()->Update(); */ pCheckBoxPaint->GetBox().Enable(_bEnabled); @@ -1425,7 +1425,7 @@ namespace svt return sal_True; } // ....................................................................... -} // namespace svt +} // namespace svt // ....................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/brwbox/editbrowsebox.hrc b/svtools/source/brwbox/editbrowsebox.hrc index 5902365b1b05..f16e32a7b8a5 100644 --- a/svtools/source/brwbox/editbrowsebox.hrc +++ b/svtools/source/brwbox/editbrowsebox.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 @@ #ifndef _SVTOOLS_EDITBROWSEBOX_HRC_ #define _SVTOOLS_EDITBROWSEBOX_HRC_ -#define IMG_EBB_CURRENT 1 -#define IMG_EBB_MODIFIED 2 -#define IMG_EBB_NEW 3 -#define IMG_EBB_DELETED 4 -#define IMG_EBB_CURRENTNEW 5 -#define IMG_EBB_PRIMARYKEY 6 -#define IMG_EBB_CURRENT_PRIMARYKEY 7 -#define IMG_EBB_FILTER 8 -#define IMG_EBB_HEADERFOOTER 9 +#define IMG_EBB_CURRENT 1 +#define IMG_EBB_MODIFIED 2 +#define IMG_EBB_NEW 3 +#define IMG_EBB_DELETED 4 +#define IMG_EBB_CURRENTNEW 5 +#define IMG_EBB_PRIMARYKEY 6 +#define IMG_EBB_CURRENT_PRIMARYKEY 7 +#define IMG_EBB_FILTER 8 +#define IMG_EBB_HEADERFOOTER 9 #endif // _SVTOOLS_EDITBROWSEBOX_HRC_ diff --git a/svtools/source/brwbox/editbrowsebox.src b/svtools/source/brwbox/editbrowsebox.src index 6511d97ea86a..c189f7033dde 100644 --- a/svtools/source/brwbox/editbrowsebox.src +++ b/svtools/source/brwbox/editbrowsebox.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/svtools/source/brwbox/editbrowsebox2.cxx b/svtools/source/brwbox/editbrowsebox2.cxx index 4add5d5a9094..cf07dbf2499d 100644 --- a/svtools/source/brwbox/editbrowsebox2.cxx +++ b/svtools/source/brwbox/editbrowsebox2.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 svt using namespace com::sun::star::accessibility; using namespace com::sun::star::uno; using namespace ::com::sun::star::accessibility::AccessibleEventId; - + // ----------------------------------------------------------------------------- Reference< XAccessible > EditBrowseBox::CreateAccessibleCheckBoxCell(long _nRow, USHORT _nColumnPos,const TriState& eState,sal_Bool _bEnabled) { @@ -89,10 +89,10 @@ void EditBrowseBox::implCreateActiveAccessible( ) if ( xMy.is() && xCont.is() ) { m_aImpl->m_xActiveCell = getAccessibleFactory().createEditBrowseBoxTableCellAccess( - xMy, // parent accessible - xCont, // control accessible - VCLUnoHelper::GetInterface( &aController->GetWindow() ), // focus window (for notifications) - *this, // the browse box + xMy, // parent accessible + xCont, // control accessible + VCLUnoHelper::GetInterface( &aController->GetWindow() ), // focus window (for notifications) + *this, // the browse box GetCurRow(), GetColumnPos( GetCurColumnId() ) ); @@ -159,8 +159,8 @@ void EditBrowseBox::DetermineFocus( const sal_uInt16 _nGetFocusFlags ) if ( GetBrowserFlags( ) & EBBF_SMART_TAB_TRAVEL ) { - if ( bHasFocus // we got the focus - && ( _nGetFocusFlags & GETFOCUS_TAB ) // using the TAB key + if ( bHasFocus // we got the focus + && ( _nGetFocusFlags & GETFOCUS_TAB ) // using the TAB key ) { long nRows = GetRowCount(); @@ -175,7 +175,7 @@ void EditBrowseBox::DetermineFocus( const sal_uInt16 _nGetFocusFlags ) GoToRowColumnId( 0, GetColumnId( 0 ) ); } else - { // the first column is the handle column -> not focussable + { // the first column is the handle column -> not focussable if ( nCols > 1 ) GoToRowColumnId( 0, GetColumnId( 1 ) ); } diff --git a/svtools/source/brwbox/editbrowseboximpl.hxx b/svtools/source/brwbox/editbrowseboximpl.hxx index c58a117d65a7..c649594df690 100644 --- a/svtools/source/brwbox/editbrowseboximpl.hxx +++ b/svtools/source/brwbox/editbrowseboximpl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ * ************************************************************************/ #ifndef SVTOOLS_EDITBROWSEBOX_IMPL_HXX -#define SVTOOLS_EDITBROWSEBOX_IMPL_HXX +#define SVTOOLS_EDITBROWSEBOX_IMPL_HXX #include <com/sun/star/accessibility/XAccessible.hpp> diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx index 53243d1933fc..226d02c1b5f5 100644 --- a/svtools/source/config/accessibilityoptions.cxx +++ b/svtools/source/config/accessibilityoptions.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,40 +65,40 @@ class SvtAccessibilityOptions_Impl { private: css::uno::Reference< css::container::XNameAccess > m_xCfg; - sal_Bool bIsModified; + sal_Bool bIsModified; public: SvtAccessibilityOptions_Impl(); ~SvtAccessibilityOptions_Impl(); - void SetVCLSettings(); - sal_Bool GetAutoDetectSystemHC(); - sal_Bool GetIsForPagePreviews() const; - sal_Bool GetIsHelpTipsDisappear() const; - sal_Bool GetIsAllowAnimatedGraphics() const; - sal_Bool GetIsAllowAnimatedText() const; - sal_Bool GetIsAutomaticFontColor() const; - sal_Bool GetIsSystemFont() const; - sal_Int16 GetHelpTipSeconds() const; - sal_Bool IsSelectionInReadonly() const; - - void SetAutoDetectSystemHC(sal_Bool bSet); - void SetIsForPagePreviews(sal_Bool bSet); - void SetIsHelpTipsDisappear(sal_Bool bSet); - void SetIsAllowAnimatedGraphics(sal_Bool bSet); - void SetIsAllowAnimatedText(sal_Bool bSet); - void SetIsAutomaticFontColor(sal_Bool bSet); - void SetIsSystemFont(sal_Bool bSet); - void SetHelpTipSeconds(sal_Int16 nSet); - void SetSelectionInReadonly(sal_Bool bSet); - - sal_Bool IsModified() const { return bIsModified; }; + void SetVCLSettings(); + sal_Bool GetAutoDetectSystemHC(); + sal_Bool GetIsForPagePreviews() const; + sal_Bool GetIsHelpTipsDisappear() const; + sal_Bool GetIsAllowAnimatedGraphics() const; + sal_Bool GetIsAllowAnimatedText() const; + sal_Bool GetIsAutomaticFontColor() const; + sal_Bool GetIsSystemFont() const; + sal_Int16 GetHelpTipSeconds() const; + sal_Bool IsSelectionInReadonly() const; + + void SetAutoDetectSystemHC(sal_Bool bSet); + void SetIsForPagePreviews(sal_Bool bSet); + void SetIsHelpTipsDisappear(sal_Bool bSet); + void SetIsAllowAnimatedGraphics(sal_Bool bSet); + void SetIsAllowAnimatedText(sal_Bool bSet); + void SetIsAutomaticFontColor(sal_Bool bSet); + void SetIsSystemFont(sal_Bool bSet); + void SetHelpTipSeconds(sal_Int16 nSet); + void SetSelectionInReadonly(sal_Bool bSet); + + sal_Bool IsModified() const { return bIsModified; }; }; // initialization of static members -------------------------------------- -SvtAccessibilityOptions_Impl* volatile SvtAccessibilityOptions::sm_pSingleImplConfig =NULL; -sal_Int32 volatile SvtAccessibilityOptions::sm_nAccessibilityRefCount(0); +SvtAccessibilityOptions_Impl* volatile SvtAccessibilityOptions::sm_pSingleImplConfig =NULL; +sal_Int32 volatile SvtAccessibilityOptions::sm_nAccessibilityRefCount(0); namespace { @@ -137,7 +137,7 @@ SvtAccessibilityOptions_Impl::~SvtAccessibilityOptions_Impl() sal_Bool SvtAccessibilityOptions_Impl::GetAutoDetectSystemHC() { css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY); - sal_Bool bRet = sal_True; + sal_Bool bRet = sal_True; try { @@ -155,7 +155,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetAutoDetectSystemHC() sal_Bool SvtAccessibilityOptions_Impl::GetIsForPagePreviews() const { css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY); - sal_Bool bRet = sal_True; + sal_Bool bRet = sal_True; try { @@ -172,7 +172,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetIsForPagePreviews() const sal_Bool SvtAccessibilityOptions_Impl::GetIsHelpTipsDisappear() const { css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY); - sal_Bool bRet = sal_True; + sal_Bool bRet = sal_True; try { @@ -190,7 +190,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetIsHelpTipsDisappear() const sal_Bool SvtAccessibilityOptions_Impl::GetIsAllowAnimatedGraphics() const { css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY); - sal_Bool bRet = sal_True; + sal_Bool bRet = sal_True; try { @@ -208,7 +208,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetIsAllowAnimatedGraphics() const sal_Bool SvtAccessibilityOptions_Impl::GetIsAllowAnimatedText() const { css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY); - sal_Bool bRet = sal_True; + sal_Bool bRet = sal_True; try { @@ -226,7 +226,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetIsAllowAnimatedText() const sal_Bool SvtAccessibilityOptions_Impl::GetIsAutomaticFontColor() const { css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY); - sal_Bool bRet = sal_False; + sal_Bool bRet = sal_False; try { @@ -244,7 +244,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetIsAutomaticFontColor() const sal_Bool SvtAccessibilityOptions_Impl::GetIsSystemFont() const { css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY); - sal_Bool bRet = sal_True; + sal_Bool bRet = sal_True; try { @@ -262,7 +262,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetIsSystemFont() const sal_Int16 SvtAccessibilityOptions_Impl::GetHelpTipSeconds() const { css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY); - sal_Int16 nRet = 4; + sal_Int16 nRet = 4; try { @@ -280,7 +280,7 @@ sal_Int16 SvtAccessibilityOptions_Impl::GetHelpTipSeconds() const sal_Bool SvtAccessibilityOptions_Impl::IsSelectionInReadonly() const { css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY); - sal_Bool bRet = sal_False; + sal_Bool bRet = sal_False; try { @@ -518,7 +518,7 @@ SvtAccessibilityOptions::~SvtAccessibilityOptions() if( !--sm_nAccessibilityRefCount ) { //if( sm_pSingleImplConfig->IsModified() ) - // sm_pSingleImplConfig->Commit(); + // sm_pSingleImplConfig->Commit(); DELETEZ( sm_pSingleImplConfig ); } } diff --git a/svtools/source/config/apearcfg.cxx b/svtools/source/config/apearcfg.cxx index cadbb3c7da6f..b30c676a9db3 100644 --- a/svtools/source/config/apearcfg.cxx +++ b/svtools/source/config/apearcfg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ #define DEFAULT_DRAGMODE 2 #define DEFAULT_SNAPMODE 0 #define DEFAULT_SCALEFACTOR 100 -#define DEFAULT_AAMINHEIGHT 8 +#define DEFAULT_AAMINHEIGHT 8 using namespace ::rtl; using namespace ::com::sun::star::uno; @@ -54,23 +54,23 @@ sal_Bool SvtTabAppearanceCfg::bInitialized = sal_False; --------------------------------------------------------------------*/ SvtTabAppearanceCfg::SvtTabAppearanceCfg() :ConfigItem(OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/View"))) - ,nLookNFeel ( DEFAULT_LOOKNFEEL ) - ,nDragMode ( DEFAULT_DRAGMODE ) + ,nLookNFeel ( DEFAULT_LOOKNFEEL ) + ,nDragMode ( DEFAULT_DRAGMODE ) ,nScaleFactor ( DEFAULT_SCALEFACTOR ) - ,nSnapMode ( DEFAULT_SNAPMODE ) + ,nSnapMode ( DEFAULT_SNAPMODE ) ,nMiddleMouse ( MOUSE_MIDDLE_AUTOSCROLL ) #if defined( UNX ) || defined ( FS_PRIV_DEBUG ) - ,nAAMinPixelHeight ( DEFAULT_AAMINHEIGHT ) + ,nAAMinPixelHeight ( DEFAULT_AAMINHEIGHT ) #endif ,bMenuMouseFollow(FALSE) ,bSingleLineTabCtrl(FALSE) ,bColoredTabCtrl(FALSE) #if defined( UNX ) || defined ( FS_PRIV_DEBUG ) - ,bFontAntialiasing ( TRUE ) + ,bFontAntialiasing ( TRUE ) #endif { RTL_LOGFILE_CONTEXT(aLog, "svtools SvtTabAppearanceCfg::SvtTabAppearanceCfg()"); - + const Sequence<OUString>& rNames = GetPropertyNames(); Sequence<Any> aValues = GetProperties(rNames); const Any* pValues = aValues.getConstArray(); @@ -240,20 +240,20 @@ void SvtTabAppearanceCfg::SetApplicationDefaults ( Application* pApp ) switch ( nLookNFeel ) { case LookMotif: - hAppStyle.SetStandardUnixStyles(); break; + hAppStyle.SetStandardUnixStyles(); break; case LookOSTwo: - hAppStyle.SetStandardOS2Styles(); break; + hAppStyle.SetStandardOS2Styles(); break; case LookMacintosh: - hAppStyle.SetStandardMacStyles(); break; + hAppStyle.SetStandardMacStyles(); break; case LookWindows: - hAppStyle.SetStandardWinStyles(); break; + hAppStyle.SetStandardWinStyles(); break; case LookStardivision: default: - hAppStyle.SetStandardStyles(); break; + hAppStyle.SetStandardStyles(); break; } // and set it here diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx index e537c5682622..4f833e81adb9 100644 --- a/svtools/source/config/colorcfg.cxx +++ b/svtools/source/config/colorcfg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ namespace svtools static const sal_Char cColor[] = "/Color"; static const sal_Char cColorSchemes[] = "ColorSchemes/"; sal_Int32 nColorRefCount_Impl = 0; -namespace +namespace { - struct ColorMutex_Impl - : public rtl::Static< ::osl::Mutex, ColorMutex_Impl > {}; + struct ColorMutex_Impl + : public rtl::Static< ::osl::Mutex, ColorMutex_Impl > {}; } ColorConfig_Impl* ColorConfig::m_pImpl = NULL; @@ -135,7 +135,7 @@ uno::Sequence< OUString> ColorConfig_Impl::GetPropertyNames(const rtl::OUString& { RTL_CONSTASCII_USTRINGPARAM("/AppBackground") ,sal_False }, { RTL_CONSTASCII_USTRINGPARAM("/ObjectBoundaries"),sal_True }, { RTL_CONSTASCII_USTRINGPARAM("/TableBoundaries") ,sal_True }, - { RTL_CONSTASCII_USTRINGPARAM("/FontColor") ,sal_False }, + { RTL_CONSTASCII_USTRINGPARAM("/FontColor") ,sal_False }, { RTL_CONSTASCII_USTRINGPARAM("/Links") ,sal_True }, { RTL_CONSTASCII_USTRINGPARAM("/LinksVisited") ,sal_True }, { RTL_CONSTASCII_USTRINGPARAM("/Anchor") ,sal_False }, @@ -495,7 +495,7 @@ Color ColorConfig::GetDefaultColor(ColorConfigEntry eEntry) 0x000000, // SQLOPERATOR 0x0000E6, // SQLKEYWORD 0x259D9D, // SQLPARAMTER - 0x969696,// SQLCOMMENT + 0x969696,// SQLCOMMENT }; Color aRet; switch(eEntry) @@ -510,7 +510,7 @@ Color ColorConfig::GetDefaultColor(ColorConfigEntry eEntry) case SPELL : case DRAWDRAWING : - case SMARTTAGS : + case SMARTTAGS : { const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); aRet = rStyleSettings.GetHighContrastMode() ? @@ -520,7 +520,7 @@ Color ColorConfig::GetDefaultColor(ColorConfigEntry eEntry) case DRAWFILL : aRet = /*rStyleSettings.GetHighContrastMode() ? - rStyleSettings.OutlineMode??? : */ aAutoColors[eEntry]; + rStyleSettings.OutlineMode??? : */ aAutoColors[eEntry]; break; case FONTCOLOR : diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx index 7610554612c6..fa6c2ae6c24e 100644 --- a/svtools/source/config/extcolorcfg.cxx +++ b/svtools/source/config/extcolorcfg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ namespace svtools #define C2U(cChar) OUString::createFromAscii(cChar) sal_Int32 nExtendedColorRefCount_Impl = 0; -namespace +namespace { - struct ColorMutex_Impl - : public rtl::Static< ::osl::Mutex, ColorMutex_Impl > {}; + struct ColorMutex_Impl + : public rtl::Static< ::osl::Mutex, ColorMutex_Impl > {}; } ExtendedColorConfig_Impl* ExtendedColorConfig::m_pImpl = NULL; @@ -79,13 +79,13 @@ class ExtendedColorConfig_Impl : public utl::ConfigItem, public SfxBroadcaster typedef ::std::vector<TConfigValues::iterator> TMapPos; typedef ::std::pair< TConfigValues, TMapPos > TComponentMapping; DECLARE_STL_USTRINGACCESS_MAP(TComponentMapping,TComponents); - TComponents m_aConfigValues; - TDisplayNames m_aComponentDisplayNames; - ::std::vector<TComponents::iterator> m_aConfigValuesPos; + TComponents m_aConfigValues; + TDisplayNames m_aComponentDisplayNames; + ::std::vector<TComponents::iterator> m_aConfigValuesPos; sal_Bool m_bEditMode; rtl::OUString m_sLoadedScheme; - sal_Bool m_bIsBroadcastEnabled; + sal_Bool m_bIsBroadcastEnabled; static sal_Bool m_bLockBroadcast; static sal_Bool m_bBroadcastWhenUnlocked; @@ -99,15 +99,15 @@ public: void CommitCurrentSchemeName(); //changes the name of the current scheme but doesn't load it! void SetCurrentSchemeName(const rtl::OUString& rSchemeName) {m_sLoadedScheme = rSchemeName;} - sal_Bool ExistsScheme(const ::rtl::OUString& _sSchemeName); + sal_Bool ExistsScheme(const ::rtl::OUString& _sSchemeName); virtual void Commit(); virtual void Notify( const uno::Sequence<rtl::OUString>& aPropertyNames); - sal_Int32 GetComponentCount() const; - ::rtl::OUString GetComponentName(sal_uInt32 _nPos) const; - ::rtl::OUString GetComponentDisplayName(const ::rtl::OUString& _sComponentName) const; - sal_Int32 GetComponentColorCount(const ::rtl::OUString& _sName) const; - ExtendedColorConfigValue GetComponentColorConfigValue(const ::rtl::OUString& _sName,sal_uInt32 _nPos) const; + sal_Int32 GetComponentCount() const; + ::rtl::OUString GetComponentName(sal_uInt32 _nPos) const; + ::rtl::OUString GetComponentDisplayName(const ::rtl::OUString& _sComponentName) const; + sal_Int32 GetComponentColorCount(const ::rtl::OUString& _sName) const; + ExtendedColorConfigValue GetComponentColorConfigValue(const ::rtl::OUString& _sName,sal_uInt32 _nPos) const; ExtendedColorConfigValue GetColorConfigValue(const ::rtl::OUString& _sComponentName,const ::rtl::OUString& _sName) { @@ -141,9 +141,9 @@ public: void ClearModified(){ConfigItem::ClearModified();} void SettingsChanged(); - static void DisableBroadcast(); - static void EnableBroadcast(); - static sal_Bool IsEnableBroadcast(); + static void DisableBroadcast(); + static void EnableBroadcast(); + static sal_Bool IsEnableBroadcast(); static void LockBroadcast(); static void UnlockBroadcast(); @@ -159,7 +159,7 @@ uno::Sequence< OUString> ExtendedColorConfig_Impl::GetPropertyNames(const rtl::O { uno::Sequence< OUString> aNames(GetNodeNames(rScheme)); ::rtl::OUString* pIter = aNames.getArray(); - ::rtl::OUString* pEnd = pIter + aNames.getLength(); + ::rtl::OUString* pEnd = pIter + aNames.getLength(); ::rtl::OUString sSep(RTL_CONSTASCII_USTRINGPARAM("/")); for(;pIter != pEnd;++pIter) { @@ -197,7 +197,7 @@ ExtendedColorConfigValue ExtendedColorConfig_Impl::GetComponentColorConfigValue( return ExtendedColorConfigValue(); } // ----------------------------------------------------------------------------- -::rtl::OUString ExtendedColorConfig_Impl::GetComponentDisplayName(const ::rtl::OUString& _sComponentName) const +::rtl::OUString ExtendedColorConfig_Impl::GetComponentDisplayName(const ::rtl::OUString& _sComponentName) const { ::rtl::OUString sRet; TDisplayNames::const_iterator aFind = m_aComponentDisplayNames.find(_sComponentName); @@ -257,8 +257,8 @@ void ExtendedColorConfig_Impl::EnableBroadcast() ExtendedColorConfig::m_pImpl->m_bIsBroadcastEnabled = sal_True; } // ----------------------------------------------------------------------------- -sal_Bool ExtendedColorConfig_Impl::IsEnableBroadcast() -{ +sal_Bool ExtendedColorConfig_Impl::IsEnableBroadcast() +{ return ExtendedColorConfig::m_pImpl ? ExtendedColorConfig::m_pImpl->m_bIsBroadcastEnabled : sal_False; } /* -----------------------------22.03.2002 14:38------------------------------ @@ -303,7 +303,7 @@ void ExtendedColorConfig_Impl::Load(const rtl::OUString& rScheme) lcl_addString(aDisplayNames,sDisplayName); uno::Sequence< uno::Any > aDisplayNamesValue = GetProperties( aDisplayNames ); - + const ::rtl::OUString* pDispIter = aDisplayNames.getConstArray(); const ::rtl::OUString* pDispEnd = pDispIter + aDisplayNames.getLength(); for(sal_Int32 j = 0;pDispIter != pDispEnd;++pDispIter,++j) @@ -315,12 +315,12 @@ void ExtendedColorConfig_Impl::Load(const rtl::OUString& rScheme) ::rtl::OUString sCurrentDisplayName; aDisplayNamesValue[j] >>= sCurrentDisplayName; aDisplayNameMap.insert(TDisplayNames::value_type(sName,sCurrentDisplayName)); - } + } } // load color settings rtl::OUString sScheme(rScheme); - + if(!sScheme.getLength()) { //detect current scheme name @@ -329,7 +329,7 @@ void ExtendedColorConfig_Impl::Load(const rtl::OUString& rScheme) uno::Sequence< uno::Any > aCurrentVal = GetProperties( aCurrent ); aCurrentVal.getConstArray()[0] >>= sScheme; } // if(!sScheme.getLength()) - + m_sLoadedScheme = sScheme; ::rtl::OUString sBase(RTL_CONSTASCII_USTRINGPARAM("ExtendedColorScheme/ColorSchemes/")); sBase += sScheme; @@ -343,7 +343,7 @@ void ExtendedColorConfig_Impl::Load(const rtl::OUString& rScheme) if ( !m_sLoadedScheme.getLength() ) m_sLoadedScheme = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("default")); - + if ( !sScheme.equalsAscii("default") ) { ::rtl::OUString sDefault(RTL_CONSTASCII_USTRINGPARAM("default")); @@ -390,7 +390,7 @@ void ExtendedColorConfig_Impl::FillComponentColors(uno::Sequence < ::rtl::OUStri ::rtl::OUString* pColorIter = aColorNames.getArray(); ::rtl::OUString* pColorEnd = pColorIter + aColorNames.getLength(); - + m_aConfigValuesPos.push_back(m_aConfigValues.insert(TComponents::value_type(sComponentName,TComponentMapping(TConfigValues(),TMapPos()))).first); TConfigValues& aConfigValues = (*m_aConfigValuesPos.rbegin())->second.first; TMapPos& aConfigValuesPos = (*m_aConfigValuesPos.rbegin())->second.second; @@ -402,14 +402,14 @@ void ExtendedColorConfig_Impl::FillComponentColors(uno::Sequence < ::rtl::OUStri pColorIter->getToken(2,'/',nIndex); ::rtl::OUString sName(pColorIter->copy(nIndex)),sDisplayName; ::rtl::OUString sTemp = sName.copy(0,sName.lastIndexOf(sColor)); - + TDisplayNames::const_iterator aFind = _rDisplayNames.find(sTemp); nIndex = 0; sName = sName.getToken(2,'/',nIndex); OSL_ENSURE(aFind != _rDisplayNames.end(),"DisplayName is not in EntryNames config list!"); if ( aFind != _rDisplayNames.end() ) sDisplayName = aFind->second; - + OSL_ENSURE(pColors[i].hasValue(),"Color config entry has NIL as color value set!"); OSL_ENSURE(pDefaultColors[i].hasValue(),"Color config entry has NIL as color value set!"); sal_Int32 nColor = 0,nDefaultColor = 0; @@ -487,7 +487,7 @@ void ExtendedColorConfig_Impl::Commit() ::rtl::OUString s(RTL_CONSTASCII_USTRINGPARAM("ExtendedColorScheme/ColorSchemes")); SetSetProperties(s, aPropValues); } - } + } CommitCurrentSchemeName(); } @@ -507,11 +507,11 @@ void ExtendedColorConfig_Impl::CommitCurrentSchemeName() sal_Bool ExtendedColorConfig_Impl::ExistsScheme(const ::rtl::OUString& _sSchemeName) { ::rtl::OUString sBase(RTL_CONSTASCII_USTRINGPARAM("ExtendedColorScheme/ColorSchemes")); - + uno::Sequence < ::rtl::OUString > aComponentNames = GetPropertyNames(sBase); sBase += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + _sSchemeName; const ::rtl::OUString* pCompIter = aComponentNames.getConstArray(); - const ::rtl::OUString* pCompEnd = pCompIter + aComponentNames.getLength(); + const ::rtl::OUString* pCompEnd = pCompIter + aComponentNames.getLength(); for(;pCompIter != pCompEnd && *pCompIter != sBase;++pCompIter) ; return pCompIter != pCompEnd; diff --git a/svtools/source/config/fontsubstconfig.cxx b/svtools/source/config/fontsubstconfig.cxx index 4202ffa45a52..53a8ae2879d2 100644 --- a/svtools/source/config/fontsubstconfig.cxx +++ b/svtools/source/config/fontsubstconfig.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,10 +50,10 @@ using namespace com::sun::star::beans; const sal_Char cReplacement[] = "Replacement"; const sal_Char cFontPairs[] = "FontPairs"; -const sal_Char cReplaceFont[] = "ReplaceFont"; +const sal_Char cReplaceFont[] = "ReplaceFont"; const sal_Char cSubstituteFont[]= "SubstituteFont"; -const sal_Char cOnScreenOnly[] = "OnScreenOnly"; -const sal_Char cAlways[] = "Always"; +const sal_Char cOnScreenOnly[] = "OnScreenOnly"; +const sal_Char cAlways[] = "Always"; //----------------------------------------------------------------------------- typedef SubstitutionStruct* SubstitutionStructPtr; @@ -62,7 +62,7 @@ SV_IMPL_PTRARR(SubstitutionStructArr, SubstitutionStructPtr); //----------------------------------------------------------------------------- struct SvtFontSubstConfig_Impl { - SubstitutionStructArr aSubstArr; + SubstitutionStructArr aSubstArr; }; /* -----------------------------18.01.01 12:04-------------------------------- @@ -73,7 +73,7 @@ SvtFontSubstConfig::SvtFontSubstConfig() : pImpl(new SvtFontSubstConfig_Impl) { RTL_LOGFILE_CONTEXT(aLog, "svtools SvtFontSubstConfig::SvtFontSubstConfig()"); - + Sequence<OUString> aNames(1); aNames.getArray()[0] = C2U(cReplacement); Sequence<Any> aValues = GetProperties(aNames); @@ -94,10 +94,10 @@ SvtFontSubstConfig::SvtFontSubstConfig() : OUString sStart(sPropPrefix); sStart += pNodeNames[nNode]; sStart += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); - pNames[nName] = sStart; pNames[nName++] += C2U(cReplaceFont); - pNames[nName] = sStart; pNames[nName++] += C2U(cSubstituteFont); - pNames[nName] = sStart; pNames[nName++] += C2U(cAlways); - pNames[nName] = sStart; pNames[nName++] += C2U(cOnScreenOnly); + pNames[nName] = sStart; pNames[nName++] += C2U(cReplaceFont); + pNames[nName] = sStart; pNames[nName++] += C2U(cSubstituteFont); + pNames[nName] = sStart; pNames[nName++] += C2U(cAlways); + pNames[nName] = sStart; pNames[nName++] += C2U(cOnScreenOnly); } Sequence<Any> aNodeValues = GetProperties(aPropNames); const Any* pNodeValues = aNodeValues.getConstArray(); diff --git a/svtools/source/config/helpopt.cxx b/svtools/source/config/helpopt.cxx index 6e1f817ad622..b9bf4f005e03 100644 --- a/svtools/source/config/helpopt.cxx +++ b/svtools/source/config/helpopt.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,31 +50,31 @@ using namespace com::sun::star; static SvtHelpOptions_Impl* pOptions = NULL; static sal_Int32 nRefCount = 0; -#define EXTENDEDHELP 0 -#define HELPTIPS 1 -#define AGENT_ENABLED 2 -#define AGENT_TIMEOUT 3 -#define AGENT_RETRYLIMIT 4 -#define LOCALE 5 -#define SYSTEM 6 +#define EXTENDEDHELP 0 +#define HELPTIPS 1 +#define AGENT_ENABLED 2 +#define AGENT_TIMEOUT 3 +#define AGENT_RETRYLIMIT 4 +#define LOCALE 5 +#define SYSTEM 6 #define STYLESHEET 7 class SvtHelpOptions_Impl : public utl::ConfigItem { IdList* pList; - sal_Int32 nHelpAgentTimeoutPeriod; - sal_Int32 nHelpAgentRetryLimit; + sal_Int32 nHelpAgentTimeoutPeriod; + sal_Int32 nHelpAgentRetryLimit; sal_Bool bExtendedHelp; sal_Bool bHelpTips; sal_Bool bHelpAgentEnabled; sal_Bool bWelcomeScreen; - String aLocale; - String aSystem; + String aLocale; + String aSystem; String sHelpStyleSheet; DECLARE_STL_USTRINGACCESS_MAP( sal_Int32, MapString2Int ); - MapString2Int aURLIgnoreCounters; - ::osl::Mutex aIgnoreCounterSafety; + MapString2Int aURLIgnoreCounters; + ::osl::Mutex aIgnoreCounterSafety; Sequence< OUString > GetPropertyNames(); @@ -90,25 +90,25 @@ public: void SetHelpTips( sal_Bool b ) { bHelpTips = b; SetModified(); } sal_Bool IsHelpTips() const { return bHelpTips; } - void SetHelpAgentEnabled( sal_Bool b ) { bHelpAgentEnabled = b; SetModified(); } - sal_Bool IsHelpAgentEnabled() const { return bHelpAgentEnabled; } - void SetHelpAgentTimeoutPeriod( sal_Int32 _nSeconds ) { nHelpAgentTimeoutPeriod = _nSeconds; SetModified(); } - sal_Int32 GetHelpAgentTimeoutPeriod( ) const { return nHelpAgentTimeoutPeriod; } - void SetHelpAgentRetryLimit( sal_Int32 _nTrials ) { nHelpAgentRetryLimit = _nTrials; SetModified(); } - sal_Int32 GetHelpAgentRetryLimit( ) const { return nHelpAgentRetryLimit; } + void SetHelpAgentEnabled( sal_Bool b ) { bHelpAgentEnabled = b; SetModified(); } + sal_Bool IsHelpAgentEnabled() const { return bHelpAgentEnabled; } + void SetHelpAgentTimeoutPeriod( sal_Int32 _nSeconds ) { nHelpAgentTimeoutPeriod = _nSeconds; SetModified(); } + sal_Int32 GetHelpAgentTimeoutPeriod( ) const { return nHelpAgentTimeoutPeriod; } + void SetHelpAgentRetryLimit( sal_Int32 _nTrials ) { nHelpAgentRetryLimit = _nTrials; SetModified(); } + sal_Int32 GetHelpAgentRetryLimit( ) const { return nHelpAgentRetryLimit; } - sal_Int32 getAgentIgnoreURLCounter( const ::rtl::OUString& _rURL ); - void decAgentIgnoreURLCounter( const ::rtl::OUString& _rURL ); - void resetAgentIgnoreURLCounter( const ::rtl::OUString& _rURL ); - void resetAgentIgnoreURLCounter(); + sal_Int32 getAgentIgnoreURLCounter( const ::rtl::OUString& _rURL ); + void decAgentIgnoreURLCounter( const ::rtl::OUString& _rURL ); + void resetAgentIgnoreURLCounter( const ::rtl::OUString& _rURL ); + void resetAgentIgnoreURLCounter(); void SetWelcomeScreen( sal_Bool b ) { bWelcomeScreen = b; SetModified(); } sal_Bool IsWelcomeScreen() const { return bWelcomeScreen; } IdList* GetPIStarterList() { return pList; } void AddToPIStarterList( sal_Int32 nId ); void RemoveFromPIStarterList( sal_Int32 nId ); - String GetLocale() const { return aLocale; } - String GetSystem() const { return aSystem; } + String GetLocale() const { return aLocale; } + String GetSystem() const { return aSystem; } const String& GetHelpStyleSheet()const{return sHelpStyleSheet;} void SetHelpStyleSheet(const String& rStyleSheet){sHelpStyleSheet = rStyleSheet; SetModified();} @@ -116,10 +116,10 @@ public: static ::osl::Mutex & getInitMutex(); protected: - void implLoadURLCounters(); - void implSaveURLCounters(); + void implLoadURLCounters(); + void implSaveURLCounters(); // to be called with aIgnoreCounterSafety locked - void implGetURLCounters( Sequence< ::rtl::OUString >& _rNodeNames, Sequence< Any >& _rURLs, Sequence< Any >& _rCounter ); + void implGetURLCounters( Sequence< ::rtl::OUString >& _rNodeNames, Sequence< Any >& _rURLs, Sequence< Any >& _rCounter ); }; Sequence< OUString > SvtHelpOptions_Impl::GetPropertyNames() @@ -134,7 +134,7 @@ Sequence< OUString > SvtHelpOptions_Impl::GetPropertyNames() "Locale", "System", "HelpStyleSheet", -// "HowTo/Show" +// "HowTo/Show" }; const int nCount = sizeof( aPropNames ) / sizeof( const char* ); @@ -184,11 +184,11 @@ static int lcl_MapPropertyName( const ::rtl::OUString rCompare, const uno::Sequence< ::rtl::OUString>& aInternalPropertyNames) { for(int nProp = 0; nProp < aInternalPropertyNames.getLength(); ++nProp) - { + { if( aInternalPropertyNames[nProp] == rCompare ) return nProp; } - return -1; + return -1; } void SvtHelpOptions_Impl::Load(const uno::Sequence< ::rtl::OUString>& rPropertyNames) @@ -345,27 +345,27 @@ void SvtHelpOptions_Impl::implSaveURLCounters() const ::rtl::OUString sCounterLocalPath = ::rtl::OUString::createFromAscii("/Counter"); // get the current URL/counter pairs (as they're persistent at the moment) - Sequence< ::rtl::OUString > aNodeNames; - Sequence< Any > aURLs; - Sequence< Any > aCounters; + Sequence< ::rtl::OUString > aNodeNames; + Sequence< Any > aURLs; + Sequence< Any > aCounters; implGetURLCounters(aNodeNames, aURLs, aCounters); sal_Int32 nKnownURLs = aURLs.getLength(); - const ::rtl::OUString* pNodeNames = aNodeNames.getConstArray(); - const Any* pURLs = aURLs.getConstArray(); - const Any* pCounters = aCounters.getConstArray(); + const ::rtl::OUString* pNodeNames = aNodeNames.getConstArray(); + const Any* pURLs = aURLs.getConstArray(); + const Any* pCounters = aCounters.getConstArray(); // check which of them must be deleted/modified - Sequence< ::rtl::OUString > aDeleteFromConfig(nKnownURLs); // names of nodes to be deleted - ::rtl::OUString* pDeleteFromConfig = aDeleteFromConfig.getArray(); - ::std::set< ::rtl::OUString > aAlreadyPresent; // URLs currently persistent + Sequence< ::rtl::OUString > aDeleteFromConfig(nKnownURLs); // names of nodes to be deleted + ::rtl::OUString* pDeleteFromConfig = aDeleteFromConfig.getArray(); + ::std::set< ::rtl::OUString > aAlreadyPresent; // URLs currently persistent // for modifying already existent nodes - Sequence< ::rtl::OUString > aNewCounterNodePaths(nKnownURLs); - Sequence< Any > aNewCounterValues(nKnownURLs); - ::rtl::OUString* pNewCounterNodePaths = aNewCounterNodePaths.getArray(); - Any* pNewCounterValues = aNewCounterValues.getArray(); + Sequence< ::rtl::OUString > aNewCounterNodePaths(nKnownURLs); + Sequence< Any > aNewCounterValues(nKnownURLs); + ::rtl::OUString* pNewCounterNodePaths = aNewCounterNodePaths.getArray(); + Any* pNewCounterValues = aNewCounterValues.getArray(); // temporaries needed inside the loop ::rtl::OUString sCurrentURL, sCurrentURLNodeName; @@ -377,13 +377,13 @@ void SvtHelpOptions_Impl::implSaveURLCounters() ConstMapString2IntIterator aThisURLNewCounter = aURLIgnoreCounters.find(sCurrentURL); if (aURLIgnoreCounters.end() == aThisURLNewCounter) - { // we do not know anything about this URL anymore. + { // we do not know anything about this URL anymore. // -> have to removed it from the configuration later on *pDeleteFromConfig = *pNodeNames; ++pDeleteFromConfig; } else - { // we know this URL + { // we know this URL sCurrentURLNodeName = sIgnoreListNodePath; sCurrentURLNodeName += sPathSeparator; sCurrentURLNodeName += *pNodeNames; @@ -395,7 +395,7 @@ void SvtHelpOptions_Impl::implSaveURLCounters() (*pCounters) >>= nThisURLPersistentCounter; if (aThisURLNewCounter->second != nThisURLPersistentCounter) - { // the counter changed + { // the counter changed // -> remember the path and the new counter for the adjustment below *pNewCounterNodePaths = sCurrentURLNodeName; *pNewCounterNodePaths += sCounterLocalPath; @@ -425,15 +425,15 @@ void SvtHelpOptions_Impl::implSaveURLCounters() // and for the new ones ... ::rtl::OUString sNewNodeName; Sequence< ::rtl::OUString > aNewCounterDataNodeNames(2); - Sequence< Any > aNewCounterDataValues(2); + Sequence< Any > aNewCounterDataValues(2); const ::rtl::OUString sNodeNameBase = ::rtl::OUString::createFromAscii("URL"); - for ( ConstMapString2IntIterator aCollectNew = aURLIgnoreCounters.begin(); + for ( ConstMapString2IntIterator aCollectNew = aURLIgnoreCounters.begin(); aCollectNew != aURLIgnoreCounters.end(); ++aCollectNew ) { if (aAlreadyPresent.end() == aAlreadyPresent.find(aCollectNew->first)) - { // this URL is not persistent, yet + { // this URL is not persistent, yet // -> add a new node sNewNodeName = sNodeNameBase; if (!getUniqueSetElementName(sIgnoreListNodePath, sNewNodeName)) @@ -448,13 +448,13 @@ void SvtHelpOptions_Impl::implSaveURLCounters() aNewCounterDataNodeNames[0] += sPathSeparator; aNewCounterDataNodeNames[0] += sNewNodeName; aNewCounterDataNodeNames[0] += sURLLocalPath; - aNewCounterDataValues[0] <<= aCollectNew->first; + aNewCounterDataValues[0] <<= aCollectNew->first; aNewCounterDataNodeNames[1] = sIgnoreListNodePath; aNewCounterDataNodeNames[1] += sPathSeparator; aNewCounterDataNodeNames[1] += sNewNodeName; aNewCounterDataNodeNames[1] += sCounterLocalPath; - aNewCounterDataValues[1] <<= aCollectNew->second; + aNewCounterDataValues[1] <<= aCollectNew->second; PutProperties(aNewCounterDataNodeNames, aNewCounterDataValues); } @@ -467,9 +467,9 @@ void SvtHelpOptions_Impl::implLoadURLCounters() { ::osl::MutexGuard aGuard(aIgnoreCounterSafety); - Sequence< ::rtl::OUString > aNodeNames; - Sequence< Any > aURLs; - Sequence< Any > aCounters; + Sequence< ::rtl::OUString > aNodeNames; + Sequence< Any > aURLs; + Sequence< Any > aCounters; implGetURLCounters(aNodeNames, aURLs, aCounters); sal_Int32 nKnownURLs = aURLs.getLength(); @@ -554,7 +554,7 @@ SvtHelpOptions::SvtHelpOptions() { RTL_LOGFILE_CONTEXT(aLog, "svtools ( ??? ) ::SvtHelpOptions_Impl::ctor()"); pOptions = new SvtHelpOptions_Impl; - + ItemHolder2::holdConfigItem(E_HELPOPTIONS); } pImp = pOptions; @@ -578,7 +578,7 @@ void SvtHelpOptions_Impl::decAgentIgnoreURLCounter( const ::rtl::OUString& _rURL ::osl::MutexGuard aGuard(aIgnoreCounterSafety); MapString2IntIterator aMapPos = aURLIgnoreCounters.find(_rURL); if (aURLIgnoreCounters.end() == aMapPos) - { // nothing known about this URL 'til now + { // nothing known about this URL 'til now sal_Int32 nLimit = GetHelpAgentRetryLimit(); sal_Int32 nIgnoreAgain = nLimit > 0 ? nLimit - 1 : 0; aURLIgnoreCounters[_rURL] = nIgnoreAgain; diff --git a/svtools/source/config/htmlcfg.cxx b/svtools/source/config/htmlcfg.cxx index 77b9083c2481..9952d3e70052 100644 --- a/svtools/source/config/htmlcfg.cxx +++ b/svtools/source/config/htmlcfg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,14 +38,14 @@ #include <sal/macros.h> // ----------------------------------------------------------------------- -#define HTMLCFG_UNKNOWN_TAGS 0x01 -//#define HTMLCFG_STYLE_SHEETS 0x02 -//#define HTMLCFG_NETSCAPE3 0x04 -#define HTMLCFG_STAR_BASIC 0x08 -#define HTMLCFG_LOCAL_GRF 0x10 -#define HTMLCFG_PRINT_LAYOUT_EXTENSION 0x20 -#define HTMLCFG_IGNORE_FONT_FAMILY 0x40 -#define HTMLCFG_IS_BASIC_WARNING 0x80 +#define HTMLCFG_UNKNOWN_TAGS 0x01 +//#define HTMLCFG_STYLE_SHEETS 0x02 +//#define HTMLCFG_NETSCAPE3 0x04 +#define HTMLCFG_STAR_BASIC 0x08 +#define HTMLCFG_LOCAL_GRF 0x10 +#define HTMLCFG_PRINT_LAYOUT_EXTENSION 0x20 +#define HTMLCFG_IGNORE_FONT_FAMILY 0x40 +#define HTMLCFG_IS_BASIC_WARNING 0x80 #define HTMLCFG_NUMBERS_ENGLISH_US 0x100 using namespace utl; @@ -63,10 +63,10 @@ DECLARE_LIST( LinkList, Link * ) struct HtmlOptions_Impl { LinkList aList; - sal_Int32 nFlags; - sal_Int32 nExportMode; - sal_Int32 aFontSizeArr[HTML_FONT_COUNT]; - sal_Int32 eEncoding; + sal_Int32 nFlags; + sal_Int32 nExportMode; + sal_Int32 aFontSizeArr[HTML_FONT_COUNT]; + sal_Int32 eEncoding; sal_Bool bIsEncodingDefault; HtmlOptions_Impl() : @@ -95,21 +95,21 @@ const Sequence<OUString>& SvxHtmlOptions::GetPropertyNames() { static const char* aPropNames[] = { - "Import/UnknownTag", // 0 - "Import/FontSetting", // 1 - "Import/FontSize/Size_1", // 2 - "Import/FontSize/Size_2", // 3 - "Import/FontSize/Size_3", // 4 - "Import/FontSize/Size_4", // 5 - "Import/FontSize/Size_5", // 6 - "Import/FontSize/Size_6", // 7 - "Import/FontSize/Size_7", // 8 - "Export/Browser", // 9 - "Export/Basic", // 0 - "Export/PrintLayout", // 11 - "Export/LocalGraphic", // 12 - "Export/Warning", // 13 - "Export/Encoding", // 14 + "Import/UnknownTag", // 0 + "Import/FontSetting", // 1 + "Import/FontSize/Size_1", // 2 + "Import/FontSize/Size_2", // 3 + "Import/FontSize/Size_3", // 4 + "Import/FontSize/Size_4", // 5 + "Import/FontSize/Size_5", // 6 + "Import/FontSize/Size_6", // 7 + "Import/FontSize/Size_7", // 8 + "Export/Browser", // 9 + "Export/Basic", // 0 + "Export/PrintLayout", // 11 + "Export/LocalGraphic", // 12 + "Export/Warning", // 13 + "Export/Encoding", // 14 "Import/NumbersEnglishUS" // 15 }; const int nCount = SAL_N_ELEMENTS(aPropNames); @@ -166,17 +166,17 @@ void SvxHtmlOptions::Load( const Sequence< OUString >& aNames ) case 9://"Export/Browser", { sal_Int32 nExpMode = 0; -// pValues[nProp] >>= pImp->nExportMode; +// pValues[nProp] >>= pImp->nExportMode; pValues[nProp] >>= nExpMode; switch( nExpMode ) { - case 0: nExpMode = HTML_CFG_HTML32; break; - case 1: nExpMode = HTML_CFG_MSIE_40; break; -// case 2: nExpMode = HTML_CFG_NS30; break; depricated - case 3: nExpMode = HTML_CFG_WRITER; break; - case 4: nExpMode = HTML_CFG_NS40; break; - case 5: nExpMode = HTML_CFG_MSIE_40_OLD;break; - default: nExpMode = HTML_CFG_NS40; break; + case 0: nExpMode = HTML_CFG_HTML32; break; + case 1: nExpMode = HTML_CFG_MSIE_40; break; +// case 2: nExpMode = HTML_CFG_NS30; break; depricated + case 3: nExpMode = HTML_CFG_WRITER; break; + case 4: nExpMode = HTML_CFG_NS40; break; + case 5: nExpMode = HTML_CFG_MSIE_40_OLD;break; + default: nExpMode = HTML_CFG_NS40; break; } pImp->nExportMode = nExpMode; @@ -214,15 +214,15 @@ void SvxHtmlOptions::Load( const Sequence< OUString >& aNames ) } // ----------------------------------------------------------------------- -void SvxHtmlOptions::Commit() +void SvxHtmlOptions::Commit() { const Sequence<OUString>& aNames = GetPropertyNames(); -// const OUString* pNames = aNames.getConstArray(); +// const OUString* pNames = aNames.getConstArray(); Sequence<Any> aValues(aNames.getLength()); Any* pValues = aValues.getArray(); -// const Type& rType = ::getBooleanCppuType(); +// const Type& rType = ::getBooleanCppuType(); for(int nProp = 0; nProp < aNames.getLength(); nProp++) { sal_Bool bSet = sal_False; @@ -237,19 +237,19 @@ void SvxHtmlOptions::Commit() case 6: pValues[nProp] <<= pImp->aFontSizeArr[4];break;//"Import/FontSize/Size_5", case 7: pValues[nProp] <<= pImp->aFontSizeArr[5];break;//"Import/FontSize/Size_6", case 8: pValues[nProp] <<= pImp->aFontSizeArr[6];break;//"Import/FontSize/Size_7", - case 9: //"Export/Browser", + case 9: //"Export/Browser", { sal_Int32 nExpMode = pImp->nExportMode; switch( nExpMode ) { - case HTML_CFG_HTML32: nExpMode = 0; break; - case HTML_CFG_MSIE_40: nExpMode = 1; break; -// case HTML_CFG_NS30: nExpMode = 2; break; depricated - case HTML_CFG_WRITER: nExpMode = 3; break; - case HTML_CFG_NS40: nExpMode = 4; break; - case HTML_CFG_MSIE_40_OLD: nExpMode = 5; break; - default: nExpMode = 4; break; // NS40 + case HTML_CFG_HTML32: nExpMode = 0; break; + case HTML_CFG_MSIE_40: nExpMode = 1; break; +// case HTML_CFG_NS30: nExpMode = 2; break; depricated + case HTML_CFG_WRITER: nExpMode = 3; break; + case HTML_CFG_NS40: nExpMode = 4; break; + case HTML_CFG_MSIE_40_OLD: nExpMode = 5; break; + default: nExpMode = 4; break; // NS40 } pValues[nProp] <<= nExpMode; @@ -302,7 +302,7 @@ void SvxHtmlOptions::Notify( const com::sun::star::uno::Sequence< rtl::OUString } // ----------------------------------------------------------------------- -USHORT SvxHtmlOptions::GetFontSize(USHORT nPos) const +USHORT SvxHtmlOptions::GetFontSize(USHORT nPos) const { if(nPos < HTML_FONT_COUNT) return (USHORT)pImp->aFontSizeArr[nPos]; @@ -343,7 +343,7 @@ void SvxHtmlOptions::SetImportUnknown(BOOL bSet) // ----------------------------------------------------------------------- -USHORT SvxHtmlOptions::GetExportMode() const +USHORT SvxHtmlOptions::GetExportMode() const { return (USHORT)pImp->nExportMode; } @@ -405,7 +405,7 @@ void SvxHtmlOptions::SetSaveGraphicsLocal(BOOL bSet) --------------------------------------------------*/ -BOOL SvxHtmlOptions::IsPrintLayoutExtension() const +BOOL SvxHtmlOptions::IsPrintLayoutExtension() const { BOOL bRet = 0 != (pImp->nFlags & HTMLCFG_PRINT_LAYOUT_EXTENSION); switch( pImp->nExportMode ) @@ -422,7 +422,7 @@ BOOL SvxHtmlOptions::IsPrintLayoutExtension() const /*-----------------10/21/97 08:34am----------------- --------------------------------------------------*/ -void SvxHtmlOptions::SetPrintLayoutExtension(BOOL bSet) +void SvxHtmlOptions::SetPrintLayoutExtension(BOOL bSet) { if(bSet) pImp->nFlags |= HTMLCFG_PRINT_LAYOUT_EXTENSION; diff --git a/svtools/source/config/itemholder2.cxx b/svtools/source/config/itemholder2.cxx index 2c0b250934b5..8508ea9b629f 100644 --- a/svtools/source/config/itemholder2.cxx +++ b/svtools/source/config/itemholder2.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/svtools/source/config/itemholder2.hxx b/svtools/source/config/itemholder2.hxx index 884536d89bb0..25a41788ba84 100644 --- a/svtools/source/config/itemholder2.hxx +++ b/svtools/source/config/itemholder2.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/svtools/source/config/menuoptions.cxx b/svtools/source/config/menuoptions.cxx index cb497a1ea6eb..e0b57c58bef2 100644 --- a/svtools/source/config/menuoptions.cxx +++ b/svtools/source/config/menuoptions.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,30 +41,30 @@ #include "itemholder2.hxx" //_________________________________________________________________________________________________________________ -// namespaces +// namespaces //_________________________________________________________________________________________________________________ -using namespace ::utl ; -using namespace ::rtl ; -using namespace ::osl ; -using namespace ::com::sun::star::uno ; +using namespace ::utl ; +using namespace ::rtl ; +using namespace ::osl ; +using namespace ::com::sun::star::uno ; //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ -#define ROOTNODE_MENU OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/View/Menu" )) -#define DEFAULT_DONTHIDEDISABLEDENTRIES sal_False -#define DEFAULT_FOLLOWMOUSE sal_True -#define DEFAULT_MENUICONS 2 +#define ROOTNODE_MENU OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/View/Menu" )) +#define DEFAULT_DONTHIDEDISABLEDENTRIES sal_False +#define DEFAULT_FOLLOWMOUSE sal_True +#define DEFAULT_MENUICONS 2 -#define PROPERTYNAME_DONTHIDEDISABLEDENTRIES OUString(RTL_CONSTASCII_USTRINGPARAM("DontHideDisabledEntry" )) -#define PROPERTYNAME_FOLLOWMOUSE OUString(RTL_CONSTASCII_USTRINGPARAM("FollowMouse" )) +#define PROPERTYNAME_DONTHIDEDISABLEDENTRIES OUString(RTL_CONSTASCII_USTRINGPARAM("DontHideDisabledEntry" )) +#define PROPERTYNAME_FOLLOWMOUSE OUString(RTL_CONSTASCII_USTRINGPARAM("FollowMouse" )) #define PROPERTYNAME_SHOWICONSINMENUES OUString(RTL_CONSTASCII_USTRINGPARAM("ShowIconsInMenues" )) #define PROPERTYNAME_SYSTEMICONSINMENUES OUString(RTL_CONSTASCII_USTRINGPARAM("IsSystemIconsInMenus" )) -#define PROPERTYHANDLE_DONTHIDEDISABLEDENTRIES 0 -#define PROPERTYHANDLE_FOLLOWMOUSE 1 +#define PROPERTYHANDLE_DONTHIDEDISABLEDENTRIES 0 +#define PROPERTYHANDLE_FOLLOWMOUSE 1 #define PROPERTYHANDLE_SHOWICONSINMENUES 2 #define PROPERTYHANDLE_SYSTEMICONSINMENUES 3 @@ -75,29 +75,29 @@ using namespace ::com::sun::star::uno ; DECLARE_LIST( LinkList, Link * ) //_________________________________________________________________________________________________________________ -// private declarations! +// private declarations! //_________________________________________________________________________________________________________________ class SvtMenuOptions_Impl : public ConfigItem { //------------------------------------------------------------------------------------------------------------- - // private member + // private member //------------------------------------------------------------------------------------------------------------- private: LinkList aList; - sal_Bool m_bDontHideDisabledEntries ; /// cache "DontHideDisabledEntries" of Menu section - sal_Bool m_bFollowMouse ; /// cache "FollowMouse" of Menu section - sal_Int16 m_nMenuIcons ; /// cache "MenuIcons" of Menu section + sal_Bool m_bDontHideDisabledEntries ; /// cache "DontHideDisabledEntries" of Menu section + sal_Bool m_bFollowMouse ; /// cache "FollowMouse" of Menu section + sal_Int16 m_nMenuIcons ; /// cache "MenuIcons" of Menu section //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: //--------------------------------------------------------------------------------------------------------- - // constructor / destructor + // constructor / destructor //--------------------------------------------------------------------------------------------------------- SvtMenuOptions_Impl(); @@ -107,67 +107,67 @@ class SvtMenuOptions_Impl : public ConfigItem void RemoveListenerLink( const Link& rLink ); //--------------------------------------------------------------------------------------------------------- - // overloaded methods of baseclass + // overloaded methods of baseclass //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short called for notify of configmanager - @descr These method is called from the ConfigManager before application ends or from the + @short called for notify of configmanager + @descr These method is called from the ConfigManager before application ends or from the PropertyChangeListener if the sub tree broadcasts changes. You must update your internal values. - @seealso baseclass ConfigItem + @seealso baseclass ConfigItem - @param "seqPropertyNames" is the list of properties which should be updated. - @return - + @param "seqPropertyNames" is the list of properties which should be updated. + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual void Notify( const Sequence< OUString >& seqPropertyNames ); /*-****************************************************************************************************//** - @short write changes to configuration - @descr These method writes the changed values into the sub tree + @short write changes to configuration + @descr These method writes the changed values into the sub tree and should always called in our destructor to guarantee consistency of config data. - @seealso baseclass ConfigItem + @seealso baseclass ConfigItem - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual void Commit(); //--------------------------------------------------------------------------------------------------------- - // public interface + // public interface //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short access method to get internal values - @descr These method give us a chance to regulate acces to ouer internal values. + @short access method to get internal values + @descr These method give us a chance to regulate acces to ouer internal values. It's not used in the moment - but it's possible for the feature! - @seealso - + @seealso - - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ - sal_Bool IsEntryHidingEnabled() const + sal_Bool IsEntryHidingEnabled() const { return m_bDontHideDisabledEntries; } - sal_Bool IsFollowMouseEnabled() const + sal_Bool IsFollowMouseEnabled() const { return m_bFollowMouse; } - sal_Int16 GetMenuIconsState() const + sal_Int16 GetMenuIconsState() const { return m_nMenuIcons; } - void SetEntryHidingState ( sal_Bool bState ) + void SetEntryHidingState ( sal_Bool bState ) { m_bDontHideDisabledEntries = bState; SetModified(); @@ -176,7 +176,7 @@ class SvtMenuOptions_Impl : public ConfigItem Commit(); } - void SetFollowMouseState ( sal_Bool bState ) + void SetFollowMouseState ( sal_Bool bState ) { m_bFollowMouse = bState; SetModified(); @@ -185,7 +185,7 @@ class SvtMenuOptions_Impl : public ConfigItem Commit(); } - void SetMenuIconsState ( sal_Int16 nState ) + void SetMenuIconsState ( sal_Int16 nState ) { m_nMenuIcons = nState; SetModified(); @@ -195,45 +195,45 @@ class SvtMenuOptions_Impl : public ConfigItem } //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- private: /*-****************************************************************************************************//** - @short return list of fix key names of ouer configuration management which represent oue module tree - @descr These methods return a static const list of key names. We need it to get needed values from our + @short return list of fix key names of ouer configuration management which represent oue module tree + @descr These methods return a static const list of key names. We need it to get needed values from our configuration management. - @seealso - + @seealso - - @param - - @return A list of needed configuration keys is returned. + @param - + @return A list of needed configuration keys is returned. - @onerror - + @onerror - *//*-*****************************************************************************************************/ static Sequence< OUString > impl_GetPropertyNames(); }; //_________________________________________________________________________________________________________________ -// definitions +// definitions //_________________________________________________________________________________________________________________ //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** SvtMenuOptions_Impl::SvtMenuOptions_Impl() // Init baseclasses first - : ConfigItem ( ROOTNODE_MENU ) + : ConfigItem ( ROOTNODE_MENU ) // Init member then. - , m_bDontHideDisabledEntries ( DEFAULT_DONTHIDEDISABLEDENTRIES ) - , m_bFollowMouse ( DEFAULT_FOLLOWMOUSE ) - , m_nMenuIcons ( DEFAULT_MENUICONS ) + , m_bDontHideDisabledEntries ( DEFAULT_DONTHIDEDISABLEDENTRIES ) + , m_bFollowMouse ( DEFAULT_FOLLOWMOUSE ) + , m_nMenuIcons ( DEFAULT_MENUICONS ) { // Use our static list of configuration keys to get his values. - Sequence< OUString > seqNames = impl_GetPropertyNames(); - Sequence< Any > seqValues = GetProperties( seqNames ) ; + Sequence< OUString > seqNames = impl_GetPropertyNames(); + Sequence< Any > seqValues = GetProperties( seqNames ) ; // Safe impossible cases. // We need values from ALL configuration keys. @@ -251,8 +251,8 @@ SvtMenuOptions_Impl::SvtMenuOptions_Impl() } // Copy values from list in right order to ouer internal member. - sal_Int32 nPropertyCount = seqValues.getLength() ; - sal_Int32 nProperty = 0 ; + sal_Int32 nPropertyCount = seqValues.getLength() ; + sal_Int32 nProperty = 0 ; for( nProperty=0; nProperty<nPropertyCount; ++nProperty ) { // Safe impossible cases. @@ -260,13 +260,13 @@ SvtMenuOptions_Impl::SvtMenuOptions_Impl() DBG_ASSERT( !(seqValues[nProperty].hasValue()==sal_False), "SvtMenuOptions_Impl::SvtMenuOptions_Impl()\nInvalid property value for property detected!\n" ); switch( nProperty ) { - case PROPERTYHANDLE_DONTHIDEDISABLEDENTRIES : { + case PROPERTYHANDLE_DONTHIDEDISABLEDENTRIES : { DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtMenuOptions_Impl::SvtMenuOptions_Impl()\nWho has changed the value type of \"Office.Common\\View\\Menu\\DontHideDisabledEntry\"?" ); seqValues[nProperty] >>= m_bDontHideDisabledEntries; } break; - case PROPERTYHANDLE_FOLLOWMOUSE : { + case PROPERTYHANDLE_FOLLOWMOUSE : { DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtMenuOptions_Impl::SvtMenuOptions_Impl()\nWho has changed the value type of \"Office.Common\\View\\Menu\\FollowMouse\"?" ); seqValues[nProperty] >>= m_bFollowMouse; } @@ -276,7 +276,7 @@ SvtMenuOptions_Impl::SvtMenuOptions_Impl() seqValues[nProperty] >>= bMenuIcons; } break; - case PROPERTYHANDLE_SYSTEMICONSINMENUES : { + case PROPERTYHANDLE_SYSTEMICONSINMENUES : { DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtMenuOptions_Impl::SvtMenuOptions_Impl()\nWho has changed the value type of \"Office.Common\\View\\Menu\\IsSystemIconsInMenus\"?" ); seqValues[nProperty] >>= bSystemMenuIcons; } @@ -290,7 +290,7 @@ SvtMenuOptions_Impl::SvtMenuOptions_Impl() } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** SvtMenuOptions_Impl::~SvtMenuOptions_Impl() { @@ -306,7 +306,7 @@ SvtMenuOptions_Impl::~SvtMenuOptions_Impl() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtMenuOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames ) { @@ -358,24 +358,24 @@ void SvtMenuOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames ) } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtMenuOptions_Impl::Commit() { // Get names of supported properties, create a list for values and copy current values to it. - Sequence< OUString > seqNames = impl_GetPropertyNames(); - sal_Int32 nCount = seqNames.getLength(); - Sequence< Any > seqValues ( nCount ); + Sequence< OUString > seqNames = impl_GetPropertyNames(); + sal_Int32 nCount = seqNames.getLength(); + Sequence< Any > seqValues ( nCount ); for( sal_Int32 nProperty=0; nProperty<nCount; ++nProperty ) { switch( nProperty ) { - case PROPERTYHANDLE_DONTHIDEDISABLEDENTRIES : { + case PROPERTYHANDLE_DONTHIDEDISABLEDENTRIES : { seqValues[nProperty] <<= m_bDontHideDisabledEntries; } break; - case PROPERTYHANDLE_FOLLOWMOUSE : { + case PROPERTYHANDLE_FOLLOWMOUSE : { seqValues[nProperty] <<= m_bFollowMouse; } break; @@ -385,7 +385,7 @@ void SvtMenuOptions_Impl::Commit() seqValues[nProperty] <<= bValue; } break; - case PROPERTYHANDLE_SYSTEMICONSINMENUES : { + case PROPERTYHANDLE_SYSTEMICONSINMENUES : { sal_Bool bValue = (m_nMenuIcons == 2 ? sal_True : sal_False) ; seqValues[nProperty] <<= bValue; } @@ -397,16 +397,16 @@ void SvtMenuOptions_Impl::Commit() } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** Sequence< OUString > SvtMenuOptions_Impl::impl_GetPropertyNames() { // Build static list of configuration key names. static const OUString pProperties[] = { - PROPERTYNAME_DONTHIDEDISABLEDENTRIES , - PROPERTYNAME_FOLLOWMOUSE , - PROPERTYNAME_SHOWICONSINMENUES , + PROPERTYNAME_DONTHIDEDISABLEDENTRIES , + PROPERTYNAME_FOLLOWMOUSE , + PROPERTYNAME_SHOWICONSINMENUES , PROPERTYNAME_SYSTEMICONSINMENUES }; // Initialize return sequence with these list ... @@ -433,15 +433,15 @@ void SvtMenuOptions_Impl::RemoveListenerLink( const Link& rLink ) } //***************************************************************************************************************** -// initialize static member -// DON'T DO IT IN YOUR HEADER! -// see definition for further informations +// initialize static member +// DON'T DO IT IN YOUR HEADER! +// see definition for further informations //***************************************************************************************************************** -SvtMenuOptions_Impl* SvtMenuOptions::m_pDataContainer = NULL ; -sal_Int32 SvtMenuOptions::m_nRefCount = 0 ; +SvtMenuOptions_Impl* SvtMenuOptions::m_pDataContainer = NULL ; +sal_Int32 SvtMenuOptions::m_nRefCount = 0 ; //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** SvtMenuOptions::SvtMenuOptions() { @@ -460,7 +460,7 @@ SvtMenuOptions::SvtMenuOptions() } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** SvtMenuOptions::~SvtMenuOptions() { @@ -478,7 +478,7 @@ SvtMenuOptions::~SvtMenuOptions() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Bool SvtMenuOptions::IsEntryHidingEnabled() const { @@ -487,7 +487,7 @@ sal_Bool SvtMenuOptions::IsEntryHidingEnabled() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Bool SvtMenuOptions::IsFollowMouseEnabled() const { @@ -496,7 +496,7 @@ sal_Bool SvtMenuOptions::IsFollowMouseEnabled() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtMenuOptions::SetEntryHidingState( sal_Bool bState ) { @@ -505,7 +505,7 @@ void SvtMenuOptions::SetEntryHidingState( sal_Bool bState ) } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtMenuOptions::SetFollowMouseState( sal_Bool bState ) { @@ -514,7 +514,7 @@ void SvtMenuOptions::SetFollowMouseState( sal_Bool bState ) } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Int16 SvtMenuOptions::GetMenuIconsState() const { @@ -523,7 +523,7 @@ sal_Int16 SvtMenuOptions::GetMenuIconsState() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtMenuOptions::SetMenuIconsState( sal_Int16 bState ) { @@ -532,7 +532,7 @@ void SvtMenuOptions::SetMenuIconsState( sal_Int16 bState ) } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** Mutex& SvtMenuOptions::GetOwnStaticMutex() { diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx index 8d481799789f..7ec66b1f1329 100644 --- a/svtools/source/config/miscopt.cxx +++ b/svtools/source/config/miscopt.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" //_________________________________________________________________________________________________________________ -// includes +// includes //_________________________________________________________________________________________________________________ #include <svtools/miscopt.hxx> @@ -50,41 +50,41 @@ #include <vcl/svapp.hxx> //_________________________________________________________________________________________________________________ -// namespaces +// namespaces //_________________________________________________________________________________________________________________ -using namespace ::utl ; -using namespace ::rtl ; -using namespace ::osl ; -using namespace ::com::sun::star::uno ; +using namespace ::utl ; +using namespace ::rtl ; +using namespace ::osl ; +using namespace ::com::sun::star::uno ; using namespace ::com::sun::star; //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ -#define ASCII_STR(s) OUString( RTL_CONSTASCII_USTRINGPARAM(s) ) -#define ROOTNODE_MISC ASCII_STR("Office.Common/Misc") -#define DEFAULT_PLUGINSENABLED sal_True; - -#define PROPERTYNAME_PLUGINSENABLED ASCII_STR("PluginsEnabled") -#define PROPERTYHANDLE_PLUGINSENABLED 0 -#define PROPERTYNAME_SYMBOLSET ASCII_STR("SymbolSet") -#define PROPERTYHANDLE_SYMBOLSET 1 -#define PROPERTYNAME_TOOLBOXSTYLE ASCII_STR("ToolboxStyle") -#define PROPERTYHANDLE_TOOLBOXSTYLE 2 -#define PROPERTYNAME_USESYSTEMFILEDIALOG ASCII_STR("UseSystemFileDialog") -#define PROPERTYHANDLE_USESYSTEMFILEDIALOG 3 -#define PROPERTYNAME_SYMBOLSTYLE ASCII_STR("SymbolStyle") -#define PROPERTYHANDLE_SYMBOLSTYLE 4 -#define PROPERTYNAME_USESYSTEMPRINTDIALOG ASCII_STR("UseSystemPrintDialog") -#define PROPERTYHANDLE_USESYSTEMPRINTDIALOG 5 +#define ASCII_STR(s) OUString( RTL_CONSTASCII_USTRINGPARAM(s) ) +#define ROOTNODE_MISC ASCII_STR("Office.Common/Misc") +#define DEFAULT_PLUGINSENABLED sal_True; + +#define PROPERTYNAME_PLUGINSENABLED ASCII_STR("PluginsEnabled") +#define PROPERTYHANDLE_PLUGINSENABLED 0 +#define PROPERTYNAME_SYMBOLSET ASCII_STR("SymbolSet") +#define PROPERTYHANDLE_SYMBOLSET 1 +#define PROPERTYNAME_TOOLBOXSTYLE ASCII_STR("ToolboxStyle") +#define PROPERTYHANDLE_TOOLBOXSTYLE 2 +#define PROPERTYNAME_USESYSTEMFILEDIALOG ASCII_STR("UseSystemFileDialog") +#define PROPERTYHANDLE_USESYSTEMFILEDIALOG 3 +#define PROPERTYNAME_SYMBOLSTYLE ASCII_STR("SymbolStyle") +#define PROPERTYHANDLE_SYMBOLSTYLE 4 +#define PROPERTYNAME_USESYSTEMPRINTDIALOG ASCII_STR("UseSystemPrintDialog") +#define PROPERTYHANDLE_USESYSTEMPRINTDIALOG 5 #define PROPERTYNAME_TRYODMADIALOG ASCII_STR("TryODMADialog") #define PROPERTYHANDLE_TRYODMADIALOG 6 -#define PROPERTYNAME_SHOWLINKWARNINGDIALOG ASCII_STR("ShowLinkWarningDialog") +#define PROPERTYNAME_SHOWLINKWARNINGDIALOG ASCII_STR("ShowLinkWarningDialog") #define PROPERTYHANDLE_SHOWLINKWARNINGDIALOG 7 -#define PROPERTYNAME_DISABLEUICUSTOMIZATION ASCII_STR("DisableUICustomization") -#define PROPERTYHANDLE_DISABLEUICUSTOMIZATION 8 +#define PROPERTYNAME_DISABLEUICUSTOMIZATION ASCII_STR("DisableUICustomization") +#define PROPERTYHANDLE_DISABLEUICUSTOMIZATION 8 #define PROPERTYNAME_ALWAYSALLOWSAVE ASCII_STR("AlwaysAllowSave") #define PROPERTYHANDLE_ALWAYSALLOWSAVE 9 #define PROPERTYNAME_EXPERIMENTALMODE ASCII_STR("ExperimentalMode") @@ -92,18 +92,18 @@ using namespace ::com::sun::star; #define PROPERTYCOUNT 11 -#define VCL_TOOLBOX_STYLE_FLAT ((USHORT)0x0004) // from <vcl/toolbox.hxx> +#define VCL_TOOLBOX_STYLE_FLAT ((USHORT)0x0004) // from <vcl/toolbox.hxx> DECLARE_LIST( LinkList, Link * ) //_________________________________________________________________________________________________________________ -// private declarations! +// private declarations! //_________________________________________________________________________________________________________________ class SvtMiscOptions_Impl : public ConfigItem { //------------------------------------------------------------------------------------------------------------- - // private member + // private member //------------------------------------------------------------------------------------------------------------- private: @@ -128,34 +128,34 @@ class SvtMiscOptions_Impl : public ConfigItem sal_Bool m_bExperimentalMode; //------------------------------------------------------------------------------------------------------------- - // public methods + // public methods //------------------------------------------------------------------------------------------------------------- public: //--------------------------------------------------------------------------------------------------------- - // constructor / destructor + // constructor / destructor //--------------------------------------------------------------------------------------------------------- SvtMiscOptions_Impl(); ~SvtMiscOptions_Impl(); //--------------------------------------------------------------------------------------------------------- - // overloaded methods of baseclass + // overloaded methods of baseclass //--------------------------------------------------------------------------------------------------------- /*-****************************************************************************************************//** - @short called for notify of configmanager - @descr These method is called from the ConfigManager before application ends or from the + @short called for notify of configmanager + @descr These method is called from the ConfigManager before application ends or from the PropertyChangeListener if the sub tree broadcasts changes. You must update your internal values. - @seealso baseclass ConfigItem + @seealso baseclass ConfigItem - @param "seqPropertyNames" is the list of properties which should be updated. - @return - + @param "seqPropertyNames" is the list of properties which should be updated. + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual void Notify( const Sequence< OUString >& seqPropertyNames ); @@ -167,22 +167,22 @@ class SvtMiscOptions_Impl : public ConfigItem void Load( const Sequence< OUString >& rPropertyNames ); /*-****************************************************************************************************//** - @short write changes to configuration - @descr These method writes the changed values into the sub tree + @short write changes to configuration + @descr These method writes the changed values into the sub tree and should always called in our destructor to guarantee consistency of config data. - @seealso baseclass ConfigItem + @seealso baseclass ConfigItem - @param - - @return - + @param - + @return - - @onerror - + @onerror - *//*-*****************************************************************************************************/ virtual void Commit(); //--------------------------------------------------------------------------------------------------------- - // public interface + // public interface //--------------------------------------------------------------------------------------------------------- inline sal_Bool UseSystemFileDialog() const @@ -280,22 +280,22 @@ class SvtMiscOptions_Impl : public ConfigItem void CallListeners(); //------------------------------------------------------------------------------------------------------------- - // private methods + // private methods //------------------------------------------------------------------------------------------------------------- private: /*-****************************************************************************************************//** - @short return list of key names of ouer configuration management which represent oue module tree - @descr These methods return a static const list of key names. We need it to get needed values from our + @short return list of key names of ouer configuration management which represent oue module tree + @descr These methods return a static const list of key names. We need it to get needed values from our configuration management. - @seealso - + @seealso - - @param - - @return A list of needed configuration keys is returned. + @param - + @return A list of needed configuration keys is returned. - @onerror - + @onerror - *//*-*****************************************************************************************************/ static Sequence< OUString > GetPropertyNames(); @@ -305,7 +305,7 @@ class SvtMiscOptions_Impl : public ConfigItem }; //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** SvtMiscOptions_Impl::SvtMiscOptions_Impl() // Init baseclasses first @@ -331,7 +331,7 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl() { // Use our static list of configuration keys to get his values. - Sequence< OUString > seqNames = GetPropertyNames ( ); + Sequence< OUString > seqNames = GetPropertyNames ( ); Load( seqNames ); Sequence< Any > seqValues = GetProperties ( seqNames ); Sequence< sal_Bool > seqRO = GetReadOnlyStates ( seqNames ); @@ -460,7 +460,7 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl() } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** SvtMiscOptions_Impl::~SvtMiscOptions_Impl() { @@ -664,7 +664,7 @@ void SvtMiscOptions_Impl::SetPluginsEnabled( sal_Bool bEnable ) } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtMiscOptions_Impl::Notify( const Sequence< OUString >& rPropertyNames ) { @@ -673,14 +673,14 @@ void SvtMiscOptions_Impl::Notify( const Sequence< OUString >& rPropertyNames ) } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtMiscOptions_Impl::Commit() { // Get names of supported properties, create a list for values and copy current values to it. - Sequence< OUString > seqNames = GetPropertyNames (); - sal_Int32 nCount = seqNames.getLength(); - Sequence< Any > seqValues ( nCount ); + Sequence< OUString > seqNames = GetPropertyNames (); + sal_Int32 nCount = seqNames.getLength(); + Sequence< Any > seqValues ( nCount ); for( sal_Int32 nProperty=0; nProperty<nCount; ++nProperty ) { switch( nProperty ) @@ -763,7 +763,7 @@ void SvtMiscOptions_Impl::Commit() } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** Sequence< OUString > SvtMiscOptions_Impl::GetPropertyNames() { @@ -790,15 +790,15 @@ Sequence< OUString > SvtMiscOptions_Impl::GetPropertyNames() } //***************************************************************************************************************** -// initialize static member -// DON'T DO IT IN YOUR HEADER! -// see definition for further informations +// initialize static member +// DON'T DO IT IN YOUR HEADER! +// see definition for further informations //***************************************************************************************************************** -SvtMiscOptions_Impl* SvtMiscOptions::m_pDataContainer = NULL ; -sal_Int32 SvtMiscOptions::m_nRefCount = 0 ; +SvtMiscOptions_Impl* SvtMiscOptions::m_pDataContainer = NULL ; +sal_Int32 SvtMiscOptions::m_nRefCount = 0 ; //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** SvtMiscOptions::SvtMiscOptions() { @@ -816,7 +816,7 @@ SvtMiscOptions::SvtMiscOptions() } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** SvtMiscOptions::~SvtMiscOptions() { @@ -1007,7 +1007,7 @@ sal_Bool SvtMiscOptions::IsExperimentalMode() const } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** Mutex & SvtMiscOptions::GetInitMutex() { diff --git a/svtools/source/config/optionsdrawinglayer.cxx b/svtools/source/config/optionsdrawinglayer.cxx index 546212bebc45..60df691ab8b9 100644 --- a/svtools/source/config/optionsdrawinglayer.cxx +++ b/svtools/source/config/optionsdrawinglayer.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ #endif //_________________________________________________________________________________________________________________ -// includes +// includes //_________________________________________________________________________________________________________________ #include <svtools/optionsdrawinglayer.hxx> @@ -46,189 +46,189 @@ #include <vcl/outdev.hxx> //_________________________________________________________________________________________________________________ -// namespaces +// namespaces //_________________________________________________________________________________________________________________ -using namespace ::utl ; -using namespace ::rtl ; -using namespace ::osl ; -using namespace ::com::sun::star::uno ; +using namespace ::utl ; +using namespace ::rtl ; +using namespace ::osl ; +using namespace ::com::sun::star::uno ; //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ -#define ROOTNODE_START OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Drawinglayer" )) -#define DEFAULT_OVERLAYBUFFER sal_True -#define DEFAULT_PAINTBUFFER sal_True -#define DEFAULT_STRIPE_COLOR_A 0 -#define DEFAULT_STRIPE_COLOR_B 16581375 -#define DEFAULT_STRIPE_LENGTH 4 +#define ROOTNODE_START OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Drawinglayer" )) +#define DEFAULT_OVERLAYBUFFER sal_True +#define DEFAULT_PAINTBUFFER sal_True +#define DEFAULT_STRIPE_COLOR_A 0 +#define DEFAULT_STRIPE_COLOR_B 16581375 +#define DEFAULT_STRIPE_LENGTH 4 // #i73602# // #i74769#, #i75172# : Change default for Calc and Writer to True -#define DEFAULT_OVERLAYBUFFER_CALC sal_True -#define DEFAULT_OVERLAYBUFFER_WRITER sal_True -#define DEFAULT_OVERLAYBUFFER_DRAWIMPRESS sal_True +#define DEFAULT_OVERLAYBUFFER_CALC sal_True +#define DEFAULT_OVERLAYBUFFER_WRITER sal_True +#define DEFAULT_OVERLAYBUFFER_DRAWIMPRESS sal_True // #i74769#, #i75172# -#define DEFAULT_PAINTBUFFER_CALC sal_True -#define DEFAULT_PAINTBUFFER_WRITER sal_True -#define DEFAULT_PAINTBUFFER_DRAWIMPRESS sal_True +#define DEFAULT_PAINTBUFFER_CALC sal_True +#define DEFAULT_PAINTBUFFER_WRITER sal_True +#define DEFAULT_PAINTBUFFER_DRAWIMPRESS sal_True // #i4219# -#define DEFAULT_MAXIMUMPAPERWIDTH 300 -#define DEFAULT_MAXIMUMPAPERHEIGHT 300 -#define DEFAULT_MAXIMUMPAPERLEFTMARGIN 9999 -#define DEFAULT_MAXIMUMPAPERRIGHTMARGIN 9999 -#define DEFAULT_MAXIMUMPAPERTOPMARGIN 9999 -#define DEFAULT_MAXIMUMPAPERBOTTOMMARGIN 9999 +#define DEFAULT_MAXIMUMPAPERWIDTH 300 +#define DEFAULT_MAXIMUMPAPERHEIGHT 300 +#define DEFAULT_MAXIMUMPAPERLEFTMARGIN 9999 +#define DEFAULT_MAXIMUMPAPERRIGHTMARGIN 9999 +#define DEFAULT_MAXIMUMPAPERTOPMARGIN 9999 +#define DEFAULT_MAXIMUMPAPERBOTTOMMARGIN 9999 // primitives -#define DEFAULT_ANTIALIASING sal_True -#define DEFAULT_SNAPHORVERLINESTODISCRETE sal_True -#define DEFAULT_SOLIDDRAGCREATE sal_True -#define DEFAULT_RENDERDECORATEDTEXTDIRECT sal_True -#define DEFAULT_RENDERSIMPLETEXTDIRECT sal_True -#define DEFAULT_QUADRATIC3DRENDERLIMIT 1000000 -#define DEFAULT_QUADRATICFORMCONTROLRENDERLIMIT 45000 +#define DEFAULT_ANTIALIASING sal_True +#define DEFAULT_SNAPHORVERLINESTODISCRETE sal_True +#define DEFAULT_SOLIDDRAGCREATE sal_True +#define DEFAULT_RENDERDECORATEDTEXTDIRECT sal_True +#define DEFAULT_RENDERSIMPLETEXTDIRECT sal_True +#define DEFAULT_QUADRATIC3DRENDERLIMIT 1000000 +#define DEFAULT_QUADRATICFORMCONTROLRENDERLIMIT 45000 // #i97672# selection settings -#define DEFAULT_TRANSPARENTSELECTION sal_True -#define DEFAULT_TRANSPARENTSELECTIONPERCENT 75 +#define DEFAULT_TRANSPARENTSELECTION sal_True +#define DEFAULT_TRANSPARENTSELECTIONPERCENT 75 #define DEFAULT_SELECTIONMAXIMUMLUMINANCEPERCENT 70 -#define PROPERTYNAME_OVERLAYBUFFER OUString(RTL_CONSTASCII_USTRINGPARAM("OverlayBuffer" )) -#define PROPERTYNAME_PAINTBUFFER OUString(RTL_CONSTASCII_USTRINGPARAM("PaintBuffer" )) -#define PROPERTYNAME_STRIPE_COLOR_A OUString(RTL_CONSTASCII_USTRINGPARAM("StripeColorA" )) -#define PROPERTYNAME_STRIPE_COLOR_B OUString(RTL_CONSTASCII_USTRINGPARAM("StripeColorB" )) -#define PROPERTYNAME_STRIPE_LENGTH OUString(RTL_CONSTASCII_USTRINGPARAM("StripeLength" )) +#define PROPERTYNAME_OVERLAYBUFFER OUString(RTL_CONSTASCII_USTRINGPARAM("OverlayBuffer" )) +#define PROPERTYNAME_PAINTBUFFER OUString(RTL_CONSTASCII_USTRINGPARAM("PaintBuffer" )) +#define PROPERTYNAME_STRIPE_COLOR_A OUString(RTL_CONSTASCII_USTRINGPARAM("StripeColorA" )) +#define PROPERTYNAME_STRIPE_COLOR_B OUString(RTL_CONSTASCII_USTRINGPARAM("StripeColorB" )) +#define PROPERTYNAME_STRIPE_LENGTH OUString(RTL_CONSTASCII_USTRINGPARAM("StripeLength" )) // #i73602# -#define PROPERTYNAME_OVERLAYBUFFER_CALC OUString(RTL_CONSTASCII_USTRINGPARAM("OverlayBuffer_Calc")) -#define PROPERTYNAME_OVERLAYBUFFER_WRITER OUString(RTL_CONSTASCII_USTRINGPARAM("OverlayBuffer_Writer")) -#define PROPERTYNAME_OVERLAYBUFFER_DRAWIMPRESS OUString(RTL_CONSTASCII_USTRINGPARAM("OverlayBuffer_DrawImpress")) +#define PROPERTYNAME_OVERLAYBUFFER_CALC OUString(RTL_CONSTASCII_USTRINGPARAM("OverlayBuffer_Calc")) +#define PROPERTYNAME_OVERLAYBUFFER_WRITER OUString(RTL_CONSTASCII_USTRINGPARAM("OverlayBuffer_Writer")) +#define PROPERTYNAME_OVERLAYBUFFER_DRAWIMPRESS OUString(RTL_CONSTASCII_USTRINGPARAM("OverlayBuffer_DrawImpress")) // #i74769#, #i75172# -#define PROPERTYNAME_PAINTBUFFER_CALC OUString(RTL_CONSTASCII_USTRINGPARAM("PaintBuffer_Calc")) -#define PROPERTYNAME_PAINTBUFFER_WRITER OUString(RTL_CONSTASCII_USTRINGPARAM("PaintBuffer_Writer")) -#define PROPERTYNAME_PAINTBUFFER_DRAWIMPRESS OUString(RTL_CONSTASCII_USTRINGPARAM("PaintBuffer_DrawImpress")) +#define PROPERTYNAME_PAINTBUFFER_CALC OUString(RTL_CONSTASCII_USTRINGPARAM("PaintBuffer_Calc")) +#define PROPERTYNAME_PAINTBUFFER_WRITER OUString(RTL_CONSTASCII_USTRINGPARAM("PaintBuffer_Writer")) +#define PROPERTYNAME_PAINTBUFFER_DRAWIMPRESS OUString(RTL_CONSTASCII_USTRINGPARAM("PaintBuffer_DrawImpress")) // #i4219# -#define PROPERTYNAME_MAXIMUMPAPERWIDTH OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperWidth")) -#define PROPERTYNAME_MAXIMUMPAPERHEIGHT OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperHeight")) -#define PROPERTYNAME_MAXIMUMPAPERLEFTMARGIN OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperLeftMargin")) -#define PROPERTYNAME_MAXIMUMPAPERRIGHTMARGIN OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperRightMargin")) -#define PROPERTYNAME_MAXIMUMPAPERTOPMARGIN OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperTopMargin")) -#define PROPERTYNAME_MAXIMUMPAPERBOTTOMMARGIN OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperBottomMargin")) +#define PROPERTYNAME_MAXIMUMPAPERWIDTH OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperWidth")) +#define PROPERTYNAME_MAXIMUMPAPERHEIGHT OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperHeight")) +#define PROPERTYNAME_MAXIMUMPAPERLEFTMARGIN OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperLeftMargin")) +#define PROPERTYNAME_MAXIMUMPAPERRIGHTMARGIN OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperRightMargin")) +#define PROPERTYNAME_MAXIMUMPAPERTOPMARGIN OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperTopMargin")) +#define PROPERTYNAME_MAXIMUMPAPERBOTTOMMARGIN OUString(RTL_CONSTASCII_USTRINGPARAM("MaximumPaperBottomMargin")) // primitives -#define PROPERTYNAME_ANTIALIASING OUString(RTL_CONSTASCII_USTRINGPARAM("AntiAliasing")) -#define PROPERTYNAME_SNAPHORVERLINESTODISCRETE OUString(RTL_CONSTASCII_USTRINGPARAM("SnapHorVerLinesToDiscrete")) -#define PROPERTYNAME_SOLIDDRAGCREATE OUString(RTL_CONSTASCII_USTRINGPARAM("SolidDragCreate")) -#define PROPERTYNAME_RENDERDECORATEDTEXTDIRECT OUString(RTL_CONSTASCII_USTRINGPARAM("RenderDecoratedTextDirect")) -#define PROPERTYNAME_RENDERSIMPLETEXTDIRECT OUString(RTL_CONSTASCII_USTRINGPARAM("RenderSimpleTextDirect")) -#define PROPERTYNAME_QUADRATIC3DRENDERLIMIT OUString(RTL_CONSTASCII_USTRINGPARAM("Quadratic3DRenderLimit")) -#define PROPERTYNAME_QUADRATICFORMCONTROLRENDERLIMIT OUString(RTL_CONSTASCII_USTRINGPARAM("QuadraticFormControlRenderLimit")) +#define PROPERTYNAME_ANTIALIASING OUString(RTL_CONSTASCII_USTRINGPARAM("AntiAliasing")) +#define PROPERTYNAME_SNAPHORVERLINESTODISCRETE OUString(RTL_CONSTASCII_USTRINGPARAM("SnapHorVerLinesToDiscrete")) +#define PROPERTYNAME_SOLIDDRAGCREATE OUString(RTL_CONSTASCII_USTRINGPARAM("SolidDragCreate")) +#define PROPERTYNAME_RENDERDECORATEDTEXTDIRECT OUString(RTL_CONSTASCII_USTRINGPARAM("RenderDecoratedTextDirect")) +#define PROPERTYNAME_RENDERSIMPLETEXTDIRECT OUString(RTL_CONSTASCII_USTRINGPARAM("RenderSimpleTextDirect")) +#define PROPERTYNAME_QUADRATIC3DRENDERLIMIT OUString(RTL_CONSTASCII_USTRINGPARAM("Quadratic3DRenderLimit")) +#define PROPERTYNAME_QUADRATICFORMCONTROLRENDERLIMIT OUString(RTL_CONSTASCII_USTRINGPARAM("QuadraticFormControlRenderLimit")) // #i97672# selection settings -#define PROPERTYNAME_TRANSPARENTSELECTION OUString(RTL_CONSTASCII_USTRINGPARAM("TransparentSelection")) -#define PROPERTYNAME_TRANSPARENTSELECTIONPERCENT OUString(RTL_CONSTASCII_USTRINGPARAM("TransparentSelectionPercent")) -#define PROPERTYNAME_SELECTIONMAXIMUMLUMINANCEPERCENT OUString(RTL_CONSTASCII_USTRINGPARAM("SelectionMaximumLuminancePercent")) +#define PROPERTYNAME_TRANSPARENTSELECTION OUString(RTL_CONSTASCII_USTRINGPARAM("TransparentSelection")) +#define PROPERTYNAME_TRANSPARENTSELECTIONPERCENT OUString(RTL_CONSTASCII_USTRINGPARAM("TransparentSelectionPercent")) +#define PROPERTYNAME_SELECTIONMAXIMUMLUMINANCEPERCENT OUString(RTL_CONSTASCII_USTRINGPARAM("SelectionMaximumLuminancePercent")) -#define PROPERTYHANDLE_OVERLAYBUFFER 0 -#define PROPERTYHANDLE_PAINTBUFFER 1 -#define PROPERTYHANDLE_STRIPE_COLOR_A 2 -#define PROPERTYHANDLE_STRIPE_COLOR_B 3 -#define PROPERTYHANDLE_STRIPE_LENGTH 4 +#define PROPERTYHANDLE_OVERLAYBUFFER 0 +#define PROPERTYHANDLE_PAINTBUFFER 1 +#define PROPERTYHANDLE_STRIPE_COLOR_A 2 +#define PROPERTYHANDLE_STRIPE_COLOR_B 3 +#define PROPERTYHANDLE_STRIPE_LENGTH 4 // #i73602# -#define PROPERTYHANDLE_OVERLAYBUFFER_CALC 5 -#define PROPERTYHANDLE_OVERLAYBUFFER_WRITER 6 -#define PROPERTYHANDLE_OVERLAYBUFFER_DRAWIMPRESS 7 +#define PROPERTYHANDLE_OVERLAYBUFFER_CALC 5 +#define PROPERTYHANDLE_OVERLAYBUFFER_WRITER 6 +#define PROPERTYHANDLE_OVERLAYBUFFER_DRAWIMPRESS 7 // #i74769#, #i75172# -#define PROPERTYHANDLE_PAINTBUFFER_CALC 8 -#define PROPERTYHANDLE_PAINTBUFFER_WRITER 9 -#define PROPERTYHANDLE_PAINTBUFFER_DRAWIMPRESS 10 +#define PROPERTYHANDLE_PAINTBUFFER_CALC 8 +#define PROPERTYHANDLE_PAINTBUFFER_WRITER 9 +#define PROPERTYHANDLE_PAINTBUFFER_DRAWIMPRESS 10 // #i4219# -#define PROPERTYHANDLE_MAXIMUMPAPERWIDTH 11 -#define PROPERTYHANDLE_MAXIMUMPAPERHEIGHT 12 -#define PROPERTYHANDLE_MAXIMUMPAPERLEFTMARGIN 13 -#define PROPERTYHANDLE_MAXIMUMPAPERRIGHTMARGIN 14 -#define PROPERTYHANDLE_MAXIMUMPAPERTOPMARGIN 15 -#define PROPERTYHANDLE_MAXIMUMPAPERBOTTOMMARGIN 16 +#define PROPERTYHANDLE_MAXIMUMPAPERWIDTH 11 +#define PROPERTYHANDLE_MAXIMUMPAPERHEIGHT 12 +#define PROPERTYHANDLE_MAXIMUMPAPERLEFTMARGIN 13 +#define PROPERTYHANDLE_MAXIMUMPAPERRIGHTMARGIN 14 +#define PROPERTYHANDLE_MAXIMUMPAPERTOPMARGIN 15 +#define PROPERTYHANDLE_MAXIMUMPAPERBOTTOMMARGIN 16 // primitives -#define PROPERTYHANDLE_ANTIALIASING 17 -#define PROPERTYHANDLE_SNAPHORVERLINESTODISCRETE 18 -#define PROPERTYHANDLE_SOLIDDRAGCREATE 19 -#define PROPERTYHANDLE_RENDERDECORATEDTEXTDIRECT 20 -#define PROPERTYHANDLE_RENDERSIMPLETEXTDIRECT 21 -#define PROPERTYHANDLE_QUADRATIC3DRENDERLIMIT 22 -#define PROPERTYHANDLE_QUADRATICFORMCONTROLRENDERLIMIT 23 +#define PROPERTYHANDLE_ANTIALIASING 17 +#define PROPERTYHANDLE_SNAPHORVERLINESTODISCRETE 18 +#define PROPERTYHANDLE_SOLIDDRAGCREATE 19 +#define PROPERTYHANDLE_RENDERDECORATEDTEXTDIRECT 20 +#define PROPERTYHANDLE_RENDERSIMPLETEXTDIRECT 21 +#define PROPERTYHANDLE_QUADRATIC3DRENDERLIMIT 22 +#define PROPERTYHANDLE_QUADRATICFORMCONTROLRENDERLIMIT 23 // #i97672# selection settings -#define PROPERTYHANDLE_TRANSPARENTSELECTION 24 -#define PROPERTYHANDLE_TRANSPARENTSELECTIONPERCENT 25 -#define PROPERTYHANDLE_SELECTIONMAXIMUMLUMINANCEPERCENT 26 +#define PROPERTYHANDLE_TRANSPARENTSELECTION 24 +#define PROPERTYHANDLE_TRANSPARENTSELECTIONPERCENT 25 +#define PROPERTYHANDLE_SELECTIONMAXIMUMLUMINANCEPERCENT 26 -#define PROPERTYCOUNT 27 +#define PROPERTYCOUNT 27 class SvtOptionsDrawinglayer_Impl : public ConfigItem { public: //--------------------------------------------------------------------------------------------------------- -// constructor / destructor +// constructor / destructor //--------------------------------------------------------------------------------------------------------- SvtOptionsDrawinglayer_Impl(); ~SvtOptionsDrawinglayer_Impl(); //--------------------------------------------------------------------------------------------------------- -// overloaded methods of baseclass +// overloaded methods of baseclass //--------------------------------------------------------------------------------------------------------- virtual void Commit(); virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames); //--------------------------------------------------------------------------------------------------------- -// public interface +// public interface //--------------------------------------------------------------------------------------------------------- - sal_Bool IsOverlayBuffer() const; - sal_Bool IsPaintBuffer() const; - Color GetStripeColorA() const; - Color GetStripeColorB() const; - sal_uInt16 GetStripeLength() const; + sal_Bool IsOverlayBuffer() const; + sal_Bool IsPaintBuffer() const; + Color GetStripeColorA() const; + Color GetStripeColorB() const; + sal_uInt16 GetStripeLength() const; // #i73602# - sal_Bool IsOverlayBuffer_Calc() const; - sal_Bool IsOverlayBuffer_Writer() const; - sal_Bool IsOverlayBuffer_DrawImpress() const; + sal_Bool IsOverlayBuffer_Calc() const; + sal_Bool IsOverlayBuffer_Writer() const; + sal_Bool IsOverlayBuffer_DrawImpress() const; // #i74769#, #i75172# - sal_Bool IsPaintBuffer_Calc() const; - sal_Bool IsPaintBuffer_Writer() const; - sal_Bool IsPaintBuffer_DrawImpress() const; + sal_Bool IsPaintBuffer_Calc() const; + sal_Bool IsPaintBuffer_Writer() const; + sal_Bool IsPaintBuffer_DrawImpress() const; - void SetOverlayBuffer( sal_Bool bState ); - void SetPaintBuffer( sal_Bool bState ); - void SetStripeColorA( Color aColor ); - void SetStripeColorB( Color aColor ); - void SetStripeLength( sal_uInt16 nLength ); + void SetOverlayBuffer( sal_Bool bState ); + void SetPaintBuffer( sal_Bool bState ); + void SetStripeColorA( Color aColor ); + void SetStripeColorB( Color aColor ); + void SetStripeLength( sal_uInt16 nLength ); // #i73602# - void SetOverlayBuffer_Calc( sal_Bool bState ); - void SetOverlayBuffer_Writer( sal_Bool bState ); - void SetOverlayBuffer_DrawImpress( sal_Bool bState ); + void SetOverlayBuffer_Calc( sal_Bool bState ); + void SetOverlayBuffer_Writer( sal_Bool bState ); + void SetOverlayBuffer_DrawImpress( sal_Bool bState ); // #i74769#, #i75172# - void SetPaintBuffer_Calc( sal_Bool bState ); - void SetPaintBuffer_Writer( sal_Bool bState ); - void SetPaintBuffer_DrawImpress( sal_Bool bState ); + void SetPaintBuffer_Calc( sal_Bool bState ); + void SetPaintBuffer_Writer( sal_Bool bState ); + void SetPaintBuffer_DrawImpress( sal_Bool bState ); // #i4219# sal_uInt32 GetMaximumPaperWidth() const; @@ -249,33 +249,33 @@ public: sal_Bool IsAAPossibleOnThisSystem() const; // primitives - sal_Bool IsAntiAliasing() const; - sal_Bool IsSnapHorVerLinesToDiscrete() const; - sal_Bool IsSolidDragCreate() const; - sal_Bool IsRenderDecoratedTextDirect() const; - sal_Bool IsRenderSimpleTextDirect() const; + sal_Bool IsAntiAliasing() const; + sal_Bool IsSnapHorVerLinesToDiscrete() const; + sal_Bool IsSolidDragCreate() const; + sal_Bool IsRenderDecoratedTextDirect() const; + sal_Bool IsRenderSimpleTextDirect() const; sal_uInt32 GetQuadratic3DRenderLimit() const; sal_uInt32 GetQuadraticFormControlRenderLimit() const; - void SetAntiAliasing( sal_Bool bState ); - void SetSnapHorVerLinesToDiscrete( sal_Bool bState ); - void SetSolidDragCreate( sal_Bool bState ); - void SetRenderDecoratedTextDirect( sal_Bool bState ); - void SetRenderSimpleTextDirect( sal_Bool bState ); + void SetAntiAliasing( sal_Bool bState ); + void SetSnapHorVerLinesToDiscrete( sal_Bool bState ); + void SetSolidDragCreate( sal_Bool bState ); + void SetRenderDecoratedTextDirect( sal_Bool bState ); + void SetRenderSimpleTextDirect( sal_Bool bState ); void SetQuadratic3DRenderLimit(sal_uInt32 nNew); void SetQuadraticFormControlRenderLimit(sal_uInt32 nNew); // #i97672# selection settings - sal_Bool IsTransparentSelection() const; - sal_uInt16 GetTransparentSelectionPercent() const; - sal_uInt16 GetSelectionMaximumLuminancePercent() const; + sal_Bool IsTransparentSelection() const; + sal_uInt16 GetTransparentSelectionPercent() const; + sal_uInt16 GetSelectionMaximumLuminancePercent() const; - void SetTransparentSelection( sal_Bool bState ); - void SetTransparentSelectionPercent( sal_uInt16 nPercent ); - void SetSelectionMaximumLuminancePercent( sal_uInt16 nPercent ); + void SetTransparentSelection( sal_Bool bState ); + void SetTransparentSelectionPercent( sal_uInt16 nPercent ); + void SetSelectionMaximumLuminancePercent( sal_uInt16 nPercent ); //------------------------------------------------------------------------------------------------------------- -// private methods +// private methods //------------------------------------------------------------------------------------------------------------- private: @@ -283,48 +283,48 @@ private: static Sequence< OUString > impl_GetPropertyNames(); //------------------------------------------------------------------------------------------------------------- -// private member +// private member //------------------------------------------------------------------------------------------------------------- private: - sal_Bool m_bOverlayBuffer; - sal_Bool m_bPaintBuffer; - Color m_bStripeColorA; - Color m_bStripeColorB; - sal_uInt16 m_nStripeLength; + sal_Bool m_bOverlayBuffer; + sal_Bool m_bPaintBuffer; + Color m_bStripeColorA; + Color m_bStripeColorB; + sal_uInt16 m_nStripeLength; // #i73602# - sal_Bool m_bOverlayBuffer_Calc; - sal_Bool m_bOverlayBuffer_Writer; - sal_Bool m_bOverlayBuffer_DrawImpress; + sal_Bool m_bOverlayBuffer_Calc; + sal_Bool m_bOverlayBuffer_Writer; + sal_Bool m_bOverlayBuffer_DrawImpress; // #i74769#, #i75172# - sal_Bool m_bPaintBuffer_Calc; - sal_Bool m_bPaintBuffer_Writer; - sal_Bool m_bPaintBuffer_DrawImpress; + sal_Bool m_bPaintBuffer_Calc; + sal_Bool m_bPaintBuffer_Writer; + sal_Bool m_bPaintBuffer_DrawImpress; // #i4219# - sal_uInt32 m_nMaximumPaperWidth; - sal_uInt32 m_nMaximumPaperHeight; - sal_uInt32 m_nMaximumPaperLeftMargin; - sal_uInt32 m_nMaximumPaperRightMargin; - sal_uInt32 m_nMaximumPaperTopMargin; - sal_uInt32 m_nMaximumPaperBottomMargin; + sal_uInt32 m_nMaximumPaperWidth; + sal_uInt32 m_nMaximumPaperHeight; + sal_uInt32 m_nMaximumPaperLeftMargin; + sal_uInt32 m_nMaximumPaperRightMargin; + sal_uInt32 m_nMaximumPaperTopMargin; + sal_uInt32 m_nMaximumPaperBottomMargin; // primitives - sal_Bool m_bAntiAliasing; - sal_Bool m_bSnapHorVerLinesToDiscrete; - sal_Bool m_bSolidDragCreate; - sal_Bool m_bRenderDecoratedTextDirect; - sal_Bool m_bRenderSimpleTextDirect; - sal_uInt32 m_nQuadratic3DRenderLimit; - sal_uInt32 m_nQuadraticFormControlRenderLimit; + sal_Bool m_bAntiAliasing; + sal_Bool m_bSnapHorVerLinesToDiscrete; + sal_Bool m_bSolidDragCreate; + sal_Bool m_bRenderDecoratedTextDirect; + sal_Bool m_bRenderSimpleTextDirect; + sal_uInt32 m_nQuadratic3DRenderLimit; + sal_uInt32 m_nQuadraticFormControlRenderLimit; // #i97672# selection settings - sal_uInt16 m_nTransparentSelectionPercent; - sal_uInt16 m_nSelectionMaximumLuminancePercent; - sal_Bool m_bTransparentSelection; + sal_uInt16 m_nTransparentSelectionPercent; + sal_uInt16 m_nSelectionMaximumLuminancePercent; + sal_Bool m_bTransparentSelection; // local values bool m_bAllowAA : 1; @@ -332,14 +332,14 @@ private: }; //_________________________________________________________________________________________________________________ -// definitions +// definitions //_________________________________________________________________________________________________________________ //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl() : - ConfigItem( ROOTNODE_START ), + ConfigItem( ROOTNODE_START ), m_bOverlayBuffer( DEFAULT_OVERLAYBUFFER ), m_bPaintBuffer( DEFAULT_PAINTBUFFER ), m_bStripeColorA(Color(DEFAULT_STRIPE_COLOR_A)), @@ -382,14 +382,14 @@ SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl() : m_bAllowAA(true), m_bAllowAAChecked(false) { - Sequence< OUString > seqNames( impl_GetPropertyNames() ); - Sequence< Any > seqValues = GetProperties( seqNames ) ; + Sequence< OUString > seqNames( impl_GetPropertyNames() ); + Sequence< Any > seqValues = GetProperties( seqNames ) ; DBG_ASSERT( !(seqNames.getLength()!=seqValues.getLength()), "SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl()\nI miss some values of configuration keys!\n" ); // Copy values from list in right order to ouer internal member. sal_Int32 nPropertyCount = seqValues.getLength(); - sal_Int32 nProperty = 0; + sal_Int32 nProperty = 0; for( nProperty=0; nProperty<nPropertyCount; ++nProperty ) { @@ -581,13 +581,13 @@ SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl() : seqValues[nProperty] >>= m_bTransparentSelection; } break; - + case PROPERTYHANDLE_TRANSPARENTSELECTIONPERCENT: { DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_SHORT), "SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl()\nWho has changed the value type of \"Office.Common\\Drawinglayer\\TransparentSelectionPercent\"?" ); seqValues[nProperty] >>= m_nTransparentSelectionPercent; } - + case PROPERTYHANDLE_SELECTIONMAXIMUMLUMINANCEPERCENT: { DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_SHORT), "SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl()\nWho has changed the value type of \"Office.Common\\Drawinglayer\\SelectionMaximumLuminancePercent\"?" ); @@ -599,7 +599,7 @@ SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl() : } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** SvtOptionsDrawinglayer_Impl::~SvtOptionsDrawinglayer_Impl() { @@ -608,12 +608,12 @@ SvtOptionsDrawinglayer_Impl::~SvtOptionsDrawinglayer_Impl() } //***************************************************************************************************************** -// Commit +// Commit //***************************************************************************************************************** void SvtOptionsDrawinglayer_Impl::Commit() { - Sequence< OUString > aSeqNames( impl_GetPropertyNames() ); - Sequence< Any > aSeqValues( aSeqNames.getLength() ); + Sequence< OUString > aSeqNames( impl_GetPropertyNames() ); + Sequence< Any > aSeqValues( aSeqNames.getLength() ); for( sal_Int32 nProperty = 0, nCount = aSeqNames.getLength(); nProperty < nCount; ++nProperty ) { @@ -742,7 +742,7 @@ void SvtOptionsDrawinglayer_Impl::Notify( const com::sun::star::uno::Sequence<rt } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Bool SvtOptionsDrawinglayer_Impl::IsOverlayBuffer() const { @@ -750,7 +750,7 @@ sal_Bool SvtOptionsDrawinglayer_Impl::IsOverlayBuffer() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Bool SvtOptionsDrawinglayer_Impl::IsPaintBuffer() const { @@ -758,7 +758,7 @@ sal_Bool SvtOptionsDrawinglayer_Impl::IsPaintBuffer() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** Color SvtOptionsDrawinglayer_Impl::GetStripeColorA() const { @@ -766,7 +766,7 @@ Color SvtOptionsDrawinglayer_Impl::GetStripeColorA() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** Color SvtOptionsDrawinglayer_Impl::GetStripeColorB() const { @@ -774,7 +774,7 @@ Color SvtOptionsDrawinglayer_Impl::GetStripeColorB() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_uInt16 SvtOptionsDrawinglayer_Impl::GetStripeLength() const { @@ -845,7 +845,7 @@ sal_uInt32 SvtOptionsDrawinglayer_Impl::GetMaximumPaperBottomMargin() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtOptionsDrawinglayer_Impl::SetOverlayBuffer( sal_Bool bState ) { @@ -857,7 +857,7 @@ void SvtOptionsDrawinglayer_Impl::SetOverlayBuffer( sal_Bool bState ) } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtOptionsDrawinglayer_Impl::SetPaintBuffer( sal_Bool bState ) { @@ -869,7 +869,7 @@ void SvtOptionsDrawinglayer_Impl::SetPaintBuffer( sal_Bool bState ) } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtOptionsDrawinglayer_Impl::SetStripeColorA( Color aColor ) { @@ -881,7 +881,7 @@ void SvtOptionsDrawinglayer_Impl::SetStripeColorA( Color aColor ) } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtOptionsDrawinglayer_Impl::SetStripeColorB( Color aColor ) { @@ -893,7 +893,7 @@ void SvtOptionsDrawinglayer_Impl::SetStripeColorB( Color aColor ) } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtOptionsDrawinglayer_Impl::SetStripeLength( sal_uInt16 nLength ) { @@ -1183,18 +1183,18 @@ sal_uInt16 SvtOptionsDrawinglayer_Impl::GetSelectionMaximumLuminancePercent() co } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** Sequence< OUString > SvtOptionsDrawinglayer_Impl::impl_GetPropertyNames() { // Build static list of configuration key names. static const OUString pProperties[] = { - PROPERTYNAME_OVERLAYBUFFER , - PROPERTYNAME_PAINTBUFFER , - PROPERTYNAME_STRIPE_COLOR_A , - PROPERTYNAME_STRIPE_COLOR_B , - PROPERTYNAME_STRIPE_LENGTH , + PROPERTYNAME_OVERLAYBUFFER , + PROPERTYNAME_PAINTBUFFER , + PROPERTYNAME_STRIPE_COLOR_A , + PROPERTYNAME_STRIPE_COLOR_B , + PROPERTYNAME_STRIPE_LENGTH , // #i73602# PROPERTYNAME_OVERLAYBUFFER_CALC, @@ -1222,7 +1222,7 @@ Sequence< OUString > SvtOptionsDrawinglayer_Impl::impl_GetPropertyNames() PROPERTYNAME_RENDERSIMPLETEXTDIRECT, PROPERTYNAME_QUADRATIC3DRENDERLIMIT, PROPERTYNAME_QUADRATICFORMCONTROLRENDERLIMIT, - + // #i97672# selection settings PROPERTYNAME_TRANSPARENTSELECTION, PROPERTYNAME_TRANSPARENTSELECTIONPERCENT, @@ -1236,15 +1236,15 @@ Sequence< OUString > SvtOptionsDrawinglayer_Impl::impl_GetPropertyNames() } //***************************************************************************************************************** -// initialize static member -// DON'T DO IT IN YOUR HEADER! -// see definition for further informations +// initialize static member +// DON'T DO IT IN YOUR HEADER! +// see definition for further informations //***************************************************************************************************************** SvtOptionsDrawinglayer_Impl* SvtOptionsDrawinglayer::m_pDataContainer = NULL; sal_Int32 SvtOptionsDrawinglayer::m_nRefCount = 0; //***************************************************************************************************************** -// constructor +// constructor //***************************************************************************************************************** SvtOptionsDrawinglayer::SvtOptionsDrawinglayer() { @@ -1260,7 +1260,7 @@ SvtOptionsDrawinglayer::SvtOptionsDrawinglayer() } //***************************************************************************************************************** -// destructor +// destructor //***************************************************************************************************************** SvtOptionsDrawinglayer::~SvtOptionsDrawinglayer() { @@ -1278,7 +1278,7 @@ SvtOptionsDrawinglayer::~SvtOptionsDrawinglayer() } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Bool SvtOptionsDrawinglayer::IsOverlayBuffer() const { @@ -1287,7 +1287,7 @@ sal_Bool SvtOptionsDrawinglayer::IsOverlayBuffer() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_Bool SvtOptionsDrawinglayer::IsPaintBuffer() const { @@ -1296,7 +1296,7 @@ sal_Bool SvtOptionsDrawinglayer::IsPaintBuffer() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** Color SvtOptionsDrawinglayer::GetStripeColorA() const { @@ -1305,7 +1305,7 @@ Color SvtOptionsDrawinglayer::GetStripeColorA() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** Color SvtOptionsDrawinglayer::GetStripeColorB() const { @@ -1314,7 +1314,7 @@ Color SvtOptionsDrawinglayer::GetStripeColorB() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** sal_uInt16 SvtOptionsDrawinglayer::GetStripeLength() const { @@ -1398,7 +1398,7 @@ sal_uInt32 SvtOptionsDrawinglayer::GetMaximumPaperBottomMargin() const } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtOptionsDrawinglayer::SetOverlayBuffer( sal_Bool bState ) { @@ -1407,7 +1407,7 @@ void SvtOptionsDrawinglayer::SetOverlayBuffer( sal_Bool bState ) } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtOptionsDrawinglayer::SetPaintBuffer( sal_Bool bState ) { @@ -1416,7 +1416,7 @@ void SvtOptionsDrawinglayer::SetPaintBuffer( sal_Bool bState ) } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtOptionsDrawinglayer::SetStripeColorA( Color aColor ) { @@ -1425,7 +1425,7 @@ void SvtOptionsDrawinglayer::SetStripeColorA( Color aColor ) } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtOptionsDrawinglayer::SetStripeColorB( Color aColor ) { @@ -1434,7 +1434,7 @@ void SvtOptionsDrawinglayer::SetStripeColorB( Color aColor ) } //***************************************************************************************************************** -// public method +// public method //***************************************************************************************************************** void SvtOptionsDrawinglayer::SetStripeLength( sal_uInt16 nLength ) { @@ -1686,7 +1686,7 @@ void SvtOptionsDrawinglayer::SetSelectionMaximumLuminancePercent( sal_uInt16 nPe } //***************************************************************************************************************** -// private method +// private method //***************************************************************************************************************** Mutex& SvtOptionsDrawinglayer::GetOwnStaticMutex() { diff --git a/svtools/source/config/printoptions.cxx b/svtools/source/config/printoptions.cxx index f76104c132c8..fc032ff5b68f 100644 --- a/svtools/source/config/printoptions.cxx +++ b/svtools/source/config/printoptions.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 "precompiled_svtools.hxx" //_________________________________________________________________________________________________________________ -// includes +// includes //_________________________________________________________________________________________________________________ #include <svtools/printoptions.hxx> @@ -70,13 +70,13 @@ static USHORT aDPIArray[] = { 72, 96, 150, 200, 300, 600 }; // - Defines - // ----------- -#define ROOTNODE_START OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Print/Option")) +#define ROOTNODE_START OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/Print/Option")) #define ROOTNODE_PRINTOPTION OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common/Print/Option")) -#define PROPERTYNAME_REDUCETRANSPARENCY OUString(RTL_CONSTASCII_USTRINGPARAM("ReduceTransparency")) -#define PROPERTYNAME_REDUCEDTRANSPARENCYMODE OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedTransparencyMode")) -#define PROPERTYNAME_REDUCEGRADIENTS OUString(RTL_CONSTASCII_USTRINGPARAM("ReduceGradients")) -#define PROPERTYNAME_REDUCEDGRADIENTMODE OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedGradientMode")) +#define PROPERTYNAME_REDUCETRANSPARENCY OUString(RTL_CONSTASCII_USTRINGPARAM("ReduceTransparency")) +#define PROPERTYNAME_REDUCEDTRANSPARENCYMODE OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedTransparencyMode")) +#define PROPERTYNAME_REDUCEGRADIENTS OUString(RTL_CONSTASCII_USTRINGPARAM("ReduceGradients")) +#define PROPERTYNAME_REDUCEDGRADIENTMODE OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedGradientMode")) #define PROPERTYNAME_REDUCEDGRADIENTSTEPCOUNT OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedGradientStepCount")) #define PROPERTYNAME_REDUCEBITMAPS OUString(RTL_CONSTASCII_USTRINGPARAM("ReduceBitmaps")) #define PROPERTYNAME_REDUCEDBITMAPMODE OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedBitmapMode")) @@ -102,10 +102,10 @@ static SvtPrintOptions_Impl* pPrinterOptionsDataContainer = NULL; static SvtPrintOptions_Impl* pPrintFileOptionsDataContainer = NULL; SvtPrintOptions_Impl* SvtPrinterOptions::m_pStaticDataContainer = NULL; -sal_Int32 SvtPrinterOptions::m_nRefCount = 0; +sal_Int32 SvtPrinterOptions::m_nRefCount = 0; SvtPrintOptions_Impl* SvtPrintFileOptions::m_pStaticDataContainer = NULL; -sal_Int32 SvtPrintFileOptions::m_nRefCount = 0; +sal_Int32 SvtPrintFileOptions::m_nRefCount = 0; // ------------------------ // - SvtPrintOptions_Impl - @@ -116,28 +116,28 @@ class SvtPrintOptions_Impl public: //--------------------------------------------------------------------------------------------------------- -// constructor / destructor +// constructor / destructor //--------------------------------------------------------------------------------------------------------- SvtPrintOptions_Impl( const OUString& rConfigRoot ); ~SvtPrintOptions_Impl(); //--------------------------------------------------------------------------------------------------------- -// public interface +// public interface //--------------------------------------------------------------------------------------------------------- - sal_Bool IsReduceTransparency() const ; + sal_Bool IsReduceTransparency() const ; sal_Int16 GetReducedTransparencyMode() const ; - sal_Bool IsReduceGradients() const ; + sal_Bool IsReduceGradients() const ; sal_Int16 GetReducedGradientMode() const ; sal_Int16 GetReducedGradientStepCount() const ; - sal_Bool IsReduceBitmaps() const ; + sal_Bool IsReduceBitmaps() const ; sal_Int16 GetReducedBitmapMode() const ; sal_Int16 GetReducedBitmapResolution() const ; - sal_Bool IsReducedBitmapIncludesTransparency() const ; - sal_Bool IsConvertToGreyscales() const; + sal_Bool IsReducedBitmapIncludesTransparency() const ; + sal_Bool IsConvertToGreyscales() const; - void SetReduceTransparency( sal_Bool bState ) ; + void SetReduceTransparency( sal_Bool bState ) ; void SetReducedTransparencyMode( sal_Int16 nMode ) ; void SetReduceGradients( sal_Bool bState ) ; void SetReducedGradientMode( sal_Int16 nMode ) ; @@ -149,7 +149,7 @@ public: void SetConvertToGreyscales( sal_Bool bState ) ; //------------------------------------------------------------------------------------------------------------- -// private API +// private API //------------------------------------------------------------------------------------------------------------- private: @@ -159,7 +159,7 @@ private: ::sal_Int16 nNew ); //------------------------------------------------------------------------------------------------------------- -// private member +// private member //------------------------------------------------------------------------------------------------------------- private: diff --git a/svtools/source/config/test/test.cxx b/svtools/source/config/test/test.cxx index dc0256f5a134..47772a6d51e1 100644 --- a/svtools/source/config/test/test.cxx +++ b/svtools/source/config/test/test.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,13 +37,13 @@ #define TEST_DYNAMICMENUOPTIONS //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include <unotools/dynamicmenuoptions.hxx> //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <cppuhelper/bootstrap.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -51,7 +51,7 @@ #include <com/sun/star/registry/XSimpleRegistry.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <comphelper/regpathhelper.hxx> @@ -79,23 +79,23 @@ #include <stdio.h> //_________________________________________________________________________________________________________________ -// const +// const //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// namespace +// namespace //_________________________________________________________________________________________________________________ -using namespace ::rtl ; +using namespace ::rtl ; using namespace ::osl ; -using namespace ::comphelper ; -using namespace ::com::sun::star::uno ; +using namespace ::comphelper ; +using namespace ::com::sun::star::uno ; using namespace ::com::sun::star::lang ; using namespace ::com::sun::star::beans ; using namespace ::com::sun::star::registry ; //_________________________________________________________________________________________________________________ -// defines +// defines //_________________________________________________________________________________________________________________ #define ASCII( STEXT ) OUString( RTL_CONSTASCII_USTRINGPARAM( STEXT )) @@ -104,7 +104,7 @@ using namespace ::com::sun::star::registry ; #define SERVICENAME_NESTEDREGISTRY OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.NestedRegistry" )) //_________________________________________________________________________________________________________________ -// declarations +// declarations //_________________________________________________________________________________________________________________ class TestApplication : public Application @@ -132,16 +132,16 @@ class TestApplication : public Application //************************************************************************************************************* private: -}; // class TestApplication +}; // class TestApplication //_________________________________________________________________________________________________________________ -// global variables +// global variables //_________________________________________________________________________________________________________________ -TestApplication aTestApplication ; +TestApplication aTestApplication ; //_________________________________________________________________________________________________________________ -// main +// main //_________________________________________________________________________________________________________________ void TestApplication::Main() @@ -163,7 +163,7 @@ void TestApplication::Main() impl_testDynamicMenuOptions(); #endif -// Execute(); +// Execute(); OSL_ENSURE( sal_False, "Test was successful!\n" ); } diff --git a/svtools/source/contnr/cont_pch.cxx b/svtools/source/contnr/cont_pch.cxx index 3abdd131677a..b0cb4baac918 100644 --- a/svtools/source/contnr/cont_pch.cxx +++ b/svtools/source/contnr/cont_pch.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/svtools/source/contnr/contentenumeration.cxx b/svtools/source/contnr/contentenumeration.cxx index 0f40bf0fbb18..1a7a1bae0045 100644 --- a/svtools/source/contnr/contentenumeration.cxx +++ b/svtools/source/contnr/contentenumeration.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,12 +60,12 @@ namespace svt #define ROW_DATE_CREATE 4 #define ROW_IS_FOLDER 5 #define ROW_TARGET_URL 6 -#define ROW_IS_HIDDEN 7 -#define ROW_IS_VOLUME 8 -#define ROW_IS_REMOTE 9 -#define ROW_IS_REMOVEABLE 10 -#define ROW_IS_FLOPPY 11 -#define ROW_IS_COMPACTDISC 12 +#define ROW_IS_HIDDEN 7 +#define ROW_IS_VOLUME 8 +#define ROW_IS_REMOTE 9 +#define ROW_IS_REMOVEABLE 10 +#define ROW_IS_FLOPPY 11 +#define ROW_IS_COMPACTDISC 12 #define CONVERT_DATETIME( aUnoDT, aToolsDT ) \ aToolsDT = ::DateTime( Date( aUnoDT.Day, aUnoDT.Month, aUnoDT.Year ), \ @@ -103,7 +103,7 @@ namespace svt ,m_pFilter ( NULL ) ,m_pTranslator ( _pTranslator ) ,m_bCancelled ( false ) - ,m_rBlackList ( ::com::sun::star::uno::Sequence< ::rtl::OUString >() ) + ,m_rBlackList ( ::com::sun::star::uno::Sequence< ::rtl::OUString >() ) { } @@ -125,9 +125,9 @@ namespace svt } //-------------------------------------------------------------------- - EnumerationResult FileViewContentEnumerator::enumerateFolderContentSync( - const FolderDescriptor& _rFolder, - const IUrlFilter* _pFilter, + EnumerationResult FileViewContentEnumerator::enumerateFolderContentSync( + const FolderDescriptor& _rFolder, + const IUrlFilter* _pFilter, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList ) { { @@ -170,7 +170,7 @@ namespace svt { return osl_incrementInterlockedCount( &m_refCount ); } - + //-------------------------------------------------------------------- oslInterlockedCount SAL_CALL FileViewContentEnumerator::release() { @@ -188,7 +188,7 @@ namespace svt EnumerationResult eResult = ERROR; try { - + Reference< XResultSet > xResultSet; Sequence< OUString > aProps(12); @@ -403,7 +403,7 @@ namespace svt if ( entryName.equals( m_rBlackList[i] ) ) return true; } - + return false; } diff --git a/svtools/source/contnr/contentenumeration.hxx b/svtools/source/contnr/contentenumeration.hxx index 70e9a2a0fbc9..ca90ec8be85f 100644 --- a/svtools/source/contnr/contentenumeration.hxx +++ b/svtools/source/contnr/contentenumeration.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,7 +55,7 @@ namespace svt ::rtl::OUString maFilename; // only filename in upper case - for compare purposes ::rtl::OUString maTitle; // -> be carefull when changing maTitle to update maFilename only when new ::rtl::OUString maLowerTitle; - + public: ::rtl::OUString maType; diff --git a/svtools/source/contnr/ctrdll.cxx b/svtools/source/contnr/ctrdll.cxx index 32f9af349fa2..ceb78f537375 100644 --- a/svtools/source/contnr/ctrdll.cxx +++ b/svtools/source/contnr/ctrdll.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/svtools/source/contnr/fileview.hrc b/svtools/source/contnr/fileview.hrc index bbf340148fc9..23f620158401 100644 --- a/svtools/source/contnr/fileview.hrc +++ b/svtools/source/contnr/fileview.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 MID_FILEVIEW_DELETE 1 -#define MID_FILEVIEW_RENAME 2 +#define MID_FILEVIEW_DELETE 1 +#define MID_FILEVIEW_RENAME 2 // DLG_SFX_QUERYDELETE ******************************************************** diff --git a/svtools/source/contnr/fileview.src b/svtools/source/contnr/fileview.src index f40530c10347..a1d80474afb4 100644 --- a/svtools/source/contnr/fileview.src +++ b/svtools/source/contnr/fileview.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/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx index 4a7b54c6fed3..6b085d43fcd3 100644 --- a/svtools/source/contnr/imivctl.hxx +++ b/svtools/source/contnr/imivctl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,42 +51,42 @@ class IcnGridMap_Impl; // // some defines // -#define PAINTFLAG_HOR_CENTERED 0x0001 -#define PAINTFLAG_VER_CENTERED 0x0002 - -#define F_VER_SBARSIZE_WITH_HBAR 0x0001 -#define F_HOR_SBARSIZE_WITH_VBAR 0x0002 -#define F_PAINTED 0x0004 // TRUE nach erstem Paint -#define F_ADD_MODE 0x0008 -#define F_SELECTING_RECT 0x0020 -#define F_DOWN_CTRL 0x0080 -#define F_DOWN_DESELECT 0x0100 -#define F_START_EDITTIMER_IN_MOUSEUP 0x0400 -#define F_MOVED_ENTRIES 0x0800 -#define F_ENTRYLISTPOS_VALID 0x1000 -#define F_CLEARING_SELECTION 0x2000 -#define F_ARRANGING 0x4000 +#define PAINTFLAG_HOR_CENTERED 0x0001 +#define PAINTFLAG_VER_CENTERED 0x0002 + +#define F_VER_SBARSIZE_WITH_HBAR 0x0001 +#define F_HOR_SBARSIZE_WITH_VBAR 0x0002 +#define F_PAINTED 0x0004 // TRUE nach erstem Paint +#define F_ADD_MODE 0x0008 +#define F_SELECTING_RECT 0x0020 +#define F_DOWN_CTRL 0x0080 +#define F_DOWN_DESELECT 0x0100 +#define F_START_EDITTIMER_IN_MOUSEUP 0x0400 +#define F_MOVED_ENTRIES 0x0800 +#define F_ENTRYLISTPOS_VALID 0x1000 +#define F_CLEARING_SELECTION 0x2000 +#define F_ARRANGING 0x4000 // alle Angaben in Pixel // Abstaende von Fensterraendern -#define LROFFS_WINBORDER 4 -#define TBOFFS_WINBORDER 4 +#define LROFFS_WINBORDER 4 +#define TBOFFS_WINBORDER 4 // fuer das Bounding-Rectangle -#define LROFFS_BOUND 2 -#define TBOFFS_BOUND 2 +#define LROFFS_BOUND 2 +#define TBOFFS_BOUND 2 // Abstand Fokusrechteck - Icon -#define LROFFS_ICON 2 -#define TBOFFS_ICON 2 +#define LROFFS_ICON 2 +#define TBOFFS_ICON 2 // Abstaende Icon - Text -#define HOR_DIST_BMP_STRING 3 -#define VER_DIST_BMP_STRING 3 +#define HOR_DIST_BMP_STRING 3 +#define VER_DIST_BMP_STRING 3 // Breitenoffset Highlight-Rect bei Text -#define LROFFS_TEXT 2 +#define LROFFS_TEXT 2 -#define DEFAULT_MAX_VIRT_WIDTH 200 -#define DEFAULT_MAX_VIRT_HEIGHT 200 +#define DEFAULT_MAX_VIRT_WIDTH 200 +#define DEFAULT_MAX_VIRT_HEIGHT 200 -#define VIEWMODE_MASK (WB_ICON | WB_SMALLICON | WB_DETAILS) +#define VIEWMODE_MASK (WB_ICON | WB_SMALLICON | WB_DETAILS) /////////////////////////////////////////////////////////////////////////////// // @@ -105,9 +105,9 @@ enum IcnViewFieldType // struct LocalFocus { - BOOL bOn; - Rectangle aRect; - Color aPenColor; + BOOL bOn; + Rectangle aRect; + Color aPenColor; LocalFocus() { bOn = FALSE; } }; @@ -122,9 +122,9 @@ private: using List::Replace; - SvxIconChoiceCtrl_Impl* _pOwner; + SvxIconChoiceCtrl_Impl* _pOwner; - void Removed_Impl( SvxIconChoiceCtrlEntry* pEntry ); + void Removed_Impl( SvxIconChoiceCtrlEntry* pEntry ); public: EntryList_Impl( @@ -138,10 +138,10 @@ public: USHORT _nReSize ); ~EntryList_Impl(); - void Clear(); - void Insert( SvxIconChoiceCtrlEntry* pEntry, ULONG nPos ); - SvxIconChoiceCtrlEntry* Remove( ULONG nPos ); - void Remove( SvxIconChoiceCtrlEntry* pEntry ); + void Clear(); + void Insert( SvxIconChoiceCtrlEntry* pEntry, ULONG nPos ); + SvxIconChoiceCtrlEntry* Remove( ULONG nPos ); + void Remove( SvxIconChoiceCtrlEntry* pEntry ); }; @@ -155,72 +155,72 @@ class SvxIconChoiceCtrl_Impl friend class EntryList_Impl; friend class IcnGridMap_Impl; - BOOL bChooseWithCursor; - EntryList_Impl aEntries; - ScrollBar aVerSBar; - ScrollBar aHorSBar; - ScrollBarBox aScrBarBox; - Rectangle aCurSelectionRect; - SvPtrarr aSelectedRectList; - Timer aEditTimer; // fuer Inplace-Editieren - Timer aAutoArrangeTimer; - Timer aDocRectChangedTimer; - Timer aVisRectChangedTimer; - Timer aCallSelectHdlTimer; - Size aVirtOutputSize; - Size aImageSize; - Size aDefaultTextSize; - Size aOutputSize; // Pixel - Point aDDLastEntryPos; - Point aDDLastRectPos; - Point aDDPaintOffs; - Point aDDStartPos; - SvtIconChoiceCtrl* pView; - IcnCursor_Impl* pImpCursor; + BOOL bChooseWithCursor; + EntryList_Impl aEntries; + ScrollBar aVerSBar; + ScrollBar aHorSBar; + ScrollBarBox aScrBarBox; + Rectangle aCurSelectionRect; + SvPtrarr aSelectedRectList; + Timer aEditTimer; // fuer Inplace-Editieren + Timer aAutoArrangeTimer; + Timer aDocRectChangedTimer; + Timer aVisRectChangedTimer; + Timer aCallSelectHdlTimer; + Size aVirtOutputSize; + Size aImageSize; + Size aDefaultTextSize; + Size aOutputSize; // Pixel + Point aDDLastEntryPos; + Point aDDLastRectPos; + Point aDDPaintOffs; + Point aDDStartPos; + SvtIconChoiceCtrl* pView; + IcnCursor_Impl* pImpCursor; IcnGridMap_Impl* pGridMap; - long nMaxVirtWidth; // max. Breite aVirtOutputSize bei ALIGN_TOP - long nMaxVirtHeight; // max. Hoehe aVirtOutputSize bei ALIGN_LEFT - List* pZOrderList; - SvPtrarr* pColumns; + long nMaxVirtWidth; // max. Breite aVirtOutputSize bei ALIGN_TOP + long nMaxVirtHeight; // max. Hoehe aVirtOutputSize bei ALIGN_LEFT + List* pZOrderList; + SvPtrarr* pColumns; IcnViewEdit_Impl* pEdit; - WinBits nWinBits; - long nMaxBoundHeight; // Hoehe des hoechsten BoundRects - USHORT nFlags; - USHORT nCurTextDrawFlags; - ULONG nUserEventAdjustScrBars; - ULONG nUserEventShowCursor; - SvxIconChoiceCtrlEntry* pCurHighlightFrame; - BOOL bHighlightFramePressed; - SvxIconChoiceCtrlEntry* pHead; // Eintrag oben links + WinBits nWinBits; + long nMaxBoundHeight; // Hoehe des hoechsten BoundRects + USHORT nFlags; + USHORT nCurTextDrawFlags; + ULONG nUserEventAdjustScrBars; + ULONG nUserEventShowCursor; + SvxIconChoiceCtrlEntry* pCurHighlightFrame; + BOOL bHighlightFramePressed; + SvxIconChoiceCtrlEntry* pHead; // Eintrag oben links SvxIconChoiceCtrlEntry* pCursor; - SvxIconChoiceCtrlEntry* pPrevDropTarget; - SvxIconChoiceCtrlEntry* pHdlEntry; - SvxIconChoiceCtrlEntry* pDDRefEntry; - VirtualDevice* pDDDev; - VirtualDevice* pDDBufDev; + SvxIconChoiceCtrlEntry* pPrevDropTarget; + SvxIconChoiceCtrlEntry* pHdlEntry; + SvxIconChoiceCtrlEntry* pDDRefEntry; + VirtualDevice* pDDDev; + VirtualDevice* pDDBufDev; VirtualDevice* pDDTempDev; - VirtualDevice* pEntryPaintDev; - SvxIconChoiceCtrlEntry* pAnchor; // fuer Selektion - LocalFocus aFocus; // Data for focusrect + VirtualDevice* pEntryPaintDev; + SvxIconChoiceCtrlEntry* pAnchor; // fuer Selektion + LocalFocus aFocus; // Data for focusrect ::svt::AccessibleFactoryAccess aAccFactory; - List* pDraggedSelection; - SvxIconChoiceCtrlEntry* pCurEditedEntry; + List* pDraggedSelection; + SvxIconChoiceCtrlEntry* pCurEditedEntry; SvxIconChoiceCtrlTextMode eTextMode; - SelectionMode eSelectionMode; - ULONG nSelectionCount; + SelectionMode eSelectionMode; + ULONG nSelectionCount; SvxIconChoiceCtrlPositionMode ePositionMode; - BOOL bBoundRectsDirty; - BOOL bUpdateMode; - BOOL bEntryEditingEnabled; - BOOL bInDragDrop; + BOOL bBoundRectsDirty; + BOOL bUpdateMode; + BOOL bEntryEditingEnabled; + BOOL bInDragDrop; - void ShowCursor( BOOL bShow ); + void ShowCursor( BOOL bShow ); - void ImpArrange( BOOL bKeepPredecessors = FALSE ); - void AdjustVirtSize( const Rectangle& ); - void ResetVirtSize(); - void CheckScrollBars(); + void ImpArrange( BOOL bKeepPredecessors = FALSE ); + void AdjustVirtSize( const Rectangle& ); + void ResetVirtSize(); + void CheckScrollBars(); DECL_LINK( ScrollUpDownHdl, ScrollBar * ); DECL_LINK( ScrollLeftRightHdl, ScrollBar * ); @@ -232,67 +232,67 @@ class SvxIconChoiceCtrl_Impl DECL_LINK( VisRectChangedHdl, void* ); DECL_LINK( CallSelectHdlHdl, void* ); - void AdjustScrollBars( BOOL bVirtSizeGrowedOnly = FALSE); - void PositionScrollBars( long nRealWidth, long nRealHeight ); - long GetScrollBarPageSize( long nVisibleRange ) const { return ((nVisibleRange*75)/100); } - long GetScrollBarLineSize() const { return nMaxBoundHeight / 2; } - BOOL HandleScrollCommand( const CommandEvent& rCmd ); - void ToDocPos( Point& rPosPixel ) { rPosPixel -= pView->GetMapMode().GetOrigin(); } - void InitScrollBarBox(); - SvxIconChoiceCtrlEntry* FindNewCursor(); - void ToggleSelection( SvxIconChoiceCtrlEntry* ); - void DeselectAllBut( SvxIconChoiceCtrlEntry*, BOOL bPaintSync=FALSE ); - void Center( SvxIconChoiceCtrlEntry* pEntry ) const; - void StopEditTimer() { aEditTimer.Stop(); } - void StartEditTimer() { aEditTimer.Start(); } - void ImpHideDDIcon(); - void CallSelectHandler( SvxIconChoiceCtrlEntry* ); - void SelectRect( + void AdjustScrollBars( BOOL bVirtSizeGrowedOnly = FALSE); + void PositionScrollBars( long nRealWidth, long nRealHeight ); + long GetScrollBarPageSize( long nVisibleRange ) const { return ((nVisibleRange*75)/100); } + long GetScrollBarLineSize() const { return nMaxBoundHeight / 2; } + BOOL HandleScrollCommand( const CommandEvent& rCmd ); + void ToDocPos( Point& rPosPixel ) { rPosPixel -= pView->GetMapMode().GetOrigin(); } + void InitScrollBarBox(); + SvxIconChoiceCtrlEntry* FindNewCursor(); + void ToggleSelection( SvxIconChoiceCtrlEntry* ); + void DeselectAllBut( SvxIconChoiceCtrlEntry*, BOOL bPaintSync=FALSE ); + void Center( SvxIconChoiceCtrlEntry* pEntry ) const; + void StopEditTimer() { aEditTimer.Stop(); } + void StartEditTimer() { aEditTimer.Start(); } + void ImpHideDDIcon(); + void CallSelectHandler( SvxIconChoiceCtrlEntry* ); + void SelectRect( SvxIconChoiceCtrlEntry* pEntry1, SvxIconChoiceCtrlEntry* pEntry2, BOOL bAdd = TRUE, SvPtrarr* pOtherRects = 0 ); - void SelectRange( + void SelectRange( SvxIconChoiceCtrlEntry* pStart, SvxIconChoiceCtrlEntry* pEnd, BOOL bAdd = TRUE ); - void AddSelectedRect( const Rectangle& ); - void AddSelectedRect( + void AddSelectedRect( const Rectangle& ); + void AddSelectedRect( SvxIconChoiceCtrlEntry* pEntry1, SvxIconChoiceCtrlEntry* pEntry2 ); - void ClearSelectedRectList(); - void ClearColumnList(); - Rectangle CalcMaxTextRect( const SvxIconChoiceCtrlEntry* pEntry ) const; + void ClearSelectedRectList(); + void ClearColumnList(); + Rectangle CalcMaxTextRect( const SvxIconChoiceCtrlEntry* pEntry ) const; - void ClipAtVirtOutRect( Rectangle& rRect ) const; - void AdjustAtGrid( const SvPtrarr& rRow, SvxIconChoiceCtrlEntry* pStart=0 ); - Point AdjustAtGrid( + void ClipAtVirtOutRect( Rectangle& rRect ) const; + void AdjustAtGrid( const SvPtrarr& rRow, SvxIconChoiceCtrlEntry* pStart=0 ); + Point AdjustAtGrid( const Rectangle& rCenterRect, // "Schwerpunkt" des Objekts (typ. Bmp-Rect) const Rectangle& rBoundRect ) const; - ULONG GetPredecessorGrid( const Point& rDocPos) const; + ULONG GetPredecessorGrid( const Point& rDocPos) const; - void InitPredecessors(); - void ClearPredecessors(); + void InitPredecessors(); + void ClearPredecessors(); - BOOL CheckVerScrollBar(); - BOOL CheckHorScrollBar(); - void CancelUserEvents(); - void EntrySelected( SvxIconChoiceCtrlEntry* pEntry, BOOL bSelect, + BOOL CheckVerScrollBar(); + BOOL CheckHorScrollBar(); + void CancelUserEvents(); + void EntrySelected( SvxIconChoiceCtrlEntry* pEntry, BOOL bSelect, BOOL bSyncPaint ); - void SaveSelection( List** ); - void RepaintEntries( USHORT nEntryFlagsMask ); - void SetListPositions(); - void SetDefaultTextSize(); - BOOL IsAutoArrange() const { + void SaveSelection( List** ); + void RepaintEntries( USHORT nEntryFlagsMask ); + void SetListPositions(); + void SetDefaultTextSize(); + BOOL IsAutoArrange() const { return (BOOL)(ePositionMode == IcnViewPositionModeAutoArrange); } - BOOL IsAutoAdjust() const { + BOOL IsAutoAdjust() const { return (BOOL)(ePositionMode == IcnViewPositionModeAutoAdjust); } - void DocRectChanged() { aDocRectChangedTimer.Start(); } - void VisRectChanged() { aVisRectChangedTimer.Start(); } - void SetOrigin( const Point&, BOOL bDoNotUpdateWallpaper = FALSE ); + void DocRectChanged() { aDocRectChangedTimer.Start(); } + void VisRectChanged() { aVisRectChangedTimer.Start(); } + void SetOrigin( const Point&, BOOL bDoNotUpdateWallpaper = FALSE ); DECL_LINK( TextEditEndedHdl, IcnViewEdit_Impl* ); @@ -300,112 +300,112 @@ class SvxIconChoiceCtrl_Impl void HideFocus (); void DrawFocusRect ( OutputDevice* pOut ); - BOOL IsMnemonicChar( sal_Unicode cChar, ULONG& rPos ) const; + BOOL IsMnemonicChar( sal_Unicode cChar, ULONG& rPos ) const; public: - long nGridDX, + long nGridDX, nGridDY; - long nHorSBarHeight, + long nHorSBarHeight, nVerSBarWidth; SvxIconChoiceCtrl_Impl( SvtIconChoiceCtrl* pView, WinBits nWinStyle ); ~SvxIconChoiceCtrl_Impl(); - BOOL SetChoiceWithCursor ( BOOL bDo = TRUE ) { BOOL bOld=bChooseWithCursor; bChooseWithCursor = bDo; return bOld; } - void Clear( BOOL bInCtor = FALSE ); - void SetStyle( WinBits nWinStyle ); - WinBits GetStyle() const { return nWinBits; } - void InsertEntry( SvxIconChoiceCtrlEntry*, ULONG nPos, const Point* pPos=0 ); - void CreateAutoMnemonics( MnemonicGenerator* _pGenerator = NULL ); - void RemoveEntry( SvxIconChoiceCtrlEntry* pEntry ); - void FontModified(); - void SelectAll( BOOL bSelect = TRUE, BOOL bPaint = TRUE ); - void SelectEntry( + BOOL SetChoiceWithCursor ( BOOL bDo = TRUE ) { BOOL bOld=bChooseWithCursor; bChooseWithCursor = bDo; return bOld; } + void Clear( BOOL bInCtor = FALSE ); + void SetStyle( WinBits nWinStyle ); + WinBits GetStyle() const { return nWinBits; } + void InsertEntry( SvxIconChoiceCtrlEntry*, ULONG nPos, const Point* pPos=0 ); + void CreateAutoMnemonics( MnemonicGenerator* _pGenerator = NULL ); + void RemoveEntry( SvxIconChoiceCtrlEntry* pEntry ); + void FontModified(); + void SelectAll( BOOL bSelect = TRUE, BOOL bPaint = TRUE ); + void SelectEntry( SvxIconChoiceCtrlEntry*, BOOL bSelect, BOOL bCallHdl = TRUE, BOOL bAddToSelection = FALSE, BOOL bSyncPaint = FALSE ); - void Paint( const Rectangle& rRect ); - BOOL MouseButtonDown( const MouseEvent& ); - BOOL MouseButtonUp( const MouseEvent& ); - BOOL MouseMove( const MouseEvent&); - BOOL RequestHelp( const HelpEvent& rHEvt ); - void SetCursor_Impl( + void Paint( const Rectangle& rRect ); + BOOL MouseButtonDown( const MouseEvent& ); + BOOL MouseButtonUp( const MouseEvent& ); + BOOL MouseMove( const MouseEvent&); + BOOL RequestHelp( const HelpEvent& rHEvt ); + void SetCursor_Impl( SvxIconChoiceCtrlEntry* pOldCursor, SvxIconChoiceCtrlEntry* pNewCursor, BOOL bMod1, BOOL bShift, BOOL bPaintSync = FALSE); - BOOL KeyInput( const KeyEvent& ); - void Resize(); - void GetFocus(); - void LoseFocus(); - void SetUpdateMode( BOOL bUpdate ); - BOOL GetUpdateMode() const { return bUpdateMode; } - void PaintEntry( SvxIconChoiceCtrlEntry* pEntry, BOOL bIsBackgroundPainted=FALSE ); - void PaintEntry( + BOOL KeyInput( const KeyEvent& ); + void Resize(); + void GetFocus(); + void LoseFocus(); + void SetUpdateMode( BOOL bUpdate ); + BOOL GetUpdateMode() const { return bUpdateMode; } + void PaintEntry( SvxIconChoiceCtrlEntry* pEntry, BOOL bIsBackgroundPainted=FALSE ); + void PaintEntry( SvxIconChoiceCtrlEntry*, const Point&, OutputDevice* pOut = 0, BOOL bIsBackgroundPainted = FALSE); - void PaintEntryVirtOutDev( SvxIconChoiceCtrlEntry* ); + void PaintEntryVirtOutDev( SvxIconChoiceCtrlEntry* ); - void SetEntryPos( + void SetEntryPos( SvxIconChoiceCtrlEntry* pEntry, const Point& rPos, BOOL bAdjustRow = FALSE, BOOL bCheckScrollBars = FALSE, BOOL bKeepGridMap = FALSE ); - void InvalidateEntry( SvxIconChoiceCtrlEntry* ); - IcnViewFieldType GetItem( SvxIconChoiceCtrlEntry*, const Point& rAbsPos ); + void InvalidateEntry( SvxIconChoiceCtrlEntry* ); + IcnViewFieldType GetItem( SvxIconChoiceCtrlEntry*, const Point& rAbsPos ); - void SetNoSelection(); + void SetNoSelection(); SvxIconChoiceCtrlEntry* GetCurEntry() const { return pCursor; } - void SetCursor( + void SetCursor( SvxIconChoiceCtrlEntry*, // TRUE == bei Single-Selection die Sel. mitfuehren BOOL bSyncSingleSelection = TRUE, BOOL bShowFocusAsync = FALSE ); SvxIconChoiceCtrlEntry* GetEntry( const Point& rDocPos, BOOL bHit = FALSE ); - SvxIconChoiceCtrlEntry* GetNextEntry( const Point& rDocPos, SvxIconChoiceCtrlEntry* pCurEntry ); - SvxIconChoiceCtrlEntry* GetPrevEntry( const Point& rDocPos, SvxIconChoiceCtrlEntry* pCurEntry ); + SvxIconChoiceCtrlEntry* GetNextEntry( const Point& rDocPos, SvxIconChoiceCtrlEntry* pCurEntry ); + SvxIconChoiceCtrlEntry* GetPrevEntry( const Point& rDocPos, SvxIconChoiceCtrlEntry* pCurEntry ); - Point GetEntryPos( SvxIconChoiceCtrlEntry* ); - void MakeEntryVisible( SvxIconChoiceCtrlEntry* pEntry, BOOL bBound = TRUE ); + Point GetEntryPos( SvxIconChoiceCtrlEntry* ); + void MakeEntryVisible( SvxIconChoiceCtrlEntry* pEntry, BOOL bBound = TRUE ); - void Arrange(BOOL bKeepPredecessors = FALSE, long nSetMaxVirtWidth =0, long nSetMaxVirtHeight =0 ); + void Arrange(BOOL bKeepPredecessors = FALSE, long nSetMaxVirtWidth =0, long nSetMaxVirtHeight =0 ); - Rectangle CalcFocusRect( SvxIconChoiceCtrlEntry* ); - Rectangle CalcBmpRect( SvxIconChoiceCtrlEntry*, const Point* pPos = 0 ); - Rectangle CalcTextRect( + Rectangle CalcFocusRect( SvxIconChoiceCtrlEntry* ); + Rectangle CalcBmpRect( SvxIconChoiceCtrlEntry*, const Point* pPos = 0 ); + Rectangle CalcTextRect( SvxIconChoiceCtrlEntry*, const Point* pPos = 0, BOOL bForInplaceEdit = FALSE, const String* pStr = 0 ); - long CalcBoundingWidth( SvxIconChoiceCtrlEntry* ) const; - long CalcBoundingHeight( SvxIconChoiceCtrlEntry* ) const; - Size CalcBoundingSize( SvxIconChoiceCtrlEntry* ) const; - void FindBoundingRect( SvxIconChoiceCtrlEntry* pEntry ); - void SetBoundingRect_Impl( + long CalcBoundingWidth( SvxIconChoiceCtrlEntry* ) const; + long CalcBoundingHeight( SvxIconChoiceCtrlEntry* ) const; + Size CalcBoundingSize( SvxIconChoiceCtrlEntry* ) const; + void FindBoundingRect( SvxIconChoiceCtrlEntry* pEntry ); + void SetBoundingRect_Impl( SvxIconChoiceCtrlEntry* pEntry, const Point& rPos, const Size& rBoundingSize ); // berechnet alle BoundRects neu - void RecalcAllBoundingRects(); + void RecalcAllBoundingRects(); // berechnet alle ungueltigen BoundRects neu - void RecalcAllBoundingRectsSmart(); + void RecalcAllBoundingRectsSmart(); const Rectangle& GetEntryBoundRect( SvxIconChoiceCtrlEntry* ); - void InvalidateBoundingRect( SvxIconChoiceCtrlEntry* ); - void InvalidateBoundingRect( Rectangle& rRect ) { rRect.Right() = LONG_MAX; bBoundRectsDirty = TRUE; } - BOOL IsBoundingRectValid( const Rectangle& rRect ) const { return (BOOL)( rRect.Right() != LONG_MAX ); } + void InvalidateBoundingRect( SvxIconChoiceCtrlEntry* ); + void InvalidateBoundingRect( Rectangle& rRect ) { rRect.Right() = LONG_MAX; bBoundRectsDirty = TRUE; } + BOOL IsBoundingRectValid( const Rectangle& rRect ) const { return (BOOL)( rRect.Right() != LONG_MAX ); } - void PaintEmphasis( + void PaintEmphasis( const Rectangle& rRect1, const Rectangle& rRect2, BOOL bSelected, @@ -414,7 +414,7 @@ public: OutputDevice* pOut, BOOL bIsBackgroundPainted = FALSE); - void PaintItem( + void PaintItem( const Rectangle& rRect, IcnViewFieldType eItem, SvxIconChoiceCtrlEntry* pEntry, @@ -424,116 +424,116 @@ public: ::vcl::ControlLayoutData* _pLayoutData = NULL ); // berechnet alle BoundingRects neu, wenn bMustRecalcBoundingRects == TRUE - void CheckBoundingRects() { if (bBoundRectsDirty) RecalcAllBoundingRectsSmart(); } + void CheckBoundingRects() { if (bBoundRectsDirty) RecalcAllBoundingRectsSmart(); } // berechnet alle invalidierten BoundingRects neu - void UpdateBoundingRects(); - void ShowTargetEmphasis( SvxIconChoiceCtrlEntry* pEntry, BOOL bShow ); - void PrepareCommandEvent( const CommandEvent& ); - void Command( const CommandEvent& rCEvt ); - void ToTop( SvxIconChoiceCtrlEntry* ); - - ULONG GetSelectionCount() const; - void SetGrid( const Size& ); - Size GetMinGrid() const; - ULONG GetGridCount( + void UpdateBoundingRects(); + void ShowTargetEmphasis( SvxIconChoiceCtrlEntry* pEntry, BOOL bShow ); + void PrepareCommandEvent( const CommandEvent& ); + void Command( const CommandEvent& rCEvt ); + void ToTop( SvxIconChoiceCtrlEntry* ); + + ULONG GetSelectionCount() const; + void SetGrid( const Size& ); + Size GetMinGrid() const; + ULONG GetGridCount( const Size& rSize, BOOL bCheckScrBars, BOOL bSmartScrBar ) const; - void Scroll( long nDeltaX, long nDeltaY, BOOL bScrollBar = FALSE ); - const Size& GetItemSize( SvxIconChoiceCtrlEntry*, IcnViewFieldType ) const; + void Scroll( long nDeltaX, long nDeltaY, BOOL bScrollBar = FALSE ); + const Size& GetItemSize( SvxIconChoiceCtrlEntry*, IcnViewFieldType ) const; - void HideDDIcon(); - void ShowDDIcon( SvxIconChoiceCtrlEntry* pRefEntry, const Point& rPos ); - void HideShowDDIcon( + void HideDDIcon(); + void ShowDDIcon( SvxIconChoiceCtrlEntry* pRefEntry, const Point& rPos ); + void HideShowDDIcon( SvxIconChoiceCtrlEntry* pRefEntry, const Point& rPos ); - BOOL IsOver( + BOOL IsOver( SvPtrarr* pSelectedRectList, const Rectangle& rEntryBoundRect ) const; - void SelectRect( + void SelectRect( const Rectangle&, BOOL bAdd = TRUE, SvPtrarr* pOtherRects = 0 ); - void CalcScrollOffsets( + void CalcScrollOffsets( const Point& rRefPosPixel, long& rX, long& rY, BOOL bDragDrop = FALSE, USHORT nBorderWidth = 10 ); - BOOL IsTextHit( SvxIconChoiceCtrlEntry* pEntry, const Point& rDocPos ); - void MakeVisible( + BOOL IsTextHit( SvxIconChoiceCtrlEntry* pEntry, const Point& rDocPos ); + void MakeVisible( const Rectangle& rDocPos, BOOL bInScrollBarEvent=FALSE, BOOL bCallRectChangedHdl = TRUE ); - void AdjustEntryAtGrid( SvxIconChoiceCtrlEntry* pStart = 0 ); - void SetEntryTextMode( SvxIconChoiceCtrlTextMode, SvxIconChoiceCtrlEntry* pEntry = 0 ); + void AdjustEntryAtGrid( SvxIconChoiceCtrlEntry* pStart = 0 ); + void SetEntryTextMode( SvxIconChoiceCtrlTextMode, SvxIconChoiceCtrlEntry* pEntry = 0 ); SvxIconChoiceCtrlTextMode GetTextMode( const SvxIconChoiceCtrlEntry* pEntry = 0 ) const; - void ShowEntryFocusRect( const SvxIconChoiceCtrlEntry* pEntry ); - void EnableEntryEditing( BOOL bEnable ) { bEntryEditingEnabled = bEnable; } - BOOL IsEntryEditingEnabled() const { return bEntryEditingEnabled; } - BOOL IsEntryEditing() const { return (BOOL)(pCurEditedEntry!=0); } - void EditEntry( SvxIconChoiceCtrlEntry* pEntry ); - void StopEntryEditing( BOOL bCancel ); - void LockEntryPos( SvxIconChoiceCtrlEntry* pEntry, BOOL bLock ); - ULONG GetEntryCount() const { return aEntries.Count(); } - SvxIconChoiceCtrlEntry* GetEntry( ULONG nPos ) const { return (SvxIconChoiceCtrlEntry*)aEntries.GetObject(nPos); } - SvxIconChoiceCtrlEntry* GetFirstSelectedEntry( ULONG& ) const; - SvxIconChoiceCtrlEntry* GetNextSelectedEntry( ULONG& ) const; + void ShowEntryFocusRect( const SvxIconChoiceCtrlEntry* pEntry ); + void EnableEntryEditing( BOOL bEnable ) { bEntryEditingEnabled = bEnable; } + BOOL IsEntryEditingEnabled() const { return bEntryEditingEnabled; } + BOOL IsEntryEditing() const { return (BOOL)(pCurEditedEntry!=0); } + void EditEntry( SvxIconChoiceCtrlEntry* pEntry ); + void StopEntryEditing( BOOL bCancel ); + void LockEntryPos( SvxIconChoiceCtrlEntry* pEntry, BOOL bLock ); + ULONG GetEntryCount() const { return aEntries.Count(); } + SvxIconChoiceCtrlEntry* GetEntry( ULONG nPos ) const { return (SvxIconChoiceCtrlEntry*)aEntries.GetObject(nPos); } + SvxIconChoiceCtrlEntry* GetFirstSelectedEntry( ULONG& ) const; + SvxIconChoiceCtrlEntry* GetNextSelectedEntry( ULONG& ) const; SvxIconChoiceCtrlEntry* GetHdlEntry() const { return pHdlEntry; } - void SetHdlEntry( SvxIconChoiceCtrlEntry* pEntry ) { pHdlEntry = pEntry; } + void SetHdlEntry( SvxIconChoiceCtrlEntry* pEntry ) { pHdlEntry = pEntry; } SvxIconChoiceCtrlTextMode GetEntryTextModeSmart( const SvxIconChoiceCtrlEntry* pEntry ) const; - void SetSelectionMode( SelectionMode eMode ) { eSelectionMode=eMode; } - SelectionMode GetSelectionMode() const { return eSelectionMode; } - BOOL AreEntriesMoved() const { return (BOOL)((nFlags & F_MOVED_ENTRIES)!=0); } - void SetEntriesMoved( BOOL bMoved ) + void SetSelectionMode( SelectionMode eMode ) { eSelectionMode=eMode; } + SelectionMode GetSelectionMode() const { return eSelectionMode; } + BOOL AreEntriesMoved() const { return (BOOL)((nFlags & F_MOVED_ENTRIES)!=0); } + void SetEntriesMoved( BOOL bMoved ) { if( bMoved ) nFlags |= F_MOVED_ENTRIES; else nFlags &= ~(F_MOVED_ENTRIES); } - ULONG GetEntryListPos( SvxIconChoiceCtrlEntry* ) const; - void SetEntryListPos( SvxIconChoiceCtrlEntry* pEntry, ULONG nNewPos ); - void SetEntryImageSize( const Size& rSize ) { aImageSize = rSize; } - void SetEntryFlags( SvxIconChoiceCtrlEntry* pEntry, USHORT nFlags ); + ULONG GetEntryListPos( SvxIconChoiceCtrlEntry* ) const; + void SetEntryListPos( SvxIconChoiceCtrlEntry* pEntry, ULONG nNewPos ); + void SetEntryImageSize( const Size& rSize ) { aImageSize = rSize; } + void SetEntryFlags( SvxIconChoiceCtrlEntry* pEntry, USHORT nFlags ); SvxIconChoiceCtrlEntry* GoLeftRight( SvxIconChoiceCtrlEntry*, BOOL bRight ); SvxIconChoiceCtrlEntry* GoUpDown( SvxIconChoiceCtrlEntry*, BOOL bDown ); - void InitSettings(); - Rectangle GetOutputRect() const; + void InitSettings(); + Rectangle GetOutputRect() const; - BOOL ArePredecessorsSet() const { return (BOOL)(pHead != 0); } + BOOL ArePredecessorsSet() const { return (BOOL)(pHead != 0); } SvxIconChoiceCtrlEntry* GetPredecessorHead() const { return pHead; } - void SetEntryPredecessor(SvxIconChoiceCtrlEntry* pEntry,SvxIconChoiceCtrlEntry* pPredecessor); - BOOL GetEntryPredecessor(SvxIconChoiceCtrlEntry* pEntry,SvxIconChoiceCtrlEntry** ppPredecessor); + void SetEntryPredecessor(SvxIconChoiceCtrlEntry* pEntry,SvxIconChoiceCtrlEntry* pPredecessor); + BOOL GetEntryPredecessor(SvxIconChoiceCtrlEntry* pEntry,SvxIconChoiceCtrlEntry** ppPredecessor); // liefert gueltige Ergebnisse nur im AutoArrange-Modus! - SvxIconChoiceCtrlEntry* FindEntryPredecessor( SvxIconChoiceCtrlEntry* pEntry, const Point& ); + SvxIconChoiceCtrlEntry* FindEntryPredecessor( SvxIconChoiceCtrlEntry* pEntry, const Point& ); - void SetPositionMode( SvxIconChoiceCtrlPositionMode ); + void SetPositionMode( SvxIconChoiceCtrlPositionMode ); SvxIconChoiceCtrlPositionMode GetPositionMode() const { return ePositionMode;} - void Flush(); - void SetColumn( USHORT nIndex, const SvxIconChoiceCtrlColumnInfo& ); + void Flush(); + void SetColumn( USHORT nIndex, const SvxIconChoiceCtrlColumnInfo& ); const SvxIconChoiceCtrlColumnInfo* GetColumn( USHORT nIndex ) const; const SvxIconChoiceCtrlColumnInfo* GetItemColumn( USHORT nSubItem, long& rLeft ) const; - Rectangle GetDocumentRect() const { return Rectangle( Point(), aVirtOutputSize ); } - Rectangle GetVisibleRect() const { return GetOutputRect(); } + Rectangle GetDocumentRect() const { return Rectangle( Point(), aVirtOutputSize ); } + Rectangle GetVisibleRect() const { return GetOutputRect(); } - void SetEntryHighlightFrame( SvxIconChoiceCtrlEntry* pEntry,BOOL bKeepHighlightFlags=FALSE ); - void HideEntryHighlightFrame(); - void DrawHighlightFrame( OutputDevice* pOut, + void SetEntryHighlightFrame( SvxIconChoiceCtrlEntry* pEntry,BOOL bKeepHighlightFlags=FALSE ); + void HideEntryHighlightFrame(); + void DrawHighlightFrame( OutputDevice* pOut, const Rectangle& rBmpRect, BOOL bHide ); - void StopSelectTimer() { aCallSelectHdlTimer.Stop(); } - void Tracking( const TrackingEvent& rTEvt ); - Point GetPopupMenuPosPixel() const; + void StopSelectTimer() { aCallSelectHdlTimer.Stop(); } + void Tracking( const TrackingEvent& rTEvt ); + Point GetPopupMenuPosPixel() const; - BOOL HandleShortCutKey( const KeyEvent& rKeyEvent ); + BOOL HandleShortCutKey( const KeyEvent& rKeyEvent ); - void CallEventListeners( ULONG nEvent, void* pData = NULL ); + void CallEventListeners( ULONG nEvent, void* pData = NULL ); inline ::svt::IAccessibleFactory& GetAccessibleFactory() { return aAccFactory.getFactory(); } @@ -543,19 +543,19 @@ public: class IcnCursor_Impl { - SvxIconChoiceCtrl_Impl* pView; - SvPtrarr* pColumns; - SvPtrarr* pRows; - long nCols; - long nRows; - short nDeltaWidth; - short nDeltaHeight; + SvxIconChoiceCtrl_Impl* pView; + SvPtrarr* pColumns; + SvPtrarr* pRows; + long nCols; + long nRows; + short nDeltaWidth; + short nDeltaHeight; SvxIconChoiceCtrlEntry* pCurEntry; - void SetDeltas(); - void ImplCreate(); - void Create() { if( !pColumns ) ImplCreate(); } + void SetDeltas(); + void ImplCreate(); + void Create() { if( !pColumns ) ImplCreate(); } - USHORT GetSortListPos( SvPtrarr* pList, long nValue, int bVertical); + USHORT GetSortListPos( SvPtrarr* pList, long nValue, int bVertical); SvxIconChoiceCtrlEntry* SearchCol(USHORT nCol,USHORT nTop,USHORT nBottom,USHORT nPref, BOOL bDown, BOOL bSimple ); @@ -565,7 +565,7 @@ class IcnCursor_Impl public: IcnCursor_Impl( SvxIconChoiceCtrl_Impl* pOwner ); ~IcnCursor_Impl(); - void Clear(); + void Clear(); // fuer Cursortravelling usw. SvxIconChoiceCtrlEntry* GoLeftRight( SvxIconChoiceCtrlEntry*, BOOL bRight ); @@ -576,53 +576,53 @@ public: // sortierte Liste der Eintraege, die in ihr stehen. Eine Liste kann // leer sein. Die Listen gehen in das Eigentum des Rufenden ueber und // muessen mit DestroyGridAdjustData geloescht werden - void CreateGridAjustData( SvPtrarr& pLists, SvxIconChoiceCtrlEntry* pRow=0); - static void DestroyGridAdjustData( SvPtrarr& rLists ); + void CreateGridAjustData( SvPtrarr& pLists, SvxIconChoiceCtrlEntry* pRow=0); + static void DestroyGridAdjustData( SvPtrarr& rLists ); }; // ---------------------------------------------------------------------------------------------- typedef ULONG GridId; -#define GRID_NOT_FOUND ((GridId)ULONG_MAX) +#define GRID_NOT_FOUND ((GridId)ULONG_MAX) class IcnGridMap_Impl { - Rectangle _aLastOccupiedGrid; - SvxIconChoiceCtrl_Impl* _pView; - BOOL* _pGridMap; - USHORT _nGridCols, _nGridRows; + Rectangle _aLastOccupiedGrid; + SvxIconChoiceCtrl_Impl* _pView; + BOOL* _pGridMap; + USHORT _nGridCols, _nGridRows; - void Expand(); - void Create_Impl(); - void Create() { if(!_pGridMap) Create_Impl(); } + void Expand(); + void Create_Impl(); + void Create() { if(!_pGridMap) Create_Impl(); } - void GetMinMapSize( USHORT& rDX, USHORT& rDY ) const; + void GetMinMapSize( USHORT& rDX, USHORT& rDY ) const; public: - IcnGridMap_Impl(SvxIconChoiceCtrl_Impl* pView); + IcnGridMap_Impl(SvxIconChoiceCtrl_Impl* pView); ~IcnGridMap_Impl(); - void Clear(); + void Clear(); - GridId GetGrid( const Point& rDocPos, BOOL* pbClipped = 0 ); - GridId GetGrid( USHORT nGridX, USHORT nGridY ); - GridId GetUnoccupiedGrid( BOOL bOccupyFound=TRUE ); + GridId GetGrid( const Point& rDocPos, BOOL* pbClipped = 0 ); + GridId GetGrid( USHORT nGridX, USHORT nGridY ); + GridId GetUnoccupiedGrid( BOOL bOccupyFound=TRUE ); - void OccupyGrids( const Rectangle&, BOOL bOccupy = TRUE ); - void OccupyGrids( const SvxIconChoiceCtrlEntry*, BOOL bOccupy = TRUE ); - void OccupyGrid( GridId nId, BOOL bOccupy = TRUE ) + void OccupyGrids( const Rectangle&, BOOL bOccupy = TRUE ); + void OccupyGrids( const SvxIconChoiceCtrlEntry*, BOOL bOccupy = TRUE ); + void OccupyGrid( GridId nId, BOOL bOccupy = TRUE ) { DBG_ASSERT(!_pGridMap || nId<(ULONG)(_nGridCols*_nGridRows),"OccupyGrid: Bad GridId"); if(_pGridMap && nId < (ULONG)(_nGridCols *_nGridRows) ) _pGridMap[ nId ] = bOccupy; } - Rectangle GetGridRect( GridId ); - void GetGridCoord( GridId, USHORT& rGridX, USHORT& rGridY ); - static ULONG GetGridCount( const Size& rSizePixel, USHORT nGridWidth, USHORT nGridHeight ); + Rectangle GetGridRect( GridId ); + void GetGridCoord( GridId, USHORT& rGridX, USHORT& rGridY ); + static ULONG GetGridCount( const Size& rSizePixel, USHORT nGridWidth, USHORT nGridHeight ); - void OutputSizeChanged(); + void OutputSizeChanged(); }; diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index 29b1e9dfbd76..58b1fdbb03c3 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,13 +58,13 @@ #define DRAWTEXT_FLAGS_SMALLICON (TEXT_DRAW_LEFT|TEXT_DRAW_ENDELLIPSIS|TEXT_DRAW_CLIP) -#define EVENTID_SHOW_CURSOR ((void*)1) -#define EVENTID_ADJUST_SCROLLBARS ((void*)2) +#define EVENTID_SHOW_CURSOR ((void*)1) +#define EVENTID_ADJUST_SCROLLBARS ((void*)2) struct SvxIconChoiceCtrlEntry_Impl { - SvxIconChoiceCtrlEntry* _pEntry; - Point _aPos; + SvxIconChoiceCtrlEntry* _pEntry; + Point _aPos; SvxIconChoiceCtrlEntry_Impl( SvxIconChoiceCtrlEntry* pEntry, const Rectangle& rBoundRect ) : _pEntry( pEntry), _aPos( rBoundRect.TopLeft()) {} }; @@ -73,15 +73,15 @@ static BOOL bEndScrollInvalidate = TRUE; class IcnViewEdit_Impl : public MultiLineEdit { - Link aCallBackHdl; - Accelerator aAccReturn; - Accelerator aAccEscape; - Timer aTimer; - BOOL bCanceled; - BOOL bAlreadyInCallback; - BOOL bGrabFocus; + Link aCallBackHdl; + Accelerator aAccReturn; + Accelerator aAccEscape; + Timer aTimer; + BOOL bCanceled; + BOOL bAlreadyInCallback; + BOOL bGrabFocus; - void CallCallBackHdl_Impl(); + void CallCallBackHdl_Impl(); DECL_LINK( Timeout_Impl, Timer * ); DECL_LINK( ReturnHdl_Impl, Accelerator * ); DECL_LINK( EscapeHdl_Impl, Accelerator * ); @@ -96,11 +96,11 @@ public: const Link& rNotifyEditEnd ); ~IcnViewEdit_Impl(); - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual long PreNotify( NotifyEvent& rNEvt ); - BOOL EditingCanceled() const { return bCanceled; } - void StopEditing( BOOL bCancel = FALSE ); - BOOL IsGrabFocus() const { return bGrabFocus; } + virtual void KeyInput( const KeyEvent& rKEvt ); + virtual long PreNotify( NotifyEvent& rNEvt ); + BOOL EditingCanceled() const { return bCanceled; } + void StopEditing( BOOL bCancel = FALSE ); + BOOL IsGrabFocus() const { return bGrabFocus; } }; SvxIconChoiceCtrl_Impl::SvxIconChoiceCtrl_Impl( SvtIconChoiceCtrl* pCurView, @@ -304,7 +304,7 @@ void SvxIconChoiceCtrl_Impl::InsertEntry( SvxIconChoiceCtrlEntry* pEntry, ULONG pZOrderList->Insert( (void*)pEntry, LIST_APPEND ); //pZOrderList->Count() ); pImpCursor->Clear(); -// pGridMap->Clear(); +// pGridMap->Clear(); if( pPos ) { Size aSize( CalcBoundingSize( pEntry ) ); @@ -325,7 +325,7 @@ void SvxIconChoiceCtrl_Impl::InsertEntry( SvxIconChoiceCtrlEntry* pEntry, ULONG Rectangle aOutputArea( GetOutputRect() ); pGridMap->OccupyGrids( pEntry ); if( !aOutputArea.IsOver( pEntry->aRect ) ) - return; // ist nicht sichtbar + return; // ist nicht sichtbar pView->Invalidate( pEntry->aRect ); } else @@ -356,8 +356,8 @@ void SvxIconChoiceCtrl_Impl::CreateAutoMnemonics( MnemonicGenerator* _pGenerator // exchange texts with generated mnemonics for( i = 0; i < nEntryCount; ++i ) { - SvxIconChoiceCtrlEntry* pEntry = GetEntry( i ); - String aTxt = pEntry->GetText(); + SvxIconChoiceCtrlEntry* pEntry = GetEntry( i ); + String aTxt = pEntry->GetText(); if( _pGenerator->CreateMnemonic( aTxt ) ) pEntry->SetText( aTxt ); @@ -1706,8 +1706,8 @@ void SvxIconChoiceCtrl_Impl::LoseFocus() pCursor->ClearFlags( ICNVIEW_FLAG_FOCUSED ); ShowCursor( FALSE ); -// HideFocus (); -// pView->Invalidate ( aFocus.aRect ); +// HideFocus (); +// pView->Invalidate ( aFocus.aRect ); RepaintEntries( ICNVIEW_FLAG_SELECTED ); } @@ -1809,8 +1809,8 @@ void SvxIconChoiceCtrl_Impl::PaintEmphasis( } // die Emphasis des Images muss von der abgeleiteten Klasse gezeichnet werden // (in der virtuellen Funktion DrawEntryImage) -// else -// pOut->DrawRect( rImageRect ); +// else +// pOut->DrawRect( rImageRect ); pOut->SetFillColor( aOldFillColor ); } @@ -1946,12 +1946,12 @@ void SvxIconChoiceCtrl_Impl::PaintEntry( SvxIconChoiceCtrlEntry* pEntry, const P Rectangle aTextRect( CalcTextRect(pEntry,&rPos,FALSE,&aEntryText)); Rectangle aBmpRect( CalcBmpRect(pEntry, &rPos ) ); - sal_Bool bShowSelection = - ( ( ( bSelected && !bCursored ) - || bDropTarget + sal_Bool bShowSelection = + ( ( ( bSelected && !bCursored ) + || bDropTarget ) - && !bNoEmphasis - && ( eSelectionMode != NO_SELECTION ) + && !bNoEmphasis + && ( eSelectionMode != NO_SELECTION ) ); sal_Bool bActiveSelection = ( 0 != ( nWinBits & WB_NOHIDESELECTION ) ) || pView->HasFocus(); @@ -2087,7 +2087,7 @@ void SvxIconChoiceCtrl_Impl::SetEntryPos( SvxIconChoiceCtrlEntry* pEntry, const } else { - SvxIconChoiceCtrlEntry* pPrev = FindEntryPredecessor( pEntry, rPos ); + SvxIconChoiceCtrlEntry* pPrev = FindEntryPredecessor( pEntry, rPos ); SetEntryPredecessor( pEntry, pPrev ); aAutoArrangeTimer.Start(); } @@ -2299,7 +2299,7 @@ Rectangle SvxIconChoiceCtrl_Impl::CalcTextRect( SvxIconChoiceCtrlEntry* pEntry, long SvxIconChoiceCtrl_Impl::CalcBoundingWidth( SvxIconChoiceCtrlEntry* pEntry ) const { long nStringWidth = GetItemSize( pEntry, IcnViewFieldTypeText ).Width(); -// nStringWidth += 2*LROFFS_TEXT; +// nStringWidth += 2*LROFFS_TEXT; long nWidth = 0; switch( nWinBits & (VIEWMODE_MASK) ) @@ -2353,7 +2353,7 @@ Size SvxIconChoiceCtrl_Impl::CalcBoundingSize( SvxIconChoiceCtrlEntry* pEntry ) void SvxIconChoiceCtrl_Impl::RecalcAllBoundingRects() { - nMaxBoundHeight = 0; + nMaxBoundHeight = 0; pZOrderList->Clear(); ULONG nCount = aEntries.Count(); ULONG nCur; @@ -2387,7 +2387,7 @@ void SvxIconChoiceCtrl_Impl::RecalcAllBoundingRects() void SvxIconChoiceCtrl_Impl::RecalcAllBoundingRectsSmart() { - nMaxBoundHeight = 0; + nMaxBoundHeight = 0; pZOrderList->Clear(); ULONG nCur; SvxIconChoiceCtrlEntry* pEntry; @@ -2682,7 +2682,7 @@ void SvxIconChoiceCtrl_Impl::InvalidateBoundingRect( SvxIconChoiceCtrlEntry* pEn BOOL SvxIconChoiceCtrl_Impl::HandleScrollCommand( const CommandEvent& rCmd ) { - Rectangle aDocRect( GetDocumentRect() ); + Rectangle aDocRect( GetDocumentRect() ); Rectangle aVisRect( GetVisibleRect() ); if( aVisRect.IsInside( aDocRect )) return FALSE; @@ -2812,7 +2812,7 @@ void SvxIconChoiceCtrl_Impl::MakeVisible( const Rectangle& rRect, BOOL bScrBar, aOrigin *= -1; Rectangle aOutputArea( GetOutputRect() ); if( aOutputArea.IsInside( aVirtRect ) ) - return; // ist schon sichtbar + return; // ist schon sichtbar long nDy; if( aVirtRect.Top() < aOutputArea.Top() ) @@ -2967,7 +2967,7 @@ Size SvxIconChoiceCtrl_Impl::GetMinGrid() const { Size aMinSize( aImageSize ); aMinSize.Width() += 2 * LROFFS_BOUND; - aMinSize.Height() += TBOFFS_BOUND; // PB: einmal Offset reicht (FileDlg) + aMinSize.Height() += TBOFFS_BOUND; // PB: einmal Offset reicht (FileDlg) String aStrDummy( RTL_CONSTASCII_USTRINGPARAM( "XXX" ) ); Size aTextSize( pView->GetTextWidth( aStrDummy ), pView->GetTextHeight() ); if( nWinBits & WB_ICON ) @@ -3258,9 +3258,9 @@ void SvxIconChoiceCtrl_Impl::SelectRange( BOOL bAdd ) { ULONG nFront = GetEntryListPos( pStart ); - ULONG nBack = GetEntryListPos( pEnd ); + ULONG nBack = GetEntryListPos( pEnd ); ULONG nFirst = std::min( nFront, nBack ); - ULONG nLast = std::max( nFront, nBack ); + ULONG nLast = std::max( nFront, nBack ); ULONG i; SvxIconChoiceCtrlEntry* pEntry; @@ -4296,7 +4296,7 @@ BOOL SvxIconChoiceCtrl_Impl::GetEntryPredecessor( SvxIconChoiceCtrlEntry* pEntry return TRUE; } -SvxIconChoiceCtrlEntry* SvxIconChoiceCtrl_Impl::FindEntryPredecessor( SvxIconChoiceCtrlEntry* pEntry, +SvxIconChoiceCtrlEntry* SvxIconChoiceCtrl_Impl::FindEntryPredecessor( SvxIconChoiceCtrlEntry* pEntry, const Point& rPosTopLeft ) { Point aPos( rPosTopLeft ); //TopLeft @@ -4615,12 +4615,12 @@ BOOL SvxIconChoiceCtrl_Impl::HandleShortCutKey( const KeyEvent& rKEvt ) { StopEditTimer(); - BOOL bRet = FALSE; + BOOL bRet = FALSE; DBG_ASSERT( rKEvt.GetKeyCode().IsMod2(), "*SvxIconChoiceCtrl_Impl::HandleShortCutKey(): no <ALT> pressed!?" ); - sal_Unicode cChar = rKEvt.GetCharCode(); - ULONG nPos = (ULONG)-1; + sal_Unicode cChar = rKEvt.GetCharCode(); + ULONG nPos = (ULONG)-1; if( cChar && IsMnemonicChar( cChar, nPos ) ) { diff --git a/svtools/source/contnr/imivctl2.cxx b/svtools/source/contnr/imivctl2.cxx index 43b03f569d5d..fbd7869df61d 100644 --- a/svtools/source/contnr/imivctl2.cxx +++ b/svtools/source/contnr/imivctl2.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,14 +32,14 @@ IcnCursor_Impl::IcnCursor_Impl( SvxIconChoiceCtrl_Impl* pOwner ) { - pView = pOwner; - pColumns = 0; - pRows = 0; - pCurEntry = 0; + pView = pOwner; + pColumns = 0; + pRows = 0; + pCurEntry = 0; nDeltaWidth = 0; nDeltaHeight= 0; - nCols = 0; - nRows = 0; + nCols = 0; + nRows = 0; } IcnCursor_Impl::~IcnCursor_Impl() @@ -347,7 +347,7 @@ SvxIconChoiceCtrlEntry* IcnCursor_Impl::GoLeftRight( SvxIconChoiceCtrlEntry* pCt SvxIconChoiceCtrlEntry* IcnCursor_Impl::GoPageUpDown( SvxIconChoiceCtrlEntry* pStart, BOOL bDown) { - if( pView->IsAutoArrange() && !(pView->nWinBits & WB_ALIGN_TOP) ) + if( pView->IsAutoArrange() && !(pView->nWinBits & WB_ALIGN_TOP) ) { const long nPos = (long)pView->GetEntryListPos( pStart ); long nEntriesInView = (pView->aOutputSize.Height() / pView->nGridDY); @@ -407,7 +407,7 @@ SvxIconChoiceCtrlEntry* IcnCursor_Impl::GoPageUpDown( SvxIconChoiceCtrlEntry* pS SvxIconChoiceCtrlEntry* IcnCursor_Impl::GoUpDown( SvxIconChoiceCtrlEntry* pCtrlEntry, BOOL bDown) { - if( pView->IsAutoArrange() && !(pView->nWinBits & WB_ALIGN_TOP) ) + if( pView->IsAutoArrange() && !(pView->nWinBits & WB_ALIGN_TOP) ) { ULONG nPos = pView->GetEntryListPos( pCtrlEntry ); if( bDown && nPos < (pView->aEntries.Count() - 1) ) diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx index 6eeb469cf543..38949282f42b 100644 --- a/svtools/source/contnr/ivctrl.cxx +++ b/svtools/source/contnr/ivctrl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,9 +129,9 @@ SvtIconChoiceCtrl::SvtIconChoiceCtrl( Window* pParent, WinBits nWinStyle ) : // WB_CLIPCHILDREN an, da ScrollBars auf dem Fenster liegen! Control( pParent, nWinStyle | WB_CLIPCHILDREN ), - _pCurKeyEvent ( NULL ), - _pImp ( new SvxIconChoiceCtrl_Impl( this, nWinStyle ) ), - _bAutoFontColor ( FALSE ) + _pCurKeyEvent ( NULL ), + _pImp ( new SvxIconChoiceCtrl_Impl( this, nWinStyle ) ), + _bAutoFontColor ( FALSE ) { SetLineColor(); @@ -144,9 +144,9 @@ SvtIconChoiceCtrl::SvtIconChoiceCtrl( Window* pParent, const ResId& rResId ) : Control( pParent, rResId ), - _pCurKeyEvent ( NULL ), - _pImp ( new SvxIconChoiceCtrl_Impl( this, WB_BORDER ) ), - _bAutoFontColor ( FALSE ) + _pCurKeyEvent ( NULL ), + _pImp ( new SvxIconChoiceCtrl_Impl( this, WB_BORDER ) ), + _bAutoFontColor ( FALSE ) { SetLineColor(); diff --git a/svtools/source/contnr/svcontnr.src b/svtools/source/contnr/svcontnr.src index bcd1e060664f..aaf134383562 100644 --- a/svtools/source/contnr/svcontnr.src +++ b/svtools/source/contnr/svcontnr.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/svtools/source/contnr/svicnvw.cxx b/svtools/source/contnr/svicnvw.cxx index 7aaf2314b8a3..825db6d99370 100644 --- a/svtools/source/contnr/svicnvw.cxx +++ b/svtools/source/contnr/svicnvw.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ #include <svimpicn.hxx> #include <svtools/svlbitm.hxx> -#define ICNVW_BLOCK_ENTRYINS 0x0001 +#define ICNVW_BLOCK_ENTRYINS 0x0001 SvIcnVwDataEntry::SvIcnVwDataEntry() : nIcnVwFlags(0),eTextMode(ShowTextDontKnow) diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx index 86c5146d9dec..a7a7bb615a8b 100644 --- a/svtools/source/contnr/svimpbox.cxx +++ b/svtools/source/contnr/svimpbox.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,15 +50,15 @@ // #102891# -------------------- #include <comphelper/processfactory.hxx> -#define NODE_BMP_TABDIST_NOTVALID -2000000 -#define FIRST_ENTRY_TAB 1 +#define NODE_BMP_TABDIST_NOTVALID -2000000 +#define FIRST_ENTRY_TAB 1 // #i27063# (pl), #i32300# (pb) never access VCL after DeInitVCL - also no destructors -Image* SvImpLBox::s_pDefCollapsed = NULL; -Image* SvImpLBox::s_pDefExpanded = NULL; -Image* SvImpLBox::s_pDefCollapsedHC = NULL; -Image* SvImpLBox::s_pDefExpandedHC = NULL; -sal_Int32 SvImpLBox::s_nImageRefCount = 0; +Image* SvImpLBox::s_pDefCollapsed = NULL; +Image* SvImpLBox::s_pDefExpanded = NULL; +Image* SvImpLBox::s_pDefCollapsedHC = NULL; +Image* SvImpLBox::s_pDefExpandedHC = NULL; +sal_Int32 SvImpLBox::s_nImageRefCount = 0; SvImpLBox::SvImpLBox( SvTreeListBox* pLBView, SvLBoxTreeList* pLBTree, WinBits nWinStyle) : @@ -95,15 +95,15 @@ SvImpLBox::SvImpLBox( SvTreeListBox* pLBView, SvLBoxTreeList* pLBTree, WinBits n nHorSBarHeight = (short)aHorSBar.GetSizePixel().Height(); nVerSBarWidth = (short)aVerSBar.GetSizePixel().Width(); - pStartEntry = 0; - pCursor = 0; - pAnchor = 0; - nVisibleCount = 0; // Anzahl Daten-Zeilen im Control + pStartEntry = 0; + pCursor = 0; + pAnchor = 0; + nVisibleCount = 0; // Anzahl Daten-Zeilen im Control nNodeBmpTabDistance = NODE_BMP_TABDIST_NOTVALID; - nYoffsNodeBmp = 0; - nNodeBmpWidth = 0; + nYoffsNodeBmp = 0; + nNodeBmpWidth = 0; - bAsyncBeginDrag = FALSE; + bAsyncBeginDrag = FALSE; aAsyncBeginDragTimer.SetTimeout( 0 ); aAsyncBeginDragTimer.SetTimeoutHdl( LINK(this,SvImpLBox,BeginDragHdl)); // Button-Animation in Listbox @@ -264,7 +264,7 @@ void SvImpLBox::SetExtendedWindowBits( ExtendedWinBits _nBits ) void SvImpLBox::Clear() { StopUserEvent(); - pStartEntry = 0; + pStartEntry = 0; pAnchor = 0; pActiveButton = 0; @@ -1061,10 +1061,10 @@ void SvImpLBox::DrawNet() //for platforms who don't have nets, DrawNativeControl does nothing and return true //so that SvImpLBox::DrawNet() doesn't draw anything too if(pView->IsNativeControlSupported( CTRL_LISTNET, PART_ENTIRE_CONTROL)) { - ImplControlValue aControlValue; + ImplControlValue aControlValue; Point aTemp(0,0); // temporary needed for g++ 3.3.5 Rectangle aCtrlRegion( aTemp, Size( 0, 0 ) ); - ControlState nState = CTRL_STATE_ENABLED; + ControlState nState = CTRL_STATE_ENABLED; if( pView->DrawNativeControl( CTRL_LISTNET, PART_ENTIRE_CONTROL, aCtrlRegion, nState, aControlValue, rtl::OUString() ) ) { @@ -1422,7 +1422,7 @@ void SvImpLBox::FillView() if( bFound ) { aVerSBar.SetThumbPos( nThumb ); - ShowCursor( TRUE ); // Focusrect neu berechnen + ShowCursor( TRUE ); // Focusrect neu berechnen pView->Invalidate(); } } @@ -1744,7 +1744,7 @@ void SvImpLBox::RemovingEntry( SvLBoxEntry* pEntry ) { if( bSimpleTravel ) pView->Select( pCursor, FALSE ); - ShowCursor( FALSE ); // Focus-Rect weg + ShowCursor( FALSE ); // Focus-Rect weg // NextSibling, weil auch Childs des Cursors geloescht werden pTemp = pView->NextSibling( pCursor ); if( !pTemp ) @@ -1906,8 +1906,8 @@ void SvImpLBox::EntryInserted( SvLBoxEntry* pEntry ) SelAllDestrAnch( FALSE, TRUE ); else DestroyAnchor(); - // nFlags &= (~F_DESEL_ALL); -// ShowCursor( FALSE ); // falls sich Cursor nach unten verschiebt + // nFlags &= (~F_DESEL_ALL); +// ShowCursor( FALSE ); // falls sich Cursor nach unten verschiebt long nY = GetEntryLine( pEntry ); BOOL bEntryVisible = IsLineVisible( nY ); if( bEntryVisible ) @@ -1972,7 +1972,7 @@ void SvImpLBox::EntryInserted( SvLBoxEntry* pEntry ) // ****** Steuerung der Controlanimation BOOL SvImpLBox::ButtonDownCheckCtrl(const MouseEvent& rMEvt, SvLBoxEntry* pEntry, - long nY ) + long nY ) { SvLBoxItem* pItem = pView->GetItem(pEntry,rMEvt.GetPosPixel().X(),&pActiveTab); if( pItem && (pItem->IsA()==SV_ITEM_ID_LBOXBUTTON)) @@ -2229,7 +2229,7 @@ void SvImpLBox::MouseMove( const MouseEvent& rMEvt) BOOL SvImpLBox::KeyInput( const KeyEvent& rKEvt) { aEditTimer.Stop(); - const KeyCode& rKeyCode = rKEvt.GetKeyCode(); + const KeyCode& rKeyCode = rKEvt.GetKeyCode(); if( rKeyCode.IsMod2() ) return FALSE; // Alt-Taste nicht auswerten @@ -2276,7 +2276,7 @@ BOOL SvImpLBox::KeyInput( const KeyEvent& rKEvt) if( pNewCursor ) { aSelEng.CursorPosChanging( bShift, bMod1 ); - SetCursor( pNewCursor, bMod1 ); // no selection, when Ctrl is on + SetCursor( pNewCursor, bMod1 ); // no selection, when Ctrl is on if( !IsEntryInView( pNewCursor ) ) KeyUp( FALSE ); } @@ -2307,13 +2307,13 @@ BOOL SvImpLBox::KeyInput( const KeyEvent& rKEvt) { aSelEng.CursorPosChanging( bShift, bMod1 ); if( IsEntryInView( pNewCursor ) ) - SetCursor( pNewCursor, bMod1 ); // no selection, when Ctrl is on + SetCursor( pNewCursor, bMod1 ); // no selection, when Ctrl is on else { if( pCursor ) pView->Select( pCursor, FALSE ); KeyDown( FALSE ); - SetCursor( pNewCursor, bMod1 ); // no selection, when Ctrl is on + SetCursor( pNewCursor, bMod1 ); // no selection, when Ctrl is on } } else @@ -2336,9 +2336,9 @@ BOOL SvImpLBox::KeyInput( const KeyEvent& rKEvt) } else if( pView->nWindowStyle & WB_HSCROLL ) { - long nThumb = aHorSBar.GetThumbPos(); + long nThumb = aHorSBar.GetThumbPos(); nThumb += aHorSBar.GetLineSize(); - long nOldThumb = aHorSBar.GetThumbPos(); + long nOldThumb = aHorSBar.GetThumbPos(); aHorSBar.SetThumbPos( nThumb ); nThumb = nOldThumb; nThumb -= aHorSBar.GetThumbPos(); @@ -2367,9 +2367,9 @@ BOOL SvImpLBox::KeyInput( const KeyEvent& rKEvt) } else if ( pView->nWindowStyle & WB_HSCROLL ) { - long nThumb = aHorSBar.GetThumbPos(); + long nThumb = aHorSBar.GetThumbPos(); nThumb -= aHorSBar.GetLineSize(); - long nOldThumb = aHorSBar.GetThumbPos(); + long nOldThumb = aHorSBar.GetThumbPos(); aHorSBar.SetThumbPos( nThumb ); nThumb = nOldThumb; nThumb -= aHorSBar.GetThumbPos(); @@ -2554,8 +2554,8 @@ BOOL SvImpLBox::KeyInput( const KeyEvent& rKEvt) case KEY_A: if( bMod1 ) SelAllDestrAnch( TRUE ); -// else -// bKeyUsed = FALSE; #105907# assume user wants to use quicksearch with key "a", so key is handled! +// else +// bKeyUsed = FALSE; #105907# assume user wants to use quicksearch with key "a", so key is handled! break; case KEY_SUBTRACT: @@ -2626,7 +2626,7 @@ BOOL SvImpLBox::KeyInput( const KeyEvent& rKEvt) if( pNewCursor && pNewCursor != pCursor ) { -// SelAllDestrAnch( FALSE ); +// SelAllDestrAnch( FALSE ); aSelEng.CursorPosChanging( bShift, bMod1 ); SetCursor( pNewCursor ); if( !IsEntryInView( pNewCursor ) ) @@ -2646,7 +2646,7 @@ BOOL SvImpLBox::KeyInput( const KeyEvent& rKEvt) if( pNewCursor && pNewCursor != pCursor) { -// SelAllDestrAnch( FALSE ); +// SelAllDestrAnch( FALSE ); aSelEng.CursorPosChanging( bShift, bMod1 ); SetCursor( pNewCursor ); if( !IsEntryInView( pNewCursor ) ) @@ -2681,8 +2681,8 @@ void __EXPORT SvImpLBox::GetFocus() pView->SetEntryFocus( pCursor, TRUE ); ShowCursor( TRUE ); // auskommentiert wg. deselectall -// if( bSimpleTravel && !pView->IsSelected(pCursor) ) -// pView->Select( pCursor, TRUE ); +// if( bSimpleTravel && !pView->IsSelected(pCursor) ) +// pView->Select( pCursor, TRUE ); } if( nWinBits & WB_HIDESELECTION ) { @@ -2792,7 +2792,7 @@ BOOL __EXPORT ImpLBSelEng::SetCursorAtPoint(const Point& rPoint, BOOL bDontSelec // bei SimpleTravel wird in SetCursor selektiert und // der Select-Handler gerufen //if( !bDontSelectAtCursor && !pImp->bSimpleTravel ) - // pImp->SelectEntry( pNewCursor, TRUE ); + // pImp->SelectEntry( pNewCursor, TRUE ); pImp->SetCursor( pNewCursor, bDontSelectAtCursor ); return TRUE; } @@ -3095,7 +3095,7 @@ void lcl_DeleteSubPopups(PopupMenu* pPopup) bool SvImpLBox::Command( const CommandEvent& rCEvt ) { - USHORT nCommand = rCEvt.GetCommand(); + USHORT nCommand = rCEvt.GetCommand(); if( nCommand == COMMAND_CONTEXTMENU ) aEditTimer.Stop(); @@ -3120,22 +3120,22 @@ bool SvImpLBox::Command( const CommandEvent& rCEvt ) if( bContextMenuHandling && nCommand == COMMAND_CONTEXTMENU ) { - Point aPopupPos; - BOOL bClickedIsFreePlace = FALSE; + Point aPopupPos; + BOOL bClickedIsFreePlace = FALSE; std::stack<SvLBoxEntry*> aSelRestore; if( rCEvt.IsMouseEvent() ) - { // change selection, if mouse pos doesn't fit to selection + { // change selection, if mouse pos doesn't fit to selection aPopupPos = rCEvt.GetMousePosPixel(); - SvLBoxEntry* pClickedEntry = GetEntry( aPopupPos ); + SvLBoxEntry* pClickedEntry = GetEntry( aPopupPos ); if( pClickedEntry ) - { // mouse in non empty area - BOOL bClickedIsSelected = FALSE; + { // mouse in non empty area + BOOL bClickedIsSelected = FALSE; // collect the currently selected entries - SvLBoxEntry* pSelected = pView->FirstSelected(); + SvLBoxEntry* pSelected = pView->FirstSelected(); while( pSelected ) { bClickedIsSelected |= ( pClickedEntry == pSelected ); @@ -3144,7 +3144,7 @@ bool SvImpLBox::Command( const CommandEvent& rCEvt ) // if the entry which the user clicked at is not selected if( !bClickedIsSelected ) - { // deselect all other and select the clicked one + { // deselect all other and select the clicked one pView->SelectAll( FALSE ); pView->SetCursor( pClickedEntry ); } @@ -3152,8 +3152,8 @@ bool SvImpLBox::Command( const CommandEvent& rCEvt ) else if( aSelEng.GetSelectionMode() == SINGLE_SELECTION ) {//modified by BerryJia for fixing Bug102739 2002-9-9 17:00(Beijing Time) bClickedIsFreePlace = TRUE; - INT32 nSelectedEntries = pView->GetSelectionCount(); - SvLBoxEntry* pSelected = pView->FirstSelected(); + INT32 nSelectedEntries = pView->GetSelectionCount(); + SvLBoxEntry* pSelected = pView->FirstSelected(); for(USHORT nSel = 0; nSel < nSelectedEntries; nSel++ ) { aSelRestore.push(pSelected); @@ -3162,17 +3162,17 @@ bool SvImpLBox::Command( const CommandEvent& rCEvt ) pView->SelectAll( FALSE ); } else - { // deselect all + { // deselect all pView->SelectAll( FALSE ); } } else - { // key event (or at least no mouse event) - INT32 nSelectionCount = pView->GetSelectionCount(); + { // key event (or at least no mouse event) + INT32 nSelectionCount = pView->GetSelectionCount(); if( nSelectionCount ) - { // now allways take first visible as base for positioning the menu - SvLBoxEntry* pSelected = pView->FirstSelected(); + { // now allways take first visible as base for positioning the menu + SvLBoxEntry* pSelected = pView->FirstSelected(); while( pSelected ) { if( IsEntryInView( pSelected ) ) @@ -3194,7 +3194,7 @@ bool SvImpLBox::Command( const CommandEvent& rCEvt ) aPopupPos = Point( 0, 0 ); } - PopupMenu* pPopup = pView->CreateContextMenu(); + PopupMenu* pPopup = pView->CreateContextMenu(); if( pPopup ) { @@ -3291,8 +3291,8 @@ IMPL_LINK( SvImpLBox, EditTimerCall, Timer *, EMPTYARG ) if ( bIsMouseTriggered ) { Point aCurrentMousePos = pView->GetPointerPosPixel(); - if ( ( abs( aCurrentMousePos.X() - aEditClickPos.X() ) > 5 ) - || ( abs( aCurrentMousePos.Y() - aEditClickPos.Y() ) > 5 ) + if ( ( abs( aCurrentMousePos.X() - aEditClickPos.X() ) > 5 ) + || ( abs( aCurrentMousePos.Y() - aEditClickPos.Y() ) > 5 ) ) { return 0L; @@ -3346,7 +3346,7 @@ BOOL SvImpLBox::RequestHelp( const HelpEvent& rHEvt ) { // rechten Item-Rand am View-Rand clippen //if( aItemRect.Right() > aViewRect.Right() ) - // aItemRect.Right() = aViewRect.Right(); + // aItemRect.Right() = aViewRect.Right(); Point aPt = pView->OutputToScreenPixel( aItemRect.TopLeft() ); aItemRect.Left() = aPt.X(); diff --git a/svtools/source/contnr/svimpicn.cxx b/svtools/source/contnr/svimpicn.cxx index 95e1e2835a54..43e3289deb24 100644 --- a/svtools/source/contnr/svimpicn.cxx +++ b/svtools/source/contnr/svimpicn.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,32 +44,32 @@ -#define VIEWMODE_ICON 0x0001 // Text unter Bitmap -#define VIEWMODE_NAME 0x0002 // Text rechts neben Bitmap -#define VIEWMODE_TEXT 0x0004 // Text ohne Bitmap +#define VIEWMODE_ICON 0x0001 // Text unter Bitmap +#define VIEWMODE_NAME 0x0002 // Text rechts neben Bitmap +#define VIEWMODE_TEXT 0x0004 // Text ohne Bitmap #define DD_SCROLL_PIXEL 10 // alle Angaben in Pixel -#define ICONVIEW_OFFS_BMP_STRING 3 +#define ICONVIEW_OFFS_BMP_STRING 3 // fuer das Bounding-Rectangle -#define LROFFS_BOUND 2 -#define TBOFFS_BOUND 2 +#define LROFFS_BOUND 2 +#define TBOFFS_BOUND 2 // fuer das Focus-Rectangle um Icons -#define LROFFS_ICON 2 -#define TBOFFS_ICON 2 +#define LROFFS_ICON 2 +#define TBOFFS_ICON 2 -#define NAMEVIEW_OFFS_BMP_STRING 3 +#define NAMEVIEW_OFFS_BMP_STRING 3 // Abstaende von Fensterraendern -#define LROFFS_WINBORDER 4 -#define TBOFFS_WINBORDER 4 +#define LROFFS_WINBORDER 4 +#define TBOFFS_WINBORDER 4 // Breitenoffset Highlight-Rect bei Text -#define LROFFS_TEXT 2 +#define LROFFS_TEXT 2 #define ICNVIEWDATA(xPtr) (SvIcnVwDataEntry*)(pView->GetViewDataEntry(xPtr)) @@ -643,62 +643,62 @@ void DrawText( OutputDevice* pDev, const Rectangle& rRect, class ImpIcnCursor { - SvImpIconView* pView; - SvPtrarr* pColumns; - SvPtrarr* pRows; - BOOL* pGridMap; - long nGridDX, nGridDY; - long nGridCols, nGridRows; - long nCols; - long nRows; - short nDeltaWidth; - short nDeltaHeight; - SvLBoxEntry* pCurEntry; - void SetDeltas(); - void ImplCreate(); - void Create() { if( !pColumns ) ImplCreate(); } - - USHORT GetSortListPos( SvPtrarr* pList, long nValue, int bVertical); - SvLBoxEntry* SearchCol(USHORT nCol,USHORT nTop,USHORT nBottom,USHORT nPref, + SvImpIconView* pView; + SvPtrarr* pColumns; + SvPtrarr* pRows; + BOOL* pGridMap; + long nGridDX, nGridDY; + long nGridCols, nGridRows; + long nCols; + long nRows; + short nDeltaWidth; + short nDeltaHeight; + SvLBoxEntry* pCurEntry; + void SetDeltas(); + void ImplCreate(); + void Create() { if( !pColumns ) ImplCreate(); } + + USHORT GetSortListPos( SvPtrarr* pList, long nValue, int bVertical); + SvLBoxEntry* SearchCol(USHORT nCol,USHORT nTop,USHORT nBottom,USHORT nPref, BOOL bDown, BOOL bSimple ); - SvLBoxEntry* SearchRow(USHORT nRow,USHORT nRight,USHORT nLeft,USHORT nPref, + SvLBoxEntry* SearchRow(USHORT nRow,USHORT nRight,USHORT nLeft,USHORT nPref, BOOL bRight, BOOL bSimple ); - void ExpandGrid(); - void CreateGridMap(); + void ExpandGrid(); + void CreateGridMap(); // Rueckgabe FALSE: Eintrag liegt nicht in der GridMap. rGridx,y werden // dann an nGridCols, nGridRows geclippt - BOOL GetGrid( const Point& rDocPos, USHORT& rGridX, USHORT& rGridY ) const; - void SetGridUsed( USHORT nDX, USHORT nDY, BOOL bUsed ) + BOOL GetGrid( const Point& rDocPos, USHORT& rGridX, USHORT& rGridY ) const; + void SetGridUsed( USHORT nDX, USHORT nDY, BOOL bUsed ) { pGridMap[ (nDY * nGridCols) + nDX ] = bUsed; } - BOOL IsGridUsed( USHORT nDX, USHORT nDY ) + BOOL IsGridUsed( USHORT nDX, USHORT nDY ) { return pGridMap[ (nDY * nGridCols) + nDX ]; } public: ImpIcnCursor( SvImpIconView* pOwner ); ~ImpIcnCursor(); - void Clear( BOOL bGridToo = TRUE ); + void Clear( BOOL bGridToo = TRUE ); // fuer Cursortravelling usw. - SvLBoxEntry* GoLeftRight( SvLBoxEntry*, BOOL bRight ); - SvLBoxEntry* GoUpDown( SvLBoxEntry*, BOOL bDown ); + SvLBoxEntry* GoLeftRight( SvLBoxEntry*, BOOL bRight ); + SvLBoxEntry* GoUpDown( SvLBoxEntry*, BOOL bDown ); // Rueckgaebe: FALSE == Das leere Rect steht hinter dem letzten // Eintrag; d.h. beim naechsten Einfuegen ergibt sich das naechste // leere Rechteck durch Addition. Hinweis: Das Rechteck kann dann // ausserhalb des View-Space liegen - BOOL FindEmptyGridRect( Rectangle& rRect ); + BOOL FindEmptyGridRect( Rectangle& rRect ); // Erzeugt fuer jede Zeile (Hoehe=nGridDY) eine nach BoundRect.Left() // sortierte Liste der Eintraege, die in ihr stehen. Eine Liste kann // leer sein. Die Listen gehen in das Eigentum des Rufenden ueber und // muessen mit DestroyGridAdjustData geloescht werden - void CreateGridAjustData( SvPtrarr& pLists, SvLBoxEntry* pRow=0); - static void DestroyGridAdjustData( SvPtrarr& rLists ); - void SetGridUsed( const Rectangle&, BOOL bUsed = TRUE ); + void CreateGridAjustData( SvPtrarr& pLists, SvLBoxEntry* pRow=0); + static void DestroyGridAdjustData( SvPtrarr& rLists ); + void SetGridUsed( const Rectangle&, BOOL bUsed = TRUE ); }; @@ -876,7 +876,7 @@ void SvImpIconView::EntryInserted( SvLBoxEntry* pEntry ) StopEditTimer(); DBG_ASSERT(pZOrderList->GetPos(pEntry)==0xffff,"EntryInserted:ZOrder?"); pZOrderList->Insert( pEntry, pZOrderList->Count() ); - if( nFlags & F_GRIDMODE ) + if( nFlags & F_GRIDMODE ) pImpCursor->Clear( FALSE ); else pImpCursor->Clear( TRUE ); @@ -1044,7 +1044,7 @@ void SvImpIconView::EntrySelected( SvLBoxEntry* pEntry, BOOL bSelect ) void SvImpIconView::SetNextEntryPos(const Point& rPos) { aPrevBoundRect.SetPos( rPos ); - aPrevBoundRect.Right() = LONG_MAX; // dont know + aPrevBoundRect.Right() = LONG_MAX; // dont know } Point SvImpIconView::FindNextEntryPos( const Size& rBoundSize ) @@ -2092,8 +2092,8 @@ void SvImpIconView::PaintEntry( SvLBoxEntry* pEntry, const Point& rPos, SvLBoxString* pStringItem = (SvLBoxString*)(pEntry->GetFirstItem(SV_ITEM_ID_LBOXSTRING)); - BOOL bSelected = pViewData->IsSelected(); - BOOL bCursored = pViewData->IsCursored(); + BOOL bSelected = pViewData->IsSelected(); + BOOL bCursored = pViewData->IsCursored(); Font aTempFont( pOut->GetFont() ); // waehrend D&D nicht die Fontfarbe wechseln, da sonst auch die @@ -2416,7 +2416,7 @@ Rectangle SvImpIconView::CalcTextRect( SvLBoxEntry* pEntry, Rectangle aRect( aPos, aTextSize ); // KNALLT BEIM D&D, WENN GECLIPPT WIRD (In DrawText von Thomas) -// ClipAtVirtOutRect( aRect ); +// ClipAtVirtOutRect( aRect ); return aRect; } @@ -2497,7 +2497,7 @@ Size SvImpIconView::CalcBoundingSize( SvLBoxEntry* pEntry, void SvImpIconView::RecalcAllBoundingRects() { - nMaxBoundHeight = 0; + nMaxBoundHeight = 0; pZOrderList->Remove(0, pZOrderList->Count() ); SvLBoxEntry* pEntry = pModel->FirstChild( pCurParent ); while( pEntry ) @@ -2512,7 +2512,7 @@ void SvImpIconView::RecalcAllBoundingRects() void SvImpIconView::RecalcAllBoundingRectsSmart() { - nMaxBoundHeight = 0; + nMaxBoundHeight = 0; pZOrderList->Remove(0, pZOrderList->Count() ); SvLBoxEntry* pEntry = pModel->FirstChild( pCurParent ); while( pEntry ) @@ -2917,7 +2917,7 @@ void SvImpIconView::MakeVisible( const Rectangle& rRect, BOOL bScrBar ) Rectangle aOutputArea( aOrigin, aOutputSize ); if( aOutputArea.IsInside( aRect ) ) - return; // ist schon sichtbar + return; // ist schon sichtbar long nDy; if( aRect.Top() < aOutputArea.Top() ) @@ -3039,22 +3039,22 @@ void SvImpIconView::DeselectAllBut( SvLBoxEntry* pThisEntryNot ) } } -#define ICN_ROWS 50 -#define ICN_COLS 30 +#define ICN_ROWS 50 +#define ICN_COLS 30 ImpIcnCursor::ImpIcnCursor( SvImpIconView* pOwner ) { - pView = pOwner; - pColumns = 0; - pRows = 0; - pCurEntry = 0; + pView = pOwner; + pColumns = 0; + pRows = 0; + pCurEntry = 0; nDeltaWidth = 0; nDeltaHeight= 0; - nCols = 0; - nRows = 0; - nGridCols = 0; - nGridRows = 0; - pGridMap = 0; + nCols = 0; + nRows = 0; + nGridCols = 0; + nGridRows = 0; + pGridMap = 0; } ImpIcnCursor::~ImpIcnCursor() @@ -3587,7 +3587,7 @@ BOOL ImpIcnCursor::FindEmptyGridRect( Rectangle& rRect ) //XXX //if( nRow + 5 > nGridRows ) - // ExpandGrid(); + // ExpandGrid(); DBG_ASSERT(pGridMap[nCur],"SetGridUsed failed"); return TRUE; } diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx index 39a62ade19fa..0803be345ee3 100644 --- a/svtools/source/contnr/svlbitm.cxx +++ b/svtools/source/contnr/svlbitm.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ struct SvLBoxButtonData_Impl { - SvLBoxEntry* pEntry; - BOOL bDefaultImages; - BOOL bShowRadioButton; + SvLBoxEntry* pEntry; + BOOL bDefaultImages; + BOOL bShowRadioButton; SvLBoxButtonData_Impl() : pEntry( NULL ), bDefaultImages( FALSE ), bShowRadioButton( FALSE ) {} }; @@ -177,21 +177,21 @@ void SvLBoxButtonData::SetDefaultImages( const Control* pCtrl ) if ( pImpl->bShowRadioButton ) { - aBmps[ SV_BMP_UNCHECKED ] = RadioButton::GetRadioImage( rSettings, BUTTON_DRAW_DEFAULT ); - aBmps[ SV_BMP_CHECKED ] = RadioButton::GetRadioImage( rSettings, BUTTON_DRAW_CHECKED ); - aBmps[ SV_BMP_HICHECKED ] = RadioButton::GetRadioImage( rSettings, BUTTON_DRAW_CHECKED | BUTTON_DRAW_PRESSED ); - aBmps[ SV_BMP_HIUNCHECKED ] = RadioButton::GetRadioImage( rSettings, BUTTON_DRAW_DEFAULT | BUTTON_DRAW_PRESSED ); - aBmps[ SV_BMP_TRISTATE ] = RadioButton::GetRadioImage( rSettings, BUTTON_DRAW_DONTKNOW ); - aBmps[ SV_BMP_HITRISTATE ] = RadioButton::GetRadioImage( rSettings, BUTTON_DRAW_DONTKNOW | BUTTON_DRAW_PRESSED ); + aBmps[ SV_BMP_UNCHECKED ] = RadioButton::GetRadioImage( rSettings, BUTTON_DRAW_DEFAULT ); + aBmps[ SV_BMP_CHECKED ] = RadioButton::GetRadioImage( rSettings, BUTTON_DRAW_CHECKED ); + aBmps[ SV_BMP_HICHECKED ] = RadioButton::GetRadioImage( rSettings, BUTTON_DRAW_CHECKED | BUTTON_DRAW_PRESSED ); + aBmps[ SV_BMP_HIUNCHECKED ] = RadioButton::GetRadioImage( rSettings, BUTTON_DRAW_DEFAULT | BUTTON_DRAW_PRESSED ); + aBmps[ SV_BMP_TRISTATE ] = RadioButton::GetRadioImage( rSettings, BUTTON_DRAW_DONTKNOW ); + aBmps[ SV_BMP_HITRISTATE ] = RadioButton::GetRadioImage( rSettings, BUTTON_DRAW_DONTKNOW | BUTTON_DRAW_PRESSED ); } else { - aBmps[ SV_BMP_UNCHECKED ] = CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_DEFAULT ); - aBmps[ SV_BMP_CHECKED ] = CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_CHECKED ); - aBmps[ SV_BMP_HICHECKED ] = CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_CHECKED | BUTTON_DRAW_PRESSED ); - aBmps[ SV_BMP_HIUNCHECKED ] = CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_DEFAULT | BUTTON_DRAW_PRESSED ); - aBmps[ SV_BMP_TRISTATE ] = CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_DONTKNOW ); - aBmps[ SV_BMP_HITRISTATE ] = CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_DONTKNOW | BUTTON_DRAW_PRESSED ); + aBmps[ SV_BMP_UNCHECKED ] = CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_DEFAULT ); + aBmps[ SV_BMP_CHECKED ] = CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_CHECKED ); + aBmps[ SV_BMP_HICHECKED ] = CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_CHECKED | BUTTON_DRAW_PRESSED ); + aBmps[ SV_BMP_HIUNCHECKED ] = CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_DEFAULT | BUTTON_DRAW_PRESSED ); + aBmps[ SV_BMP_TRISTATE ] = CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_DONTKNOW ); + aBmps[ SV_BMP_HITRISTATE ] = CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_DONTKNOW | BUTTON_DRAW_PRESSED ); } } @@ -201,7 +201,7 @@ BOOL SvLBoxButtonData::HasDefaultImages( void ) const } BOOL SvLBoxButtonData::IsRadio() { - return pImpl->bShowRadioButton; + return pImpl->bShowRadioButton; } // *************************************************************** @@ -246,7 +246,7 @@ void SvLBoxString::Paint( const Point& rPos, SvLBox& rDev, USHORT /* nFlags */, } else rDev.DrawText( rPos, aStr); - + } SvLBoxItem* SvLBoxString::Create() const @@ -412,7 +412,7 @@ void SvLBoxButton::Paint( const Point& rPos, SvLBox& rDev, USHORT /* nFlags */, ? SV_BMP_STATICIMAGE : pData->GetIndex( nItemFlags ); USHORT nStyle = eKind != SvLBoxButtonKind_disabledCheckbox && rDev.IsEnabled() ? 0 : IMAGE_DRAW_DISABLE; - + /// //Native drawing /// @@ -420,16 +420,16 @@ void SvLBoxButton::Paint( const Point& rPos, SvLBox& rDev, USHORT /* nFlags */, Window *pWin = NULL; if( rDev.GetOutDevType() == OUTDEV_WINDOW ) pWin = (Window*) &rDev; - + if ( nIndex != SV_BMP_STATICIMAGE && pWin && pWin->IsNativeControlSupported( (pData->IsRadio())? CTRL_RADIOBUTTON : CTRL_CHECKBOX, PART_ENTIRE_CONTROL) ) { ImplControlValue aControlValue; Rectangle aCtrlRegion( rPos, Size(pData->Width(), pData->Height()) ); ControlState nState = 0; - + //states CTRL_STATE_DEFAULT, CTRL_STATE_PRESSED and CTRL_STATE_ROLLOVER are not implemented - if ( IsStateHilighted() ) nState |= CTRL_STATE_FOCUSED; - if ( nStyle != IMAGE_DRAW_DISABLE ) nState |= CTRL_STATE_ENABLED; + if ( IsStateHilighted() ) nState |= CTRL_STATE_FOCUSED; + if ( nStyle != IMAGE_DRAW_DISABLE ) nState |= CTRL_STATE_ENABLED; if ( IsStateChecked() ) aControlValue.setTristateVal( BUTTONVALUE_ON ); @@ -442,7 +442,7 @@ void SvLBoxButton::Paint( const Point& rPos, SvLBox& rDev, USHORT /* nFlags */, aCtrlRegion, nState, aControlValue, rtl::OUString() ); } - if( !bNativeOK) + if( !bNativeOK) rDev.DrawImage( rPos, pData->aBmps[nIndex + nBaseOffs] ,nStyle); } @@ -480,13 +480,13 @@ bool SvLBoxButton::CheckModification() const struct SvLBoxContextBmp_Impl { - Image m_aImage1; - Image m_aImage2; + Image m_aImage1; + Image m_aImage2; - Image m_aImage1_hc; - Image m_aImage2_hc; + Image m_aImage1_hc; + Image m_aImage2_hc; - USHORT m_nB2IndicatorFlags; + USHORT m_nB2IndicatorFlags; }; // *************************************************************** @@ -585,7 +585,7 @@ void SvLBoxContextBmp::Paint( const Point& _rPos, SvLBox& _rDev, // determine the image set BmpColorMode eMode( BMP_COLOR_NORMAL ); if ( !!m_pImpl->m_aImage1_hc ) - { // we really have HC images + { // we really have HC images if ( _rDev.GetSettings().GetStyleSettings().GetHighContrastMode() ) eMode = BMP_COLOR_HIGHCONTRAST; } diff --git a/svtools/source/contnr/svlbox.cxx b/svtools/source/contnr/svlbox.cxx index 1b1552a707aa..b192d9836803 100644 --- a/svtools/source/contnr/svlbox.cxx +++ b/svtools/source/contnr/svlbox.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,19 +65,19 @@ DBG_NAME(SvInplaceEdit2) SvInplaceEdit::SvInplaceEdit ( - Window* pParent, - const Point& rPos, - const Size& rSize, - const String& rData, - const Link& rNotifyEditEnd, - const Selection& rSelection + Window* pParent, + const Point& rPos, + const Size& rSize, + const String& rData, + const Link& rNotifyEditEnd, + const Selection& rSelection ) : Edit( pParent, WB_LEFT ), - aCallBackHdl ( rNotifyEditEnd ), - bCanceled ( FALSE ), - bAlreadyInCallBack ( FALSE ) + aCallBackHdl ( rNotifyEditEnd ), + bCanceled ( FALSE ), + bAlreadyInCallBack ( FALSE ) { DBG_CTOR(SvInplaceEdit,0); @@ -270,10 +270,10 @@ SvInplaceEdit2::SvInplaceEdit2 BOOL bMulti ) : - aCallBackHdl ( rNotifyEditEnd ), - bCanceled ( FALSE ), - bAlreadyInCallBack ( FALSE ), - bMultiLine ( bMulti ) + aCallBackHdl ( rNotifyEditEnd ), + bCanceled ( FALSE ), + bAlreadyInCallBack ( FALSE ), + bMultiLine ( bMulti ) { DBG_CTOR(SvInplaceEdit2,0); @@ -535,7 +535,7 @@ SvLBoxItem::~SvLBoxItem() const Size& SvLBoxItem::GetSize( SvLBox* pView,SvLBoxEntry* pEntry ) { DBG_CHKTHIS(SvLBoxItem,0); - SvViewDataItem* pViewData = pView->GetViewDataItem( pEntry, this ); + SvViewDataItem* pViewData = pView->GetViewDataItem( pEntry, this ); return pViewData->aSize; } @@ -693,7 +693,7 @@ SvLBox_Impl::SvLBox_Impl( SvLBox& _rBox ) DBG_NAME(SvLBox); -SvLBox::SvLBox( Window* pParent, WinBits nWinStyle ) : +SvLBox::SvLBox( Window* pParent, WinBits nWinStyle ) : Control( pParent, nWinStyle | WB_CLIPCHILDREN ), DropTargetHelper( this ), DragSourceHelper( this ), eSelMode( NO_SELECTION ) { @@ -777,7 +777,7 @@ void SvLBox::DisconnectFromModel() { DBG_CHKTHIS(SvLBox,0); SvLBoxTreeList* pNewModel = new SvLBoxTreeList; - pNewModel->SetRefCount( 0 ); // else this will never be deleted + pNewModel->SetRefCount( 0 ); // else this will never be deleted SvListView::SetModel( pNewModel ); } @@ -920,18 +920,18 @@ void SvLBox::NotifyRemoving( SvLBoxEntry* ) */ #ifdef DBG_UTIL BOOL SvLBox::NotifyMoving( - SvLBoxEntry* pTarget, // D&D-Drop-Position in this->GetModel() - SvLBoxEntry* pEntry, // Zu verschiebender Entry aus + SvLBoxEntry* pTarget, // D&D-Drop-Position in this->GetModel() + SvLBoxEntry* pEntry, // Zu verschiebender Entry aus // GetSourceListBox()->GetModel() SvLBoxEntry*& rpNewParent, // Neuer Target-Parent - ULONG& rNewChildPos) // Position in Childlist des Target-Parents + ULONG& rNewChildPos) // Position in Childlist des Target-Parents #else BOOL SvLBox::NotifyMoving( - SvLBoxEntry* pTarget, // D&D-Drop-Position in this->GetModel() - SvLBoxEntry*, // Zu verschiebender Entry aus + SvLBoxEntry* pTarget, // D&D-Drop-Position in this->GetModel() + SvLBoxEntry*, // Zu verschiebender Entry aus // GetSourceListBox()->GetModel() SvLBoxEntry*& rpNewParent, // Neuer Target-Parent - ULONG& rNewChildPos) // Position in Childlist des Target-Parents + ULONG& rNewChildPos) // Position in Childlist des Target-Parents #endif { DBG_CHKTHIS(SvLBox,0); @@ -963,11 +963,11 @@ BOOL SvLBox::NotifyMoving( } BOOL SvLBox::NotifyCopying( - SvLBoxEntry* pTarget, // D&D-Drop-Position in this->GetModel() - SvLBoxEntry* pEntry, // Zu kopierender Entry aus + SvLBoxEntry* pTarget, // D&D-Drop-Position in this->GetModel() + SvLBoxEntry* pEntry, // Zu kopierender Entry aus // GetSourceListBox()->GetModel() SvLBoxEntry*& rpNewParent, // Neuer Target-Parent - ULONG& rNewChildPos) // Position in Childlist des Target-Parents + ULONG& rNewChildPos) // Position in Childlist des Target-Parents { DBG_CHKTHIS(SvLBox,0); return NotifyMoving(pTarget,pEntry,rpNewParent,rNewChildPos); @@ -1604,7 +1604,7 @@ void SvLBox::ModelHasEntryInvalidated( SvListEntry* pEntry ) USHORT nCount = ((SvLBoxEntry*)pEntry)->ItemCount(); for( USHORT nIdx = 0; nIdx < nCount; nIdx++ ) { - SvLBoxItem* pItem = ((SvLBoxEntry*)pEntry)->GetItem( nIdx ); + SvLBoxItem* pItem = ((SvLBoxEntry*)pEntry)->GetItem( nIdx ); pItem->InitViewData( this, (SvLBoxEntry*)pEntry, 0 ); } } diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx index 955d8215e13a..0440afa226ca 100644 --- a/svtools/source/contnr/svtabbx.cxx +++ b/svtools/source/contnr/svtabbx.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,7 +114,7 @@ SvTabListBox::SvTabListBox( Window* pParent, WinBits nBits ) pTabList = 0; nTabCount = 0; pViewParent = 0; - SetHighlightRange(); // ueber volle Breite selektieren + SetHighlightRange(); // ueber volle Breite selektieren } SvTabListBox::SvTabListBox( Window* pParent, const ResId& rResId ) @@ -230,7 +230,7 @@ SvLBoxEntry* SvTabListBox::InsertEntryToColumn(const XubString& rStr,SvLBoxEntry } SvLBoxEntry* SvTabListBox::InsertEntryToColumn( const XubString& rStr, - const Image& rExpandedEntryBmp, const Image& rCollapsedEntryBmp, + const Image& rExpandedEntryBmp, const Image& rCollapsedEntryBmp, SvLBoxEntry* pParent,ULONG nPos,USHORT nCol, void* pUser ) { XubString aStr; @@ -580,9 +580,9 @@ SvHeaderTabListBox::SvHeaderTabListBox( Window* pParent, WinBits nWinStyle ) : SvTabListBox( pParent, nWinStyle ), - m_bFirstPaint ( TRUE ), + m_bFirstPaint ( TRUE ), m_pImpl ( new ::svt::SvHeaderTabListBoxImpl ), - m_pAccessible ( NULL ) + m_pAccessible ( NULL ) { } @@ -592,9 +592,9 @@ SvHeaderTabListBox::SvHeaderTabListBox( Window* pParent, const ResId& rResId ) : SvTabListBox( pParent, rResId ), - m_bFirstPaint ( TRUE ), + m_bFirstPaint ( TRUE ), m_pImpl ( new ::svt::SvHeaderTabListBoxImpl ), - m_pAccessible ( NULL ) + m_pAccessible ( NULL ) { } @@ -1018,7 +1018,7 @@ Reference< XAccessible > SvHeaderTabListBox::CreateAccessibleColumnHeader( sal_u if ( m_aAccessibleChildren.empty() ) { const sal_uInt16 nColumnCount = GetColumnCount(); - sal_Int32 nCount = AreChildrenTransient() ? + sal_Int32 nCount = AreChildrenTransient() ? nColumnCount : ( GetRowCount() + 1 ) * nColumnCount; m_aAccessibleChildren.assign( nCount, Reference< XAccessible >() ); } diff --git a/svtools/source/contnr/svtreebx.cxx b/svtools/source/contnr/svtreebx.cxx index fb364d34be4d..1b457e51519a 100644 --- a/svtools/source/contnr/svtreebx.cxx +++ b/svtools/source/contnr/svtreebx.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ using namespace ::com::sun::star::accessibility; beruecksichtigt */ -#define TREEFLAG_FIXEDHEIGHT 0x0010 +#define TREEFLAG_FIXEDHEIGHT 0x0010 DBG_NAME(SvTreeListBox) @@ -214,7 +214,7 @@ void SvTreeListBox::Resize() SV_LBOXTAB_ADJUST_CENTER | \ SV_LBOXTAB_PUSHABLE) -#define TAB_STARTPOS 2 +#define TAB_STARTPOS 2 // bei Aenderungen GetTextOffset beruecksichtigen void SvTreeListBox::SetTabs() @@ -1019,7 +1019,7 @@ BOOL SvTreeListBox::Collapse( SvLBoxEntry* pParent ) pHdlEntry = pParent; BOOL bCollapsed = FALSE; - if( ExpandingHdl() ) + if( ExpandingHdl() ) { bCollapsed = TRUE; pImp->CollapsingEntry( pParent ); @@ -1081,8 +1081,8 @@ void SvTreeListBox::SelectAll( BOOL bSelect, BOOL ) DBG_CHKTHIS(SvTreeListBox,0); pImp->SelAllDestrAnch( bSelect, - TRUE, // Anker loeschen, - TRUE ); // auch bei SINGLE_SELECTION den Cursor deselektieren + TRUE, // Anker loeschen, + TRUE ); // auch bei SINGLE_SELECTION den Cursor deselektieren } void SvTreeListBox::ModelHasInsertedTree( SvListEntry* pEntry ) @@ -1511,7 +1511,7 @@ void SvTreeListBox::InvalidateEntry( SvLBoxEntry* pEntry ) if( pEntry ) { GetModel()->InvalidateEntry( pEntry ); - // pImp->InvalidateEntry( pEntry ); + // pImp->InvalidateEntry( pEntry ); } } @@ -1793,11 +1793,11 @@ long SvTreeListBox::PaintEntry1(SvLBoxEntry* pEntry,long nLine,USHORT nTabFlags, BOOL bNativeOK = FALSE; if ( IsNativeControlSupported( CTRL_LISTNODE, PART_ENTIRE_CONTROL) ) { - ImplControlValue aControlValue; + ImplControlValue aControlValue; Rectangle aCtrlRegion( aPos, pImg->GetSizePixel() ); - ControlState nState = 0; + ControlState nState = 0; - if ( IsEnabled() ) nState |= CTRL_STATE_ENABLED; + if ( IsEnabled() ) nState |= CTRL_STATE_ENABLED; if ( IsExpanded(pEntry) ) aControlValue.setTristateVal( BUTTONVALUE_ON );//expanded node @@ -2486,8 +2486,8 @@ void SvTreeListBox::DataChanged( const DataChangedEvent& rDCEvt ) { if( (rDCEvt.GetType()==DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) { - nEntryHeight = 0; // _together_ with TRUE of 1. par (bFont) of InitSettings() a zero-height - // forces complete recalc of heights! + nEntryHeight = 0; // _together_ with TRUE of 1. par (bFont) of InitSettings() a zero-height + // forces complete recalc of heights! InitSettings( TRUE, TRUE, TRUE ); Invalidate(); } diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx index 5dff290c20c1..51c81cb69ecd 100644 --- a/svtools/source/contnr/templwin.cxx +++ b/svtools/source/contnr/templwin.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,28 +103,28 @@ using namespace svtools; extern ::rtl::OUString CreateExactSizeText_Impl( sal_Int64 nSize ); // fileview.cxx -#define SPLITSET_ID 0 -#define COLSET_ID 1 -#define ICONWIN_ID 2 -#define FILEWIN_ID 3 -#define FRAMEWIN_ID 4 +#define SPLITSET_ID 0 +#define COLSET_ID 1 +#define ICONWIN_ID 2 +#define FILEWIN_ID 3 +#define FRAMEWIN_ID 4 -#define ICON_POS_NEWDOC 0 -#define ICON_POS_TEMPLATES 1 -#define ICON_POS_MYDOCS 2 -#define ICON_POS_SAMPLES 3 +#define ICON_POS_NEWDOC 0 +#define ICON_POS_TEMPLATES 1 +#define ICON_POS_MYDOCS 2 +#define ICON_POS_SAMPLES 3 -#define ASCII_STR(s) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(s) ) -#define VIEWSETTING_NEWFROMTEMPLATE ASCII_STR("NewFromTemplate") -#define VIEWSETTING_SELECTEDGROUP ASCII_STR("SelectedGroup") -#define VIEWSETTING_SELECTEDVIEW ASCII_STR("SelectedView") -#define VIEWSETTING_SPLITRATIO ASCII_STR("SplitRatio") -#define VIEWSETTING_LASTFOLDER ASCII_STR("LastFolder") +#define ASCII_STR(s) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(s) ) +#define VIEWSETTING_NEWFROMTEMPLATE ASCII_STR("NewFromTemplate") +#define VIEWSETTING_SELECTEDGROUP ASCII_STR("SelectedGroup") +#define VIEWSETTING_SELECTEDVIEW ASCII_STR("SelectedView") +#define VIEWSETTING_SPLITRATIO ASCII_STR("SplitRatio") +#define VIEWSETTING_LASTFOLDER ASCII_STR("LastFolder") struct FolderHistory { - String m_sURL; - ULONG m_nGroup; + String m_sURL; + ULONG m_nGroup; FolderHistory( const String& _rURL, sal_Int32 _nGroup ) : m_sURL( _rURL ), m_nGroup( _nGroup ) {} @@ -307,7 +307,7 @@ void SvtDummyHeaderBar_Impl::UpdateBackgroundColor() SvtDummyHeaderBar_Impl::SvtDummyHeaderBar_Impl( Window* pPar ) : Window( pPar ) { - SetSizePixel( HeaderBar( this, 0 ).CalcWindowSizePixel() ); // HeaderBar used only to calculate size + SetSizePixel( HeaderBar( this, 0 ).CalcWindowSizePixel() ); // HeaderBar used only to calculate size UpdateBackgroundColor(); } @@ -366,7 +366,7 @@ SvtIconWindow_Impl::SvtIconWindow_Impl( Window* pParent ) : Image aImage( SvtResId( bHiContrast ? IMG_SVT_NEWDOC_HC : IMG_SVT_NEWDOC ) ); nMaxTextLength = aImage.GetSizePixel().Width(); String aEntryStr = String( SvtResId( STR_SVT_NEWDOC ) ); - SvxIconChoiceCtrlEntry* pEntry = + SvxIconChoiceCtrlEntry* pEntry = aIconCtrl.InsertEntry( aEntryStr, aImage, ICON_POS_NEWDOC ); pEntry->SetUserData( new String( aNewDocumentRootURL ) ); pEntry->SetQuickHelpText( String( SvtResId( STR_SVT_NEWDOC_HELP ) ) ); @@ -423,7 +423,7 @@ SvtIconWindow_Impl::~SvtIconWindow_Impl() } } -SvxIconChoiceCtrlEntry* SvtIconWindow_Impl::GetEntry( const String& rURL ) const +SvxIconChoiceCtrlEntry* SvtIconWindow_Impl::GetEntry( const String& rURL ) const { SvxIconChoiceCtrlEntry* pEntry = NULL; for ( ULONG i = 0; i < aIconCtrl.GetEntryCount(); ++i ) @@ -513,7 +513,7 @@ ULONG SvtIconWindow_Impl::GetSelectEntryPos() const void SvtIconWindow_Impl::SetCursorPos( ULONG nPos ) { - SvxIconChoiceCtrlEntry* pEntry = aIconCtrl.GetEntry( nPos ); + SvxIconChoiceCtrlEntry* pEntry = aIconCtrl.GetEntry( nPos ); aIconCtrl.SetCursor( pEntry ); aIconCtrl.Invalidate(); aIconCtrl.Update(); @@ -541,7 +541,7 @@ long SvtIconWindow_Impl::CalcHeight() const sal_Bool SvtIconWindow_Impl::IsRootURL( const String& rURL ) const { - return rURL == aNewDocumentRootURL || + return rURL == aNewDocumentRootURL || rURL == aTemplateRootURL || rURL == aMyDocumentsRootURL || rURL == aSamplesFolderRootURL; @@ -599,9 +599,9 @@ SvtFileViewWindow_Impl::SvtFileViewWindow_Impl( SvtTemplateWindow* pParent ) : Window( pParent, WB_DIALOGCONTROL | WB_TABSTOP | WB_BORDER | WB_3DLOOK ), - rParent ( *pParent ), - aFileView ( this, SvtResId( CTRL_FILEVIEW ), FILEVIEW_SHOW_TITLE ), - bIsTemplateFolder ( sal_False ) + rParent ( *pParent ), + aFileView ( this, SvtResId( CTRL_FILEVIEW ), FILEVIEW_SHOW_TITLE ), + bIsTemplateFolder ( sal_False ) { aFileView.SetStyle( aFileView.GetStyle() | WB_DIALOGCONTROL | WB_TABSTOP ); @@ -704,8 +704,8 @@ void SvtFileViewWindow_Impl::Resize() { Size aWinSize = GetOutputSizePixel(); - static int x = 0; - static int y = 0; + static int x = 0; + static int y = 0; aWinSize.nA += x; aWinSize.nB += y; @@ -974,13 +974,13 @@ void SvtFrameWindow_Impl::OpenFile( const String& rURL, sal_Bool bPreview, sal_B pTextWin->EnableInput( FALSE, TRUE ); if ( pTextWin->IsReallyVisible() ) { - sal_Bool b = sal_True; + sal_Bool b = sal_True; Sequence < PropertyValue > aArgs( 4 ); aArgs[0].Name = ASCII_STR("Preview"); aArgs[0].Value.setValue( &b, ::getBooleanCppuType() ); aArgs[1].Name = ASCII_STR("ReadOnly"); aArgs[1].Value.setValue( &b, ::getBooleanCppuType() ); - aArgs[2].Name = ASCII_STR("AsTemplate"); // prevents getting an empty URL with getURL()! + aArgs[2].Name = ASCII_STR("AsTemplate"); // prevents getting an empty URL with getURL()! uno::Reference < task::XInteractionHandler > xInteractionHandler( ::comphelper::getProcessServiceFactory()->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.task.InteractionHandler") ), uno::UNO_QUERY ); @@ -991,11 +991,11 @@ void SvtFrameWindow_Impl::OpenFile( const String& rURL, sal_Bool bPreview, sal_B aArgs[2].Value.setValue( &b, ::getBooleanCppuType() ); xDisp->dispatch( aURL, aArgs ); - ::rtl::OUString aDispURL; - Reference< ::com::sun::star::frame::XController > xCtrl = xFrame->getController(); + ::rtl::OUString aDispURL; + Reference< ::com::sun::star::frame::XController > xCtrl = xFrame->getController(); if( xCtrl.is() ) { - Reference< ::com::sun::star::frame::XModel > xMdl = xCtrl->getModel(); + Reference< ::com::sun::star::frame::XModel > xMdl = xCtrl->getModel(); if( xMdl.is() ) aDispURL = xMdl->getURL(); } @@ -1051,10 +1051,10 @@ SvtTemplateWindow::SvtTemplateWindow( Window* pParent ) : Window( pParent, WB_DIALOGCONTROL ), - aFileViewTB ( this, SvtResId( TB_SVT_FILEVIEW ) ), - aFrameWinTB ( this, SvtResId( TB_SVT_FRAMEWIN ) ), - aSplitWin ( this, WB_DIALOGCONTROL | WB_NOSPLITDRAW ), - pHistoryList ( NULL ) + aFileViewTB ( this, SvtResId( TB_SVT_FILEVIEW ) ), + aFrameWinTB ( this, SvtResId( TB_SVT_FRAMEWIN ) ), + aSplitWin ( this, WB_DIALOGCONTROL | WB_NOSPLITDRAW ), + pHistoryList ( NULL ) { // create windows @@ -1072,7 +1072,7 @@ SvtTemplateWindow::SvtTemplateWindow( Window* pParent ) : // create the split items aSplitWin.SetAlign( WINDOWALIGN_LEFT ); - long nWidth = pIconWin->GetMaxTextLength() * 8 / 7 + 1; // extra space for border + long nWidth = pIconWin->GetMaxTextLength() * 8 / 7 + 1; // extra space for border aSplitWin.InsertItem( ICONWIN_ID, pIconWin, nWidth, SPLITWINDOW_APPEND, 0, SWIB_FIXED ); aSplitWin.InsertItem( FILEWIN_ID, pFileWin, 50, SPLITWINDOW_APPEND, 0, SWIB_PERCENTSIZE ); aSplitWin.InsertItem( FRAMEWIN_ID, pFrameWin, 50, SPLITWINDOW_APPEND, 0, SWIB_PERCENTSIZE ); @@ -1400,7 +1400,7 @@ void SvtTemplateWindow::DataChanged( const DataChangedEvent& rDCEvt ) { Window::DataChanged( rDCEvt ); - if ( ( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) || + if ( ( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) || ( rDCEvt.GetType() == DATACHANGED_DISPLAY ) ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) { @@ -1547,9 +1547,9 @@ long SvtTemplateWindow::CalcHeight() const void SvtTemplateWindow::ReadViewSettings() { // defaults - sal_Int32 nSelectedGroup = ICON_POS_TEMPLATES; - sal_Int32 nSelectedView = TI_DOCTEMPLATE_DOCINFO; - double nSplitRatio = 0.5; + sal_Int32 nSelectedGroup = ICON_POS_TEMPLATES; + sal_Int32 nSelectedView = TI_DOCTEMPLATE_DOCINFO; + double nSplitRatio = 0.5; ::rtl::OUString sLastFolder; SvtViewOptions aViewSettings( E_DIALOG, VIEWSETTING_NEWFROMTEMPLATE ); @@ -1564,8 +1564,8 @@ void SvtTemplateWindow::ReadViewSettings() aViewSettings.GetUserItem( VIEWSETTING_LASTFOLDER ) >>= sLastFolder; } // normalize - if ( nSelectedGroup < ICON_POS_NEWDOC ) nSelectedGroup = ICON_POS_NEWDOC; - if ( nSelectedGroup > ICON_POS_SAMPLES ) nSelectedGroup = ICON_POS_SAMPLES; + if ( nSelectedGroup < ICON_POS_NEWDOC ) nSelectedGroup = ICON_POS_NEWDOC; + if ( nSelectedGroup > ICON_POS_SAMPLES ) nSelectedGroup = ICON_POS_SAMPLES; if ( ( TI_DOCTEMPLATE_DOCINFO != nSelectedView ) && ( TI_DOCTEMPLATE_PREVIEW != nSelectedView ) ) nSelectedView = TI_DOCTEMPLATE_DOCINFO; @@ -1605,23 +1605,23 @@ void SvtTemplateWindow::WriteViewSettings() Sequence< NamedValue > aSettings(4); // the selected group - aSettings[0].Name = VIEWSETTING_SELECTEDGROUP; + aSettings[0].Name = VIEWSETTING_SELECTEDGROUP; pIconWin->SetFocus(); - aSettings[0].Value <<= (sal_Int32)pIconWin->GetCursorPos( ); + aSettings[0].Value <<= (sal_Int32)pIconWin->GetCursorPos( ); // the selected view mode - aSettings[1].Name = VIEWSETTING_SELECTEDVIEW; - aSettings[1].Value <<= sal_Int32( aFrameWinTB.IsItemChecked( TI_DOCTEMPLATE_DOCINFO ) ? TI_DOCTEMPLATE_DOCINFO : TI_DOCTEMPLATE_PREVIEW ); + aSettings[1].Name = VIEWSETTING_SELECTEDVIEW; + aSettings[1].Value <<= sal_Int32( aFrameWinTB.IsItemChecked( TI_DOCTEMPLATE_DOCINFO ) ? TI_DOCTEMPLATE_DOCINFO : TI_DOCTEMPLATE_PREVIEW ); // the split ratio - aSettings[2].Name = VIEWSETTING_SPLITRATIO; + aSettings[2].Name = VIEWSETTING_SPLITRATIO; sal_Int32 nSplitFileSize = aSplitWin.GetItemSize( FILEWIN_ID ); sal_Int32 nSplitFileAndFrameSize = nSplitFileSize + aSplitWin.GetItemSize( FRAMEWIN_ID ); - aSettings[2].Value <<= double( 1.0 * nSplitFileSize / nSplitFileAndFrameSize ); + aSettings[2].Value <<= double( 1.0 * nSplitFileSize / nSplitFileAndFrameSize ); // last folder - aSettings[3].Name = VIEWSETTING_LASTFOLDER; - aSettings[3].Value <<= ::rtl::OUString( pFileWin->GetFolderURL() ); + aSettings[3].Name = VIEWSETTING_LASTFOLDER; + aSettings[3].Value <<= ::rtl::OUString( pFileWin->GetFolderURL() ); // write SvtViewOptions aViewSettings( E_DIALOG, VIEWSETTING_NEWFROMTEMPLATE ); @@ -1639,10 +1639,10 @@ void SvtTemplateWindow::SelectFolder(sal_Int32 nFolderPosition) struct SvtTmplDlg_Impl { - SvtTemplateWindow* pWin; - String aTitle; - Timer aUpdateTimer; - sal_Bool bSelectNoOpen; + SvtTemplateWindow* pWin; + String aTitle; + Timer aUpdateTimer; + sal_Bool bSelectNoOpen; uno::Reference< util::XOfficeInstallationDirectories > m_xOfficeInstDirs; @@ -1954,7 +1954,7 @@ IMPL_LINK ( SvtDocumentTemplateDialog, UpdateHdl_Impl, Timer*, _pEventSource ) if ( xTemplates.is() ) { if ( _pEventSource ) - { // it was no direct call, which means it was triggered by the timer, which means we alread checked the necessity + { // it was no direct call, which means it was triggered by the timer, which means we alread checked the necessity WaitObject aWaitCursor( this ); xTemplates->update(); if ( pImpl->pWin->IsTemplateFolderOpen() ) @@ -1968,7 +1968,7 @@ IMPL_LINK ( SvtDocumentTemplateDialog, UpdateHdl_Impl, Timer*, _pEventSource ) // check if we really need to do the update ::svt::TemplateFolderCache aCache; if ( aCache.needsUpdate() ) - { // yes -> do it asynchronous (it will take a noticeable time) + { // yes -> do it asynchronous (it will take a noticeable time) // (but first store the current state) aCache.storeState(); diff --git a/svtools/source/contnr/templwin.hrc b/svtools/source/contnr/templwin.hrc index 5a0d84f1d377..80eceb20744a 100644 --- a/svtools/source/contnr/templwin.hrc +++ b/svtools/source/contnr/templwin.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,33 +27,33 @@ #ifndef _SVTOOLS_TEMPLWIN_HRC #define _SVTOOLS_TEMPLWIN_HRC -#define FL_DOCTEMPLATE 10 -#define BTN_DOCTEMPLATE_MANAGE 11 -#define BTN_DOCTEMPLATE_EDIT 12 -#define BTN_DOCTEMPLATE_OPEN 13 -#define BTN_DOCTEMPLATE_CANCEL 14 -#define BTN_DOCTEMPLATE_HELP 15 +#define FL_DOCTEMPLATE 10 +#define BTN_DOCTEMPLATE_MANAGE 11 +#define BTN_DOCTEMPLATE_EDIT 12 +#define BTN_DOCTEMPLATE_OPEN 13 +#define BTN_DOCTEMPLATE_CANCEL 14 +#define BTN_DOCTEMPLATE_HELP 15 #define FT_DOCTEMPLATE_LINK 16 -#define TI_DOCTEMPLATE_BACK 1 -#define TI_DOCTEMPLATE_PREV 2 -#define TI_DOCTEMPLATE_PRINT 3 -#define TI_DOCTEMPLATE_DOCINFO 4 -#define TI_DOCTEMPLATE_PREVIEW 5 +#define TI_DOCTEMPLATE_BACK 1 +#define TI_DOCTEMPLATE_PREV 2 +#define TI_DOCTEMPLATE_PRINT 3 +#define TI_DOCTEMPLATE_DOCINFO 4 +#define TI_DOCTEMPLATE_PREVIEW 5 -#define HBI_CATEGORY 1 +#define HBI_CATEGORY 1 -#define DI_TITLE 1 -#define DI_FROM 2 -#define DI_DATE 3 -#define DI_KEYWORDS 4 -#define DI_DESCRIPTION 5 -#define DI_MIMETYPE 6 -#define DI_MODIFIEDDATE 7 -#define DI_MODIFIEDBY 8 -#define DI_PRINTDATE 9 -#define DI_PRINTBY 10 -#define DI_THEME 11 -#define DI_SIZE 12 +#define DI_TITLE 1 +#define DI_FROM 2 +#define DI_DATE 3 +#define DI_KEYWORDS 4 +#define DI_DESCRIPTION 5 +#define DI_MIMETYPE 6 +#define DI_MODIFIEDDATE 7 +#define DI_MODIFIEDBY 8 +#define DI_PRINTDATE 9 +#define DI_PRINTBY 10 +#define DI_THEME 11 +#define DI_SIZE 12 #endif // _SVTOOLS_TEMPLWIN_HRC diff --git a/svtools/source/contnr/templwin.hxx b/svtools/source/contnr/templwin.hxx index aa2766fbe104..17c5c1e56700 100644 --- a/svtools/source/contnr/templwin.hxx +++ b/svtools/source/contnr/templwin.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,7 +55,7 @@ namespace svtools class SvtDummyHeaderBar_Impl : public Window { private: - void UpdateBackgroundColor(); + void UpdateBackgroundColor(); public: SvtDummyHeaderBar_Impl( Window* pParent ); @@ -69,46 +69,46 @@ public: class SvtIconWindow_Impl : public Window { private: - SvtDummyHeaderBar_Impl aDummyHeaderBar; // spaceholder instead of HeaderBar - SvtIconChoiceCtrl aIconCtrl; + SvtDummyHeaderBar_Impl aDummyHeaderBar; // spaceholder instead of HeaderBar + SvtIconChoiceCtrl aIconCtrl; - String aNewDocumentRootURL; - String aTemplateRootURL; - String aMyDocumentsRootURL; - String aSamplesFolderRootURL; + String aNewDocumentRootURL; + String aTemplateRootURL; + String aMyDocumentsRootURL; + String aSamplesFolderRootURL; - long nMaxTextLength; + long nMaxTextLength; - SvxIconChoiceCtrlEntry* GetEntry( const String& rURL ) const; + SvxIconChoiceCtrlEntry* GetEntry( const String& rURL ) const; public: SvtIconWindow_Impl( Window* pParent ); ~SvtIconWindow_Impl(); - virtual void Resize(); + virtual void Resize(); - inline long GetMaxTextLength() const { return nMaxTextLength; } - inline void SetClickHdl( const Link& rLink ) { aIconCtrl.SetClickHdl( rLink ); } + inline long GetMaxTextLength() const { return nMaxTextLength; } + inline void SetClickHdl( const Link& rLink ) { aIconCtrl.SetClickHdl( rLink ); } - String GetSelectedIconURL() const; - String GetSelectedIconText() const; - String GetCursorPosIconURL() const; - String GetIconText( const String& rURL ) const; - void InvalidateIconControl(); - void SetCursorPos( ULONG nPos ); - ULONG GetCursorPos() const; - ULONG GetSelectEntryPos() const; - void SetFocus(); - long CalcHeight() const; - sal_Bool IsRootURL( const String& rURL ) const; - ULONG GetRootPos( const String& rURL ) const; - void UpdateIcons( sal_Bool _bHiContrast ); + String GetSelectedIconURL() const; + String GetSelectedIconText() const; + String GetCursorPosIconURL() const; + String GetIconText( const String& rURL ) const; + void InvalidateIconControl(); + void SetCursorPos( ULONG nPos ); + ULONG GetCursorPos() const; + ULONG GetSelectEntryPos() const; + void SetFocus(); + long CalcHeight() const; + sal_Bool IsRootURL( const String& rURL ) const; + ULONG GetRootPos( const String& rURL ) const; + void UpdateIcons( sal_Bool _bHiContrast ); - inline sal_Bool ProcessKeyEvent( const KeyEvent& rKEvt ); + inline sal_Bool ProcessKeyEvent( const KeyEvent& rKEvt ); - inline const String& GetTemplateRootURL() const { return aTemplateRootURL; } - inline const String& GetMyDocumentsRootURL() const { return aMyDocumentsRootURL; } - inline const String& GetSamplesFolderURL() const { return aSamplesFolderRootURL; } + inline const String& GetTemplateRootURL() const { return aTemplateRootURL; } + inline const String& GetMyDocumentsRootURL() const { return aMyDocumentsRootURL; } + inline const String& GetSamplesFolderURL() const { return aSamplesFolderRootURL; } void SelectFolder(sal_Int32 nFolderPos); }; @@ -125,17 +125,17 @@ class SvtTemplateWindow; class SvtFileViewWindow_Impl : public Window { private: - SvtTemplateWindow& rParent; - SvtFileView aFileView; - Link aNewFolderLink; - String aCurrentRootURL; - String aFolderURL; - String aMyDocumentsURL; - String aSamplesFolderURL; + SvtTemplateWindow& rParent; + SvtFileView aFileView; + Link aNewFolderLink; + String aCurrentRootURL; + String aFolderURL; + String aMyDocumentsURL; + String aSamplesFolderURL; ::svt::RestrictedPaths aURLFilter; - sal_Bool bIsTemplateFolder; + sal_Bool bIsTemplateFolder; ::com::sun::star::uno::Sequence< ::rtl::OUString > GetNewDocContents() const; @@ -144,25 +144,25 @@ public: SvtFileViewWindow_Impl( SvtTemplateWindow* pParent ); ~SvtFileViewWindow_Impl(); - virtual void Resize(); + virtual void Resize(); - inline void SetSelectHdl( const Link& rLink ) { aFileView.SetSelectHdl( rLink ); } - inline void SetDoubleClickHdl( const Link& rLink ) { aFileView.SetDoubleClickHdl( rLink ); } - inline void SetNewFolderHdl( const Link& rLink ) { aNewFolderLink = rLink; } - inline void ResetCursor() { aFileView.ResetCursor(); } - inline sal_Bool IsTemplateFolder() const { return bIsTemplateFolder; } - inline String GetFolderURL() const { return aFolderURL; } - inline String GetRootURL() const { return aCurrentRootURL; } - inline void OpenRoot( const String& rRootURL ) + inline void SetSelectHdl( const Link& rLink ) { aFileView.SetSelectHdl( rLink ); } + inline void SetDoubleClickHdl( const Link& rLink ) { aFileView.SetDoubleClickHdl( rLink ); } + inline void SetNewFolderHdl( const Link& rLink ) { aNewFolderLink = rLink; } + inline void ResetCursor() { aFileView.ResetCursor(); } + inline sal_Bool IsTemplateFolder() const { return bIsTemplateFolder; } + inline String GetFolderURL() const { return aFolderURL; } + inline String GetRootURL() const { return aCurrentRootURL; } + inline void OpenRoot( const String& rRootURL ) { aCurrentRootURL = rRootURL; OpenFolder( rRootURL ); } - inline void SetMyDocumentsURL( const String& _rNewURL ) { aMyDocumentsURL = _rNewURL; } - inline void SetSamplesFolderURL( const String& _rNewURL ) { aSamplesFolderURL = _rNewURL; } - - String GetSelectedFile() const; - void OpenFolder( const String& rURL ); - sal_Bool HasPreviousLevel( String& rURL ) const; - String GetFolderTitle() const; - void SetFocus(); + inline void SetMyDocumentsURL( const String& _rNewURL ) { aMyDocumentsURL = _rNewURL; } + inline void SetSamplesFolderURL( const String& _rNewURL ) { aSamplesFolderURL = _rNewURL; } + + String GetSelectedFile() const; + void OpenFolder( const String& rURL ); + sal_Bool HasPreviousLevel( String& rURL ) const; + String GetFolderTitle() const; + void SetFocus(); }; // class SvtFrameWindow_Impl --------------------------------------------- @@ -170,12 +170,12 @@ public: class SvtDocInfoTable_Impl : public ResStringArray { private: - String aEmptyString; + String aEmptyString; public: SvtDocInfoTable_Impl(); - const String& GetString( long nId ) const; + const String& GetString( long nId ) const; }; class SvtExtendedMultiLineEdit_Impl : public ExtMultiLineEdit @@ -184,8 +184,8 @@ public: SvtExtendedMultiLineEdit_Impl( Window* pParent,WinBits _nBits ); inline ~SvtExtendedMultiLineEdit_Impl() {} - inline void Clear() { SetText( String() ); } - void InsertEntry( const String& rTitle, const String& rValue ); + inline void Clear() { SetText( String() ); } + void InsertEntry( const String& rTitle, const String& rValue ); }; class SvtFrameWindow_Impl : public Window @@ -200,19 +200,19 @@ private: ::svtools::ODocumentInfoPreview* pEditWin; - Window* pTextWin; - Window* pEmptyWin; - ::com::sun::star::lang::Locale aLocale; - SvtDocInfoTable_Impl aInfoTable; - String aCurrentURL; - ::rtl::OUString m_aOpenURL; - sal_Bool bDocInfo; - - void ShowDocInfo( const String& rURL ); - void ViewEditWin(); - void ViewTextWin(); - void ViewEmptyWin(); - void ViewNonEmptyWin(); // views depending on bDocInfo + Window* pTextWin; + Window* pEmptyWin; + ::com::sun::star::lang::Locale aLocale; + SvtDocInfoTable_Impl aInfoTable; + String aCurrentURL; + ::rtl::OUString m_aOpenURL; + sal_Bool bDocInfo; + + void ShowDocInfo( const String& rURL ); + void ViewEditWin(); + void ViewTextWin(); + void ViewEmptyWin(); + void ViewNonEmptyWin(); // views depending on bDocInfo struct SvtExecuteInfo { @@ -226,10 +226,10 @@ public: SvtFrameWindow_Impl( Window* pParent ); ~SvtFrameWindow_Impl(); - virtual void Resize(); + virtual void Resize(); - void OpenFile( const String& rURL, sal_Bool bPreview, sal_Bool bIsTemplate, sal_Bool bAsTemplate ); - void ToggleView( sal_Bool bDocInfo ); + void OpenFile( const String& rURL, sal_Bool bPreview, sal_Bool bIsTemplate, sal_Bool bAsTemplate ); + void ToggleView( sal_Bool bDocInfo ); }; // class SvtTemplateWindow ----------------------------------------------- @@ -239,69 +239,69 @@ class HistoryList_Impl; class SvtTemplateWindow : public Window { private: - ToolBox aFileViewTB; - ToolBox aFrameWinTB; - SplitWindow aSplitWin; - - SvtIconWindow_Impl* pIconWin; - SvtFileViewWindow_Impl* pFileWin; - SvtFrameWindow_Impl* pFrameWin; - HistoryList_Impl* pHistoryList; - - Link aSelectHdl; - Link aDoubleClickHdl; - Link aNewFolderHdl; - Link aSendFocusHdl; - - Timer aSelectTimer; - - String aFolderTitle; - - virtual void Resize(); - - DECL_LINK( IconClickHdl_Impl, SvtIconChoiceCtrl* ); - DECL_LINK( FileSelectHdl_Impl, SvtFileView* ); - DECL_LINK( FileDblClickHdl_Impl, SvtFileView* ); - DECL_LINK( NewFolderHdl_Impl, SvtFileView* ); - DECL_LINK( TimeoutHdl_Impl, Timer* ); - DECL_LINK( ClickHdl_Impl, ToolBox* ); - DECL_LINK( ResizeHdl_Impl, SplitWindow* ); // used for split and initial setting of toolbar pos - - void PrintFile( const String& rURL ); - void AppendHistoryURL( const String& rURL, ULONG nGroup ); - void OpenHistory(); - void DoAction( USHORT nAction ); - void InitToolBoxes(); - void InitToolBoxImages(); - void UpdateIcons(); + ToolBox aFileViewTB; + ToolBox aFrameWinTB; + SplitWindow aSplitWin; + + SvtIconWindow_Impl* pIconWin; + SvtFileViewWindow_Impl* pFileWin; + SvtFrameWindow_Impl* pFrameWin; + HistoryList_Impl* pHistoryList; + + Link aSelectHdl; + Link aDoubleClickHdl; + Link aNewFolderHdl; + Link aSendFocusHdl; + + Timer aSelectTimer; + + String aFolderTitle; + + virtual void Resize(); + + DECL_LINK( IconClickHdl_Impl, SvtIconChoiceCtrl* ); + DECL_LINK( FileSelectHdl_Impl, SvtFileView* ); + DECL_LINK( FileDblClickHdl_Impl, SvtFileView* ); + DECL_LINK( NewFolderHdl_Impl, SvtFileView* ); + DECL_LINK( TimeoutHdl_Impl, Timer* ); + DECL_LINK( ClickHdl_Impl, ToolBox* ); + DECL_LINK( ResizeHdl_Impl, SplitWindow* ); // used for split and initial setting of toolbar pos + + void PrintFile( const String& rURL ); + void AppendHistoryURL( const String& rURL, ULONG nGroup ); + void OpenHistory(); + void DoAction( USHORT nAction ); + void InitToolBoxes(); + void InitToolBoxImages(); + void UpdateIcons(); protected: virtual long PreNotify( NotifyEvent& rNEvt ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); public: SvtTemplateWindow( Window* pParent ); ~SvtTemplateWindow(); - inline void SetSelectHdl( const Link& rLink ) { aSelectHdl = rLink; } - inline void SetDoubleClickHdl( const Link& rLink ) { aDoubleClickHdl = rLink; } - inline void SetNewFolderHdl( const Link& rLink ) { aNewFolderHdl = rLink; } - inline void SetSendFocusHdl( const Link& rLink ) { aSendFocusHdl = rLink; } - inline sal_Bool IsTemplateFolderOpen() const { return pFileWin->IsTemplateFolder(); } - inline sal_Bool HasIconWinFocus() const { return pIconWin->HasChildPathFocus(); } - - void ReadViewSettings( ); - void WriteViewSettings( ); - sal_Bool IsFileSelected() const; - String GetSelectedFile() const; - void OpenFile( sal_Bool bNotAsTemplate ); - String GetFolderTitle() const; - String GetFolderURL() const; - void SetFocus( sal_Bool bIconWin ); - void OpenTemplateRoot(); - void SetPrevLevelButtonState( const String& rURL ); // sets state (enable/disable) for previous level button - void ClearHistory(); - long CalcHeight() const; + inline void SetSelectHdl( const Link& rLink ) { aSelectHdl = rLink; } + inline void SetDoubleClickHdl( const Link& rLink ) { aDoubleClickHdl = rLink; } + inline void SetNewFolderHdl( const Link& rLink ) { aNewFolderHdl = rLink; } + inline void SetSendFocusHdl( const Link& rLink ) { aSendFocusHdl = rLink; } + inline sal_Bool IsTemplateFolderOpen() const { return pFileWin->IsTemplateFolder(); } + inline sal_Bool HasIconWinFocus() const { return pIconWin->HasChildPathFocus(); } + + void ReadViewSettings( ); + void WriteViewSettings( ); + sal_Bool IsFileSelected() const; + String GetSelectedFile() const; + void OpenFile( sal_Bool bNotAsTemplate ); + String GetFolderTitle() const; + String GetFolderURL() const; + void SetFocus( sal_Bool bIconWin ); + void OpenTemplateRoot(); + void SetPrevLevelButtonState( const String& rURL ); // sets state (enable/disable) for previous level button + void ClearHistory(); + long CalcHeight() const; void SelectFolder(sal_Int32 nFolderPosition); }; diff --git a/svtools/source/contnr/templwin.src b/svtools/source/contnr/templwin.src index 048d052c18d8..b0208503ccfe 100644 --- a/svtools/source/contnr/templwin.src +++ b/svtools/source/contnr/templwin.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 @@ #include <svtools/svtools.hrc> // Magenta and Grey as mask colors -#define MASK_COL_MAGENTA Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; }; +#define MASK_COL_MAGENTA Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; }; Control CTRL_FILEVIEW { diff --git a/svtools/source/contnr/tooltiplbox.cxx b/svtools/source/contnr/tooltiplbox.cxx index 9a148336adbe..67b3f37c2d6c 100644 --- a/svtools/source/contnr/tooltiplbox.cxx +++ b/svtools/source/contnr/tooltiplbox.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx index 6fb03eba73fb..698ac18dc478 100644 --- a/svtools/source/contnr/treelist.cxx +++ b/svtools/source/contnr/treelist.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 SvListEntry::Clone( SvListEntry* pSource) DBG_CHKTHIS(SvListEntry,0); nListPos &= 0x80000000; nListPos |= ( pSource->nListPos & 0x7fffffff); - nAbsPos = pSource->nAbsPos; + nAbsPos = pSource->nAbsPos; } void SvListEntry::SetListPositions() { if( pChilds ) { - SvListEntry *pEntry = (SvListEntry*)pChilds->First(); - ULONG nCur = 0; + SvListEntry *pEntry = (SvListEntry*)pChilds->First(); + ULONG nCur = 0; while ( pEntry ) { pEntry->nListPos &= 0x80000000; @@ -107,9 +107,9 @@ SvViewData::SvViewData() SvViewData::SvViewData( const SvViewData& rData ) { DBG_CTOR(SvViewData,0); - nFlags = rData.nFlags; + nFlags = rData.nFlags; nFlags &= ~( SVLISTENTRYFLAG_SELECTED | SVLISTENTRYFLAG_FOCUSED ); - nVisPos = rData.nVisPos; + nVisPos = rData.nVisPos; } SvViewData::~SvViewData() @@ -390,7 +390,7 @@ ULONG SvTreeList::Copy(SvListEntry* pSrcEntry,SvListEntry* pTargetParent,ULONG n nEntryCount += nCloneCount; SvTreeEntryList* pDstList = pTargetParent->pChilds; - pClonedEntry->pParent = pTargetParent; // Parent umsetzen + pClonedEntry->pParent = pTargetParent; // Parent umsetzen pDstList->Insert( pClonedEntry, nListPos ); // Einfuegen SetListPositions( pDstList ); // Listenpositionen in Zielliste korrigieren @@ -663,7 +663,7 @@ ULONG SvTreeList::GetChildSelectionCount(const SvListView* pView,SvListEntry* pP if( pParent && pView->IsSelected( pParent ) && nRefDepth < nActDepth) nCount++; } while( pParent && nRefDepth < nActDepth ); -// nCount--; +// nCount--; return nCount; } @@ -815,15 +815,15 @@ SvListEntry* SvTreeList::Prev( SvListEntry* pActEntry, USHORT* pDepth ) const SvListEntry* SvTreeList::Last( USHORT* /* nDepth */ ) const { SvTreeEntryList* pActList = pRootItem->pChilds; -// if ( pActList->Count() == 0 ) -// return 0; +// if ( pActList->Count() == 0 ) +// return 0; SvListEntry* pEntry = 0; while( pActList ) { pEntry = (SvListEntry*)(pActList->Last()); pActList = pEntry->pChilds; -// if ( pActList->Count() == 0 ) -// pActList = 0; +// if ( pActList->Count() == 0 ) +// pActList = 0; } return pEntry; } @@ -1141,7 +1141,7 @@ SvListEntry* SvTreeList::NextSibling( SvListEntry* pEntry ) const if( !pEntry ) return 0; SvTreeEntryList* pList = pEntry->pParent->pChilds; -// ULONG nPos = pList->GetPos( pEntry ); +// ULONG nPos = pList->GetPos( pEntry ); ULONG nPos = pEntry->GetChildListPos(); nPos++; pEntry = (SvListEntry*)(pList->GetObject( nPos )); @@ -1474,9 +1474,9 @@ BOOL SvTreeList::Remove( SvListEntry* pEntry ) pList->Remove( (void*) pEntry ); } - + // moved to end of method because it is used later with Broadcast - // delete pEntry; // loescht auch alle Childs + // delete pEntry; // loescht auch alle Childs if ( pList->Count() == 0 ) { @@ -1494,7 +1494,7 @@ BOOL SvTreeList::Remove( SvListEntry* pEntry ) CheckIntegrity(); #endif Broadcast( LISTACTION_REMOVED, pEntry ); - + delete pEntry; // loescht auch alle Childs return TRUE; } @@ -1810,7 +1810,7 @@ void SvListView::ModelHasInsertedTree( SvListEntry* ) } void SvListView::ModelIsMoving( SvListEntry* /* pSource */ , - SvListEntry* /* pTargetParent */ , ULONG /* nPos */ ) + SvListEntry* /* pTargetParent */ , ULONG /* nPos */ ) { DBG_CHKTHIS(SvListView,0); } diff --git a/svtools/source/control/asynclink.cxx b/svtools/source/control/asynclink.cxx index 758999d61dcd..f83d9add50f2 100644 --- a/svtools/source/control/asynclink.cxx +++ b/svtools/source/control/asynclink.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx index 0fba66e132a8..242af6124d07 100644 --- a/svtools/source/control/calendar.cxx +++ b/svtools/source/control/calendar.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,29 +50,29 @@ // ======================================================================= -#define DAY_OFFX 4 -#define DAY_OFFY 2 -#define MONTH_BORDERX 4 -#define MONTH_OFFY 3 -#define WEEKNUMBER_OFFX 4 -#define WEEKDAY_OFFY 3 -#define TITLE_OFFY 3 -#define TITLE_BORDERY 2 -#define SPIN_OFFX 4 -#define SPIN_OFFY TITLE_BORDERY +#define DAY_OFFX 4 +#define DAY_OFFY 2 +#define MONTH_BORDERX 4 +#define MONTH_OFFY 3 +#define WEEKNUMBER_OFFX 4 +#define WEEKDAY_OFFY 3 +#define TITLE_OFFY 3 +#define TITLE_BORDERY 2 +#define SPIN_OFFX 4 +#define SPIN_OFFY TITLE_BORDERY -#define WEEKNUMBER_HEIGHT 85 +#define WEEKNUMBER_HEIGHT 85 -#define CALENDAR_HITTEST_DAY ((USHORT)0x0001) -#define CALENDAR_HITTEST_WEEK ((USHORT)0x0002) -#define CALENDAR_HITTEST_MONTHTITLE ((USHORT)0x0004) -#define CALENDAR_HITTEST_PREV ((USHORT)0x0008) -#define CALENDAR_HITTEST_NEXT ((USHORT)0x0010) -#define CALENDAR_HITTEST_OUTSIDE ((USHORT)0x1000) +#define CALENDAR_HITTEST_DAY ((USHORT)0x0001) +#define CALENDAR_HITTEST_WEEK ((USHORT)0x0002) +#define CALENDAR_HITTEST_MONTHTITLE ((USHORT)0x0004) +#define CALENDAR_HITTEST_PREV ((USHORT)0x0008) +#define CALENDAR_HITTEST_NEXT ((USHORT)0x0010) +#define CALENDAR_HITTEST_OUTSIDE ((USHORT)0x1000) -#define MENU_YEAR_COUNT 3 +#define MENU_YEAR_COUNT 3 -#define TABLE_DATE_SELECTED ((void*)0x00000001) +#define TABLE_DATE_SELECTED ((void*)0x00000001) using namespace ::com::sun::star; @@ -80,10 +80,10 @@ using namespace ::com::sun::star; struct ImplDateInfo { - XubString maText; - Color* mpTextColor; - Color* mpFrameColor; - USHORT mnFlags; + XubString maText; + Color* mpTextColor; + Color* mpFrameColor; + USHORT mnFlags; ImplDateInfo( const XubString& rText ) : maText( rText ) @@ -197,36 +197,36 @@ inline void ImplCalendarClearSelectDate( Table* pTable ) void Calendar::ImplInit( WinBits nWinStyle ) { - mpDateTable = NULL; - mpSelectTable = new Table; - mpOldSelectTable = NULL; - mpRestoreSelectTable = NULL; - mpStandardColor = NULL; - mpSaturdayColor = NULL; - mpSundayColor = NULL; - mnDayCount = 0; - mnWinStyle = nWinStyle; - mnFirstYear = 0; - mnLastYear = 0; - mnRequestYear = 0; - mbCalc = TRUE; - mbFormat = TRUE; - mbDrag = FALSE; - mbSelection = FALSE; - mbMultiSelection = FALSE; - mbWeekSel = FALSE; - mbUnSel = FALSE; - mbMenuDown = FALSE; - mbSpinDown = FALSE; - mbPrevIn = FALSE; - mbNextIn = FALSE; - mbDirect = FALSE; - mbInSelChange = FALSE; - mbTravelSelect = FALSE; - mbScrollDateRange = FALSE; - mbSelLeft = FALSE; - mbAllSel = FALSE; - mbDropPos = FALSE; + mpDateTable = NULL; + mpSelectTable = new Table; + mpOldSelectTable = NULL; + mpRestoreSelectTable = NULL; + mpStandardColor = NULL; + mpSaturdayColor = NULL; + mpSundayColor = NULL; + mnDayCount = 0; + mnWinStyle = nWinStyle; + mnFirstYear = 0; + mnLastYear = 0; + mnRequestYear = 0; + mbCalc = TRUE; + mbFormat = TRUE; + mbDrag = FALSE; + mbSelection = FALSE; + mbMultiSelection = FALSE; + mbWeekSel = FALSE; + mbUnSel = FALSE; + mbMenuDown = FALSE; + mbSpinDown = FALSE; + mbPrevIn = FALSE; + mbNextIn = FALSE; + mbDirect = FALSE; + mbInSelChange = FALSE; + mbTravelSelect = FALSE; + mbScrollDateRange = FALSE; + mbSelLeft = FALSE; + mbAllSel = FALSE; + mbDropPos = FALSE; ::rtl::OUString aGregorian( RTL_CONSTASCII_USTRINGPARAM( "gregorian")); maCalendarWrapper.loadCalendar( aGregorian, @@ -466,39 +466,39 @@ void Calendar::ImplFormat() long nTextHeight = GetTextHeight(); // Breiten und X-Positionen berechnen - mnDayWidth = n99TextWidth+DAY_OFFX; - mnMonthWidth = mnDayWidth*7; + mnDayWidth = n99TextWidth+DAY_OFFX; + mnMonthWidth = mnDayWidth*7; mnMonthWidth += mnWeekWidth; mnMonthWidth += MONTH_BORDERX*2; - mnMonthPerLine = aOutSize.Width() / mnMonthWidth; + mnMonthPerLine = aOutSize.Width() / mnMonthWidth; if ( !mnMonthPerLine ) mnMonthPerLine = 1; - long nOver = ((aOutSize.Width()-(mnMonthPerLine*mnMonthWidth)) / mnMonthPerLine); + long nOver = ((aOutSize.Width()-(mnMonthPerLine*mnMonthWidth)) / mnMonthPerLine); mnMonthWidth += nOver; - mnDaysOffX = MONTH_BORDERX; - mnDaysOffX += nOver/2; - mnDaysOffX += mnWeekWidth; + mnDaysOffX = MONTH_BORDERX; + mnDaysOffX += nOver/2; + mnDaysOffX += mnWeekWidth; // Hoehen und Y-Positionen berechnen - mnDayHeight = nTextHeight + DAY_OFFY; - mnWeekDayOffY = nTextHeight + TITLE_OFFY + (TITLE_BORDERY*2); - mnDaysOffY = mnWeekDayOffY + nTextHeight + WEEKDAY_OFFY; - mnMonthHeight = (mnDayHeight*6) + mnDaysOffY; + mnDayHeight = nTextHeight + DAY_OFFY; + mnWeekDayOffY = nTextHeight + TITLE_OFFY + (TITLE_BORDERY*2); + mnDaysOffY = mnWeekDayOffY + nTextHeight + WEEKDAY_OFFY; + mnMonthHeight = (mnDayHeight*6) + mnDaysOffY; mnMonthHeight += MONTH_OFFY; - mnLines = aOutSize.Height() / mnMonthHeight; + mnLines = aOutSize.Height() / mnMonthHeight; if ( !mnLines ) mnLines = 1; mnMonthHeight += (aOutSize.Height()-(mnLines*mnMonthHeight)) / mnLines; // Spinfelder berechnen - long nSpinSize = nTextHeight+TITLE_BORDERY-SPIN_OFFY; - maPrevRect.Left() = SPIN_OFFX; - maPrevRect.Top() = SPIN_OFFY; - maPrevRect.Right() = maPrevRect.Left()+nSpinSize; + long nSpinSize = nTextHeight+TITLE_BORDERY-SPIN_OFFY; + maPrevRect.Left() = SPIN_OFFX; + maPrevRect.Top() = SPIN_OFFY; + maPrevRect.Right() = maPrevRect.Left()+nSpinSize; maPrevRect.Bottom() = maPrevRect.Top()+nSpinSize; - maNextRect.Left() = aOutSize.Width()-SPIN_OFFX-nSpinSize-1; - maNextRect.Top() = SPIN_OFFY; - maNextRect.Right() = maNextRect.Left()+nSpinSize; + maNextRect.Left() = aOutSize.Width()-SPIN_OFFX-nSpinSize-1; + maNextRect.Top() = SPIN_OFFY; + maNextRect.Right() = maNextRect.Left()+nSpinSize; maNextRect.Bottom() = maNextRect.Top()+nSpinSize; if ( mnWinStyle & WB_BOLDTEXT ) @@ -616,12 +616,12 @@ USHORT Calendar::ImplHitTest( const Point& rPos, Date& rDate ) const else if ( maNextRect.IsInside( rPos ) ) return CALENDAR_HITTEST_NEXT; - long nX; - long nY; - long nOffX; - long nYMonth; - USHORT nDay; - DayOfWeek eStartDay = ImplGetWeekStart(); + long nX; + long nY; + long nOffX; + long nYMonth; + USHORT nDay; + DayOfWeek eStartDay = ImplGetWeekStart(); rDate = GetFirstMonth(); nY = 0; @@ -740,11 +740,11 @@ USHORT Calendar::ImplHitTest( const Point& rPos, Date& rDate ) const static void ImplDrawSpinArrow( OutputDevice* pDev, const Rectangle& rRect, BOOL bPrev ) { - long i; - long n; - long nLines; - long nHeight = rRect.GetHeight(); - long nWidth = rRect.GetWidth(); + long i; + long n; + long nLines; + long nHeight = rRect.GetHeight(); + long nWidth = rRect.GetWidth(); if ( nWidth < nHeight ) n = nWidth; else @@ -794,7 +794,7 @@ void Calendar::ImplDrawSpin( BOOL bDrawPrev, BOOL bDrawNext ) { Rectangle aOutRect = maPrevRect; aOutRect.Left() += 3; - aOutRect.Top() += 3; + aOutRect.Top() += 3; aOutRect.Right() -= 3; aOutRect.Bottom() -= 3; ImplDrawSpinArrow( this, aOutRect, TRUE ); @@ -803,7 +803,7 @@ void Calendar::ImplDrawSpin( BOOL bDrawPrev, BOOL bDrawNext ) { Rectangle aOutRect = maNextRect; aOutRect.Left() += 3; - aOutRect.Top() += 3; + aOutRect.Top() += 3; aOutRect.Right() -= 3; aOutRect.Bottom() -= 3; ImplDrawSpinArrow( this, aOutRect, FALSE ); @@ -817,15 +817,15 @@ void Calendar::ImplDrawDate( long nX, long nY, DayOfWeek eDayOfWeek, BOOL bBack, BOOL bOther, ULONG nToday ) { - ImplDateInfo* pDateInfo; - Color* pTextColor = NULL; - const String& rDay = *(mpDayText[nDay-1]); - Rectangle aDateRect( nX, nY, nX+mnDayWidth-1, nY+mnDayHeight-1 ); + ImplDateInfo* pDateInfo; + Color* pTextColor = NULL; + const String& rDay = *(mpDayText[nDay-1]); + Rectangle aDateRect( nX, nY, nX+mnDayWidth-1, nY+mnDayHeight-1 ); BOOL bSel = FALSE; BOOL bFocus = FALSE; // Aktueller Tag - if ( (nDay == maCurDate.GetDay()) && + if ( (nDay == maCurDate.GetDay()) && (nMonth == maCurDate.GetMonth()) && (nYear == maCurDate.GetYear()) ) bFocus = TRUE; @@ -916,7 +916,7 @@ void Calendar::ImplDrawDate( long nX, long nY, aTodayDate.SetDate( nToday ); else aTodayDate = Date(); - if ( (nDay == aTodayDate.GetDay()) && + if ( (nDay == aTodayDate.GetDay()) && (nMonth == aTodayDate.GetMonth()) && (nYear == aTodayDate.GetYear()) ) { @@ -971,21 +971,21 @@ void Calendar::ImplDraw( BOOL bPaint ) ImplFormat(); const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); - Size aOutSize = GetOutputSizePixel(); - long i; - long j; - long nX; - long nY; - long nDeltaX; - long nDeltaY; - long nDayX; - long nDayY; - ULONG nToday = Date().GetDate(); - USHORT nDay; - USHORT nMonth; - USHORT nYear; - Date aDate = GetFirstMonth(); - DayOfWeek eStartDay = ImplGetWeekStart(); + Size aOutSize = GetOutputSizePixel(); + long i; + long j; + long nX; + long nY; + long nDeltaX; + long nDeltaY; + long nDayX; + long nDayY; + ULONG nToday = Date().GetDate(); + USHORT nDay; + USHORT nMonth; + USHORT nYear; + Date aDate = GetFirstMonth(); + DayOfWeek eStartDay = ImplGetWeekStart(); HideFocus(); @@ -1043,8 +1043,8 @@ void Calendar::ImplDraw( BOOL bPaint ) nX = 0; for ( j = 0; j < mnMonthPerLine; j++ ) { - nMonth = aDate.GetMonth(); - nYear = aDate.GetYear(); + nMonth = aDate.GetMonth(); + nYear = aDate.GetYear(); // Monat in der Titleleiste ausgeben nDeltaX = nX; @@ -1123,9 +1123,9 @@ void Calendar::ImplDraw( BOOL bPaint ) for ( USHORT nWeekCount = 0; nWeekCount < 6; nWeekCount++ ) { sal_Int16 nWeek = maCalendarWrapper.getValue( i18n::CalendarFieldIndex::WEEK_OF_YEAR); - String aWeekText( String::CreateFromInt32( nWeek)); - long nOffX = (mnWeekWidth-WEEKNUMBER_OFFX)-GetTextWidth( aWeekText ); - long nOffY = (mnDayHeight-GetTextHeight())/2; + String aWeekText( String::CreateFromInt32( nWeek)); + long nOffX = (mnWeekWidth-WEEKNUMBER_OFFX)-GetTextWidth( aWeekText ); + long nOffY = (mnDayHeight-GetTextHeight())/2; DrawText( Point( nDayX+nOffX, nDayY+nOffY ), aWeekText ); nDayY += mnDayHeight; maCalendarWrapper.addValue( i18n::CalendarFieldIndex::DAY_OF_MONTH, 7); @@ -1228,9 +1228,9 @@ void Calendar::ImplUpdateDate( const Date& rDate ) void Calendar::ImplUpdateSelection( Table* pOld ) { - Table* pNew = mpSelectTable; - void* p; - ULONG nKey; + Table* pNew = mpSelectTable; + void* p; + ULONG nKey; p = pOld->First(); while ( p ) @@ -1264,9 +1264,9 @@ void Calendar::ImplUpdateSelection( Table* pOld ) void Calendar::ImplMouseSelect( const Date& rDate, USHORT nHitTest, BOOL bMove, BOOL bExpand, BOOL bExtended ) { - Table* pOldSel = new Table( *mpSelectTable ); - Date aOldDate = maCurDate; - Date aTempDate = rDate; + Table* pOldSel = new Table( *mpSelectTable ); + Date aOldDate = maCurDate; + Date aTempDate = rDate; if ( !(nHitTest & CALENDAR_HITTEST_DAY) ) aTempDate--; @@ -1430,15 +1430,15 @@ void Calendar::ImplShowMenu( const Point& rPos, const Date& rDate ) { EndSelection(); - Date aOldFirstDate = GetFirstMonth(); - PopupMenu aPopupMenu; - PopupMenu* pYearPopupMenus[MENU_YEAR_COUNT]; - USHORT nMonthOff; - USHORT nCurItemId; - USHORT nYear = rDate.GetYear()-1; - USHORT i; - USHORT j; - USHORT nYearIdCount = 1000; + Date aOldFirstDate = GetFirstMonth(); + PopupMenu aPopupMenu; + PopupMenu* pYearPopupMenus[MENU_YEAR_COUNT]; + USHORT nMonthOff; + USHORT nCurItemId; + USHORT nYear = rDate.GetYear()-1; + USHORT i; + USHORT j; + USHORT nYearIdCount = 1000; nMonthOff = (rDate.GetYear()-aOldFirstDate.GetYear())*12; if ( aOldFirstDate.GetMonth() < rDate.GetMonth() ) @@ -1493,8 +1493,8 @@ void Calendar::ImplShowMenu( const Point& rPos, const Date& rDate ) void Calendar::ImplTracking( const Point& rPos, BOOL bRepeat ) { - Date aTempDate = maCurDate; - USHORT nHitTest = ImplHitTest( rPos, aTempDate ); + Date aTempDate = maCurDate; + USHORT nHitTest = ImplHitTest( rPos, aTempDate ); if ( mbSpinDown ) { @@ -1519,13 +1519,13 @@ void Calendar::ImplEndTracking( BOOL bCancel ) BOOL bSelection = mbSelection; BOOL bSpinDown = mbSpinDown; - mbDrag = FALSE; - mbSelection = FALSE; - mbMultiSelection = FALSE; - mbUnSel = FALSE; - mbSpinDown = FALSE; - mbPrevIn = FALSE; - mbNextIn = FALSE; + mbDrag = FALSE; + mbSelection = FALSE; + mbMultiSelection = FALSE; + mbUnSel = FALSE; + mbSpinDown = FALSE; + mbPrevIn = FALSE; + mbNextIn = FALSE; if ( bCancel ) { @@ -1534,10 +1534,10 @@ void Calendar::ImplEndTracking( BOOL bCancel ) if ( !bSpinDown ) { - Table* pOldSel = new Table( *mpSelectTable ); - Date aOldDate = maCurDate; - maCurDate = maOldCurDate; - *mpSelectTable = *mpOldSelectTable; + Table* pOldSel = new Table( *mpSelectTable ); + Date aOldDate = maCurDate; + maCurDate = maOldCurDate; + *mpSelectTable = *mpOldSelectTable; HideFocus(); ImplUpdateSelection( pOldSel ); if ( !pOldSel->Get( aOldDate.GetDate() ) ) @@ -1601,8 +1601,8 @@ void Calendar::MouseButtonDown( const MouseEvent& rMEvt ) { if ( rMEvt.IsLeft() && !mbMenuDown ) { - Date aTempDate = maCurDate; - USHORT nHitTest = ImplHitTest( rMEvt.GetPosPixel(), aTempDate ); + Date aTempDate = maCurDate; + USHORT nHitTest = ImplHitTest( rMEvt.GetPosPixel(), aTempDate ); if ( nHitTest ) { if ( nHitTest & CALENDAR_HITTEST_MONTHTITLE ) @@ -1694,10 +1694,10 @@ void Calendar::Tracking( const TrackingEvent& rTEvt ) void Calendar::KeyInput( const KeyEvent& rKEvt ) { - Date aNewDate = maCurDate; - BOOL bMultiSel = (mnWinStyle & (WB_RANGESELECT | WB_MULTISELECT)) != 0; - BOOL bExpand = rKEvt.GetKeyCode().IsShift(); - BOOL bExtended = rKEvt.GetKeyCode().IsMod1(); + Date aNewDate = maCurDate; + BOOL bMultiSel = (mnWinStyle & (WB_RANGESELECT | WB_MULTISELECT)) != 0; + BOOL bExpand = rKEvt.GetKeyCode().IsShift(); + BOOL bExtended = rKEvt.GetKeyCode().IsMod1(); switch ( rKEvt.GetKeyCode().GetCode() ) { @@ -1882,8 +1882,8 @@ void Calendar::RequestHelp( const HelpEvent& rHEvt ) { maCalendarWrapper.setGregorianDateTime( aDate); USHORT nWeek = (USHORT) maCalendarWrapper.getValue( i18n::CalendarFieldIndex::WEEK_OF_YEAR); - USHORT nMonth = aDate.GetMonth(); - XubString aStr( maDayText ); + USHORT nMonth = aDate.GetMonth(); + XubString aStr( maDayText ); aStr.AppendAscii( ": " ); aStr.Append( XubString::CreateFromInt32( aDate.GetDayOfYear() ) ); aStr.AppendAscii( " / " ); @@ -1918,8 +1918,8 @@ void Calendar::Command( const CommandEvent& rCEvt ) { if ( !mbSelection && rCEvt.IsMouseEvent() ) { - Date aTempDate = maCurDate; - USHORT nHitTest = ImplHitTest( rCEvt.GetMousePosPixel(), aTempDate ); + Date aTempDate = maCurDate; + USHORT nHitTest = ImplHitTest( rCEvt.GetMousePosPixel(), aTempDate ); if ( nHitTest & CALENDAR_HITTEST_MONTHTITLE ) { ImplShowMenu( rCEvt.GetMousePosPixel(), aTempDate ); @@ -2121,10 +2121,10 @@ void Calendar::SetCurDate( const Date& rNewDate ) if ( maCurDate != rNewDate ) { - BOOL bUpdate = IsVisible() && IsUpdateMode(); - Date aOldDate = maCurDate; - maCurDate = rNewDate; - maAnchorDate = maCurDate; + BOOL bUpdate = IsVisible() && IsUpdateMode(); + Date aOldDate = maCurDate; + maCurDate = rNewDate; + maAnchorDate = maCurDate; if ( !(mnWinStyle & (WB_RANGESELECT | WB_MULTISELECT)) ) { @@ -2235,8 +2235,8 @@ BOOL Calendar::GetDropDate( Date& rDate ) const BOOL Calendar::GetDate( const Point& rPos, Date& rDate ) const { - Date aDate = maCurDate; - USHORT nHitTest = ImplHitTest( rPos, aDate ); + Date aDate = maCurDate; + USHORT nHitTest = ImplHitTest( rPos, aDate ); if ( nHitTest & CALENDAR_HITTEST_DAY ) { rDate = aDate; @@ -2255,11 +2255,11 @@ Rectangle Calendar::GetDateRect( const Date& rDate ) const if ( mbFormat || (rDate < maFirstDate) || (rDate > (maFirstDate+mnDayCount)) ) return aRect; - long nX; - long nY; - ULONG nDaysOff; - USHORT nDayIndex; - Date aDate = GetFirstMonth(); + long nX; + long nY; + ULONG nDaysOff; + USHORT nDayIndex; + Date aDate = GetFirstMonth(); if ( rDate < aDate ) { @@ -2322,10 +2322,10 @@ Rectangle Calendar::GetDateRect( const Date& rDate ) const { if ( nDay == rDate.GetDay() ) { - aRect.Left() = nDayX + (nDayIndex*mnDayWidth); - aRect.Top() = nDayY; - aRect.Right() = aRect.Left()+mnDayWidth; - aRect.Bottom() = aRect.Top()+mnDayHeight; + aRect.Left() = nDayX + (nDayIndex*mnDayWidth); + aRect.Top() = nDayY; + aRect.Right() = aRect.Left()+mnDayWidth; + aRect.Bottom() = aRect.Top()+mnDayHeight; break; } if ( nDayIndex == 6 ) @@ -2390,9 +2390,9 @@ void Calendar::AddDateInfo( const Date& rDate, const String& rText, if ( !mpDateTable ) mpDateTable = new ImplDateTable( 256, 256 ); - BOOL bChanged = FALSE; - ULONG nKey = rDate.GetDate(); - ImplDateInfo* pDateInfo = mpDateTable->Get( nKey ); + BOOL bChanged = FALSE; + ULONG nKey = rDate.GetDate(); + ImplDateInfo* pDateInfo = mpDateTable->Get( nKey ); if ( pDateInfo ) pDateInfo->maText = rText; else @@ -2503,8 +2503,8 @@ XubString Calendar::GetDateInfoText( const Date& rDate ) XubString aRet; if ( mpDateTable ) { - ULONG nKey = rDate.GetDate(); - ImplDateInfo* pDateInfo = mpDateTable->Get( nKey ); + ULONG nKey = rDate.GetDate(); + ImplDateInfo* pDateInfo = mpDateTable->Get( nKey ); if ( pDateInfo ) aRet = pDateInfo->maText; } @@ -2515,7 +2515,7 @@ XubString Calendar::GetDateInfoText( const Date& rDate ) BOOL Calendar::ShowDropPos( const Point& rPos, Date& rDate ) { - Date aTempDate = maCurDate; + Date aTempDate = maCurDate; mnDragScrollHitTest = ImplHitTest( rPos, aTempDate ); if ( mnDragScrollHitTest ) @@ -2583,12 +2583,12 @@ void Calendar::EndSelection() if ( !mbSelection ) ReleaseMouse(); - mbDrag = FALSE; - mbSelection = FALSE; - mbMultiSelection = FALSE; - mbSpinDown = FALSE; - mbPrevIn = FALSE; - mbNextIn = FALSE; + mbDrag = FALSE; + mbSelection = FALSE; + mbMultiSelection = FALSE; + mbSpinDown = FALSE; + mbPrevIn = FALSE; + mbNextIn = FALSE; } } @@ -2597,8 +2597,8 @@ void Calendar::EndSelection() Size Calendar::CalcWindowSizePixel( long nCalcMonthPerLine, long nCalcLines ) const { - XubString a99Text( XubString( RTL_CONSTASCII_USTRINGPARAM( "99" ) ) ); - Font aOldFont = GetFont(); + XubString a99Text( XubString( RTL_CONSTASCII_USTRINGPARAM( "99" ) ) ); + Font aOldFont = GetFont(); // Wochenanzeige beruecksichtigen long nWeekWidth; @@ -2623,9 +2623,9 @@ Size Calendar::CalcWindowSizePixel( long nCalcMonthPerLine, ((Calendar*)this)->SetFont( aFont ); } - Size aSize; - long n99TextWidth = GetTextWidth( a99Text ); - long nTextHeight = GetTextHeight(); + Size aSize; + long n99TextWidth = GetTextWidth( a99Text ); + long nTextHeight = GetTextHeight(); if ( mnWinStyle & WB_BOLDTEXT ) ((Calendar*)this)->SetFont( aOldFont ); @@ -2634,7 +2634,7 @@ Size Calendar::CalcWindowSizePixel( long nCalcMonthPerLine, aSize.Width() += MONTH_BORDERX*2; aSize.Width() *= nCalcMonthPerLine; - aSize.Height() = nTextHeight + TITLE_OFFY + (TITLE_BORDERY*2); + aSize.Height() = nTextHeight + TITLE_OFFY + (TITLE_BORDERY*2); aSize.Height() += nTextHeight + WEEKDAY_OFFY; aSize.Height() += ((nTextHeight+DAY_OFFY)*6); aSize.Height() += MONTH_OFFY; @@ -2645,35 +2645,35 @@ Size Calendar::CalcWindowSizePixel( long nCalcMonthPerLine, // ======================================================================= -#define CALFIELD_EXTRA_BUTTON_WIDTH 14 -#define CALFIELD_EXTRA_BUTTON_HEIGHT 8 -#define CALFIELD_SEP_X 6 -#define CALFIELD_BORDERLINE_X 5 -#define CALFIELD_BORDER_YTOP 4 -#define CALFIELD_BORDER_Y 5 +#define CALFIELD_EXTRA_BUTTON_WIDTH 14 +#define CALFIELD_EXTRA_BUTTON_HEIGHT 8 +#define CALFIELD_SEP_X 6 +#define CALFIELD_BORDERLINE_X 5 +#define CALFIELD_BORDER_YTOP 4 +#define CALFIELD_BORDER_Y 5 // ======================================================================= class ImplCFieldFloatWin : public FloatingWindow { private: - Calendar* mpCalendar; - PushButton* mpTodayBtn; - PushButton* mpNoneBtn; - FixedLine* mpFixedLine; + Calendar* mpCalendar; + PushButton* mpTodayBtn; + PushButton* mpNoneBtn; + FixedLine* mpFixedLine; public: ImplCFieldFloatWin( Window* pParent ); ~ImplCFieldFloatWin(); - void SetCalendar( Calendar* pCalendar ) + void SetCalendar( Calendar* pCalendar ) { mpCalendar = pCalendar; } - PushButton* EnableTodayBtn( BOOL bEnable ); - PushButton* EnableNoneBtn( BOOL bEnable ); - void ArrangeButtons(); + PushButton* EnableTodayBtn( BOOL bEnable ); + PushButton* EnableNoneBtn( BOOL bEnable ); + void ArrangeButtons(); - long Notify( NotifyEvent& rNEvt ); + long Notify( NotifyEvent& rNEvt ); }; // ----------------------------------------------------------------------- @@ -2681,9 +2681,9 @@ public: ImplCFieldFloatWin::ImplCFieldFloatWin( Window* pParent ) : FloatingWindow( pParent, WB_BORDER | WB_SYSTEMWINDOW | WB_NOSHADOW ) { - mpCalendar = NULL; - mpTodayBtn = NULL; - mpNoneBtn = NULL; + mpCalendar = NULL; + mpTodayBtn = NULL; + mpNoneBtn = NULL; mpFixedLine = NULL; } @@ -2708,8 +2708,8 @@ PushButton* ImplCFieldFloatWin::EnableTodayBtn( BOOL bEnable ) XubString aTodayText( SvtResId( STR_SVT_CALENDAR_TODAY ) ); mpTodayBtn->SetText( aTodayText ); Size aSize; - aSize.Width() = mpTodayBtn->GetCtrlTextWidth( mpTodayBtn->GetText() ); - aSize.Height() = mpTodayBtn->GetTextHeight(); + aSize.Width() = mpTodayBtn->GetCtrlTextWidth( mpTodayBtn->GetText() ); + aSize.Height() = mpTodayBtn->GetTextHeight(); aSize.Width() += CALFIELD_EXTRA_BUTTON_WIDTH; aSize.Height() += CALFIELD_EXTRA_BUTTON_HEIGHT; mpTodayBtn->SetSizePixel( aSize ); @@ -2740,8 +2740,8 @@ PushButton* ImplCFieldFloatWin::EnableNoneBtn( BOOL bEnable ) XubString aNoneText( SvtResId( STR_SVT_CALENDAR_NONE ) ); mpNoneBtn->SetText( aNoneText ); Size aSize; - aSize.Width() = mpNoneBtn->GetCtrlTextWidth( mpNoneBtn->GetText() ); - aSize.Height() = mpNoneBtn->GetTextHeight(); + aSize.Width() = mpNoneBtn->GetCtrlTextWidth( mpNoneBtn->GetText() ); + aSize.Height() = mpNoneBtn->GetTextHeight(); aSize.Width() += CALFIELD_EXTRA_BUTTON_WIDTH; aSize.Height() += CALFIELD_EXTRA_BUTTON_HEIGHT; mpNoneBtn->SetSizePixel( aSize ); @@ -2765,8 +2765,8 @@ PushButton* ImplCFieldFloatWin::EnableNoneBtn( BOOL bEnable ) void ImplCFieldFloatWin::ArrangeButtons() { long nBtnHeight = 0; - long nBtnWidth = 0; - Size aOutSize = GetOutputSizePixel(); + long nBtnWidth = 0; + Size aOutSize = GetOutputSizePixel(); if ( mpTodayBtn && mpNoneBtn ) { Size aTodayBtnSize = mpTodayBtn->GetSizePixel(); @@ -2846,11 +2846,11 @@ CalendarField::CalendarField( Window* pParent, WinBits nWinStyle ) : DateField( pParent, nWinStyle ), maDefaultDate( 0, 0, 0 ) { - mpFloatWin = NULL; - mpCalendar = NULL; + mpFloatWin = NULL; + mpCalendar = NULL; mnCalendarStyle = 0; - mbToday = FALSE; - mbNone = FALSE; + mbToday = FALSE; + mbNone = FALSE; } // ----------------------------------------------------------------------- @@ -2859,11 +2859,11 @@ CalendarField::CalendarField( Window* pParent, const ResId& rResId ) : DateField( pParent, rResId ), maDefaultDate( 0, 0, 0 ) { - mpFloatWin = NULL; - mpCalendar = NULL; + mpFloatWin = NULL; + mpCalendar = NULL; mnCalendarStyle = 0; - mbToday = FALSE; - mbNone = FALSE; + mbToday = FALSE; + mbNone = FALSE; } // ----------------------------------------------------------------------- @@ -2969,8 +2969,8 @@ BOOL CalendarField::ShowDropDown( BOOL bShow ) pCalendar->SelectDate( aDate ); } pCalendar->SetCurDate( aDate ); - Point aPos( GetParent()->OutputToScreenPixel( GetPosPixel() ) ); - Rectangle aRect( aPos, GetSizePixel() ); + Point aPos( GetParent()->OutputToScreenPixel( GetPosPixel() ) ); + Rectangle aRect( aPos, GetSizePixel() ); aRect.Bottom() -= 1; mpCalendar->SetOutputSizePixel( mpCalendar->CalcWindowSizePixel() ); mpFloatWin->SetOutputSizePixel( mpCalendar->GetSizePixel() ); diff --git a/svtools/source/control/calendar.src b/svtools/source/control/calendar.src index 4dd31765a5c1..82f8bb0f4ef4 100755 --- a/svtools/source/control/calendar.src +++ b/svtools/source/control/calendar.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/svtools/source/control/collatorres.cxx b/svtools/source/control/collatorres.cxx index 20b7865db569..fb5566607cdd 100644 --- a/svtools/source/control/collatorres.cxx +++ b/svtools/source/control/collatorres.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,31 +45,31 @@ class CollatorRessourceData { friend class CollatorRessource; private: /* data */ - String ma_Name; - String ma_Translation; + String ma_Name; + String ma_Translation; private: /* member functions */ CollatorRessourceData () {} public: CollatorRessourceData ( const String &r_Algorithm, const String &r_Translation) : ma_Name (r_Algorithm), ma_Translation (r_Translation) {} - const String& GetAlgorithm () const { return ma_Name; } + const String& GetAlgorithm () const { return ma_Name; } - const String& GetTranslation () const { return ma_Translation; } + const String& GetTranslation () const { return ma_Translation; } ~CollatorRessourceData () {} CollatorRessourceData& operator= (const CollatorRessourceData& r_From) - { - ma_Name = r_From.GetAlgorithm(); - ma_Translation = r_From.GetTranslation(); + { + ma_Name = r_From.GetAlgorithm(); + ma_Translation = r_From.GetTranslation(); return *this; } }; // ------------------------------------------------------------------------- // -// implementation of the collator-algorithm-name translation +// implementation of the collator-algorithm-name translation // // ------------------------------------------------------------------------- @@ -117,12 +117,12 @@ CollatorRessource::GetTranslation (const String &r_Algorithm) nIndex += 1; aLocaleFreeAlgorithm = String(r_Algorithm, nIndex, r_Algorithm.Len() - nIndex); } - + for (sal_uInt32 i = 0; i < COLLATOR_RESSOURCE_COUNT; i++) { if (aLocaleFreeAlgorithm == mp_Data[i].GetAlgorithm()) return mp_Data[i].GetTranslation(); - } + } return r_Algorithm; } diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index 0dce36d4a5d8..37b01f3d30a4 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -643,20 +643,20 @@ void LineListBox::UpdateLineColors( void ) { if( UpdatePaintLineColor() ) { - ULONG nCount = pLineList->Count(); + ULONG nCount = pLineList->Count(); if( !nCount ) return; - XubString aStr; - Bitmap aBmp; + XubString aStr; + Bitmap aBmp; // exchange entries which containing lines SetUpdateMode( FALSE ); - USHORT nSelEntry = GetSelectEntryPos(); + USHORT nSelEntry = GetSelectEntryPos(); for( ULONG n = 0 ; n < nCount ; ++n ) { - ImpLineListData* pData = pLineList->GetObject( n ); + ImpLineListData* pData = pLineList->GetObject( n ); if( pData ) { // exchange listbox data @@ -679,9 +679,9 @@ void LineListBox::UpdateLineColors( void ) BOOL LineListBox::UpdatePaintLineColor( void ) { - BOOL bRet = TRUE; - const StyleSettings& rSettings = GetSettings().GetStyleSettings(); - Color aNewCol( rSettings.GetWindowColor().IsDark()? rSettings.GetLabelTextColor() : aColor ); + BOOL bRet = TRUE; + const StyleSettings& rSettings = GetSettings().GetStyleSettings(); + Color aNewCol( rSettings.GetWindowColor().IsDark()? rSettings.GetLabelTextColor() : aColor ); bRet = aNewCol != maPaintCol; diff --git a/svtools/source/control/ctrlbox.src b/svtools/source/control/ctrlbox.src index 95440c905d89..5ddedbe4098f 100755 --- a/svtools/source/control/ctrlbox.src +++ b/svtools/source/control/ctrlbox.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/svtools/source/control/ctrldll.cxx b/svtools/source/control/ctrldll.cxx index e9ecfaf7b550..4ba19c9de22e 100644 --- a/svtools/source/control/ctrldll.cxx +++ b/svtools/source/control/ctrldll.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx index 3e5d3e16cc39..674113e14097 100644 --- a/svtools/source/control/ctrltool.cxx +++ b/svtools/source/control/ctrltool.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,8 +93,8 @@ class ImplFontListFontInfo : public FontInfo friend class FontList; private: - OutputDevice* mpDevice; - ImplFontListFontInfo* mpNext; + OutputDevice* mpDevice; + ImplFontListFontInfo* mpNext; public: ImplFontListFontInfo( const FontInfo& rInfo, @@ -104,7 +104,7 @@ public: mpDevice = pDev; } - OutputDevice* GetDevice() const { return mpDevice; } + OutputDevice* GetDevice() const { return mpDevice; } }; // ------------------------------ @@ -116,15 +116,15 @@ class ImplFontListNameInfo friend class FontList; private: - XubString maSearchName; - ImplFontListFontInfo* mpFirst; - USHORT mnType; + XubString maSearchName; + ImplFontListFontInfo* mpFirst; + USHORT mnType; ImplFontListNameInfo( const XubString& rSearchName ) : maSearchName( rSearchName ) {} - const XubString& GetSearchName() const { return maSearchName; } + const XubString& GetSearchName() const { return maSearchName; } }; // ======================================================================= @@ -196,11 +196,11 @@ ImplFontListNameInfo* FontList::ImplFind( const XubString& rSearchName, ULONG* p } // Fonts in der Liste suchen - ImplFontListNameInfo* pCompareData; - ImplFontListNameInfo* pFoundData = NULL; - ULONG nLow = 0; - ULONG nHigh = nCnt-1; - ULONG nMid; + ImplFontListNameInfo* pCompareData; + ImplFontListNameInfo* pFoundData = NULL; + ULONG nLow = 0; + ULONG nHigh = nCnt-1; + ULONG nMid; do { @@ -262,7 +262,7 @@ void FontList::ImplInsertFonts( OutputDevice* pDevice, BOOL bAll, // Alle Fonts vom Device abfragen int n = pDevice->GetDevFontCount(); - USHORT i; + USHORT i; for( i = 0; i < n; i++ ) { FontInfo aFontInfo = pDevice->GetDevFont( i ); @@ -272,9 +272,9 @@ void FontList::ImplInsertFonts( OutputDevice* pDevice, BOOL bAll, if ( !bAll && (aFontInfo.GetType() == TYPE_RASTER) ) continue; - XubString aSearchName = aFontInfo.GetName(); - ImplFontListNameInfo* pData; - ULONG nIndex; + XubString aSearchName = aFontInfo.GetName(); + ImplFontListNameInfo* pData; + ULONG nIndex; ImplMakeSearchString( aSearchName ); pData = ImplFind( aSearchName, &nIndex ); @@ -284,9 +284,9 @@ void FontList::ImplInsertFonts( OutputDevice* pDevice, BOOL bAll, { ImplFontListFontInfo* pNewInfo = new ImplFontListFontInfo( aFontInfo, pDevice ); pData = new ImplFontListNameInfo( aSearchName ); - pData->mpFirst = pNewInfo; - pNewInfo->mpNext = NULL; - pData->mnType = 0; + pData->mpFirst = pNewInfo; + pNewInfo->mpNext = NULL; + pData->mnType = 0; Insert( (void*)pData, nIndex ); } } @@ -294,10 +294,10 @@ void FontList::ImplInsertFonts( OutputDevice* pDevice, BOOL bAll, { if ( bInsertData ) { - BOOL bInsert = TRUE; - ImplFontListFontInfo* pPrev = NULL; - ImplFontListFontInfo* pTemp = pData->mpFirst; - ImplFontListFontInfo* pNewInfo = new ImplFontListFontInfo( aFontInfo, pDevice ); + BOOL bInsert = TRUE; + ImplFontListFontInfo* pPrev = NULL; + ImplFontListFontInfo* pTemp = pData->mpFirst; + ImplFontListFontInfo* pNewInfo = new ImplFontListFontInfo( aFontInfo, pDevice ); while ( pTemp ) { StringCompare eComp = ImplCompareFontInfo( pNewInfo, pTemp ); @@ -356,14 +356,14 @@ FontList::FontList( OutputDevice* pDevice, OutputDevice* pDevice2, BOOL bAll ) : mpSizeAry = NULL; // Stylenamen festlegen - maLight = XubString( SvtResId( STR_SVT_STYLE_LIGHT ) ); - maLightItalic = XubString( SvtResId( STR_SVT_STYLE_LIGHT_ITALIC ) ); - maNormal = XubString( SvtResId( STR_SVT_STYLE_NORMAL ) ); - maNormalItalic = XubString( SvtResId( STR_SVT_STYLE_NORMAL_ITALIC ) ); - maBold = XubString( SvtResId( STR_SVT_STYLE_BOLD ) ); - maBoldItalic = XubString( SvtResId( STR_SVT_STYLE_BOLD_ITALIC ) ); - maBlack = XubString( SvtResId( STR_SVT_STYLE_BLACK ) ); - maBlackItalic = XubString( SvtResId( STR_SVT_STYLE_BLACK_ITALIC ) ); + maLight = XubString( SvtResId( STR_SVT_STYLE_LIGHT ) ); + maLightItalic = XubString( SvtResId( STR_SVT_STYLE_LIGHT_ITALIC ) ); + maNormal = XubString( SvtResId( STR_SVT_STYLE_NORMAL ) ); + maNormalItalic = XubString( SvtResId( STR_SVT_STYLE_NORMAL_ITALIC ) ); + maBold = XubString( SvtResId( STR_SVT_STYLE_BOLD ) ); + maBoldItalic = XubString( SvtResId( STR_SVT_STYLE_BOLD_ITALIC ) ); + maBlack = XubString( SvtResId( STR_SVT_STYLE_BLACK ) ); + maBlackItalic = XubString( SvtResId( STR_SVT_STYLE_BLACK_ITALIC ) ); ImplInsertFonts( pDevice, bAll, TRUE ); @@ -412,7 +412,7 @@ FontList* FontList::Clone() const FontList* pReturn = new FontList( mpDev, mpDev2, GetFontNameCount() == mpDev->GetDevFontCount()); return pReturn; -} +} // ----------------------------------------------------------------------- @@ -459,9 +459,9 @@ const XubString& FontList::GetStyleName( FontWeight eWeight, FontItalic eItalic XubString FontList::GetStyleName( const FontInfo& rInfo ) const { - XubString aStyleName = rInfo.GetStyleName(); - FontWeight eWeight = rInfo.GetWeight(); - FontItalic eItalic = rInfo.GetItalic(); + XubString aStyleName = rInfo.GetStyleName(); + FontWeight eWeight = rInfo.GetWeight(); + FontItalic eItalic = rInfo.GetItalic(); // Nur wenn kein StyleName gesetzt ist, geben wir einen syntetischen // Namen zurueck @@ -530,15 +530,15 @@ XubString FontList::GetFontMapText( const FontInfo& rInfo ) const } // search for synthetic style - USHORT nType = pData->mnType; - const XubString& rStyleName = rInfo.GetStyleName(); + USHORT nType = pData->mnType; + const XubString& rStyleName = rInfo.GetStyleName(); if ( rStyleName.Len() ) { - BOOL bNotSynthetic = FALSE; - BOOL bNoneAvailable = FALSE; - FontWeight eWeight = rInfo.GetWeight(); - FontItalic eItalic = rInfo.GetItalic(); - ImplFontListFontInfo* pFontInfo = pData->mpFirst; + BOOL bNotSynthetic = FALSE; + BOOL bNoneAvailable = FALSE; + FontWeight eWeight = rInfo.GetWeight(); + FontItalic eItalic = rInfo.GetItalic(); + ImplFontListFontInfo* pFontInfo = pData->mpFirst; while ( pFontInfo ) { if ( (eWeight == pFontInfo->GetWeight()) && @@ -584,7 +584,7 @@ XubString FontList::GetFontMapText( const FontInfo& rInfo ) const return maMapPrinterOnly; } // Only Screen-Font? - else if ( (nType & (FONTLIST_FONTNAMETYPE_PRINTER | FONTLIST_FONTNAMETYPE_SCREEN)) == FONTLIST_FONTNAMETYPE_SCREEN + else if ( (nType & (FONTLIST_FONTNAMETYPE_PRINTER | FONTLIST_FONTNAMETYPE_SCREEN)) == FONTLIST_FONTNAMETYPE_SCREEN && rInfo.GetType() == TYPE_RASTER ) { if ( !maMapScreenOnly.Len() ) @@ -818,8 +818,8 @@ const long* FontList::GetSizeAry( const FontInfo& rInfo ) const // Zuerst nach dem Fontnamen suchen um das Device dann von dem // entsprechenden Font zu nehmen - OutputDevice* pDevice = mpDev; - ImplFontListNameInfo* pData = ImplFindByName( rInfo.GetName() ); + OutputDevice* pDevice = mpDev; + ImplFontListNameInfo* pData = ImplFindByName( rInfo.GetName() ); if ( pData ) pDevice = pData->mpFirst->GetDevice(); @@ -832,9 +832,9 @@ const long* FontList::GetSizeAry( const FontInfo& rInfo ) const MapMode aMap( MAP_10TH_INCH, Point(), Fraction( 1, 72 ), Fraction( 1, 72 ) ); pDevice->SetMapMode( aMap ); - USHORT i; - USHORT nRealCount = 0; - long nOldHeight = 0; + USHORT i; + USHORT nRealCount = 0; + long nOldHeight = 0; ((FontList*)this)->mpSizeAry = new long[nDevSizeCount+1]; for ( i = 0; i < nDevSizeCount; i++ ) { @@ -867,7 +867,7 @@ const long* FontList::GetStdSizeAry() struct ImplFSNameItem { - long mnSize; + long mnSize; const char* mszUtf8Name; }; diff --git a/svtools/source/control/ctrltool.src b/svtools/source/control/ctrltool.src index 72420af4908e..75e039708e75 100755 --- a/svtools/source/control/ctrltool.src +++ b/svtools/source/control/ctrltool.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/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx index 1a1d539d0120..a97fb4ceef6e 100644 --- a/svtools/source/control/filectrl.cxx +++ b/svtools/source/control/filectrl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/svtools/source/control/filectrl.src b/svtools/source/control/filectrl.src index dc8bbb5905d6..3ac29f94da89 100644 --- a/svtools/source/control/filectrl.src +++ b/svtools/source/control/filectrl.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/svtools/source/control/filectrl2.cxx b/svtools/source/control/filectrl2.cxx index a45014d7d13e..cbb40c1b6be7 100644 --- a/svtools/source/control/filectrl2.cxx +++ b/svtools/source/control/filectrl2.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/svtools/source/control/fileurlbox.cxx b/svtools/source/control/fileurlbox.cxx index f2880feef2d0..51fddf787acc 100644 --- a/svtools/source/control/fileurlbox.cxx +++ b/svtools/source/control/fileurlbox.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,7 +120,7 @@ namespace svt } //......................................................................... -} // namespace svt +} // namespace svt //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/control/fixedhyper.cxx b/svtools/source/control/fixedhyper.cxx index c5500bd691ea..1c9ab29f40c9 100644 --- a/svtools/source/control/fixedhyper.cxx +++ b/svtools/source/control/fixedhyper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx index 8a2c4767794a..7c7d3d4247ff 100644 --- a/svtools/source/control/fmtfield.cxx +++ b/svtools/source/control/fmtfield.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,35 +76,35 @@ namespace validation // the states of our automat. enum State { - START, // at the very start of the string - NUM_START, // the very start of the number + START, // at the very start of the string + NUM_START, // the very start of the number - DIGIT_PRE_COMMA, // some pre-comma digits are read, perhaps including some thousand separators + DIGIT_PRE_COMMA, // some pre-comma digits are read, perhaps including some thousand separators - DIGIT_POST_COMMA, // reading digits after the comma - EXPONENT_START, // at the very start of the exponent value + DIGIT_POST_COMMA, // reading digits after the comma + EXPONENT_START, // at the very start of the exponent value // (means: not including the "e" which denotes the exponent) - EXPONENT_DIGIT, // currently reading the digits of the exponent + EXPONENT_DIGIT, // currently reading the digits of the exponent - END // reached the end of the string + END // reached the end of the string }; // a row in the transition table (means the set of states to be reached from a given state) - typedef ::std::map< sal_Unicode, State > StateTransitions; + typedef ::std::map< sal_Unicode, State > StateTransitions; // a single transition - typedef StateTransitions::value_type Transition; + typedef StateTransitions::value_type Transition; // the complete transition table - typedef ::std::map< State, StateTransitions > TransitionTable; + typedef ::std::map< State, StateTransitions > TransitionTable; // the validator class class NumberValidator { private: - TransitionTable m_aTransitions; - const sal_Unicode m_cThSep; - const sal_Unicode m_cDecSep; + TransitionTable m_aTransitions; + const sal_Unicode m_cThSep; + const sal_Unicode m_cDecSep; public: NumberValidator( const sal_Unicode _cThSep, const sal_Unicode _cDecSep ); @@ -342,25 +342,25 @@ FormattedField::StaticFormatter::~StaticFormatter() //============================================================================== DBG_NAME(FormattedField); -#define INIT_MEMBERS() \ - m_aLastSelection(0,0) \ - ,m_dMinValue(0) \ - ,m_dMaxValue(0) \ - ,m_bHasMin(FALSE) \ - ,m_bHasMax(FALSE) \ - ,m_bStrictFormat(TRUE) \ - ,m_bValueDirty(TRUE) \ - ,m_bEnableEmptyField(TRUE) \ - ,m_bAutoColor(FALSE) \ +#define INIT_MEMBERS() \ + m_aLastSelection(0,0) \ + ,m_dMinValue(0) \ + ,m_dMaxValue(0) \ + ,m_bHasMin(FALSE) \ + ,m_bHasMax(FALSE) \ + ,m_bStrictFormat(TRUE) \ + ,m_bValueDirty(TRUE) \ + ,m_bEnableEmptyField(TRUE) \ + ,m_bAutoColor(FALSE) \ ,m_bEnableNaN(FALSE) \ - ,m_dCurrentValue(0) \ - ,m_dDefaultValue(0) \ - ,m_nFormatKey(0) \ - ,m_pFormatter(NULL) \ - ,m_dSpinSize(1) \ - ,m_dSpinFirst(-1000000) \ - ,m_dSpinLast(1000000) \ - ,m_bTreatAsNumber(TRUE) \ + ,m_dCurrentValue(0) \ + ,m_dDefaultValue(0) \ + ,m_nFormatKey(0) \ + ,m_pFormatter(NULL) \ + ,m_dSpinSize(1) \ + ,m_dSpinFirst(-1000000) \ + ,m_dSpinLast(1000000) \ + ,m_bTreatAsNumber(TRUE) \ ,m_pLastOutputColor(NULL) \ ,m_bUseInputStringForFormatting(false) @@ -459,22 +459,22 @@ void FormattedField::SetTextFormatted(const XubString& rStr) USHORT nNewLen = sFormatted.Len(); USHORT nCurrentLen = GetText().Len(); if ((nNewLen > nCurrentLen) && (aNewSel.Max() == nCurrentLen)) - { // the new text is longer and the cursor was behind the last char (of the old text) + { // the new text is longer and the cursor was behind the last char (of the old text) if (aNewSel.Min() == 0) - { // the whole text was selected -> select the new text on the whole, too + { // the whole text was selected -> select the new text on the whole, too aNewSel.Max() = nNewLen; if (!nCurrentLen) - { // there wasn't really a previous selection (as there was no previous text), we're setting a new one -> check the selection options + { // there wasn't really a previous selection (as there was no previous text), we're setting a new one -> check the selection options ULONG nSelOptions = GetSettings().GetStyleSettings().GetSelectionOptions(); if (nSelOptions & SELECTION_OPTION_SHOWFIRST) - { // selection should be from right to left -> swap min and max + { // selection should be from right to left -> swap min and max aNewSel.Min() = aNewSel.Max(); aNewSel.Max() = 0; } } } else if (aNewSel.Max() == aNewSel.Min()) - { // there was no selection -> set the cursor behind the new last char + { // there was no selection -> set the cursor behind the new last char aNewSel.Max() = nNewLen; aNewSel.Min() = nNewLen; } @@ -482,7 +482,7 @@ void FormattedField::SetTextFormatted(const XubString& rStr) else if (aNewSel.Max() > nNewLen) aNewSel.Max() = nNewLen; else - aNewSel = aSel; // don't use the justified version + aNewSel = aSel; // don't use the justified version SpinField::SetText(sFormatted, aNewSel); m_bValueDirty = FALSE; } @@ -515,7 +515,7 @@ void FormattedField::SetAutoColor(BOOL _bAutomatic) m_bAutoColor = _bAutomatic; if (m_bAutoColor) - { // if auto color is switched on, adjust the current text color, too + { // if auto color is switched on, adjust the current text color, too if (m_pLastOutputColor) SetControlForeground(*m_pLastOutputColor); else @@ -574,22 +574,22 @@ void FormattedField::ImplSetTextImpl(const XubString& rNew, Selection* pNewSel) USHORT nCurrentLen = GetText().Len(); if ((nNewLen > nCurrentLen) && (aSel.Max() == nCurrentLen)) - { // new new text is longer and the cursor is behind the last char + { // new new text is longer and the cursor is behind the last char if (aSel.Min() == 0) - { // the whole text was selected -> select the new text on the whole, too + { // the whole text was selected -> select the new text on the whole, too aSel.Max() = nNewLen; if (!nCurrentLen) - { // there wasn't really a previous selection (as there was no previous text), we're setting a new one -> check the selection options + { // there wasn't really a previous selection (as there was no previous text), we're setting a new one -> check the selection options ULONG nSelOptions = GetSettings().GetStyleSettings().GetSelectionOptions(); if (nSelOptions & SELECTION_OPTION_SHOWFIRST) - { // selection should be from right to left -> swap min and max + { // selection should be from right to left -> swap min and max aSel.Min() = aSel.Max(); aSel.Max() = 0; } } } else if (aSel.Max() == aSel.Min()) - { // there was no selection -> set the cursor behind the new last char + { // there was no selection -> set the cursor behind the new last char aSel.Max() = nNewLen; aSel.Min() = nNewLen; } @@ -621,7 +621,7 @@ void FormattedField::ImplSetFormatKey(ULONG nFormatKey) BOOL bNeedFormatter = (m_pFormatter == NULL) && (nFormatKey != 0); if (bNeedFormatter) { - ImplGetFormatter(); // damit wird ein Standard-Formatter angelegt + ImplGetFormatter(); // damit wird ein Standard-Formatter angelegt m_nFormatKey = nFormatKey; // kann sein, dass das in dem Standard-Formatter keinen Sinn macht, aber der nimmt dann ein Default-Format an. @@ -826,10 +826,10 @@ void FormattedField::Commit() // do the reformat ReFormat(); - + // did the text change? if ( GetText() != sOld ) - { // consider the field as modified + { // consider the field as modified Modify(); // but we have the most recent value now m_bValueDirty = FALSE; @@ -1024,7 +1024,7 @@ BOOL FormattedField::ImplGetValue(double& dNewVal) DBG_ASSERT(ImplGetFormatter() != NULL, "FormattedField::ImplGetValue : can't give you a current value without a formatter !"); - sal_uInt32 nFormatKey = m_nFormatKey; // IsNumberFormat veraendert den FormatKey ... + sal_uInt32 nFormatKey = m_nFormatKey; // IsNumberFormat veraendert den FormatKey ... if (ImplGetFormatter()->IsTextFormat(nFormatKey) && m_bTreatAsNumber) // damit wir in einem als Text formatierten Feld trotzdem eine Eingabe wie '1,1' erkennen ... diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx index 284338e0fb76..6f041cae4635 100644 --- a/svtools/source/control/headbar.cxx +++ b/svtools/source/control/headbar.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,54 +43,54 @@ struct ImplHeadItem { - USHORT mnId; - HeaderBarItemBits mnBits; - long mnSize; - ULONG mnHelpId; - Image maImage; - XubString maOutText; - XubString maText; - XubString maHelpText; - void* mpUserData; + USHORT mnId; + HeaderBarItemBits mnBits; + long mnSize; + ULONG mnHelpId; + Image maImage; + XubString maOutText; + XubString maText; + XubString maHelpText; + void* mpUserData; }; DECLARE_LIST( ImplHeadItemList, ImplHeadItem* ) // ======================================================================= -#define HEAD_ARROWSIZE1 4 -#define HEAD_ARROWSIZE2 7 +#define HEAD_ARROWSIZE1 4 +#define HEAD_ARROWSIZE2 7 -#define HEADERBAR_TEXTOFF 2 -#define HEADERBAR_ARROWOFF 5 -#define HEADERBAR_SPLITOFF 3 +#define HEADERBAR_TEXTOFF 2 +#define HEADERBAR_ARROWOFF 5 +#define HEADERBAR_SPLITOFF 3 -#define HEADERBAR_DRAGOFF 4 -#define HEADERBAR_DRAGOUTOFF 15 +#define HEADERBAR_DRAGOFF 4 +#define HEADERBAR_DRAGOUTOFF 15 -#define HEAD_HITTEST_ITEM ((USHORT)0x0001) -#define HEAD_HITTEST_DIVIDER ((USHORT)0x0002) +#define HEAD_HITTEST_ITEM ((USHORT)0x0001) +#define HEAD_HITTEST_DIVIDER ((USHORT)0x0002) // ======================================================================= void HeaderBar::ImplInit( WinBits nWinStyle ) { - mpItemList = new ImplHeadItemList; - mnBorderOff1 = 0; - mnBorderOff2 = 0; - mnOffset = 0; - mnDX = 0; - mnDY = 0; - mnDragSize = 0; - mnStartPos = 0; - mnDragPos = 0; - mnMouseOff = 0; - mnCurItemId = 0; - mnItemDragPos = HEADERBAR_ITEM_NOTFOUND; - mbDrag = FALSE; - mbItemDrag = FALSE; - mbOutDrag = FALSE; - mbItemMode = FALSE; + mpItemList = new ImplHeadItemList; + mnBorderOff1 = 0; + mnBorderOff2 = 0; + mnOffset = 0; + mnDX = 0; + mnDY = 0; + mnDragSize = 0; + mnStartPos = 0; + mnDragPos = 0; + mnMouseOff = 0; + mnCurItemId = 0; + mnItemDragPos = HEADERBAR_ITEM_NOTFOUND; + mbDrag = FALSE; + mbItemDrag = FALSE; + mbOutDrag = FALSE; + mbItemMode = FALSE; // StyleBits auswerten if ( nWinStyle & WB_DRAG ) @@ -212,10 +212,10 @@ Rectangle HeaderBar::ImplGetItemRect( USHORT nPos ) const USHORT HeaderBar::ImplHitTest( const Point& rPos, long& nMouseOff, USHORT& nPos ) const { - ImplHeadItem* pItem; - USHORT nCount = (USHORT)mpItemList->Count(); - BOOL bLastFixed = TRUE; - long nX = -mnOffset; + ImplHeadItem* pItem; + USHORT nCount = (USHORT)mpItemList->Count(); + BOOL bLastFixed = TRUE; + long nX = -mnOffset; for ( USHORT i = 0; i < nCount; i++ ) { @@ -278,8 +278,8 @@ void HeaderBar::ImplInvertDrag( USHORT nStartPos, USHORT nEndPos ) { Rectangle aRect1 = ImplGetItemRect( nStartPos ); Rectangle aRect2 = ImplGetItemRect( nEndPos ); - Point aStartPos = aRect1.Center(); - Point aEndPos = aStartPos; + Point aStartPos = aRect1.Center(); + Point aEndPos = aStartPos; Rectangle aStartRect( aStartPos.X()-2, aStartPos.Y()-2, aStartPos.X()+2, aStartPos.Y()+2 ); @@ -350,13 +350,13 @@ void HeaderBar::ImplDrawItem( OutputDevice* pDev, return; } - ImplHeadItem* pItem = mpItemList->GetObject( nPos ); - HeaderBarItemBits nBits = pItem->mnBits; - const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); + ImplHeadItem* pItem = mpItemList->GetObject( nPos ); + HeaderBarItemBits nBits = pItem->mnBits; + const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); // Border muss nicht gemalt werden - aRect.Top() += mnBorderOff1; - aRect.Bottom() -= mnBorderOff2; + aRect.Top() += mnBorderOff1; + aRect.Bottom() -= mnBorderOff2; // Hintergrund loeschen if ( !pRect || bDrag ) @@ -651,8 +651,8 @@ void HeaderBar::ImplUpdate( USHORT nPos, BOOL bEnd, BOOL bDirect ) { if ( !bDirect ) { - Rectangle aRect; - USHORT nItemCount = (USHORT)(mpItemList->Count()); + Rectangle aRect; + USHORT nItemCount = (USHORT)(mpItemList->Count()); if ( nPos < nItemCount ) aRect = ImplGetItemRect( nPos ); else @@ -663,8 +663,8 @@ void HeaderBar::ImplUpdate( USHORT nPos, BOOL bEnd, BOOL bDirect ) } if ( bEnd ) aRect.Right() = mnDX-1; - aRect.Top() += mnBorderOff1; - aRect.Bottom() -= mnBorderOff2; + aRect.Top() += mnBorderOff1; + aRect.Bottom() -= mnBorderOff2; Invalidate( aRect ); } else @@ -678,8 +678,8 @@ void HeaderBar::ImplUpdate( USHORT nPos, BOOL bEnd, BOOL bDirect ) aRect.Right() = mnDX-1; if ( aRect.Left() < aRect.Right() ) { - aRect.Top() += mnBorderOff1; - aRect.Bottom() -= mnBorderOff2; + aRect.Top() += mnBorderOff1; + aRect.Bottom() -= mnBorderOff2; Erase( aRect ); } } @@ -691,8 +691,8 @@ void HeaderBar::ImplUpdate( USHORT nPos, BOOL bEnd, BOOL bDirect ) void HeaderBar::ImplStartDrag( const Point& rMousePos, BOOL bCommand ) { - USHORT nPos; - USHORT nHitTest = ImplHitTest( rMousePos, mnMouseOff, nPos ); + USHORT nPos; + USHORT nHitTest = ImplHitTest( rMousePos, mnMouseOff, nPos ); if ( nHitTest ) { mbDrag = FALSE; @@ -754,8 +754,8 @@ void HeaderBar::ImplStartDrag( const Point& rMousePos, BOOL bCommand ) void HeaderBar::ImplDrag( const Point& rMousePos ) { - BOOL bNewOutDrag; - USHORT nPos = GetItemPos( mnCurItemId ); + BOOL bNewOutDrag; + USHORT nPos = GetItemPos( mnCurItemId ); mnDragPos = rMousePos.X()-mnMouseOff; if ( mbItemMode ) @@ -909,13 +909,13 @@ void HeaderBar::ImplEndDrag( BOOL bCancel ) } } - mbDrag = FALSE; + mbDrag = FALSE; EndDrag(); - mnCurItemId = 0; - mnItemDragPos = HEADERBAR_ITEM_NOTFOUND; - mbOutDrag = FALSE; - mbItemMode = FALSE; - mbItemDrag = FALSE; + mnCurItemId = 0; + mnItemDragPos = HEADERBAR_ITEM_NOTFOUND; + mbOutDrag = FALSE; + mbItemMode = FALSE; + mbItemDrag = FALSE; } // ----------------------------------------------------------------------- @@ -926,9 +926,9 @@ void HeaderBar::MouseButtonDown( const MouseEvent& rMEvt ) { if ( rMEvt.GetClicks() == 2 ) { - long nTemp; - USHORT nPos; - USHORT nHitTest = ImplHitTest( rMEvt.GetPosPixel(), nTemp, nPos ); + long nTemp; + USHORT nPos; + USHORT nHitTest = ImplHitTest( rMEvt.GetPosPixel(), nTemp, nPos ); if ( nHitTest ) { ImplHeadItem* pItem = mpItemList->GetObject( nPos ); @@ -951,10 +951,10 @@ void HeaderBar::MouseButtonDown( const MouseEvent& rMEvt ) void HeaderBar::MouseMove( const MouseEvent& rMEvt ) { - long nTemp1; - USHORT nTemp2; - PointerStyle eStyle = POINTER_ARROW; - USHORT nHitTest = ImplHitTest( rMEvt.GetPosPixel(), nTemp1, nTemp2 ); + long nTemp1; + USHORT nTemp2; + PointerStyle eStyle = POINTER_ARROW; + USHORT nHitTest = ImplHitTest( rMEvt.GetPosPixel(), nTemp1, nTemp2 ); if ( nHitTest & HEAD_HITTEST_DIVIDER ) eStyle = POINTER_HSIZEBAR; @@ -1008,10 +1008,10 @@ void HeaderBar::Paint( const Rectangle& rRect ) void HeaderBar::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags ) { - Point aPos = pDev->LogicToPixel( rPos ); - Size aSize = pDev->LogicToPixel( rSize ); - Rectangle aRect( aPos, aSize ); - Font aFont = GetDrawPixelFont( pDev ); + Point aPos = pDev->LogicToPixel( rPos ); + Size aSize = pDev->LogicToPixel( rSize ); + Rectangle aRect( aPos, aSize ); + Font aFont = GetDrawPixelFont( pDev ); pDev->Push(); pDev->SetMapMode(); @@ -1036,13 +1036,13 @@ void HeaderBar::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, if ( mnBorderOff1 && mnBorderOff2 ) { pDev->DrawLine( aRect.TopLeft(), Point( aRect.Left(), aRect.Bottom() ) ); - pDev->DrawLine( Point( aRect.Right(), aRect.Top() ), Point( aRect.Right(), aRect.Bottom() ) ); + pDev->DrawLine( Point( aRect.Right(), aRect.Top() ), Point( aRect.Right(), aRect.Bottom() ) ); } } } Rectangle aItemRect( aRect ); -// aItemRect.Bottom()--; +// aItemRect.Bottom()--; USHORT nItemCount = (USHORT)mpItemList->Count(); for ( USHORT i = 0; i < nItemCount; i++ ) { @@ -1234,11 +1234,11 @@ void HeaderBar::InsertItem( USHORT nItemId, const Image& rImage, // Item anlegen und in die Liste einfuegen ImplHeadItem* pItem = new ImplHeadItem; - pItem->mnId = nItemId; - pItem->mnBits = nBits; - pItem->mnSize = nSize; - pItem->maImage = rImage; - pItem->mpUserData = 0; + pItem->mnId = nItemId; + pItem->mnBits = nBits; + pItem->mnSize = nSize; + pItem->maImage = rImage; + pItem->mpUserData = 0; mpItemList->Insert( pItem, nPos ); // Ausgabe updaten @@ -1256,12 +1256,12 @@ void HeaderBar::InsertItem( USHORT nItemId, const XubString& rText, // Item anlegen und in die Liste einfuegen ImplHeadItem* pItem = new ImplHeadItem; - pItem->mnId = nItemId; - pItem->mnBits = nBits; - pItem->mnSize = nSize; - pItem->mnHelpId = 0; - pItem->maText = rText; - pItem->mpUserData = 0; + pItem->mnId = nItemId; + pItem->mnBits = nBits; + pItem->mnSize = nSize; + pItem->mnHelpId = 0; + pItem->maText = rText; + pItem->mpUserData = 0; mpItemList->Insert( pItem, nPos ); // Ausgabe updaten @@ -1281,13 +1281,13 @@ void HeaderBar::InsertItem( USHORT nItemId, // Item anlegen und in die Liste einfuegen ImplHeadItem* pItem = new ImplHeadItem; - pItem->mnId = nItemId; - pItem->mnBits = nBits; - pItem->mnSize = nSize; - pItem->mnHelpId = 0; - pItem->maImage = rImage; - pItem->maText = rText; - pItem->mpUserData = 0; + pItem->mnId = nItemId; + pItem->mnBits = nBits; + pItem->mnSize = nSize; + pItem->mnHelpId = 0; + pItem->maImage = rImage; + pItem->maText = rText; + pItem->mpUserData = 0; mpItemList->Insert( pItem, nPos ); // Ausgabe updaten diff --git a/svtools/source/control/hyperlabel.cxx b/svtools/source/control/hyperlabel.cxx index ab42a891a1ed..f0c8e8613627 100644 --- a/svtools/source/control/hyperlabel.cxx +++ b/svtools/source/control/hyperlabel.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ namespace svt class FontChanger { protected: - OutputDevice* m_pDev; + OutputDevice* m_pDev; public: FontChanger( OutputDevice* _pDev, const Font& _rNewFont ) @@ -70,7 +70,7 @@ namespace svt sal_Bool bInteractive; Size m_aMinSize; sal_Bool m_bHyperMode; - + HyperLabelImpl(); }; @@ -85,7 +85,7 @@ namespace svt { implInit(); } - + HyperLabel::HyperLabel( Window* _pParent, WinBits _nWinStyle ) :FixedText( _pParent, _nWinStyle ) ,m_pImpl( new HyperLabelImpl ) @@ -97,7 +97,7 @@ namespace svt sal_Int32 HyperLabel::GetLogicWidth() { Size rLogicLocSize = PixelToLogic( m_pImpl->m_aMinSize, MAP_APPFONT ); - return rLogicLocSize.Width(); + return rLogicLocSize.Width(); } @@ -106,7 +106,7 @@ namespace svt m_pImpl->m_aMinSize = FixedText::CalcMinimumSize( nMaxWidth ); // the MinimumSize is used to size the FocusRectangle // and for the MouseMove method - m_pImpl->m_aMinSize.Height() += 2; + m_pImpl->m_aMinSize.Height() += 2; m_pImpl->m_aMinSize.Width() += 1; return m_pImpl->m_aMinSize; } @@ -122,14 +122,14 @@ namespace svt Show(); } - void HyperLabel::ToggleBackgroundColor( const Color& _rGBColor ) - { + void HyperLabel::ToggleBackgroundColor( const Color& _rGBColor ) + { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); - SetControlBackground( _rGBColor ); + SetControlBackground( _rGBColor ); if (_rGBColor == COL_TRANSPARENT) - SetTextColor( rStyleSettings.GetFieldTextColor( ) ); + SetTextColor( rStyleSettings.GetFieldTextColor( ) ); else - SetTextColor( rStyleSettings.GetHighlightTextColor( ) ); + SetTextColor( rStyleSettings.GetHighlightTextColor( ) ); } @@ -137,7 +137,7 @@ namespace svt { Font aFont = GetControlFont( ); const Color aColor = GetTextColor(); - + if (rMEvt.IsLeaveWindow()) { DeactivateHyperMode(aFont, aColor); @@ -155,7 +155,7 @@ namespace svt } DeactivateHyperMode(aFont, aColor); } - } + } void HyperLabel::ActivateHyperMode(Font aFont, const Color aColor) { @@ -163,7 +163,7 @@ namespace svt m_pImpl->m_bHyperMode = sal_True; SetPointer( POINTER_REFHAND ); SetControlFont( aFont); - SetTextColor( aColor); + SetTextColor( aColor); } @@ -173,7 +173,7 @@ namespace svt aFont.SetUnderline(UNDERLINE_NONE); SetPointer( POINTER_ARROW ); SetControlFont( aFont); - SetTextColor( aColor); + SetTextColor( aColor); } void HyperLabel::MouseButtonDown( const MouseEvent& ) @@ -182,7 +182,7 @@ namespace svt { maClickHdl.Call( this ); } - } + } void HyperLabel::GetFocus() { @@ -245,24 +245,24 @@ namespace svt { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); FixedText::DataChanged( rDCEvt ); - if ((( rDCEvt.GetType() == DATACHANGED_SETTINGS ) || - ( rDCEvt.GetType() == DATACHANGED_DISPLAY )) && - ( rDCEvt.GetFlags() & SETTINGS_STYLE )) + if ((( rDCEvt.GetType() == DATACHANGED_SETTINGS ) || + ( rDCEvt.GetType() == DATACHANGED_DISPLAY )) && + ( rDCEvt.GetFlags() & SETTINGS_STYLE )) { const Color& rGBColor = GetControlBackground(); if (rGBColor == COL_TRANSPARENT) - SetTextColor( rStyleSettings.GetFieldTextColor( ) ); + SetTextColor( rStyleSettings.GetFieldTextColor( ) ); else { SetControlBackground(rStyleSettings.GetHighlightColor()); - SetTextColor( rStyleSettings.GetHighlightTextColor( ) ); + SetTextColor( rStyleSettings.GetHighlightTextColor( ) ); } Invalidate(); } } //......................................................................... -} // namespace svt +} // namespace svt //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/control/indexentryres.cxx b/svtools/source/control/indexentryres.cxx index 4bc40eb8edeb..a9636c02ce97 100644 --- a/svtools/source/control/indexentryres.cxx +++ b/svtools/source/control/indexentryres.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,24 +45,24 @@ class IndexEntryRessourceData { friend class IndexEntryRessource; private: /* data */ - String ma_Name; - String ma_Translation; + String ma_Name; + String ma_Translation; private: /* member functions */ IndexEntryRessourceData () {} public: IndexEntryRessourceData ( const String &r_Algorithm, const String &r_Translation) : ma_Name (r_Algorithm), ma_Translation (r_Translation) {} - const String& GetAlgorithm () const { return ma_Name; } + const String& GetAlgorithm () const { return ma_Name; } - const String& GetTranslation () const { return ma_Translation; } + const String& GetTranslation () const { return ma_Translation; } ~IndexEntryRessourceData () {} IndexEntryRessourceData& operator= (const IndexEntryRessourceData& r_From) { - ma_Name = r_From.GetAlgorithm(); - ma_Translation = r_From.GetTranslation(); + ma_Name = r_From.GetAlgorithm(); + ma_Translation = r_From.GetTranslation(); return *this; } }; diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index 2a3153109eed..42da1eb19bdc 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,7 +97,7 @@ public: SvStringsDtor* pURLs; SvStringsDtor* pCompletions; const IUrlFilter* pUrlFilter; - ::std::vector< WildCard > m_aFilters; + ::std::vector< WildCard > m_aFilters; static sal_Bool TildeParsing( String& aText, String& aBaseUrl ); @@ -115,18 +115,18 @@ class SvtMatchContext_Impl : public ::osl::Thread { static ::osl::Mutex* pDirMutex; - SvStringsDtor aPickList; + SvStringsDtor aPickList; SvStringsDtor* pCompletions; SvStringsDtor* pURLs; - svtools::AsynchronLink aLink; - String aBaseURL; + svtools::AsynchronLink aLink; + String aBaseURL; String aText; - SvtURLBox* pBox; + SvtURLBox* pBox; BOOL bStop; - BOOL bOnlyDirectories; - BOOL bNoSelection; + BOOL bOnlyDirectories; + BOOL bNoSelection; - DECL_STATIC_LINK( SvtMatchContext_Impl, Select_Impl, void* ); + DECL_STATIC_LINK( SvtMatchContext_Impl, Select_Impl, void* ); virtual void SAL_CALL onTerminated( ); virtual void SAL_CALL run(); @@ -140,7 +140,7 @@ public: SvtMatchContext_Impl( SvtURLBox* pBoxP, const String& rText ); ~SvtMatchContext_Impl(); - void Stop(); + void Stop(); }; ::osl::Mutex* SvtMatchContext_Impl::pDirMutex = 0; @@ -417,9 +417,9 @@ void SvtMatchContext_Impl::ReadFolder( const String& rURL, try { uno::Reference< XDynamicResultSet > xDynResultSet; - ResultSetInclude eInclude = INCLUDE_FOLDERS_AND_DOCUMENTS; + ResultSetInclude eInclude = INCLUDE_FOLDERS_AND_DOCUMENTS; if ( bOnlyDirectories ) - eInclude = INCLUDE_FOLDERS_ONLY; + eInclude = INCLUDE_FOLDERS_ONLY; xDynResultSet = aCnt.createDynamicCursor( aProps, eInclude ); @@ -553,7 +553,7 @@ String SvtURLBox::ParseSmart( String aText, String aBaseURL, String aWorkDir ) // HRO: I suppose this hack should only be done for Windows !!!??? #ifdef WNT // HRO: INetURLObject::smatRel2Abs does not recognize '\\' as a relative path - // but in case of "\\\\" INetURLObject is right - this is an absolute path ! + // but in case of "\\\\" INetURLObject is right - this is an absolute path ! if( aText.Search( '\\' ) == 0 && (aText.Len() < 2 || aText.GetChar( 1 ) != '\\') ) { diff --git a/svtools/source/control/prgsbar.cxx b/svtools/source/control/prgsbar.cxx index 500a3a5c4227..77c3b2148bb8 100644 --- a/svtools/source/control/prgsbar.cxx +++ b/svtools/source/control/prgsbar.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,15 +37,15 @@ // ======================================================================= -#define PROGRESSBAR_OFFSET 3 -#define PROGRESSBAR_WIN_OFFSET 2 +#define PROGRESSBAR_OFFSET 3 +#define PROGRESSBAR_WIN_OFFSET 2 // ======================================================================= void ProgressBar::ImplInit() { - mnPercent = 0; - mbCalcNew = TRUE; + mnPercent = 0; + mbCalcNew = TRUE; ImplInitSettings( TRUE, TRUE, TRUE ); } diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx index 55677bb15e67..c26fbdd4d912 100644 --- a/svtools/source/control/roadmap.cxx +++ b/svtools/source/control/roadmap.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,7 +67,7 @@ namespace svt public: IDLabel( Window* _pParent, WinBits _nWinStyle = 0 ); ~IDLabel( ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); }; //===================================================================== @@ -76,7 +76,7 @@ namespace svt class ColorChanger { protected: - OutputDevice* m_pDev; + OutputDevice* m_pDev; public: ColorChanger( OutputDevice* _pDev, const Color& _rNewLineColor, const Color& _rNewFillColor ) @@ -106,33 +106,33 @@ namespace svt public: RoadmapItem( ORoadmap& _rParent, const Size& _rItemPlayground ); ~RoadmapItem( ); + + void SetID( sal_Int16 _ID ); + sal_Int16 GetID() const; - void SetID( sal_Int16 _ID ); - sal_Int16 GetID() const; - - void SetIndex( ItemIndex _Index ); + void SetIndex( ItemIndex _Index ); ItemIndex GetIndex() const; - void SetLabel( const ::rtl::OUString& _rText ); - ::rtl::OUString GetLabel( ); + void SetLabel( const ::rtl::OUString& _rText ); + ::rtl::OUString GetLabel( ); - void Update( ItemIndex _RMIndex, const ::rtl::OUString& _rText ); + void Update( ItemIndex _RMIndex, const ::rtl::OUString& _rText ); + + void SetPosition( RoadmapItem* OldHyperLabel ); - void SetPosition( RoadmapItem* OldHyperLabel ); + void ToggleBackgroundColor( const Color& _rGBColor ); + void SetInteractive( sal_Bool _bInteractive ); - void ToggleBackgroundColor( const Color& _rGBColor ); - void SetInteractive( sal_Bool _bInteractive ); - - void SetClickHdl( const Link& rLink ); - const Link& GetClickHdl() const; - void SetZOrder( RoadmapItem* pRefRoadmapHyperLabel, USHORT nFlags ); - void Enable( BOOL bEnable = TRUE); - BOOL IsEnabled() const; - void GrabFocus(); + void SetClickHdl( const Link& rLink ); + const Link& GetClickHdl() const; + void SetZOrder( RoadmapItem* pRefRoadmapHyperLabel, USHORT nFlags ); + void Enable( BOOL bEnable = TRUE); + BOOL IsEnabled() const; + void GrabFocus(); bool Contains( const Window* _pWindow ) const; - - HyperLabel* GetDescriptionHyperLabel() const { return mpDescription; } + + HyperLabel* GetDescriptionHyperLabel() const { return mpDescription; } private: void ImplUpdateIndex( const ItemIndex _nIndex ); @@ -147,7 +147,7 @@ namespace svt protected: const ORoadmap& m_rAntiImpl; Link m_aSelectHdl; - BitmapEx m_aPicture; + BitmapEx m_aPicture; HL_Vector m_aRoadmapSteps; ItemId m_iCurItemID; sal_Bool m_bInteractive; @@ -165,10 +165,10 @@ namespace svt RoadmapItem* InCompleteHyperLabel; - void addHyperLabel( RoadmapItem* _rRoadmapStep ) { m_aRoadmapSteps.push_back(_rRoadmapStep); } + void addHyperLabel( RoadmapItem* _rRoadmapStep ) { m_aRoadmapSteps.push_back(_rRoadmapStep); } - HL_Vector& getHyperLabels() { return m_aRoadmapSteps; } - const HL_Vector& getHyperLabels() const { return m_aRoadmapSteps; } + HL_Vector& getHyperLabels() { return m_aRoadmapSteps; } + const HL_Vector& getHyperLabels() const { return m_aRoadmapSteps; } void insertHyperLabel( ItemIndex _Index, RoadmapItem* _rRoadmapStep ) { m_aRoadmapSteps.insert( m_aRoadmapSteps.begin() + _Index, _rRoadmapStep ); } @@ -183,11 +183,11 @@ namespace svt void setComplete(const sal_Bool _bComplete) {m_bComplete = _bComplete; } sal_Bool isComplete() const { return m_bComplete; }; - void setPicture( const BitmapEx& _rPic ) { m_aPicture = _rPic; } - const BitmapEx& getPicture( ) const { return m_aPicture; } + void setPicture( const BitmapEx& _rPic ) { m_aPicture = _rPic; } + const BitmapEx& getPicture( ) const { return m_aPicture; } - void setSelectHdl( const Link& _rHdl ) { m_aSelectHdl = _rHdl; } - const Link& getSelectHdl( ) const { return m_aSelectHdl; } + void setSelectHdl( const Link& _rHdl ) { m_aSelectHdl = _rHdl; } + const Link& getSelectHdl( ) const { return m_aSelectHdl; } void initItemSize(); const Size& getItemSize() const { return m_aItemSizePixel; } @@ -763,9 +763,9 @@ namespace svt //--------------------------------------------------------------------- void ORoadmap::DataChanged( const DataChangedEvent& rDCEvt ) { - if ((( rDCEvt.GetType() == DATACHANGED_SETTINGS ) || - ( rDCEvt.GetType() == DATACHANGED_DISPLAY )) && - ( rDCEvt.GetFlags() & SETTINGS_STYLE )) + if ((( rDCEvt.GetType() == DATACHANGED_SETTINGS ) || + ( rDCEvt.GetType() == DATACHANGED_DISPLAY )) && + ( rDCEvt.GetFlags() & SETTINGS_STYLE )) { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); SetBackground( Wallpaper( rStyleSettings.GetFieldColor() ) ); @@ -999,9 +999,9 @@ namespace svt { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); FixedText::DataChanged( rDCEvt ); - if ((( rDCEvt.GetType() == DATACHANGED_SETTINGS ) || - ( rDCEvt.GetType() == DATACHANGED_DISPLAY )) && - ( rDCEvt.GetFlags() & SETTINGS_STYLE )) + if ((( rDCEvt.GetType() == DATACHANGED_SETTINGS ) || + ( rDCEvt.GetType() == DATACHANGED_DISPLAY )) && + ( rDCEvt.GetFlags() & SETTINGS_STYLE )) { const Color& rGBColor = GetControlBackground(); if (rGBColor == COL_TRANSPARENT) @@ -1019,7 +1019,7 @@ namespace svt //......................................................................... -} // namespace svt +} // namespace svt //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index 43cdf1132c43..2395050eeff8 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -82,7 +82,7 @@ #define RULER_UNIT_MILE 6 #define RULER_UNIT_POINT 7 #define RULER_UNIT_PICA 8 -#define RULER_UNIT_CHAR 9 +#define RULER_UNIT_CHAR 9 #define RULER_UNIT_LINE 10 #define RULER_UNIT_COUNT 11 @@ -149,7 +149,7 @@ static ImplRulerUnitData aImplRulerUnitTab[RULER_UNIT_COUNT] = { MAP_10TH_INCH, 633600, 63360, 316800, 633600, 1609344, 4, " miles" }, // MILE { MAP_POINT, 1, 12, 12, 36, 353, 2, " pt" }, // POINT { MAP_100TH_MM, 423, 423, 423, 846, 423, 3, " pi" }, // PICA -{ MAP_100TH_MM, 371, 371, 371, 743, 371, 3, " ch" }, // CHAR +{ MAP_100TH_MM, 371, 371, 371, 743, 371, 3, " ch" }, // CHAR { MAP_100TH_MM, 551, 551, 551, 1102, 551, 3, " li" } // LINE }; @@ -1301,7 +1301,7 @@ void Ruler::ImplFormat() Size aVirDevSize; BOOL b3DLook = !(rStyleSettings.GetOptions() & STYLE_OPTION_MONO); - // initialize VirtualDevice + // initialize VirtualDevice if ( mnWinStyle & WB_HORZ ) { aVirDevSize.Width() = mnVirWidth; @@ -1513,16 +1513,16 @@ void Ruler::ImplDraw() if(mpData->bTextRTL) aVirDevSize.Width() -= maExtraRect.GetWidth(); -// else -// aVirDevSize.Width() -= mnVirOff; +// else +// aVirDevSize.Width() -= mnVirOff; aOffPos.Y() = RULER_OFF; } else { aOffPos.X() = RULER_OFF; aOffPos.Y() = mnVirOff; -// else -// aVirDevSize.Height() -= mnVirOff; +// else +// aVirDevSize.Height() -= mnVirOff; } DrawOutDev( aOffPos, aVirDevSize, Point(), aVirDevSize, maVirDev ); diff --git a/svtools/source/control/scriptedtext.cxx b/svtools/source/control/scriptedtext.cxx index adc92f75e719..ff07effa4c1e 100644 --- a/svtools/source/control/scriptedtext.cxx +++ b/svtools/source/control/scriptedtext.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/svtools/source/control/scrwin.cxx b/svtools/source/control/scrwin.cxx index 4c748b17ce3e..17230995a57a 100644 --- a/svtools/source/control/scrwin.cxx +++ b/svtools/source/control/scrwin.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -192,21 +192,21 @@ void __EXPORT ScrollableWindow::Resize() const long nScrSize = GetSettings().GetStyleSettings().GetScrollBarSize(); BOOL bVVisible = FALSE; // by default no vertical-ScrollBar BOOL bHVisible = FALSE; // by default no horizontal-ScrollBar - BOOL bChanged; // determines if a visiblility was changed + BOOL bChanged; // determines if a visiblility was changed do { bChanged = FALSE; // does we need a vertical ScrollBar if ( aOutPixSz.Width() < aTotPixSz.Width() && !bHVisible ) - { bHVisible = TRUE; + { bHVisible = TRUE; aOutPixSz.Height() -= nScrSize; bChanged = TRUE; } // does we need a horizontal ScrollBar if ( aOutPixSz.Height() < aTotPixSz.Height() && !bVVisible ) - { bVVisible = TRUE; + { bVVisible = TRUE; aOutPixSz.Width() -= nScrSize; bChanged = TRUE; } @@ -350,7 +350,7 @@ void ScrollableWindow::SetVisibleSize( const Size& rNewSize ) // get maximum rectangle for us from our parent-window (subst our border!) Rectangle aMax( Point(0, 0), GetParent()->GetOutputSizePixel() ); - aMax.Left() -= ( Window::GetSizePixel().Width() - + aMax.Left() -= ( Window::GetSizePixel().Width() - Window::GetOutputSizePixel().Width() ); aMax.Bottom() -= (Window::GetSizePixel().Height() - Window::GetOutputSizePixel().Height()); @@ -359,7 +359,7 @@ void ScrollableWindow::SetVisibleSize( const Size& rNewSize ) BOOL bHScroll = FALSE; const long nScrSize = GetSettings().GetStyleSettings().GetScrollBarSize(); if ( aWill.Width() < aWish.GetSize().Width() ) - { bHScroll = TRUE; + { bHScroll = TRUE; aWill.Height() = Min( aWill.Height()+nScrSize, aMax.GetSize().Height() ); } diff --git a/svtools/source/control/stdctrl.cxx b/svtools/source/control/stdctrl.cxx index 55aa20209699..e9040491b682 100644 --- a/svtools/source/control/stdctrl.cxx +++ b/svtools/source/control/stdctrl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/svtools/source/control/stdmenu.cxx b/svtools/source/control/stdmenu.cxx index 13a9cdacfc5e..c144698337df 100644 --- a/svtools/source/control/stdmenu.cxx +++ b/svtools/source/control/stdmenu.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -202,25 +202,25 @@ void FontStyleMenu::Fill( const XubString& rName, const FontList* pList ) sal_Handle hFontInfo = pList->GetFirstFontInfo( rName ); if ( hFontInfo ) { - XubString aStyleText; - USHORT nPos = 0; - USHORT nId = FONTSTYLEMENU_FIRSTID; - FontWeight eLastWeight = WEIGHT_DONTKNOW; - FontItalic eLastItalic = ITALIC_NONE; - FontWidth eLastWidth = WIDTH_DONTKNOW; - BOOL bNormal = FALSE; - BOOL bItalic = FALSE; - BOOL bBold = FALSE; - BOOL bBoldItalic = FALSE; - BOOL bInsert = FALSE; - FontInfo aInfo; + XubString aStyleText; + USHORT nPos = 0; + USHORT nId = FONTSTYLEMENU_FIRSTID; + FontWeight eLastWeight = WEIGHT_DONTKNOW; + FontItalic eLastItalic = ITALIC_NONE; + FontWidth eLastWidth = WIDTH_DONTKNOW; + BOOL bNormal = FALSE; + BOOL bItalic = FALSE; + BOOL bBold = FALSE; + BOOL bBoldItalic = FALSE; + BOOL bInsert = FALSE; + FontInfo aInfo; while ( hFontInfo ) { aInfo = pList->GetFontInfo( hFontInfo ); - FontWeight eWeight = aInfo.GetWeight(); - FontItalic eItalic = aInfo.GetItalic(); - FontWidth eWidth = aInfo.GetWidthType(); + FontWeight eWeight = aInfo.GetWeight(); + FontItalic eItalic = aInfo.GetItalic(); + FontWidth eWidth = aInfo.GetWidthType(); // Only if the attributes are different, we insert the // Font to avoid double Entries in different languages if ( (eWeight != eLastWeight) || (eItalic != eLastItalic) || @@ -329,7 +329,7 @@ void FontStyleMenu::Fill( const XubString& rName, const FontList* pList ) else { // Wenn Font nicht, dann Standard-Styles einfuegen - InsertItem( FONTSTYLEMENU_FIRSTID, pList->GetNormalStr(), + InsertItem( FONTSTYLEMENU_FIRSTID, pList->GetNormalStr(), MIB_RADIOCHECK | MIB_AUTOCHECK, 0 ); InsertItem( FONTSTYLEMENU_FIRSTID+1, pList->GetItalicStr(), MIB_RADIOCHECK | MIB_AUTOCHECK, 0 ); @@ -446,8 +446,8 @@ void FontSizeMenu::Fill( const FontInfo& rInfo, const FontList* pList ) ULONG nCount = aFontSizeNames.Count(); for( ULONG i = 0; i < nCount; i++ ) { - String aSizeName = aFontSizeNames.GetIndexName( i ); - long nSize = aFontSizeNames.GetIndexSize( i ); + String aSizeName = aFontSizeNames.GetIndexName( i ); + long nSize = aFontSizeNames.GetIndexSize( i ); mpHeightAry[nPos] = nSize; nPos++; // Id is nPos+1 InsertItem( nPos, aSizeName, MIB_RADIOCHECK | MIB_AUTOCHECK ); @@ -492,9 +492,9 @@ void FontSizeMenu::SetCurHeight( long nHeight ) mnCurHeight = nHeight; // check menue item - XubString aHeight = Application::GetSettings().GetUILocaleI18nHelper().GetNum( nHeight, 1, TRUE, FALSE ); - USHORT nChecked = 0; - USHORT nItemCount = GetItemCount(); + XubString aHeight = Application::GetSettings().GetUILocaleI18nHelper().GetNum( nHeight, 1, TRUE, FALSE ); + USHORT nChecked = 0; + USHORT nItemCount = GetItemCount(); for( USHORT i = 0; i < nItemCount; i++ ) { USHORT nItemId = GetItemId( i ); diff --git a/svtools/source/control/svxbox.cxx b/svtools/source/control/svxbox.cxx index 5dbf505d4946..0ffb10517abe 100644 --- a/svtools/source/control/svxbox.cxx +++ b/svtools/source/control/svxbox.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -89,7 +89,7 @@ SvxListBox::SvxListBox(Window* pParent, const ResId& rId): __EXPORT SvxListBox::~SvxListBox() { - aEntryLst.DeleteAndDestroy(0, aEntryLst.Count()); + aEntryLst.DeleteAndDestroy(0, aEntryLst.Count()); aDelEntryLst.DeleteAndDestroy(0, aDelEntryLst.Count()); } @@ -102,7 +102,7 @@ void SvxListBox::InitListBox() // Verwaltung fuer die Stringlist aus der Resource aufbauen USHORT nSize = GetEntryCount(); for(USHORT i=0; i < nSize; ++i) - { const SvxBoxEntry* pTmp = new SvxBoxEntry(ListBox::GetEntry(i), i); + { const SvxBoxEntry* pTmp = new SvxBoxEntry(ListBox::GetEntry(i), i); const SvxBoxEntry* &rpTmp = pTmp; aEntryLst.Insert(rpTmp, aEntryLst.Count()); } @@ -228,7 +228,7 @@ USHORT SvxListBox::GetModifiedCount() const USHORT nMod = 0; USHORT nSize = aEntryLst.Count(); for(USHORT i=0; i < nSize; ++i) - { if(aEntryLst[i]->bModified) + { if(aEntryLst[i]->bModified) nMod++; } return nMod; @@ -245,8 +245,8 @@ void SvxListBox::ModifyEntry(USHORT nPos, const String& rName) SvxBoxEntry* pEntry = aEntryLst[nPos]; aEntryLst.Remove(nPos, 1); - aEntryLst[nPos]->aName = rName; - aEntryLst[nPos]->bModified = TRUE; + aEntryLst[nPos]->aName = rName; + aEntryLst[nPos]->bModified = TRUE; ListBox::RemoveEntry(nPos); InsertSorted(pEntry); @@ -261,8 +261,8 @@ const SvxBoxEntry& SvxListBox::GetModifiedEntry(USHORT nPos) const USHORT nSize = aEntryLst.Count(); USHORT nMod = 0; for(USHORT i=0; i < nSize; ++i) - { if(aEntryLst[i]->bModified) - { if(nMod == nPos) + { if(aEntryLst[i]->bModified) + { if(nMod == nPos) return *aEntryLst[i]; nMod++; } @@ -297,14 +297,14 @@ USHORT SvxListBox::GetNewCount() const USHORT nNew = 0; USHORT nSize = aEntryLst.Count(); for(USHORT i=0; i < nSize; ++i) - { if(aEntryLst[i]->bNew) + { if(aEntryLst[i]->bNew) nNew++; } return nNew; } /*-------------------------------------------------------------------- - Beschreibung: Alle neuen Eintraege ueberpruefen + Beschreibung: Alle neuen Eintraege ueberpruefen --------------------------------------------------------------------*/ const SvxBoxEntry& SvxListBox::GetNewEntry(USHORT nPos) const @@ -312,8 +312,8 @@ const SvxBoxEntry& SvxListBox::GetNewEntry(USHORT nPos) const USHORT nSize = aEntryLst.Count(); USHORT nNew = 0; for(USHORT i=0; i < nSize; ++i) - { if(aEntryLst[i]->bNew) - { if(nNew == nPos) + { if(aEntryLst[i]->bNew) + { if(nNew == nPos) return *aEntryLst[i]; nNew++; } @@ -357,7 +357,7 @@ SvxComboBox::SvxComboBox(Window* pParent, const ResId& rId, USHORT nStyleBits ): __EXPORT SvxComboBox::~SvxComboBox() { - aEntryLst.DeleteAndDestroy(0, aEntryLst.Count()); + aEntryLst.DeleteAndDestroy(0, aEntryLst.Count()); aDelEntryLst.DeleteAndDestroy(0, aDelEntryLst.Count()); } @@ -370,7 +370,7 @@ void SvxComboBox::InitComboBox() // Verwaltung fuer die Stringlist aus der Resource aufbauen USHORT nSize = GetEntryCount(); for(USHORT i=0; i < nSize; ++i) - { const SvxBoxEntry* pTmp = new SvxBoxEntry(ComboBox::GetEntry(i), i); + { const SvxBoxEntry* pTmp = new SvxBoxEntry(ComboBox::GetEntry(i), i); const SvxBoxEntry* &rpTmp = pTmp; aEntryLst.Insert(rpTmp, aEntryLst.Count()); } @@ -470,7 +470,7 @@ USHORT SvxComboBox::GetModifiedCount() const USHORT nMod = 0; USHORT nSize = aEntryLst.Count(); for(USHORT i=0; i < nSize; ++i) - { if(aEntryLst[i]->bModified) + { if(aEntryLst[i]->bModified) nMod++; } return nMod; @@ -487,8 +487,8 @@ void SvxComboBox::ModifyEntry(USHORT nPos, const String& rName) SvxBoxEntry* pEntry = aEntryLst[nPos]; aEntryLst.Remove(nPos, 1); - aEntryLst[nPos]->aName = rName; - aEntryLst[nPos]->bModified = TRUE; + aEntryLst[nPos]->aName = rName; + aEntryLst[nPos]->bModified = TRUE; ComboBox::RemoveEntry(nPos); InsertSorted(pEntry); @@ -503,8 +503,8 @@ const SvxBoxEntry& SvxComboBox::GetModifiedEntry(USHORT nPos) const USHORT nSize = aEntryLst.Count(); USHORT nMod = 0; for(USHORT i=0; i < nSize; ++i) - { if(aEntryLst[i]->bModified) - { if(nMod == nPos) + { if(aEntryLst[i]->bModified) + { if(nMod == nPos) return *aEntryLst[i]; nMod++; } @@ -539,14 +539,14 @@ USHORT SvxComboBox::GetNewCount() const USHORT nNew = 0; USHORT nSize = aEntryLst.Count(); for(USHORT i=0; i < nSize; ++i) - { if(aEntryLst[i]->bNew) + { if(aEntryLst[i]->bNew) nNew++; } return nNew; } /*-------------------------------------------------------------------- - Beschreibung: Alle neuen Eintraege ueberpruefen + Beschreibung: Alle neuen Eintraege ueberpruefen --------------------------------------------------------------------*/ const SvxBoxEntry& SvxComboBox::GetNewEntry(USHORT nPos) const @@ -554,8 +554,8 @@ const SvxBoxEntry& SvxComboBox::GetNewEntry(USHORT nPos) const USHORT nSize = aEntryLst.Count(); USHORT nNew = 0; for(USHORT i=0; i < nSize; ++i) - { if(aEntryLst[i]->bNew) - { if(nNew == nPos) + { if(aEntryLst[i]->bNew) + { if(nNew == nPos) return *aEntryLst[i]; nNew++; } @@ -589,7 +589,7 @@ void __EXPORT SvxComboBox::KeyInput( const KeyEvent& rKEvt ) if( cChar == sal_Unicode( '/' ) || cChar == sal_Unicode( ' ' ) ) return; #else - if( cChar == sal_Unicode( ':' ) || cChar == sal_Unicode( '\\' ) || + if( cChar == sal_Unicode( ':' ) || cChar == sal_Unicode( '\\' ) || cChar == sal_Unicode( '.' ) || cChar == sal_Unicode( ' ' ) ) return; #endif diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index 0dae1ae3eb20..7b951212ea4d 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/svtools/source/control/taskbar.cxx b/svtools/source/control/taskbar.cxx index 185989c5b68f..6995ce4659eb 100644 --- a/svtools/source/control/taskbar.cxx +++ b/svtools/source/control/taskbar.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 ImplTaskBarFloat : public FloatingWindow { public: - TaskBar* mpTaskBar; + TaskBar* mpTaskBar; public: ImplTaskBarFloat( TaskBar* pTaskBar ); @@ -54,33 +54,33 @@ public: ImplTaskBarFloat::ImplTaskBarFloat( TaskBar* pTaskBar ) : FloatingWindow( pTaskBar, 0 ) { - mpTaskBar = pTaskBar; + mpTaskBar = pTaskBar; } // ======================================================================= -#define TASKBAR_BORDER 2 -#define TASKBAR_OFFSIZE 3 -#define TASKBAR_OFFX 2 -#define TASKBAR_OFFY 1 -#define TASKBAR_BUTTONOFF 5 -#define TASKBAR_AUTOHIDE_HEIGHT 2 +#define TASKBAR_BORDER 2 +#define TASKBAR_OFFSIZE 3 +#define TASKBAR_OFFX 2 +#define TASKBAR_OFFY 1 +#define TASKBAR_BUTTONOFF 5 +#define TASKBAR_AUTOHIDE_HEIGHT 2 // ======================================================================= TaskBar::TaskBar( Window* pParent, WinBits nWinStyle ) : Window( pParent, WB_3DLOOK ) { - mpButtonBar = NULL; - mpTaskToolBox = NULL; - mpStatusBar = NULL; - mnStatusWidth = 0; - mnOldStatusWidth = 0; - mnLines = 1; - mnWinBits = nWinStyle; - mbStatusText = FALSE; - mbShowItems = FALSE; - mbAutoHide = FALSE; + mpButtonBar = NULL; + mpTaskToolBox = NULL; + mpStatusBar = NULL; + mnStatusWidth = 0; + mnOldStatusWidth = 0; + mnLines = 1; + mnWinBits = nWinStyle; + mbStatusText = FALSE; + mbShowItems = FALSE; + mbAutoHide = FALSE; ImplInitSettings(); } @@ -161,14 +161,14 @@ void TaskBar::MouseMove( const MouseEvent& rMEvt ) { if ( mnWinBits & WB_SIZEABLE ) { - TaskToolBox* pTempTaskToolBox = GetTaskToolBox(); - TaskStatusBar* pTempStatusBar = GetStatusBar(); + TaskToolBox* pTempTaskToolBox = GetTaskToolBox(); + TaskStatusBar* pTempStatusBar = GetStatusBar(); if ( pTempTaskToolBox && pTempStatusBar ) { - long nStatusX = pTempStatusBar->GetPosPixel().X()-TASKBAR_OFFSIZE-2; - long nMouseX = rMEvt.GetPosPixel().X(); - PointerStyle ePtrStyle; + long nStatusX = pTempStatusBar->GetPosPixel().X()-TASKBAR_OFFSIZE-2; + long nMouseX = rMEvt.GetPosPixel().X(); + PointerStyle ePtrStyle; if ( (nMouseX >= nStatusX-1) && (nMouseX <= nStatusX+3) ) ePtrStyle = POINTER_HSIZEBAR; else @@ -185,13 +185,13 @@ void TaskBar::MouseButtonDown( const MouseEvent& rMEvt ) { if ( rMEvt.IsLeft() && (mnWinBits & WB_SIZEABLE) ) { - TaskToolBox* pTempTaskToolBox = GetTaskToolBox(); - TaskStatusBar* pTempStatusBar = GetStatusBar(); + TaskToolBox* pTempTaskToolBox = GetTaskToolBox(); + TaskStatusBar* pTempStatusBar = GetStatusBar(); if ( pTempTaskToolBox && pTempStatusBar ) { - long nStatusX = pTempStatusBar->GetPosPixel().X()-TASKBAR_OFFSIZE-2; - long nMouseX = rMEvt.GetPosPixel().X(); + long nStatusX = pTempStatusBar->GetPosPixel().X()-TASKBAR_OFFSIZE-2; + long nMouseX = rMEvt.GetPosPixel().X(); if ( (nMouseX >= nStatusX-1) && (nMouseX <= nStatusX+3) ) { if ( rMEvt.GetClicks() == 2 ) @@ -248,9 +248,9 @@ void TaskBar::Paint( const Rectangle& rRect ) { if ( mnWinBits & (WB_BORDER | WB_SIZEABLE) ) { - const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); - Size aSize = GetOutputSizePixel(); - long nY = 0; + const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); + Size aSize = GetOutputSizePixel(); + long nY = 0; if ( mnWinBits & WB_BORDER ) { @@ -263,9 +263,9 @@ void TaskBar::Paint( const Rectangle& rRect ) if ( (mnWinBits & WB_SIZEABLE) ) { - //TaskButtonBar* pTempButtonBar = GetButtonBar(); - TaskToolBox* pTempTaskToolBox = GetTaskToolBox(); - TaskStatusBar* pTempStatusBar = GetStatusBar(); + //TaskButtonBar* pTempButtonBar = GetButtonBar(); + TaskToolBox* pTempTaskToolBox = GetTaskToolBox(); + TaskStatusBar* pTempStatusBar = GetStatusBar(); if ( pTempTaskToolBox && pTempStatusBar ) { @@ -292,16 +292,16 @@ void TaskBar::Resize() if ( !IsReallyShown() ) return; - TaskButtonBar* pTempButtonBar = GetButtonBar(); - TaskToolBox* pTempTaskToolBox = GetTaskToolBox(); - TaskStatusBar* pTempStatusBar = GetStatusBar(); - Point aToolPos( TASKBAR_OFFX, 0 ); - Size aSize = GetOutputSizePixel(); - Size aStatusSize; - Size aToolSize( aSize.Width()-(TASKBAR_OFFX*2), 0 ); - long nOldStatusX = -1; - long nNewStatusX = -1; - long nTaskHeight = aSize.Height() - (TASKBAR_OFFY*2); + TaskButtonBar* pTempButtonBar = GetButtonBar(); + TaskToolBox* pTempTaskToolBox = GetTaskToolBox(); + TaskStatusBar* pTempStatusBar = GetStatusBar(); + Point aToolPos( TASKBAR_OFFX, 0 ); + Size aSize = GetOutputSizePixel(); + Size aStatusSize; + Size aToolSize( aSize.Width()-(TASKBAR_OFFX*2), 0 ); + long nOldStatusX = -1; + long nNewStatusX = -1; + long nTaskHeight = aSize.Height() - (TASKBAR_OFFY*2); if ( mnWinBits & WB_BORDER ) { @@ -311,8 +311,8 @@ void TaskBar::Resize() if ( pTempButtonBar ) { - USHORT i = 0; - BOOL bVisibleItems = FALSE; + USHORT i = 0; + BOOL bVisibleItems = FALSE; while ( i < pTempButtonBar->GetItemCount() ) { if ( pTempButtonBar->IsItemVisible( pTempButtonBar->GetItemId( i ) ) ) @@ -532,11 +532,11 @@ void TaskBar::HideStatusText() Size TaskBar::CalcWindowSizePixel() const { - TaskButtonBar* pTempButtonBar = GetButtonBar(); - TaskToolBox* pTempTaskToolBox = GetTaskToolBox(); - TaskStatusBar* pTempStatusBar = GetStatusBar(); - Size aSize; - long nTempHeight; + TaskButtonBar* pTempButtonBar = GetButtonBar(); + TaskToolBox* pTempTaskToolBox = GetTaskToolBox(); + TaskStatusBar* pTempStatusBar = GetStatusBar(); + Size aSize; + long nTempHeight; if ( pTempButtonBar && pTempButtonBar->GetItemCount() ) aSize.Height() = pTempButtonBar->CalcWindowSizePixel().Height()+(TASKBAR_OFFY*2); diff --git a/svtools/source/control/taskbox.cxx b/svtools/source/control/taskbox.cxx index 33c8002e0b46..8fa7434f646f 100644 --- a/svtools/source/control/taskbox.cxx +++ b/svtools/source/control/taskbox.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/svtools/source/control/taskmisc.cxx b/svtools/source/control/taskmisc.cxx index 1e4634a2a1fe..f293ffea556e 100644 --- a/svtools/source/control/taskmisc.cxx +++ b/svtools/source/control/taskmisc.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -112,30 +112,30 @@ void WindowArrange::ImplTile( const Rectangle& rRect ) return; } - USHORT i; - USHORT j; - USHORT nCols; - USHORT nRows; - USHORT nActRows; - USHORT nOffset; - long nOverWidth; - long nOverHeight; - Window* pWindow; - long nX = rRect.Left(); - long nY = rRect.Top(); - long nWidth = rRect.GetWidth(); - long nHeight = rRect.GetHeight(); - long nRectY = nY; - long nRectWidth = nWidth; - long nRectHeight = nHeight; - long nTempWidth; - long nTempHeight; - - nCols = ImplCeilSqareRoot( nCount ); + USHORT i; + USHORT j; + USHORT nCols; + USHORT nRows; + USHORT nActRows; + USHORT nOffset; + long nOverWidth; + long nOverHeight; + Window* pWindow; + long nX = rRect.Left(); + long nY = rRect.Top(); + long nWidth = rRect.GetWidth(); + long nHeight = rRect.GetHeight(); + long nRectY = nY; + long nRectWidth = nWidth; + long nRectHeight = nHeight; + long nTempWidth; + long nTempHeight; + + nCols = ImplCeilSqareRoot( nCount ); nOffset = (nCols*nCols) - nCount; if ( nOffset >= nCols ) { - nRows = nCols -1; + nRows = nCols -1; nOffset = nOffset - nCols; } else @@ -194,15 +194,15 @@ void WindowArrange::ImplTile( const Rectangle& rRect ) void WindowArrange::ImplHorz( const Rectangle& rRect ) { - long nCount = (long)mpWinList->Count(); - long nX = rRect.Left(); - long nY = rRect.Top(); - long nWidth = rRect.GetWidth(); - long nHeight = rRect.GetHeight(); - long nRectHeight = nHeight; - long nOver; - long nTempHeight; - Window* pWindow; + long nCount = (long)mpWinList->Count(); + long nX = rRect.Left(); + long nY = rRect.Top(); + long nWidth = rRect.GetWidth(); + long nHeight = rRect.GetHeight(); + long nRectHeight = nHeight; + long nOver; + long nTempHeight; + Window* pWindow; nHeight /= nCount; if ( nHeight < 1 ) @@ -228,15 +228,15 @@ void WindowArrange::ImplHorz( const Rectangle& rRect ) void WindowArrange::ImplVert( const Rectangle& rRect ) { - long nCount = (long)mpWinList->Count(); - long nX = rRect.Left(); - long nY = rRect.Top(); - long nWidth = rRect.GetWidth(); - long nHeight = rRect.GetHeight(); - long nRectWidth = nWidth; - long nOver; - long nTempWidth; - Window* pWindow; + long nCount = (long)mpWinList->Count(); + long nX = rRect.Left(); + long nY = rRect.Top(); + long nWidth = rRect.GetWidth(); + long nHeight = rRect.GetHeight(); + long nRectWidth = nWidth; + long nOver; + long nTempWidth; + Window* pWindow; nWidth /= nCount; if ( nWidth < 1 ) @@ -262,29 +262,29 @@ void WindowArrange::ImplVert( const Rectangle& rRect ) void WindowArrange::ImplCascade( const Rectangle& rRect ) { - long nX = rRect.Left(); - long nY = rRect.Top(); - long nWidth = rRect.GetWidth(); - long nHeight = rRect.GetHeight(); - long nRectWidth = nWidth; - long nRectHeight = nHeight; - long nOff; - long nCascadeWins; - sal_Int32 nLeftBorder; - sal_Int32 nTopBorder; - sal_Int32 nRightBorder; - sal_Int32 nBottomBorder; - long nStartOverWidth; - long nStartOverHeight; - long nOverWidth = 0; - long nOverHeight = 0; - long nTempX; - long nTempY; - long nTempWidth; - long nTempHeight; - long i; - Window* pWindow; - Window* pTempWindow; + long nX = rRect.Left(); + long nY = rRect.Top(); + long nWidth = rRect.GetWidth(); + long nHeight = rRect.GetHeight(); + long nRectWidth = nWidth; + long nRectHeight = nHeight; + long nOff; + long nCascadeWins; + sal_Int32 nLeftBorder; + sal_Int32 nTopBorder; + sal_Int32 nRightBorder; + sal_Int32 nBottomBorder; + long nStartOverWidth; + long nStartOverHeight; + long nOverWidth = 0; + long nOverHeight = 0; + long nTempX; + long nTempY; + long nTempWidth; + long nTempHeight; + long i; + Window* pWindow; + Window* pTempWindow; // Border-Fenster suchen um den Versatz zu ermitteln pTempWindow = (Window*)mpWinList->First(); @@ -304,7 +304,7 @@ void WindowArrange::ImplCascade( const Rectangle& rRect ) nCascadeWins = nRectHeight / 3 / nOff; if ( !nCascadeWins ) nCascadeWins = 1; - nWidth -= nCascadeWins*nOff; + nWidth -= nCascadeWins*nOff; nHeight -= nCascadeWins*nOff; if ( nWidth < 1 ) nWidth = 1; diff --git a/svtools/source/control/taskstat.cxx b/svtools/source/control/taskstat.cxx index 60e52ae1c4db..acba171d8ce7 100644 --- a/svtools/source/control/taskstat.cxx +++ b/svtools/source/control/taskstat.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx index b021cde67381..1ac3b9d2c197 100644 --- a/svtools/source/control/toolbarmenu.cxx +++ b/svtools/source/control/toolbarmenu.cxx @@ -98,7 +98,7 @@ ToolbarMenuEntry::ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, const Stri : mrMenu( rMenu ) { init( nEntryId, nBits ); - + maText = rText; mbHasText = true; } @@ -288,7 +288,7 @@ sal_Int32 ToolbarMenu_Impl::getAccessibleChildCount() throw (RuntimeException) } // -------------------------------------------------------------------- - + Reference< XAccessible > ToolbarMenu_Impl::getAccessibleChild( sal_Int32 index ) throw (IndexOutOfBoundsException, RuntimeException) { const int nEntryCount = maEntryVector.size(); @@ -310,7 +310,7 @@ Reference< XAccessible > ToolbarMenu_Impl::getAccessibleChild( sal_Int32 index ) } // -------------------------------------------------------------------- - + Reference< XAccessible > ToolbarMenu_Impl::getAccessibleChild( Control* pControl, sal_Int32 childIndex ) throw (IndexOutOfBoundsException, RuntimeException) { const int nEntryCount = maEntryVector.size(); @@ -691,7 +691,7 @@ Size ToolbarMenu::implCalcSize() if ( aMaxImgSz.Width() ) mpImpl->mnTextPos += std::max( nExtra, 7L ); - if ( bCheckable ) + if ( bCheckable ) mpImpl->mnTextPos += 16; // set heights, calc maximum width @@ -726,7 +726,7 @@ Size ToolbarMenu::implCalcSize() } } - + aSz.Width() = nMaxTextWidth + (BORDER_X<<1); // positionate controls @@ -881,7 +881,7 @@ void ToolbarMenu::implHighlightEntry( int nHighlightEntry, bool bHighlight ) { Size aSz( GetOutputSizePixel() ); long nX = 0, nY = 0; - + const int nEntryCount = mpImpl->maEntryVector.size(); int nEntry; for( nEntry = 0; nEntry < nEntryCount; nEntry++ ) @@ -913,7 +913,7 @@ void ToolbarMenu::implHighlightEntry( int nHighlightEntry, bool bHighlight ) long nFontHeight = GetTextHeight(); aItemRect.Right() -= nFontHeight + nFontHeight/4; } - + if( IsNativeControlSupported( CTRL_MENU_POPUP, PART_ENTIRE_CONTROL ) ) { Size aPxSize( GetOutputSizePixel() ); @@ -1019,7 +1019,7 @@ void ToolbarMenu::implHighlightEntry( const MouseEvent& rMEvt, bool bMBDown ) if ( ( nMouseY >= 0 ) && ( nMouseY < aOutSz.Height() ) ) { bool bHighlighted = FALSE; - + const int nEntryCount = mpImpl->maEntryVector.size(); int nEntry; for( nEntry = 0; nEntry < nEntryCount; nEntry++ ) @@ -1100,7 +1100,7 @@ static bool implCheckSubControlCursorMove( Control* pControl, bool bUp, int& nLa const USHORT nLine = nItemPos / nColCount; nLastColumn = nItemPos - (nLine * nColCount); - + if( bUp ) { return nLine > 0; @@ -1131,7 +1131,7 @@ ToolbarMenuEntry* ToolbarMenu::implCursorUpDown( bool bUp, bool bHomeEnd ) else n = mpImpl->maEntryVector.size()-1; } - else + else { // if we have a currently selected entry and // cursor keys are used than check if this entry @@ -1314,10 +1314,10 @@ static void ImplPaintCheckBackground( Window* i_pWindow, const Rectangle& i_rRec { ImplControlValue aControlValue; ControlState nState = CTRL_STATE_PRESSED | CTRL_STATE_ENABLED; - + aControlValue.setTristateVal( BUTTONVALUE_ON ); - - bNativeOk = i_pWindow->DrawNativeControl( CTRL_TOOLBAR, PART_BUTTON, + + bNativeOk = i_pWindow->DrawNativeControl( CTRL_TOOLBAR, PART_BUTTON, i_rRect, nState, aControlValue, rtl::OUString() ); } @@ -1333,7 +1333,7 @@ static void ImplPaintCheckBackground( Window* i_pWindow, const Rectangle& i_rRec static long ImplGetNativeCheckAndRadioSize( Window* pWin, long& rCheckHeight, long& rRadioHeight, long &rMaxWidth ) { rMaxWidth = rCheckHeight = rRadioHeight = 0; - + ImplControlValue aVal; Rectangle aNativeBounds; Rectangle aNativeContent; @@ -1453,7 +1453,7 @@ void ToolbarMenu::implPaint( ToolbarMenuEntry* pThisOnly, bool bHighlighted ) SetLineColor( rSettings.GetLightColor() ); DrawLine( aRect.TopLeft(), aRect.TopRight() ); SetLineColor( rSettings.GetShadowColor() ); - DrawLine( aRect.BottomLeft(), aRect.BottomRight() ); + DrawLine( aRect.BottomLeft(), aRect.BottomRight() ); } // CheckMark @@ -1475,29 +1475,29 @@ void ToolbarMenu::implPaint( ToolbarMenuEntry* pThisOnly, bool bHighlighted ) ControlPart nPart = ((pEntry->mnBits & MIB_RADIOCHECK) ? PART_MENU_ITEM_RADIO_MARK : PART_MENU_ITEM_CHECK_MARK); - + ControlState nState = 0; - + if ( pEntry->mbChecked ) nState |= CTRL_STATE_PRESSED; - + if ( pEntry->mbEnabled ) nState |= CTRL_STATE_ENABLED; - + if ( bHighlighted ) nState |= CTRL_STATE_SELECTED; - + long nCtrlHeight = (pEntry->mnBits & MIB_RADIOCHECK) ? nCheckHeight : nRadioHeight; aTmpPos.X() = aOuterCheckRect.Left() + (aOuterCheckRect.GetWidth() - nCtrlHeight)/2; aTmpPos.Y() = aOuterCheckRect.Top() + (aOuterCheckRect.GetHeight() - nCtrlHeight)/2; - - Rectangle aCheckRect( aTmpPos, Size( nCtrlHeight, nCtrlHeight ) ); + + Rectangle aCheckRect( aTmpPos, Size( nCtrlHeight, nCtrlHeight ) ); DrawNativeControl( CTRL_MENU_POPUP, nPart, aCheckRect, nState, ImplControlValue(), OUString() ); } else if ( pEntry->mbChecked ) // by default do nothing for unchecked items { ImplPaintCheckBackground( this, aOuterCheckRect, pThisOnly && bHighlighted ); - + SymbolType eSymbol; Size aSymbolSize; if ( pEntry->mnBits & MIB_RADIOCHECK ) @@ -1708,7 +1708,7 @@ void SAL_CALL ToolbarMenu::statusChanged( const ::com::sun::star::frame::Feature class ToolbarMenuStatusListener : public svt::FrameStatusListener { -public: +public: ToolbarMenuStatusListener( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xServiceManager, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, ToolbarMenu& rToolbarMenu ); @@ -1721,7 +1721,7 @@ public: // -------------------------------------------------------------------- -ToolbarMenuStatusListener::ToolbarMenuStatusListener( +ToolbarMenuStatusListener::ToolbarMenuStatusListener( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xServiceManager, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, ToolbarMenu& rToolbarMenu ) @@ -1791,7 +1791,7 @@ const Link& ToolbarMenu::GetSelectHdl() const // -------------------------------------------------------------------- -Reference< XFrame > ToolbarMenu::GetFrame() const +Reference< XFrame > ToolbarMenu::GetFrame() const { return mpImpl->mxFrame; } diff --git a/svtools/source/control/toolbarmenuacc.cxx b/svtools/source/control/toolbarmenuacc.cxx index 938d14bc854f..efb3f19ae467 100644 --- a/svtools/source/control/toolbarmenuacc.cxx +++ b/svtools/source/control/toolbarmenuacc.cxx @@ -210,7 +210,7 @@ sal_Int32 SAL_CALL ToolbarMenuAcc::getAccessibleIndexInParent() throw (RuntimeEx { const SolarMutexGuard aSolarGuard; ThrowIfDisposed(); - + Window* pParent = mpParent->mrMenu.GetParent(); if( pParent ) { @@ -382,7 +382,7 @@ Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleAtPoint( const aw Reference< XAccessible > xRet; const Point aVclPoint( aPoint.X, aPoint.Y ); - + const int nEntryCount = mpParent->maEntryVector.size(); for( int nEntry = 0; (nEntry < nEntryCount) && !xRet.is(); nEntry++ ) { diff --git a/svtools/source/control/toolbarmenuimp.hxx b/svtools/source/control/toolbarmenuimp.hxx index 0df8c8e78045..05bee8b34c8e 100644 --- a/svtools/source/control/toolbarmenuimp.hxx +++ b/svtools/source/control/toolbarmenuimp.hxx @@ -74,7 +74,7 @@ class ToolbarMenuEntry public: ToolbarMenu& mrMenu; - int mnEntryId; + int mnEntryId; MenuItemBits mnBits; Size maSize; @@ -254,8 +254,8 @@ public: virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException); private: - EventListenerVector mxEventListeners; - ::osl::Mutex maMutex; + EventListenerVector mxEventListeners; + ::osl::Mutex maMutex; ToolbarMenuEntry* mpParent; /** Tell all listeners that the object is dying. This callback is @@ -271,12 +271,12 @@ struct ToolbarMenu_Impl ToolbarMenu& mrMenu; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame; - rtl::Reference< svt::FrameStatusListener > mxStatusListener; + rtl::Reference< svt::FrameStatusListener > mxStatusListener; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxServiceManager; - rtl::Reference< ToolbarMenuAcc > mxAccessible; + rtl::Reference< ToolbarMenuAcc > mxAccessible; ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > mxOldSelection; - ToolbarMenuEntryVector maEntryVector; + ToolbarMenuEntryVector maEntryVector; int mnCheckPos; int mnImagePos; @@ -288,7 +288,7 @@ struct ToolbarMenu_Impl Size maSize; - Link maSelectHdl; + Link maSelectHdl; ToolbarMenu_Impl( ToolbarMenu& rMenu, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame ); ~ToolbarMenu_Impl(); diff --git a/svtools/source/control/urlcontrol.cxx b/svtools/source/control/urlcontrol.cxx index eeb562b2a663..edb4972aeb1d 100644 --- a/svtools/source/control/urlcontrol.cxx +++ b/svtools/source/control/urlcontrol.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ namespace svt } //......................................................................... -} // namespace svt +} // namespace svt //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx index 6187f655ade4..677edd376312 100644 --- a/svtools/source/control/valueacc.cxx +++ b/svtools/source/control/valueacc.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -1029,13 +1029,13 @@ uno::Reference< accessibility::XAccessibleStateSet > SAL_CALL ValueItemAcc::getA // SELECTABLE pStateSet->AddState( accessibility::AccessibleStateType::SELECTABLE ); - // pStateSet->AddState( accessibility::AccessibleStateType::FOCUSABLE ); + // pStateSet->AddState( accessibility::AccessibleStateType::FOCUSABLE ); // SELECTED if( mpParent->mrParent.GetSelectItemId() == mpParent->mnId ) { pStateSet->AddState( accessibility::AccessibleStateType::SELECTED ); - // pStateSet->AddState( accessibility::AccessibleStateType::FOCUSED ); + // pStateSet->AddState( accessibility::AccessibleStateType::FOCUSED ); } } @@ -1233,7 +1233,7 @@ sal_Int32 SAL_CALL ValueItemAcc::getForeground( ) // ----------------------------------------------------------------------------- -sal_Int32 SAL_CALL ValueItemAcc::getBackground( ) +sal_Int32 SAL_CALL ValueItemAcc::getBackground( ) throw (uno::RuntimeException) { UINT32 nColor; diff --git a/svtools/source/control/valueimp.hxx b/svtools/source/control/valueimp.hxx index 1c2d1812f8ad..47ba7eb476e2 100644 --- a/svtools/source/control/valueimp.hxx +++ b/svtools/source/control/valueimp.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,15 +50,15 @@ // - Defines - // ----------- -#define ITEM_OFFSET 4 -#define ITEM_OFFSET_DOUBLE 6 -#define NAME_LINE_OFF_X 2 -#define NAME_LINE_OFF_Y 2 -#define NAME_LINE_HEIGHT 2 -#define NAME_OFFSET 2 -#define SCRBAR_OFFSET 1 -#define VALUESET_ITEM_NONEITEM 0xFFFE -#define VALUESET_SCROLL_OFFSET 4 +#define ITEM_OFFSET 4 +#define ITEM_OFFSET_DOUBLE 6 +#define NAME_LINE_OFF_X 2 +#define NAME_LINE_OFF_Y 2 +#define NAME_LINE_HEIGHT 2 +#define NAME_OFFSET 2 +#define SCRBAR_OFFSET 1 +#define VALUESET_ITEM_NONEITEM 0xFFFE +#define VALUESET_SCROLL_OFFSET 4 // -------------------- // - ValueSetItemType - @@ -82,14 +82,14 @@ class ValueSet; struct ValueSetItem { ValueSet& mrParent; - USHORT mnId; - USHORT mnBits; - ValueSetItemType meType; - Image maImage; - Color maColor; - XubString maText; - void* mpData; - Rectangle maRect; + USHORT mnId; + USHORT mnBits; + ValueSetItemType meType; + Image maImage; + Color maColor; + XubString maText; + void* mpData; + Rectangle maRect; ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >* mpxAcc; ValueSetItem( ValueSet& rParent ); @@ -110,7 +110,7 @@ struct ValueSet_Impl { ::std::auto_ptr< ValueItemList > mpItemList; bool mbIsTransientChildrenDisabled; - Link maHighlightHdl; + Link maHighlightHdl; ValueSet_Impl() : mpItemList( ::std::auto_ptr< ValueItemList >( new ValueItemList() ) ), mbIsTransientChildrenDisabled( false ) diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index 97508e00fdc2..594cc3ea7230 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,36 +51,36 @@ void ValueSet::ImplInit() { - // Size aWinSize = GetSizePixel(); + // Size aWinSize = GetSizePixel(); mpImpl = new ValueSet_Impl; - mpNoneItem = NULL; - mpScrBar = NULL; - mnTextOffset = 0; - mnVisLines = 0; - mnLines = 0; - mnUserItemWidth = 0; - mnUserItemHeight = 0; - mnFirstLine = 0; - mnOldItemId = 0; - mnSelItemId = 0; - mnHighItemId = 0; - mnDropPos = VALUESET_ITEM_NOTFOUND; - mnCols = 0; - mnCurCol = 0; - mnUserCols = 0; - mnUserVisLines = 0; - mnSpacing = 0; - mnFrameStyle = 0; - mbFormat = TRUE; - mbHighlight = FALSE ; - mbSelection = FALSE; - mbNoSelection = TRUE; - mbDrawSelection = TRUE; - mbBlackSel = FALSE; - mbDoubleSel = FALSE; - mbScroll = FALSE; - mbDropPos = FALSE; - mbFullMode = TRUE; + mpNoneItem = NULL; + mpScrBar = NULL; + mnTextOffset = 0; + mnVisLines = 0; + mnLines = 0; + mnUserItemWidth = 0; + mnUserItemHeight = 0; + mnFirstLine = 0; + mnOldItemId = 0; + mnSelItemId = 0; + mnHighItemId = 0; + mnDropPos = VALUESET_ITEM_NOTFOUND; + mnCols = 0; + mnCurCol = 0; + mnUserCols = 0; + mnUserVisLines = 0; + mnSpacing = 0; + mnFrameStyle = 0; + mbFormat = TRUE; + mbHighlight = FALSE ; + mbSelection = FALSE; + mbNoSelection = TRUE; + mbDrawSelection = TRUE; + mbBlackSel = FALSE; + mbDoubleSel = FALSE; + mbScroll = FALSE; + mbDropPos = FALSE; + mbFullMode = TRUE; // #106446#, #106601# force mirroring of virtual device maVirDev.EnableRTL( GetParent()->IsRTLEnabled() ); @@ -232,10 +232,10 @@ void ValueSet::ImplFormatItem( ValueSetItem* pItem ) { if ( nStyle & WB_DOUBLEBORDER ) { - aRect.Left() += 2; - aRect.Top() += 2; - aRect.Right() -= 2; - aRect.Bottom() -= 2; + aRect.Left() += 2; + aRect.Top() += 2; + aRect.Right() -= 2; + aRect.Bottom() -= 2; } else { @@ -265,8 +265,8 @@ void ValueSet::ImplFormatItem( ValueSetItem* pItem ) maVirDev.SetTextFillColor(); maVirDev.SetFillColor( ( nStyle & WB_MENUSTYLEVALUESET ) ? rStyleSettings.GetMenuColor() : rStyleSettings.GetWindowColor() ); maVirDev.DrawRect( aRect ); - Point aTxtPos( aRect.Left()+2, aRect.Top() ); - long nTxtWidth = GetTextWidth( pItem->maText ); + Point aTxtPos( aRect.Left()+2, aRect.Top() ); + long nTxtWidth = GetTextWidth( pItem->maText ); if ( nStyle & WB_RADIOSEL ) { aTxtPos.X() += 4; @@ -306,9 +306,9 @@ void ValueSet::ImplFormatItem( ValueSetItem* pItem ) } else { - Size aImageSize = pItem->maImage.GetSizePixel(); - Size aRectSize = aRect.GetSize(); - Point aPos( aRect.Left(), aRect.Top() ); + Size aImageSize = pItem->maImage.GetSizePixel(); + Size aRectSize = aRect.GetSize(); + Point aPos( aRect.Left(), aRect.Top() ); aPos.X() += (aRectSize.Width()-aImageSize.Width())/2; aPos.Y() += (aRectSize.Height()-aImageSize.Height())/2; @@ -341,15 +341,15 @@ void ValueSet::ImplFormatItem( ValueSetItem* pItem ) void ValueSet::Format() { - Size aWinSize = GetOutputSizePixel(); + Size aWinSize = GetOutputSizePixel(); ULONG nItemCount = mpImpl->mpItemList->Count(); - WinBits nStyle = GetStyle(); - long nTxtHeight = GetTextHeight(); - long nOff; - long nSpace; - long nNoneHeight; - long nNoneSpace; - ScrollBar* pDelScrBar = NULL; + WinBits nStyle = GetStyle(); + long nTxtHeight = GetTextHeight(); + long nOff; + long nSpace; + long nNoneHeight; + long nNoneSpace; + ScrollBar* pDelScrBar = NULL; // Scrolling beruecksichtigen if ( nStyle & WB_VSCROLL ) @@ -462,7 +462,7 @@ void ValueSet::Format() } // Itemgroessen berechnen - long nColSpace = (mnCols-1)*nSpace; + long nColSpace = (mnCols-1)*nSpace; long nLineSpace = ((mnVisLines-1)*nSpace)+nNoneSpace; long nItemWidth; long nItemHeight; @@ -571,11 +571,11 @@ void ValueSet::Format() if ( !mpNoneItem ) mpNoneItem = new ValueSetItem( *this ); - mpNoneItem->mnId = 0; - mpNoneItem->meType = VALUESETITEM_NONE; - mpNoneItem->maRect.Left() = x; - mpNoneItem->maRect.Top() = y; - mpNoneItem->maRect.Right() = mpNoneItem->maRect.Left()+aWinSize.Width()-x-1; + mpNoneItem->mnId = 0; + mpNoneItem->meType = VALUESETITEM_NONE; + mpNoneItem->maRect.Left() = x; + mpNoneItem->maRect.Top() = y; + mpNoneItem->maRect.Right() = mpNoneItem->maRect.Left()+aWinSize.Width()-x-1; mpNoneItem->maRect.Bottom() = y+nNoneHeight-1; ImplFormatItem( mpNoneItem ); @@ -603,10 +603,10 @@ void ValueSet::Format() { const BOOL bWasEmpty = pItem->maRect.IsEmpty(); - pItem->maRect.Left() = x; - pItem->maRect.Top() = y; - pItem->maRect.Right() = pItem->maRect.Left()+nItemWidth-1; - pItem->maRect.Bottom() = pItem->maRect.Top()+nItemHeight-1; + pItem->maRect.Left() = x; + pItem->maRect.Top() = y; + pItem->maRect.Right() = pItem->maRect.Left()+nItemWidth-1; + pItem->maRect.Bottom() = pItem->maRect.Top()+nItemHeight-1; if( bWasEmpty && ImplHasAccessibleListeners() ) { @@ -643,8 +643,8 @@ void ValueSet::Format() // ScrollBar anordnen, Werte setzen und anzeigen if ( mpScrBar ) { - Point aPos( aWinSize.Width()-nScrBarWidth+SCRBAR_OFFSET, 0 ); - Size aSize( nScrBarWidth-SCRBAR_OFFSET, aWinSize.Height() ); + Point aPos( aWinSize.Width()-nScrBarWidth+SCRBAR_OFFSET, 0 ); + Size aSize( nScrBarWidth-SCRBAR_OFFSET, aWinSize.Height() ); // If a none field is visible, then we center the scrollbar if ( nStyle & WB_NONEFIELD ) { @@ -678,9 +678,9 @@ void ValueSet::ImplDrawItemText( const XubString& rText ) if ( !(GetStyle() & WB_NAMEFIELD) ) return; - Size aWinSize = GetOutputSizePixel(); - long nTxtWidth = GetTextWidth( rText ); - long nTxtOffset = mnTextOffset; + Size aWinSize = GetOutputSizePixel(); + long nTxtWidth = GetTextWidth( rText ); + long nTxtOffset = mnTextOffset; // Rechteck loeschen und Text ausgeben if ( GetStyle() & WB_FLATVALUESET ) @@ -753,8 +753,8 @@ void ValueSet::ImplDrawSelect() continue; // Selection malen - const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); - Rectangle aRect = pItem->maRect; + const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); + Rectangle aRect = pItem->maRect; Control::SetFillColor(); Color aDoubleColor( rStyleSettings.GetHighlightColor() ); @@ -799,10 +799,10 @@ void ValueSet::ImplDrawSelect() } else if ( nStyle & WB_RADIOSEL ) { - aRect.Left() += 3; - aRect.Top() += 3; - aRect.Right() -= 3; - aRect.Bottom() -= 3; + aRect.Left() += 3; + aRect.Top() += 3; + aRect.Right() -= 3; + aRect.Bottom() -= 3; if ( nStyle & WB_DOUBLEBORDER ) { aRect.Left()++; @@ -911,7 +911,7 @@ void ValueSet::ImplHideSelect( USHORT nItemId ) if ( !aRect.IsEmpty() ) { HideFocus(); - Point aPos = aRect.TopLeft(); + Point aPos = aRect.TopLeft(); Size aSize = aRect.GetSize(); DrawOutDev( aPos, aSize, aPos, aSize, maVirDev ); } @@ -944,10 +944,10 @@ void ValueSet::ImplDrawDropPos( BOOL bShow ) { if ( (mnDropPos != VALUESET_ITEM_NOTFOUND) && mpImpl->mpItemList->Count() ) { - USHORT nItemPos = mnDropPos; - USHORT nItemId1; - USHORT nItemId2 = 0; - BOOL bRight; + USHORT nItemPos = mnDropPos; + USHORT nItemId1; + USHORT nItemId2 = 0; + BOOL bRight; if ( nItemPos >= mpImpl->mpItemList->Count() ) { nItemPos = (USHORT)(mpImpl->mpItemList->Count()-1); @@ -985,8 +985,8 @@ void ValueSet::ImplDrawDropPos( BOOL bShow ) if ( bShow ) { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); - long nX; - long nY; + long nX; + long nY; SetLineColor( rStyleSettings.GetButtonTextColor() ); if ( !aRect1.IsEmpty() ) { @@ -1009,13 +1009,13 @@ void ValueSet::ImplDrawDropPos( BOOL bShow ) { if ( !aRect1.IsEmpty() ) { - Point aPos = aRect1.TopLeft(); + Point aPos = aRect1.TopLeft(); Size aSize = aRect1.GetSize(); DrawOutDev( aPos, aSize, aPos, aSize, maVirDev ); } if ( !aRect2.IsEmpty() ) { - Point aPos = aRect2.TopLeft(); + Point aPos = aRect2.TopLeft(); Size aSize = aRect2.GetSize(); DrawOutDev( aPos, aSize, aPos, aSize, maVirDev ); } @@ -1036,23 +1036,23 @@ void ValueSet::ImplDraw() HideFocus(); - Point aDefPos; - Size aSize = maVirDev.GetOutputSizePixel(); + Point aDefPos; + Size aSize = maVirDev.GetOutputSizePixel(); if ( mpScrBar && mpScrBar->IsVisible() ) { - Point aScrPos = mpScrBar->GetPosPixel(); - Size aScrSize = mpScrBar->GetSizePixel(); - Point aTempPos( 0, aScrPos.Y() ); - Size aTempSize( aSize.Width(), aScrPos.Y() ); + Point aScrPos = mpScrBar->GetPosPixel(); + Size aScrSize = mpScrBar->GetSizePixel(); + Point aTempPos( 0, aScrPos.Y() ); + Size aTempSize( aSize.Width(), aScrPos.Y() ); DrawOutDev( aDefPos, aTempSize, aDefPos, aTempSize, maVirDev ); - aTempSize.Width() = aScrPos.X()-1; - aTempSize.Height() = aScrSize.Height(); + aTempSize.Width() = aScrPos.X()-1; + aTempSize.Height() = aScrSize.Height(); DrawOutDev( aTempPos, aTempSize, aTempPos, aTempSize, maVirDev ); - aTempPos.Y() = aScrPos.Y()+aScrSize.Height(); - aTempSize.Width() = aSize.Width(); - aTempSize.Height() = aSize.Height()-aTempPos.Y(); + aTempPos.Y() = aScrPos.Y()+aScrSize.Height(); + aTempSize.Width() = aSize.Width(); + aTempSize.Height() = aSize.Height()-aTempPos.Y(); DrawOutDev( aTempPos, aTempSize, aTempPos, aTempSize, maVirDev ); } else @@ -1099,8 +1099,8 @@ BOOL ValueSet::ImplScroll( const Point& rPos ) if ( !mbScroll || (rPos.X() < 0) || (rPos.X() > aOutSize.Width()-nScrBarWidth) ) return FALSE; - long nScrollOffset; - USHORT nOldLine = mnFirstLine; + long nScrollOffset; + USHORT nOldLine = mnFirstLine; const Rectangle& rTopRect = mpImpl->mpItemList->GetObject( mnFirstLine*mnCols )->maRect; if ( rTopRect.GetHeight() <= 16 ) nScrollOffset = VALUESET_SCROLL_OFFSET/2; @@ -1140,7 +1140,7 @@ USHORT ValueSet::ImplGetItem( const Point& rPos, BOOL bMove ) const return VALUESET_ITEM_NONEITEM; } - Point aDefPos; + Point aDefPos; Rectangle aWinRect( aDefPos, maVirDev.GetOutputSizePixel() ); ULONG nItemCount = mpImpl->mpItemList->Count(); @@ -1811,9 +1811,9 @@ void ValueSet::InsertItem( USHORT nItemId, const Image& rImage, USHORT nPos ) "ValueSet::InsertItem(): ItemId already exists" ); ValueSetItem* pItem = new ValueSetItem( *this ); - pItem->mnId = nItemId; - pItem->meType = VALUESETITEM_IMAGE; - pItem->maImage = rImage; + pItem->mnId = nItemId; + pItem->meType = VALUESETITEM_IMAGE; + pItem->maImage = rImage; mpImpl->mpItemList->Insert( pItem, (ULONG)nPos ); mbFormat = TRUE; @@ -1830,9 +1830,9 @@ void ValueSet::InsertItem( USHORT nItemId, const Color& rColor, USHORT nPos ) "ValueSet::InsertItem(): ItemId already exists" ); ValueSetItem* pItem = new ValueSetItem( *this ); - pItem->mnId = nItemId; - pItem->meType = VALUESETITEM_COLOR; - pItem->maColor = rColor; + pItem->mnId = nItemId; + pItem->meType = VALUESETITEM_COLOR; + pItem->maColor = rColor; mpImpl->mpItemList->Insert( pItem, (ULONG)nPos ); mbFormat = TRUE; @@ -1850,10 +1850,10 @@ void ValueSet::InsertItem( USHORT nItemId, const Image& rImage, "ValueSet::InsertItem(): ItemId already exists" ); ValueSetItem* pItem = new ValueSetItem( *this ); - pItem->mnId = nItemId; - pItem->meType = VALUESETITEM_IMAGE; - pItem->maImage = rImage; - pItem->maText = rText; + pItem->mnId = nItemId; + pItem->meType = VALUESETITEM_IMAGE; + pItem->maImage = rImage; + pItem->maText = rText; mpImpl->mpItemList->Insert( pItem, (ULONG)nPos ); mbFormat = TRUE; @@ -1871,10 +1871,10 @@ void ValueSet::InsertItem( USHORT nItemId, const Color& rColor, "ValueSet::InsertItem(): ItemId already exists" ); ValueSetItem* pItem = new ValueSetItem( *this ); - pItem->mnId = nItemId; - pItem->meType = VALUESETITEM_COLOR; - pItem->maColor = rColor; - pItem->maText = rText; + pItem->mnId = nItemId; + pItem->meType = VALUESETITEM_COLOR; + pItem->maColor = rColor; + pItem->maText = rText; mpImpl->mpItemList->Insert( pItem, (ULONG)nPos ); mbFormat = TRUE; @@ -1891,8 +1891,8 @@ void ValueSet::InsertItem( USHORT nItemId, USHORT nPos ) "ValueSet::InsertItem(): ItemId already exists" ); ValueSetItem* pItem = new ValueSetItem( *this ); - pItem->mnId = nItemId; - pItem->meType = VALUESETITEM_USERDRAW; + pItem->mnId = nItemId; + pItem->meType = VALUESETITEM_USERDRAW; mpImpl->mpItemList->Insert( pItem, (ULONG)nPos ); mbFormat = TRUE; @@ -1909,8 +1909,8 @@ void ValueSet::InsertSpace( USHORT nItemId, USHORT nPos ) "ValueSet::InsertSpace(): ItemId already exists" ); ValueSetItem* pItem = new ValueSetItem( *this ); - pItem->mnId = nItemId; - pItem->meType = VALUESETITEM_SPACE; + pItem->mnId = nItemId; + pItem->meType = VALUESETITEM_SPACE; mpImpl->mpItemList->Insert( pItem, (ULONG)nPos ); mbFormat = TRUE; @@ -1932,11 +1932,11 @@ void ValueSet::RemoveItem( USHORT nItemId ) // Variablen zuruecksetzen if ( (mnHighItemId == nItemId) || (mnSelItemId == nItemId) ) { - mnCurCol = 0; - mnOldItemId = 0; - mnHighItemId = 0; - mnSelItemId = 0; - mbNoSelection = TRUE; + mnCurCol = 0; + mnOldItemId = 0; + mnHighItemId = 0; + mnSelItemId = 0; + mbNoSelection = TRUE; } mbFormat = TRUE; @@ -1970,12 +1970,12 @@ void ValueSet::CopyItems( const ValueSet& rValueSet ) } // Variablen zuruecksetzen - mnFirstLine = 0; - mnCurCol = 0; - mnOldItemId = 0; - mnHighItemId = 0; - mnSelItemId = 0; - mbNoSelection = TRUE; + mnFirstLine = 0; + mnCurCol = 0; + mnOldItemId = 0; + mnHighItemId = 0; + mnSelItemId = 0; + mbNoSelection = TRUE; mbFormat = TRUE; if ( IsReallyVisible() && IsUpdateMode() ) @@ -1989,12 +1989,12 @@ void ValueSet::Clear() ImplDeleteItems(); // Variablen zuruecksetzen - mnFirstLine = 0; - mnCurCol = 0; - mnOldItemId = 0; - mnHighItemId = 0; - mnSelItemId = 0; - mbNoSelection = TRUE; + mnFirstLine = 0; + mnCurCol = 0; + mnOldItemId = 0; + mnHighItemId = 0; + mnSelItemId = 0; + mbNoSelection = TRUE; mbFormat = TRUE; if ( IsReallyVisible() && IsUpdateMode() ) @@ -2263,9 +2263,9 @@ void ValueSet::SelectItem( USHORT nItemId ) void ValueSet::SetNoSelection() { - mbNoSelection = TRUE; - mbHighlight = FALSE; - mbSelection = FALSE; + mbNoSelection = TRUE; + mbHighlight = FALSE; + mbSelection = FALSE; if ( IsReallyVisible() && IsUpdateMode() ) ImplDraw(); @@ -2456,8 +2456,8 @@ XubString ValueSet::GetItemText( USHORT nItemId ) const void ValueSet::SetColor( const Color& rColor ) { - maColor = rColor; - mbFormat = TRUE; + maColor = rColor; + mbFormat = TRUE; if ( IsReallyVisible() && IsUpdateMode() ) ImplDraw(); } @@ -2480,10 +2480,10 @@ void ValueSet::SetExtraSpacing( USHORT nNewSpacing ) void ValueSet::StartSelection() { - mnOldItemId = mnSelItemId; - mbHighlight = TRUE; - mbSelection = TRUE; - mnHighItemId = mnSelItemId; + mnOldItemId = mnSelItemId; + mbHighlight = TRUE; + mbSelection = TRUE; + mnHighItemId = mnSelItemId; } // ----------------------------------------------------------------------- @@ -2577,11 +2577,11 @@ Size ValueSet::CalcWindowSizePixel( const Size& rItemSize, USHORT nDesireCols, } } - Size aSize( rItemSize.Width()*nCalcCols, rItemSize.Height()*nCalcLines ); - WinBits nStyle = GetStyle(); - long nTxtHeight = GetTextHeight(); - long nSpace; - long n; + Size aSize( rItemSize.Width()*nCalcCols, rItemSize.Height()*nCalcLines ); + WinBits nStyle = GetStyle(); + long nTxtHeight = GetTextHeight(); + long nSpace; + long n; if ( nStyle & WB_ITEMBORDER ) { diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index 3a0e8a4b8289..1384c3f6d219 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,20 +119,20 @@ namespace svt @return a <type scope="com.sun.star.sdb">CommandType</type> value */ - virtual sal_Int32 getCommandType() const = 0; + virtual sal_Int32 getCommandType() const = 0; /// checks whether or not there is an assignment for a given logical field - virtual sal_Bool hasFieldAssignment(const ::rtl::OUString& _rLogicalName) = 0; + virtual sal_Bool hasFieldAssignment(const ::rtl::OUString& _rLogicalName) = 0; /// retrieves the assignment for a given logical field virtual ::rtl::OUString getFieldAssignment(const ::rtl::OUString& _rLogicalName) = 0; /// set the assignment for a given logical field - virtual void setFieldAssignment(const ::rtl::OUString& _rLogicalName, const ::rtl::OUString& _rAssignment) = 0; + virtual void setFieldAssignment(const ::rtl::OUString& _rLogicalName, const ::rtl::OUString& _rAssignment) = 0; /// clear the assignment for a given logical field - virtual void clearFieldAssignment(const ::rtl::OUString& _rLogicalName) = 0; + virtual void clearFieldAssignment(const ::rtl::OUString& _rLogicalName) = 0; - virtual void setDatasourceName(const ::rtl::OUString& _rName) = 0; - virtual void setCommand(const ::rtl::OUString& _rCommand) = 0; + virtual void setDatasourceName(const ::rtl::OUString& _rName) = 0; + virtual void setCommand(const ::rtl::OUString& _rCommand) = 0; }; // ------------------------------------------------------------------- @@ -147,9 +147,9 @@ namespace svt { protected: Reference< XDataSource > m_xDataSource; - ::rtl::OUString m_sDSName; - ::rtl::OUString m_sTableName; - MapString2String m_aAliases; + ::rtl::OUString m_sDSName; + ::rtl::OUString m_sTableName; + MapString2String m_aAliases; public: AssigmentTransientData( @@ -162,15 +162,15 @@ public: // IAssigmentData overridables virtual ::rtl::OUString getDatasourceName() const; virtual ::rtl::OUString getCommand() const; - virtual sal_Int32 getCommandType() const; + virtual sal_Int32 getCommandType() const; - virtual sal_Bool hasFieldAssignment(const ::rtl::OUString& _rLogicalName); + virtual sal_Bool hasFieldAssignment(const ::rtl::OUString& _rLogicalName); virtual ::rtl::OUString getFieldAssignment(const ::rtl::OUString& _rLogicalName); - virtual void setFieldAssignment(const ::rtl::OUString& _rLogicalName, const ::rtl::OUString& _rAssignment); - virtual void clearFieldAssignment(const ::rtl::OUString& _rLogicalName); + virtual void setFieldAssignment(const ::rtl::OUString& _rLogicalName, const ::rtl::OUString& _rAssignment); + virtual void clearFieldAssignment(const ::rtl::OUString& _rLogicalName); - virtual void setDatasourceName(const ::rtl::OUString& _rName); - virtual void setCommand(const ::rtl::OUString& _rCommand); + virtual void setDatasourceName(const ::rtl::OUString& _rName); + virtual void setCommand(const ::rtl::OUString& _rCommand); }; // ------------------------------------------------------------------- @@ -201,9 +201,9 @@ public: } else { - DBG_ERROR ( ( ::rtl::OString("AssigmentTransientData::AssigmentTransientData: unknown programmatic name (") - += ::rtl::OString(pFields->ProgrammaticName.getStr(), pFields->ProgrammaticName.getLength(), RTL_TEXTENCODING_ASCII_US) - += ::rtl::OString(")!") + DBG_ERROR ( ( ::rtl::OString("AssigmentTransientData::AssigmentTransientData: unknown programmatic name (") + += ::rtl::OString(pFields->ProgrammaticName.getStr(), pFields->ProgrammaticName.getLength(), RTL_TEXTENCODING_ASCII_US) + += ::rtl::OString(")!") ).getStr() ); } @@ -232,8 +232,8 @@ public: sal_Bool AssigmentTransientData::hasFieldAssignment(const ::rtl::OUString& _rLogicalName) { ConstMapString2StringIterator aPos = m_aAliases.find( _rLogicalName ); - return ( m_aAliases.end() != aPos ) - && ( aPos->second.getLength() ); + return ( m_aAliases.end() != aPos ) + && ( aPos->second.getLength() ); } // ------------------------------------------------------------------- @@ -281,7 +281,7 @@ public: ,public IAssigmentData { protected: - StringBag m_aStoredFields; + StringBag m_aStoredFields; protected: ::com::sun::star::uno::Any @@ -289,12 +289,12 @@ public: ::com::sun::star::uno::Any getProperty(const sal_Char* _pLocalName) const; - ::rtl::OUString getStringProperty(const sal_Char* _pLocalName) const; - sal_Int32 getInt32Property(const sal_Char* _pLocalName) const; + ::rtl::OUString getStringProperty(const sal_Char* _pLocalName) const; + sal_Int32 getInt32Property(const sal_Char* _pLocalName) const; - ::rtl::OUString getStringProperty(const ::rtl::OUString& _rLocalName) const; + ::rtl::OUString getStringProperty(const ::rtl::OUString& _rLocalName) const; - void setStringProperty(const sal_Char* _pLocalName, const ::rtl::OUString& _rValue); + void setStringProperty(const sal_Char* _pLocalName, const ::rtl::OUString& _rValue); public: AssignmentPersistentData(); @@ -303,18 +303,18 @@ public: // IAssigmentData overridables virtual ::rtl::OUString getDatasourceName() const; virtual ::rtl::OUString getCommand() const; - virtual sal_Int32 getCommandType() const; + virtual sal_Int32 getCommandType() const; - virtual sal_Bool hasFieldAssignment(const ::rtl::OUString& _rLogicalName); + virtual sal_Bool hasFieldAssignment(const ::rtl::OUString& _rLogicalName); virtual ::rtl::OUString getFieldAssignment(const ::rtl::OUString& _rLogicalName); - virtual void setFieldAssignment(const ::rtl::OUString& _rLogicalName, const ::rtl::OUString& _rAssignment); - virtual void clearFieldAssignment(const ::rtl::OUString& _rLogicalName); + virtual void setFieldAssignment(const ::rtl::OUString& _rLogicalName, const ::rtl::OUString& _rAssignment); + virtual void clearFieldAssignment(const ::rtl::OUString& _rLogicalName); - virtual void setDatasourceName(const ::rtl::OUString& _rName); - virtual void setCommand(const ::rtl::OUString& _rCommand); + virtual void setDatasourceName(const ::rtl::OUString& _rName); + virtual void setCommand(const ::rtl::OUString& _rCommand); virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames); - virtual void Commit(); + virtual void Commit(); }; @@ -377,7 +377,7 @@ void AssignmentPersistentData::Commit() } // ------------------------------------------------------------------- - ::rtl::OUString AssignmentPersistentData::getStringProperty(const ::rtl::OUString& _rLocalName) const + ::rtl::OUString AssignmentPersistentData::getStringProperty(const ::rtl::OUString& _rLocalName) const { ::rtl::OUString sReturn; getProperty( _rLocalName ) >>= sReturn; @@ -385,7 +385,7 @@ void AssignmentPersistentData::Commit() } // ------------------------------------------------------------------- - ::rtl::OUString AssignmentPersistentData::getStringProperty(const sal_Char* _pLocalName) const + ::rtl::OUString AssignmentPersistentData::getStringProperty(const sal_Char* _pLocalName) const { ::rtl::OUString sReturn; getProperty( _pLocalName ) >>= sReturn; @@ -494,29 +494,29 @@ void AssignmentPersistentData::Commit() // =================================================================== struct AddressBookSourceDialogData { - FixedText* pFieldLabels[FIELD_PAIRS_VISIBLE * 2]; - ListBox* pFields[FIELD_PAIRS_VISIBLE * 2]; + FixedText* pFieldLabels[FIELD_PAIRS_VISIBLE * 2]; + ListBox* pFields[FIELD_PAIRS_VISIBLE * 2]; /// when working transient, we need the data source Reference< XDataSource > m_xTransientDataSource; /// current scroll pos in the field list - sal_Int32 nFieldScrollPos; + sal_Int32 nFieldScrollPos; /// the index within m_pFields of the last visible list box. This is redundant, it could be extracted from other members - sal_Int32 nLastVisibleListIndex; + sal_Int32 nLastVisibleListIndex; /// indicates that we've an odd field number. This member is for efficiency only, it's redundant. - sal_Bool bOddFieldNumber : 1; + sal_Bool bOddFieldNumber : 1; /// indicates that we're working with the real persistent configuration - sal_Bool bWorkingPersistent : 1; + sal_Bool bWorkingPersistent : 1; /// the strings to use as labels for the field selection listboxes - StringArray aFieldLabels; + StringArray aFieldLabels; // the current field assignment - StringArray aFieldAssignments; + StringArray aFieldAssignments; /// the logical field names - StringArray aLogicalFieldNames; + StringArray aLogicalFieldNames; - IAssigmentData* pConfigData; + IAssigmentData* pConfigData; // ................................................................ AddressBookSourceDialogData( ) @@ -550,20 +550,20 @@ void AssignmentPersistentData::Commit() // =================================================================== // = AddressBookSourceDialog // =================================================================== -#define INIT_FIELDS() \ +#define INIT_FIELDS() \ ModalDialog(_pParent, SvtResId( DLG_ADDRESSBOOKSOURCE ))\ - ,m_aDatasourceFrame (this, SvtResId(FL_DATASOURCEFRAME))\ - ,m_aDatasourceLabel (this, SvtResId(FT_DATASOURCE))\ - ,m_aDatasource (this, SvtResId(CB_DATASOURCE))\ - ,m_aAdministrateDatasources (this, SvtResId(PB_ADMINISTATE_DATASOURCES))\ - ,m_aTableLabel (this, SvtResId(FT_TABLE))\ - ,m_aTable (this, SvtResId(CB_TABLE))\ - ,m_aFieldsTitle (this, SvtResId(FT_FIELDS))\ - ,m_aFieldsFrame (this, SvtResId(CT_BORDER))\ - ,m_aFieldScroller (&m_aFieldsFrame, SvtResId(SB_FIELDSCROLLER))\ - ,m_aOK (this, SvtResId(PB_OK))\ - ,m_aCancel (this, SvtResId(PB_CANCEL))\ - ,m_aHelp (this, SvtResId(PB_HELP))\ + ,m_aDatasourceFrame (this, SvtResId(FL_DATASOURCEFRAME))\ + ,m_aDatasourceLabel (this, SvtResId(FT_DATASOURCE))\ + ,m_aDatasource (this, SvtResId(CB_DATASOURCE))\ + ,m_aAdministrateDatasources (this, SvtResId(PB_ADMINISTATE_DATASOURCES))\ + ,m_aTableLabel (this, SvtResId(FT_TABLE))\ + ,m_aTable (this, SvtResId(CB_TABLE))\ + ,m_aFieldsTitle (this, SvtResId(FT_FIELDS))\ + ,m_aFieldsFrame (this, SvtResId(CT_BORDER))\ + ,m_aFieldScroller (&m_aFieldsFrame, SvtResId(SB_FIELDSCROLLER))\ + ,m_aOK (this, SvtResId(PB_OK))\ + ,m_aCancel (this, SvtResId(PB_CANCEL))\ + ,m_aHelp (this, SvtResId(PB_HELP))\ ,m_sNoFieldSelection(SvtResId(STR_NO_FIELD_SELECTION))\ ,m_xORB(_rxORB) @@ -728,7 +728,7 @@ void AssignmentPersistentData::Commit() AliasProgrammaticPair* pPair = _rMapping.getArray(); ::rtl::OUString sCurrent; - for ( ConstStringArrayIterator aProgrammatic = m_pImpl->aLogicalFieldNames.begin(); + for ( ConstStringArrayIterator aProgrammatic = m_pImpl->aLogicalFieldNames.begin(); aProgrammatic != m_pImpl->aLogicalFieldNames.end(); ++aProgrammatic ) @@ -756,7 +756,7 @@ void AssignmentPersistentData::Commit() OFileNotation aFileNotation( aURL.GetMainURL( INetURLObject::NO_DECODE ) ); sName = aFileNotation.get(OFileNotation::N_SYSTEM); } - + m_aDatasource.SetText(sName); m_aTable.SetText(m_pImpl->pConfigData->getCommand()); // we ignore the CommandType: only tables are supported @@ -767,7 +767,7 @@ void AssignmentPersistentData::Commit() ConstStringArrayIterator aLogical = m_pImpl->aLogicalFieldNames.begin(); StringArrayIterator aAssignment = m_pImpl->aFieldAssignments.begin(); - for ( ; + for ( ; aLogical < m_pImpl->aLogicalFieldNames.end(); ++aLogical, ++aAssignment ) @@ -874,7 +874,7 @@ void AssignmentPersistentData::Commit() if ( m_pImpl->bWorkingPersistent ) { String sSelectedDS = lcl_getSelectedDataSource( m_aDatasource ); - + // get the data source the user has chosen and let it build a connection INetURLObject aURL( sSelectedDS ); if ( aURL.GetProtocol() != INET_PROT_NOT_VALID || m_xDatabaseContext->hasByName(sSelectedDS) ) @@ -966,7 +966,7 @@ void AssignmentPersistentData::Commit() { DBG_ERROR("AddressBookSourceDialog::resetFields: could not retrieve the table columns!"); } - + const ::rtl::OUString* pColumnNames = aColumnNames.getConstArray(); const ::rtl::OUString* pEnd = pColumnNames + aColumnNames.getLength(); @@ -1009,7 +1009,7 @@ void AssignmentPersistentData::Commit() } // adjust m_pImpl->aFieldAssignments - for ( StringArrayIterator aAdjust = m_pImpl->aFieldAssignments.begin(); + for ( StringArrayIterator aAdjust = m_pImpl->aFieldAssignments.begin(); aAdjust != m_pImpl->aFieldAssignments.end(); ++aAdjust ) @@ -1096,7 +1096,7 @@ void AssignmentPersistentData::Commit() implSelectField(*pRightListControl, *pRightAssignment); // the index of the last visible list box - ++m_pImpl->nLastVisibleListIndex; // the left hand side box is always visible + ++m_pImpl->nLastVisibleListIndex; // the left hand side box is always visible if (!bHideRightColumn) ++m_pImpl->nLastVisibleListIndex; @@ -1117,7 +1117,7 @@ void AssignmentPersistentData::Commit() } if (_bAdjustFocus && (nOldFocusRow >= 0)) - { // we have to adjust the focus and one of the list boxes has the focus + { // we have to adjust the focus and one of the list boxes has the focus sal_Int32 nDelta = m_pImpl->nFieldScrollPos - _nPos; // the new row for the focus sal_Int32 nNewFocusRow = nOldFocusRow + nDelta; @@ -1203,12 +1203,12 @@ void AssignmentPersistentData::Commit() // set the field assignments ConstStringArrayIterator aLogical = m_pImpl->aLogicalFieldNames.begin(); ConstStringArrayIterator aAssignment = m_pImpl->aFieldAssignments.begin(); - for ( ; + for ( ; aLogical < m_pImpl->aLogicalFieldNames.end(); ++aLogical, ++aAssignment ) m_pImpl->pConfigData->setFieldAssignment(*aLogical, *aAssignment); - + EndDialog(RET_OK); return 0L; @@ -1245,7 +1245,7 @@ void AssignmentPersistentData::Commit() { ::rtl::OUString sName; xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataSourceName"))) >>= sName; - + INetURLObject aURL( sName ); if( aURL.GetProtocol() != INET_PROT_NOT_VALID ) { @@ -1268,8 +1268,8 @@ void AssignmentPersistentData::Commit() // re-fill the data source list // try to preserve the current selection - -// initializeDatasources(); + +// initializeDatasources(); return 0L; } @@ -1281,20 +1281,20 @@ void AssignmentPersistentData::Commit() { case EVENT_KEYINPUT: { - const KeyEvent* pKeyEvent = _rNEvt.GetKeyEvent(); + const KeyEvent* pKeyEvent = _rNEvt.GetKeyEvent(); sal_uInt16 nCode = pKeyEvent->GetKeyCode().GetCode(); sal_Bool bShift = pKeyEvent->GetKeyCode().IsShift(); sal_Bool bCtrl = pKeyEvent->GetKeyCode().IsMod1(); - sal_Bool bAlt = pKeyEvent->GetKeyCode().IsMod2(); + sal_Bool bAlt = pKeyEvent->GetKeyCode().IsMod2(); if (KEY_TAB == nCode) - { // somebody pressed the tab key + { // somebody pressed the tab key if (!bAlt && !bCtrl && !bShift) - { // it's really the only the key (no modifiers) + { // it's really the only the key (no modifiers) if (m_pImpl->pFields[m_pImpl->nLastVisibleListIndex]->HasChildPathFocus()) // the last of our visible list boxes has the focus if (m_pImpl->nFieldScrollPos < m_aFieldScroller.GetRangeMax()) - { // we can still scroll down + { // we can still scroll down sal_Int32 nNextFocusList = m_pImpl->nLastVisibleListIndex + 1 - 2; // -> scroll down implScrollFields(m_pImpl->nFieldScrollPos + 1, sal_False, sal_True); @@ -1305,11 +1305,11 @@ void AssignmentPersistentData::Commit() } } else if (!bAlt && !bCtrl && bShift) - { // it's shift-tab + { // it's shift-tab if (m_pImpl->pFields[0]->HasChildPathFocus()) // our first list box has the focus if (m_pImpl->nFieldScrollPos > 0) - { // we can still scroll up + { // we can still scroll up // -> scroll up implScrollFields(m_pImpl->nFieldScrollPos - 1, sal_False, sal_True); // give the right control in the "prebious" line the focus @@ -1326,7 +1326,7 @@ void AssignmentPersistentData::Commit() } // ....................................................................... -} // namespace svt +} // namespace svt // ....................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/dialogs/addresstemplate.hrc b/svtools/source/dialogs/addresstemplate.hrc index 5fb89cd567fc..45e3f1b06a18 100644 --- a/svtools/source/dialogs/addresstemplate.hrc +++ b/svtools/source/dialogs/addresstemplate.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,59 +29,59 @@ #define _SVT_ADDRESSTEMPLATE_HRC_ -#define FIELD_PAIRS_VISIBLE 5 -#define FIELD_CONTROLS_VISIBLE 2 * FIELD_PAIRS_VISIBLE +#define FIELD_PAIRS_VISIBLE 5 +#define FIELD_CONTROLS_VISIBLE 2 * FIELD_PAIRS_VISIBLE -#define FL_DATASOURCEFRAME 1 -#define FT_DATASOURCE 2 -#define CB_DATASOURCE 3 -#define CT_BORDER 1 -#define PB_ADMINISTATE_DATASOURCES 4 -#define FT_TABLE 5 -#define CB_TABLE 6 -#define FT_FIELDS 7 -#define SB_FIELDSCROLLER 8 -#define PB_OK 9 -#define PB_CANCEL 10 -#define PB_HELP 11 +#define FL_DATASOURCEFRAME 1 +#define FT_DATASOURCE 2 +#define CB_DATASOURCE 3 +#define CT_BORDER 1 +#define PB_ADMINISTATE_DATASOURCES 4 +#define FT_TABLE 5 +#define CB_TABLE 6 +#define FT_FIELDS 7 +#define SB_FIELDSCROLLER 8 +#define PB_OK 9 +#define PB_CANCEL 10 +#define PB_HELP 11 -#define FT_FIELD_BASE 50 -#define LB_FIELD_BASE 50 +#define FT_FIELD_BASE 50 +#define LB_FIELD_BASE 50 -#define STR_NO_FIELD_SELECTION 1 -#define STR_FIELD_COMPANY 2 -#define STR_FIELD_DEPARTMENT 3 -#define STR_FIELD_FIRSTNAME 4 -#define STR_FIELD_LASTNAME 5 -#define STR_FIELD_STREET 6 -#define STR_FIELD_COUNTRY 7 -#define STR_FIELD_ZIPCODE 8 -#define STR_FIELD_CITY 9 -#define STR_FIELD_TITLE 10 -#define STR_FIELD_POSITION 11 -#define STR_FIELD_ADDRFORM 12 -#define STR_FIELD_INITIALS 13 -#define STR_FIELD_SALUTATION 14 -#define STR_FIELD_HOMETEL 15 -#define STR_FIELD_WORKTEL 16 -#define STR_FIELD_FAX 17 -#define STR_FIELD_EMAIL 18 -#define STR_FIELD_URL 19 -#define STR_FIELD_NOTE 20 -#define STR_FIELD_USER1 21 -#define STR_FIELD_USER2 22 -#define STR_FIELD_USER3 23 -#define STR_FIELD_USER4 24 -#define STR_FIELD_ID 25 -#define STR_FIELD_STATE 26 -#define STR_FIELD_OFFICETEL 27 -#define STR_FIELD_PAGER 28 -#define STR_FIELD_MOBILE 29 -#define STR_FIELD_TELOTHER 30 -#define STR_FIELD_CALENDAR 31 -#define STR_FIELD_INVITE 32 +#define STR_NO_FIELD_SELECTION 1 +#define STR_FIELD_COMPANY 2 +#define STR_FIELD_DEPARTMENT 3 +#define STR_FIELD_FIRSTNAME 4 +#define STR_FIELD_LASTNAME 5 +#define STR_FIELD_STREET 6 +#define STR_FIELD_COUNTRY 7 +#define STR_FIELD_ZIPCODE 8 +#define STR_FIELD_CITY 9 +#define STR_FIELD_TITLE 10 +#define STR_FIELD_POSITION 11 +#define STR_FIELD_ADDRFORM 12 +#define STR_FIELD_INITIALS 13 +#define STR_FIELD_SALUTATION 14 +#define STR_FIELD_HOMETEL 15 +#define STR_FIELD_WORKTEL 16 +#define STR_FIELD_FAX 17 +#define STR_FIELD_EMAIL 18 +#define STR_FIELD_URL 19 +#define STR_FIELD_NOTE 20 +#define STR_FIELD_USER1 21 +#define STR_FIELD_USER2 22 +#define STR_FIELD_USER3 23 +#define STR_FIELD_USER4 24 +#define STR_FIELD_ID 25 +#define STR_FIELD_STATE 26 +#define STR_FIELD_OFFICETEL 27 +#define STR_FIELD_PAGER 28 +#define STR_FIELD_MOBILE 29 +#define STR_FIELD_TELOTHER 30 +#define STR_FIELD_CALENDAR 31 +#define STR_FIELD_INVITE 32 -#define STR_LOCAGICAL_FIELD_NAMES 33 +#define STR_LOCAGICAL_FIELD_NAMES 33 #endif // _SVT_ADDRESSTEMPLATE_HRC_ diff --git a/svtools/source/dialogs/addresstemplate.src b/svtools/source/dialogs/addresstemplate.src index 0652dfb9d0f5..d038e83a773f 100644 --- a/svtools/source/dialogs/addresstemplate.src +++ b/svtools/source/dialogs/addresstemplate.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 @@ #include "controldims.hrc" #endif -#define FIELD_ROW_HEIGHT 17 +#define FIELD_ROW_HEIGHT 17 ModalDialog DLG_ADDRESSBOOKSOURCE { @@ -111,22 +111,22 @@ ModalDialog DLG_ADDRESSBOOKSOURCE Size = MAP_APPFONT ( 288 , 5 + FIELD_ROW_HEIGHT * FIELD_PAIRS_VISIBLE ) ; }; -#define DECLARE_FIELD( row, column ) \ - FixedText FT_FIELD_BASE + row * 2 + column \ - { \ - SVLook = TRUE ; \ +#define DECLARE_FIELD( row, column ) \ + FixedText FT_FIELD_BASE + row * 2 + column \ + { \ + SVLook = TRUE ; \ Pos = MAP_APPFONT ( 3 + column * 134, RSC_SP_CTRL_GROUP_Y + 2 + row * FIELD_ROW_HEIGHT ) ; \ Size = MAP_APPFONT ( 79 , 10 ) ; \ - Group = TRUE; \ - }; \ - ListBox LB_FIELD_BASE + row * 2 + column \ - { \ - SVLook = TRUE; \ + Group = TRUE; \ + }; \ + ListBox LB_FIELD_BASE + row * 2 + column \ + { \ + SVLook = TRUE; \ Pos = MAP_APPFONT ( 89 + column * 134, RSC_SP_CTRL_GROUP_Y + row * FIELD_ROW_HEIGHT ) ; \ - Size = MAP_APPFONT ( 42 , 14 ) ; \ - Border = TRUE; \ - DropDown = TRUE; \ - TabStop = TRUE; \ + Size = MAP_APPFONT ( 42 , 14 ) ; \ + Border = TRUE; \ + DropDown = TRUE; \ + TabStop = TRUE; \ } #if FIELD_PAIRS_VISIBLE > 0 diff --git a/svtools/source/dialogs/colctrl.cxx b/svtools/source/dialogs/colctrl.cxx index 1c63af7a96a2..4a988ea8ca9a 100644 --- a/svtools/source/dialogs/colctrl.cxx +++ b/svtools/source/dialogs/colctrl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ // ---------------- SvColorControl::SvColorControl( Window* pParent, WinBits nStyle ) : - Control ( pParent, nStyle ), - mpBitmap ( NULL ), - mpReadAccess ( NULL ), - mnLuminance ( 50 ) + Control ( pParent, nStyle ), + mpBitmap ( NULL ), + mpReadAccess ( NULL ), + mnLuminance ( 50 ) { Initialize(); } // ----------------------------------------------------------------------- SvColorControl::SvColorControl( Window* pParent, const ResId& rResId ) : - Control ( pParent, rResId ), - mpBitmap ( NULL ), - mpReadAccess ( NULL ), - mnLuminance ( 50 ) + Control ( pParent, rResId ), + mpBitmap ( NULL ), + mpReadAccess ( NULL ), + mnLuminance ( 50 ) { Initialize(); } @@ -75,7 +75,7 @@ void SvColorControl::Initialize() void SvColorControl::CreateBitmap() { const Size aSize( GetOutputSizePixel() ); - + if( mpBitmap && mpBitmap->GetSizePixel() != aSize ) delete mpBitmap, mpBitmap = NULL; @@ -102,7 +102,7 @@ void SvColorControl::CreateBitmap() aColHSB.SetHue( nHue ); aColHSB.SetSat( nSat ); - + // mpBitmap always has a bit count of 24 => use of SetPixel(...) is safe pWriteAccess->SetPixel( i, j, BitmapColor( aColHSB.GetRGB() ) ); } @@ -230,7 +230,7 @@ void SvColorControl::SetColor( const ColorHSB& rCol, BOOL bSetColor ) USHORT nX = (USHORT) mpBitmap->GetSizePixel().Width(); USHORT nY = (USHORT) mpBitmap->GetSizePixel().Height(); INT16 nZ = rCol.GetBri(); - + SetLuminance( nZ ); nX = rCol.GetHue() * nX / 360; // Farbe nY = nY - rCol.GetSat() * nY / 100; // Saettigung @@ -287,7 +287,7 @@ void SvColorControl::SetLuminance( short nLum ) // ----------------------------------------------------------------------- ColorPreviewControl::ColorPreviewControl( Window* pParent, WinBits nStyle ) : - Control ( pParent, nStyle ) + Control ( pParent, nStyle ) { SetFillColor( maColor ); SetLineColor( maColor ); @@ -295,7 +295,7 @@ ColorPreviewControl::ColorPreviewControl( Window* pParent, WinBits nStyle ) : // ----------------------------------------------------------------------- ColorPreviewControl::ColorPreviewControl( Window* pParent, const ResId& rResId ) : - Control ( pParent, rResId ) + Control ( pParent, rResId ) { SetFillColor( maColor ); SetLineColor( maColor ); @@ -334,9 +334,9 @@ void ColorPreviewControl::SetColor( const Color& rCol ) // ----------------------------------------------------------------------- ColorMixingControl::ColorMixingControl( Window* pParent, WinBits nStyle, USHORT nRows, USHORT nColumns ) : - ValueSet ( pParent, nStyle ), - mnRows ( nRows ), - mnColumns ( nColumns ) + ValueSet ( pParent, nStyle ), + mnRows ( nRows ), + mnColumns ( nColumns ) { Initialize(); } @@ -344,9 +344,9 @@ ColorMixingControl::ColorMixingControl( Window* pParent, WinBits nStyle, // ----------------------------------------------------------------------- ColorMixingControl::ColorMixingControl( Window* pParent, const ResId& rResId, USHORT nRows, USHORT nColumns ) : - ValueSet ( pParent, rResId ), - mnRows ( nRows ), - mnColumns ( nColumns ) + ValueSet ( pParent, rResId ), + mnRows ( nRows ), + mnColumns ( nColumns ) { Initialize(); } @@ -498,7 +498,7 @@ void ColorMixingControl::SetColor( CMCPosition ePos, const Color& rCol ) // ----------------------------------------------------------------------- String ColorMixingControl::GetRGBString( const Color& rColor ) { - String aStr( String::CreateFromInt32(rColor.GetRed()) ); + String aStr( String::CreateFromInt32(rColor.GetRed()) ); aStr += ' '; aStr += String::CreateFromInt32(rColor.GetGreen()); aStr += ' '; @@ -507,7 +507,7 @@ String ColorMixingControl::GetRGBString( const Color& rColor ) return aStr; } // ----------------------------------------------------------------------- -CMCPosition ColorMixingControl::GetCMCPosition() const +CMCPosition ColorMixingControl::GetCMCPosition() const { CMCPosition ePos = CMC_OTHER; USHORT nPos = GetSelectItemId(); @@ -643,13 +643,13 @@ Color ColorHSB::GetRGB() const switch( n ) { - case 0: cR = nB; cG = c; cB = a; break; - case 1: cR = b; cG = nB; cB = a; break; - case 2: cR = a; cG = nB; cB = c; break; - case 3: cR = a; cG = b; cB = nB; break; - case 4: cR = c; cG = a; cB = nB; break; - case 5: cR = nB; cG = a; cB = b; break; - default: cR = 0; cG = 0; cB = 0; break; // -Wall ???? + case 0: cR = nB; cG = c; cB = a; break; + case 1: cR = b; cG = nB; cB = a; break; + case 2: cR = a; cG = nB; cB = c; break; + case 3: cR = a; cG = b; cB = nB; break; + case 4: cR = c; cG = a; cB = nB; break; + case 5: cR = nB; cG = a; cB = b; break; + default: cR = 0; cG = 0; cB = 0; break; // -Wall ???? } } diff --git a/svtools/source/dialogs/colrdlg.cxx b/svtools/source/dialogs/colrdlg.cxx index de973dcbcd4a..1a2a31e5e828 100644 --- a/svtools/source/dialogs/colrdlg.cxx +++ b/svtools/source/dialogs/colrdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ // --------------- SvColorDialog::SvColorDialog( Window* pWindow ) : - ModalDialog ( pWindow, SvtResId( DLG_COLOR ) ), - maColMixCtrl ( this, SvtResId( VAL_SET_COLOR ), 8, 8 ), - maBtn1 ( this, SvtResId( BTN_1 ) ), - maBtn2 ( this, SvtResId( BTN_2 ) ), - //maBtn3 ( this, SvtResId( BTN_3 ) ), - //maBtn4 ( this, SvtResId( BTN_4 ) ), - //maFtRGB ( this, SvtResId( FT_RGB ) ), - maCtlColor ( this, SvtResId( CTL_COLOR ) ), - - maFtCyan ( this, SvtResId( FT_CYAN ) ), + ModalDialog ( pWindow, SvtResId( DLG_COLOR ) ), + maColMixCtrl ( this, SvtResId( VAL_SET_COLOR ), 8, 8 ), + maBtn1 ( this, SvtResId( BTN_1 ) ), + maBtn2 ( this, SvtResId( BTN_2 ) ), + //maBtn3 ( this, SvtResId( BTN_3 ) ), + //maBtn4 ( this, SvtResId( BTN_4 ) ), + //maFtRGB ( this, SvtResId( FT_RGB ) ), + maCtlColor ( this, SvtResId( CTL_COLOR ) ), + + maFtCyan ( this, SvtResId( FT_CYAN ) ), maNumCyan ( this, SvtResId( NUM_CYAN ) ), maFtMagenta ( this, SvtResId( FT_MAGENTA ) ), maNumMagenta ( this, SvtResId( NUM_MAGENTA ) ), @@ -56,26 +56,26 @@ SvColorDialog::SvColorDialog( Window* pWindow ) : maFtKey ( this, SvtResId( FT_KEY ) ), maNumKey ( this, SvtResId( NUM_KEY ) ), - maFtRed ( this, SvtResId( FT_RED ) ), - maNumRed ( this, SvtResId( NUM_RED ) ), - maFtGreen ( this, SvtResId( FT_GREEN ) ), - maNumGreen ( this, SvtResId( NUM_GREEN ) ), - maFtBlue ( this, SvtResId( FT_BLUE ) ), - maNumBlue ( this, SvtResId( NUM_BLUE ) ), - - maFtHue ( this, SvtResId( FT_HUE ) ), - maNumHue ( this, SvtResId( NUM_HUE ) ), - maFtSaturation ( this, SvtResId( FT_SATURATION ) ), - maNumSaturation ( this, SvtResId( NUM_SATURATION ) ), - maFtLuminance ( this, SvtResId( FT_LUMINANCE ) ), - maNumLuminance ( this, SvtResId( NUM_LUMINANCE ) ), - - maCtlPreview ( this, SvtResId( CTL_PREVIEW ) ), + maFtRed ( this, SvtResId( FT_RED ) ), + maNumRed ( this, SvtResId( NUM_RED ) ), + maFtGreen ( this, SvtResId( FT_GREEN ) ), + maNumGreen ( this, SvtResId( NUM_GREEN ) ), + maFtBlue ( this, SvtResId( FT_BLUE ) ), + maNumBlue ( this, SvtResId( NUM_BLUE ) ), + + maFtHue ( this, SvtResId( FT_HUE ) ), + maNumHue ( this, SvtResId( NUM_HUE ) ), + maFtSaturation ( this, SvtResId( FT_SATURATION ) ), + maNumSaturation ( this, SvtResId( NUM_SATURATION ) ), + maFtLuminance ( this, SvtResId( FT_LUMINANCE ) ), + maNumLuminance ( this, SvtResId( NUM_LUMINANCE ) ), + + maCtlPreview ( this, SvtResId( CTL_PREVIEW ) ), maCtlPreviewOld ( this, SvtResId( CTL_PREVIEW_OLD ) ), - maBtnOK ( this, SvtResId( BTN_OK ) ), - maBtnCancel ( this, SvtResId( BTN_CANCEL ) ), - maBtnHelp ( this, SvtResId( BTN_HELP ) ) + maBtnOK ( this, SvtResId( BTN_OK ) ), + maBtnCancel ( this, SvtResId( BTN_CANCEL ) ), + maBtnHelp ( this, SvtResId( BTN_HELP ) ) { FreeResource(); diff --git a/svtools/source/dialogs/colrdlg.hrc b/svtools/source/dialogs/colrdlg.hrc index 41329df6e366..7734866da2ca 100644 --- a/svtools/source/dialogs/colrdlg.hrc +++ b/svtools/source/dialogs/colrdlg.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/svtools/source/dialogs/colrdlg.src b/svtools/source/dialogs/colrdlg.src index 55517299c057..d7486d2e3865 100644 --- a/svtools/source/dialogs/colrdlg.src +++ b/svtools/source/dialogs/colrdlg.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/svtools/source/dialogs/filedlg.cxx b/svtools/source/dialogs/filedlg.cxx index bbcd2964773d..63a68e55567f 100644 --- a/svtools/source/dialogs/filedlg.cxx +++ b/svtools/source/dialogs/filedlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/svtools/source/dialogs/filedlg2.cxx b/svtools/source/dialogs/filedlg2.cxx index a4502631595e..ab7b3dada20c 100644 --- a/svtools/source/dialogs/filedlg2.cxx +++ b/svtools/source/dialogs/filedlg2.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,16 +56,16 @@ using namespace com::sun::star::uno; DECLARE_LIST( UniStringList, UniString* ) -#define STD_BTN_WIDTH 80 -#define STD_BTN_HEIGHT 26 +#define STD_BTN_WIDTH 80 +#define STD_BTN_HEIGHT 26 #ifndef UNX - #define ALLFILES "*.*" + #define ALLFILES "*.*" #else - #define ALLFILES "*" + #define ALLFILES "*" #endif -// #define STD_BTN_WIDTH 90 -// #define STD_BTN_HEIGHT 35 +// #define STD_BTN_WIDTH 90 +// #define STD_BTN_HEIGHT 35 #define INITCONTROL( p, ControlClass, nBits, aPos, aSize, aTitel, nHelpId ) \ p = new ControlClass( GetPathDialog(), WinBits( nBits ) ); \ @@ -85,8 +85,8 @@ KbdListBox::PreNotify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == EVENT_KEYINPUT ) { - KeyEvent aKeyEvt = *rNEvt.GetKeyEvent(); - sal_Unicode cCharCode = aKeyEvt.GetCharCode(); + KeyEvent aKeyEvt = *rNEvt.GetKeyEvent(); + sal_Unicode cCharCode = aKeyEvt.GetCharCode(); if ( IsPrintable ( cCharCode ) ) { @@ -133,7 +133,7 @@ ImpPathDialog::ImpPathDialog( PathDialog* pDlg, RESOURCE_TYPE nType, BOOL bCreat pDlg->SetHelpId( HID_FILEDLG_PATHDLG ); - lang::Locale aLocale = Application::GetSettings().GetLocale(); + lang::Locale aLocale = Application::GetSettings().GetLocale(); xCollator = ::vcl::unohelper::CreateCollator(); if( xCollator.is() ) xCollator->loadDefaultCollator( aLocale, 1 ); @@ -152,9 +152,9 @@ ImpPathDialog::~ImpPathDialog() delete pOkBtn; delete pCancelBtn; delete pNewDirBtn; -# if defined(UNX) || defined(OS2) +# if defined(UNX) || defined(OS2) delete pHomeBtn; -# endif +# endif } void ImpPathDialog::InitControls() @@ -517,7 +517,7 @@ BOOL ImpPathDialog::IsFileOk( const DirEntry& rDirEntry ) aQueryTxt.SearchAndReplaceAscii( "%s", rDirEntry.GetFull() ); QueryBox aQuery( GetPathDialog(), WB_YES_NO | WB_DEF_YES, - aQueryTxt ); + aQueryTxt ); if( aQuery.Execute() == RET_YES ) rDirEntry.MakeDir(); else @@ -545,9 +545,9 @@ void ImpPathDialog::PreExecute() UpdateEntries( TRUE ); // Zusaetzliche Buttons anordnen - Point aPos; - Size aSize; - long nDY; + Point aPos; + Size aSize; + long nDY; if( pLoadBtn ) { aPos = pLoadBtn->GetPosPixel(); @@ -630,7 +630,7 @@ void ImpPathDialog::PreExecute() for( i = 0; i < nCount; ++i ) { DirEntry& rEntry = aDir[i]; - UniString aStr = rEntry.GetFull( FSYS_STYLE_HOST, FALSE ); + UniString aStr = rEntry.GetFull( FSYS_STYLE_HOST, FALSE ); UniString aVolume = rEntry.GetVolume() ; aStr.ToUpperAscii(); @@ -913,9 +913,9 @@ IMPL_LINK( ImpFileDialog, DblClickHdl, ListBox *, pBox ) else { UniString aFilterListMask = aFilterList.GetObject( nCurPos )->aMask; -// if( aFilterListMask.Search( ';' ) == STRING_NOTFOUND ) // kein ; in der Maske -// aMask = WildCard( aFilterListMask, '\0' ); -// else // ; muss beruecksichtigt werden +// if( aFilterListMask.Search( ';' ) == STRING_NOTFOUND ) // kein ; in der Maske +// aMask = WildCard( aFilterListMask, '\0' ); +// else // ; muss beruecksichtigt werden aMask = WildCard( aFilterListMask, ';' ); } @@ -1017,7 +1017,7 @@ void ImpFileDialog::UpdateEntries( const BOOL bWithDirs ) WildCard aTmpMask( aWildCard, ';' ); if ( nEntries ) { - UniStringList aSortDirList; + UniStringList aSortDirList; for ( USHORT n = 0; n < nEntries; n++ ) { DirEntry& rEntry = aDir[n]; @@ -1148,7 +1148,7 @@ void ImpFileDialog::SetPath( UniString const & rPath ) // Falls der Pfad eine Wildcard oder einen Filenamen enthaelt // -> abschneiden und merken - if( FileStat( aFile ).GetKind() & (FSYS_KIND_FILE | FSYS_KIND_WILD) || !aFile.Exists() ) + if( FileStat( aFile ).GetKind() & (FSYS_KIND_FILE | FSYS_KIND_WILD) || !aFile.Exists() ) { aMask = aFile.CutName(); @@ -1242,7 +1242,7 @@ void ImpFileDialog::PreExecute() { // ListBoxen erst unmittelbar vor Execute fuellen // (damit vor Execute der Pfad umgesetzt werden kann, ohne das immer die - // Listboxen sofort upgedatet werden) + // Listboxen sofort upgedatet werden) GetFileDialog()->EnterWait(); diff --git a/svtools/source/dialogs/filedlg2.hxx b/svtools/source/dialogs/filedlg2.hxx index c562840d53ef..9a5874a7fd15 100644 --- a/svtools/source/dialogs/filedlg2.hxx +++ b/svtools/source/dialogs/filedlg2.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,20 +77,20 @@ class ImpPathDialog friend class ImpFileDialog; private: - PathDialog* pSvPathDialog; - Edit* pEdit; + PathDialog* pSvPathDialog; + Edit* pEdit; FixedText* pDirTitel; KbdListBox* pDirList; FixedText* pDirPath; - ListBox* pDriveList; - FixedText* pDriveTitle; + ListBox* pDriveList; + FixedText* pDriveTitle; PushButton* pLoadBtn; PushButton* pOkBtn; PushButton* pCancelBtn; PushButton* pHomeBtn; PushButton* pNewDirBtn; - USHORT nOwnChilds; + USHORT nOwnChilds; DirEntry aPath; // aktuell angewaehlter Pfad USHORT nDirCount; // Anzahl der Verzeichnis- @@ -101,31 +101,31 @@ private: protected: - virtual void UpdateEntries( const BOOL bWithDirs ); - void UpdateDirs( const DirEntry& rTmpPath ); + virtual void UpdateEntries( const BOOL bWithDirs ); + void UpdateDirs( const DirEntry& rTmpPath ); - BOOL IsFileOk( const DirEntry& rDirEntry ); - void InitControls(); + BOOL IsFileOk( const DirEntry& rDirEntry ); + void InitControls(); - DECL_LINK( SelectHdl, ListBox * ); - DECL_LINK( DblClickHdl, ListBox * ); - DECL_LINK( ClickHdl, Button * ); + DECL_LINK( SelectHdl, ListBox * ); + DECL_LINK( DblClickHdl, ListBox * ); + DECL_LINK( ClickHdl, Button * ); public: ImpPathDialog( PathDialog* pDlg, RESOURCE_TYPE nType, BOOL bCreateDir ); - virtual ~ImpPathDialog(); + virtual ~ImpPathDialog(); - virtual void SetPath( const String& rPath ); - virtual void SetPath( const Edit& rEdit ); - virtual String GetPath() const; + virtual void SetPath( const String& rPath ); + virtual void SetPath( const Edit& rEdit ); + virtual String GetPath() const; - virtual void PreExecute(); - virtual void PostExecute(); + virtual void PreExecute(); + virtual void PostExecute(); - PathDialog* GetPathDialog() const { return pSvPathDialog; } + PathDialog* GetPathDialog() const { return pSvPathDialog; } - void SetOkButtonText( const String& rText ) { pOkBtn->SetText( rText ); } - void SetCancelButtonText( const String& rText ) { pCancelBtn->SetText( rText ); } + void SetOkButtonText( const String& rText ) { pOkBtn->SetText( rText ); } + void SetCancelButtonText( const String& rText ) { pCancelBtn->SetText( rText ); } }; @@ -136,48 +136,48 @@ private: FixedText* pFileTitel; ListBox* pFileList; FixedText* pTypeTitel; - ListBox* pTypeList; + ListBox* pTypeList; WildCard aMask; // aktuelle Maske - ImpFilterList aFilterList; // Filterliste + ImpFilterList aFilterList; // Filterliste USHORT nCurFilter; // aktueller Filter BOOL bOpen; // TRUE = Open; FALSE = SAVEAS protected: - void InitControls(); + void InitControls(); - String ExtendFileName( DirEntry aEntry ) const; + String ExtendFileName( DirEntry aEntry ) const; - DECL_LINK( SelectHdl, ListBox * ); - DECL_LINK( DblClickHdl, ListBox * ); - DECL_LINK( ClickHdl, Button * ); + DECL_LINK( SelectHdl, ListBox * ); + DECL_LINK( DblClickHdl, ListBox * ); + DECL_LINK( ClickHdl, Button * ); - virtual void UpdateEntries( const BOOL bWithDirs ); - BOOL IsFileOk( const DirEntry& rDirEntry ); + virtual void UpdateEntries( const BOOL bWithDirs ); + BOOL IsFileOk( const DirEntry& rDirEntry ); public: ImpFileDialog( PathDialog* pDlg, WinBits nStyle, RESOURCE_TYPE nType ); - virtual ~ImpFileDialog(); + virtual ~ImpFileDialog(); - void AddFilter( const String& rFilter, const String& rMask ); - void RemoveFilter( const String& rFilter ); - void RemoveAllFilter(); - void SetCurFilter( const String& rFilter ); - String GetCurFilter() const; + void AddFilter( const String& rFilter, const String& rMask ); + void RemoveFilter( const String& rFilter ); + void RemoveAllFilter(); + void SetCurFilter( const String& rFilter ); + String GetCurFilter() const; - USHORT GetFilterCount() const { return (USHORT)aFilterList.Count(); } - inline String GetFilterName( USHORT nPos ) const; - inline String GetFilterType( USHORT nPos ) const; + USHORT GetFilterCount() const { return (USHORT)aFilterList.Count(); } + inline String GetFilterName( USHORT nPos ) const; + inline String GetFilterType( USHORT nPos ) const; - virtual void SetPath( const String& rPath ); - virtual void SetPath( const Edit& rEdit ); - virtual String GetPath() const; + virtual void SetPath( const String& rPath ); + virtual void SetPath( const Edit& rEdit ); + virtual String GetPath() const; - virtual void PreExecute(); + virtual void PreExecute(); - FileDialog* GetFileDialog() const { return (FileDialog*)GetPathDialog(); } + FileDialog* GetFileDialog() const { return (FileDialog*)GetPathDialog(); } }; inline String ImpFileDialog::GetFilterName( USHORT nPos ) const @@ -201,17 +201,17 @@ inline String ImpFileDialog::GetFilterType( USHORT nPos ) const class ImpSvFileDlg { private: - ImpPathDialog* pDlg; + ImpPathDialog* pDlg; public: - ImpSvFileDlg() { pDlg = 0; } - ~ImpSvFileDlg() { delete pDlg; } + ImpSvFileDlg() { pDlg = 0; } + ~ImpSvFileDlg() { delete pDlg; } - ImpPathDialog* GetDialog() const { return pDlg; } - void CreateDialog( PathDialog* pCreateFrom, WinBits nStyle, RESOURCE_TYPE nType, BOOL bCreate ); + ImpPathDialog* GetDialog() const { return pDlg; } + void CreateDialog( PathDialog* pCreateFrom, WinBits nStyle, RESOURCE_TYPE nType, BOOL bCreate ); - void SetOkButtonText( const String& rText ) { pDlg->SetOkButtonText( rText ); } // ihr habts ja nicht anders gewollt - void SetCancelButtonText( const String& rText ) { pDlg->SetCancelButtonText( rText ); } + void SetOkButtonText( const String& rText ) { pDlg->SetOkButtonText( rText ); } // ihr habts ja nicht anders gewollt + void SetCancelButtonText( const String& rText ) { pDlg->SetCancelButtonText( rText ); } }; diff --git a/svtools/source/dialogs/filedlg2.src b/svtools/source/dialogs/filedlg2.src index 977a0d6f430b..6a707a9ad4a4 100644 --- a/svtools/source/dialogs/filedlg2.src +++ b/svtools/source/dialogs/filedlg2.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/svtools/source/dialogs/formats.src b/svtools/source/dialogs/formats.src index f8ce80f62f2f..ccd806a275b4 100644 --- a/svtools/source/dialogs/formats.src +++ b/svtools/source/dialogs/formats.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/svtools/source/dialogs/insdlg.cxx b/svtools/source/dialogs/insdlg.cxx index fba9d66cdf73..b6d01b1e6c75 100644 --- a/svtools/source/dialogs/insdlg.cxx +++ b/svtools/source/dialogs/insdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,14 +58,14 @@ using namespace ::com::sun::star; struct OleObjectDescriptor { - sal_uInt32 cbSize; - ClsId clsid; - sal_uInt32 dwDrawAspect; - Size sizel; - Point pointl; - sal_uInt32 dwStatus; - sal_uInt32 dwFullUserTypeName; - sal_uInt32 dwSrcOfCopy; + sal_uInt32 cbSize; + ClsId clsid; + sal_uInt32 dwDrawAspect; + Size sizel; + Point pointl; + sal_uInt32 dwStatus; + sal_uInt32 dwFullUserTypeName; + sal_uInt32 dwSrcOfCopy; }; /********************** SvObjectServerList ******************************** diff --git a/svtools/source/dialogs/mcvmath.cxx b/svtools/source/dialogs/mcvmath.cxx index ec3abbc88418..51ed8be19507 100644 --- a/svtools/source/dialogs/mcvmath.cxx +++ b/svtools/source/dialogs/mcvmath.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/svtools/source/dialogs/mcvmath.hxx b/svtools/source/dialogs/mcvmath.hxx index bad63f33093f..dffdea7a3d72 100644 --- a/svtools/source/dialogs/mcvmath.hxx +++ b/svtools/source/dialogs/mcvmath.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,10 +72,10 @@ class ColWheel; class Fix { private: - friend class FixCpx; - friend class ColWheel; + friend class FixCpx; + friend class ColWheel; -// friend Fix ImpMultBig2( const Fix& a, const Fix& b ); +// friend Fix ImpMultBig2( const Fix& a, const Fix& b ); public: long x; @@ -122,7 +122,7 @@ public: class FixCpx { -// friend FixCpx ImpMultBig2( const FixCpx& ra, const FixCpx& rb ); +// friend FixCpx ImpMultBig2( const FixCpx& ra, const FixCpx& rb ); public: Fix r; diff --git a/svtools/source/dialogs/printdlg.cxx b/svtools/source/dialogs/printdlg.cxx index 66105d262559..36c69f8451ae 100644 --- a/svtools/source/dialogs/printdlg.cxx +++ b/svtools/source/dialogs/printdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,28 +65,28 @@ struct SvtPrinterImpl ~SvtPrinterImpl() { delete m_pTempPrinter; } }; -#define TEMPPRINTER() mpPrinterImpl->m_pTempPrinter +#define TEMPPRINTER() mpPrinterImpl->m_pTempPrinter // ======================================================================= PrintDialog::PrintDialog( Window* pWindow, bool bWithSheetsAndCells ) : - ModalDialog ( pWindow, SvtResId( DLG_SVT_PRNDLG_PRINTDLG ) ), - maFlPrinter ( this, SvtResId( FL_PRINTER ) ), - maFtName ( this, SvtResId( FT_NAME ) ), - maLbName ( this, SvtResId( LB_NAMES ) ), + ModalDialog ( pWindow, SvtResId( DLG_SVT_PRNDLG_PRINTDLG ) ), + maFlPrinter ( this, SvtResId( FL_PRINTER ) ), + maFtName ( this, SvtResId( FT_NAME ) ), + maLbName ( this, SvtResId( LB_NAMES ) ), maBtnProperties ( this, SvtResId( BTN_PROPERTIES ) ), - maFtStatus ( this, SvtResId( FT_STATUS ) ), - maFiStatus ( this, SvtResId( FI_STATUS ) ), - maFtType ( this, SvtResId( FT_TYPE ) ), - maFiType ( this, SvtResId( FI_TYPE ) ), - maFtLocation ( this, SvtResId( FT_LOCATION ) ), - maFiLocation ( this, SvtResId( FI_LOCATION ) ), - maFtComment ( this, SvtResId( FT_COMMENT ) ), - maFiComment ( this, SvtResId( FI_COMMENT ) ), - maCbxFilePrint ( this, SvtResId( CBX_FILEPRINT ) ), - maFiPrintFile ( this, SvtResId( FI_PRINTFILE ) ), - maFiFaxNo ( this, SvtResId( FI_FAXNO ) ), - maEdtFaxNo ( this, SvtResId( EDT_FAXNO ) ), + maFtStatus ( this, SvtResId( FT_STATUS ) ), + maFiStatus ( this, SvtResId( FI_STATUS ) ), + maFtType ( this, SvtResId( FT_TYPE ) ), + maFiType ( this, SvtResId( FI_TYPE ) ), + maFtLocation ( this, SvtResId( FT_LOCATION ) ), + maFiLocation ( this, SvtResId( FI_LOCATION ) ), + maFtComment ( this, SvtResId( FT_COMMENT ) ), + maFiComment ( this, SvtResId( FI_COMMENT ) ), + maCbxFilePrint ( this, SvtResId( CBX_FILEPRINT ) ), + maFiPrintFile ( this, SvtResId( FI_PRINTFILE ) ), + maFiFaxNo ( this, SvtResId( FI_FAXNO ) ), + maEdtFaxNo ( this, SvtResId( EDT_FAXNO ) ), maFlPrint ( this, SvtResId( FL_PRINT ) ), maRbtAllSheets ( this, SvtResId( RBT_ALL_SHEETS ) ), maRbtSelectedSheets ( this, SvtResId( RBT_SELECTED_SHEETS ) ), @@ -114,21 +114,21 @@ PrintDialog::PrintDialog( Window* pWindow, bool bWithSheetsAndCells ) : { FreeResource(); - mpPrinter = NULL; - mpPrinterImpl = new SvtPrinterImpl; - mnCopyCount = 1; - mnFirstPage = 0; - mnLastPage = 0; - mnMinPage = 1; - mnMaxPage = 65535; - meCheckRange = PRINTDIALOG_ALL; - mbAll = TRUE; - mbSelection = FALSE; - mbFromTo = FALSE; - mbRange = FALSE; + mpPrinter = NULL; + mpPrinterImpl = new SvtPrinterImpl; + mnCopyCount = 1; + mnFirstPage = 0; + mnLastPage = 0; + mnMinPage = 1; + mnMaxPage = 65535; + meCheckRange = PRINTDIALOG_ALL; + mbAll = TRUE; + mbSelection = FALSE; + mbFromTo = FALSE; + mbRange = FALSE; mbCollate = TRUE; mbCollateCheck = TRUE; - mbOptions = FALSE; + mbOptions = FALSE; maStatusTimer.SetTimeout( IMPL_PRINTDLG_STATUS_UPDATE ); maStatusTimer.SetTimeoutHdl( LINK( this, PrintDialog, ImplStatusHdl ) ); @@ -751,7 +751,7 @@ short PrintDialog::Execute() DBG_ERRORFILE( "PrinterSetupDialog::Execute() - No Printer or printer is printing" ); return FALSE; } - + // check if the printer brings up its own dialog // in that case leave the work to that dialog if( mpPrinter->GetCapabilities( PRINTER_CAPABILITIES_EXTERNALDIALOG ) ) diff --git a/svtools/source/dialogs/printdlg.hrc b/svtools/source/dialogs/printdlg.hrc index 83b7b0b28c82..7c7c283887e0 100644 --- a/svtools/source/dialogs/printdlg.hrc +++ b/svtools/source/dialogs/printdlg.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 <svtools/svtools.hrc> #define FL_PRINTER 1 -#define LB_NAMES 2 -#define BTN_PROPERTIES 3 -#define FT_NAME 4 -#define FT_STATUS 5 -#define FI_STATUS 6 -#define FT_TYPE 7 -#define FI_TYPE 8 -#define FT_LOCATION 9 -#define FI_LOCATION 10 -#define FT_COMMENT 11 -#define FI_COMMENT 12 -#define CBX_FILEPRINT 13 -#define FI_PRINTFILE 14 +#define LB_NAMES 2 +#define BTN_PROPERTIES 3 +#define FT_NAME 4 +#define FT_STATUS 5 +#define FI_STATUS 6 +#define FT_TYPE 7 +#define FI_TYPE 8 +#define FT_LOCATION 9 +#define FI_LOCATION 10 +#define FT_COMMENT 11 +#define FI_COMMENT 12 +#define CBX_FILEPRINT 13 +#define FI_PRINTFILE 14 #define FI_FAXNO 15 #define EDT_FAXNO 16 diff --git a/svtools/source/dialogs/printdlg.src b/svtools/source/dialogs/printdlg.src index 405accc63344..d110c102ebd1 100644 --- a/svtools/source/dialogs/printdlg.src +++ b/svtools/source/dialogs/printdlg.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/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx index 3abad8dd8505..a44d5a1de2ae 100644 --- a/svtools/source/dialogs/prnsetup.cxx +++ b/svtools/source/dialogs/prnsetup.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -90,7 +90,7 @@ Printer* ImplPrnDlgListBoxSelect( ListBox* pBox, PushButton* pPropBtn, pTempPrinter = new Printer( *pInfo ); } } - + pPropBtn->Enable( pTempPrinter->HasSupport( SUPPORT_SETUPDIALOG ) ); } else @@ -156,8 +156,8 @@ static void ImplPrnDlgAddResString( XubString& rStr, USHORT nResId ) XubString ImplPrnDlgGetStatusText( const QueueInfo& rInfo ) { - XubString aStr; - ULONG nStatus = rInfo.GetStatus(); + XubString aStr; + ULONG nStatus = rInfo.GetStatus(); // Default-Printer if ( rInfo.GetPrinterName().Len() && @@ -232,32 +232,32 @@ XubString ImplPrnDlgGetStatusText( const QueueInfo& rInfo ) // ======================================================================= PrinterSetupDialog::PrinterSetupDialog( Window* pWindow ) : - ModalDialog ( pWindow, SvtResId( DLG_SVT_PRNDLG_PRNSETUPDLG ) ), - maFlPrinter ( this, SvtResId( FL_PRINTER ) ), - maFtName ( this, SvtResId( FT_NAME ) ), - maLbName ( this, SvtResId( LB_NAMES ) ), + ModalDialog ( pWindow, SvtResId( DLG_SVT_PRNDLG_PRNSETUPDLG ) ), + maFlPrinter ( this, SvtResId( FL_PRINTER ) ), + maFtName ( this, SvtResId( FT_NAME ) ), + maLbName ( this, SvtResId( LB_NAMES ) ), maBtnProperties ( this, SvtResId( BTN_PROPERTIES ) ), maBtnOptions ( this, SvtResId( BTN_OPTIONS ) ), - maFtStatus ( this, SvtResId( FT_STATUS ) ), - maFiStatus ( this, SvtResId( FI_STATUS ) ), - maFtType ( this, SvtResId( FT_TYPE ) ), - maFiType ( this, SvtResId( FI_TYPE ) ), - maFtLocation ( this, SvtResId( FT_LOCATION ) ), - maFiLocation ( this, SvtResId( FI_LOCATION ) ), - maFtComment ( this, SvtResId( FT_COMMENT ) ), - maFiComment ( this, SvtResId( FI_COMMENT ) ), - maFlSepButton ( this, SvtResId( FL_SEPBUTTON ) ), - maBtnOK ( this, SvtResId( BTN_OK ) ), - maBtnCancel ( this, SvtResId( BTN_CANCEL ) ), - maBtnHelp ( this, SvtResId( BTN_HELP ) ) + maFtStatus ( this, SvtResId( FT_STATUS ) ), + maFiStatus ( this, SvtResId( FI_STATUS ) ), + maFtType ( this, SvtResId( FT_TYPE ) ), + maFiType ( this, SvtResId( FI_TYPE ) ), + maFtLocation ( this, SvtResId( FT_LOCATION ) ), + maFiLocation ( this, SvtResId( FI_LOCATION ) ), + maFtComment ( this, SvtResId( FT_COMMENT ) ), + maFiComment ( this, SvtResId( FI_COMMENT ) ), + maFlSepButton ( this, SvtResId( FL_SEPBUTTON ) ), + maBtnOK ( this, SvtResId( BTN_OK ) ), + maBtnCancel ( this, SvtResId( BTN_CANCEL ) ), + maBtnHelp ( this, SvtResId( BTN_HELP ) ) { FreeResource(); - + // show options button only if link is set maBtnOptions.Hide(); - mpPrinter = NULL; - mpTempPrinter = NULL; + mpPrinter = NULL; + mpTempPrinter = NULL; maStatusTimer.SetTimeout( IMPL_PRINTDLG_STATUS_UPDATE ); maStatusTimer.SetTimeoutHdl( LINK( this, PrinterSetupDialog, ImplStatusHdl ) ); diff --git a/svtools/source/dialogs/prnsetup.hrc b/svtools/source/dialogs/prnsetup.hrc index 4a06c3cf0e63..164844d8dd15 100644 --- a/svtools/source/dialogs/prnsetup.hrc +++ b/svtools/source/dialogs/prnsetup.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,23 +26,23 @@ ************************************************************************/ #include <svtools/svtools.hrc> -#define FL_PRINTER 1 -#define LB_NAMES 2 -#define BTN_PROPERTIES 3 -#define FT_NAME 4 -#define FT_STATUS 5 -#define FI_STATUS 6 -#define FT_TYPE 7 -#define FI_TYPE 8 -#define FT_LOCATION 9 -#define FI_LOCATION 10 -#define FT_COMMENT 11 -#define FI_COMMENT 12 +#define FL_PRINTER 1 +#define LB_NAMES 2 +#define BTN_PROPERTIES 3 +#define FT_NAME 4 +#define FT_STATUS 5 +#define FI_STATUS 6 +#define FT_TYPE 7 +#define FI_TYPE 8 +#define FT_LOCATION 9 +#define FI_LOCATION 10 +#define FT_COMMENT 11 +#define FI_COMMENT 12 -#define BTN_OK 13 -#define BTN_CANCEL 14 -#define BTN_HELP 15 +#define BTN_OK 13 +#define BTN_CANCEL 14 +#define BTN_HELP 15 -#define FL_SEPBUTTON 16 +#define FL_SEPBUTTON 16 #define BTN_OPTIONS 17 diff --git a/svtools/source/dialogs/prnsetup.src b/svtools/source/dialogs/prnsetup.src index 1443a35e0f39..11b6d853c7fe 100644 --- a/svtools/source/dialogs/prnsetup.src +++ b/svtools/source/dialogs/prnsetup.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/svtools/source/dialogs/propctrl.cxx b/svtools/source/dialogs/propctrl.cxx index 3d0df16fe056..c69a2dc078b7 100644 --- a/svtools/source/dialogs/propctrl.cxx +++ b/svtools/source/dialogs/propctrl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,32 +61,32 @@ public: SMART_UNO_DECLARATION(ImplIntrospection,UsrObject); // Methoden von XInterface - XInterface * queryInterface( Uik aUik ); - XIdlClassRef getIdlClass(); + XInterface * queryInterface( Uik aUik ); + XIdlClassRef getIdlClass(); */ // Methoden von SvPropertyDataControl - virtual void Modified( const String& aName, + virtual void Modified( const String& aName, const String& aVal, void* pData); - virtual void Clicked( const String& aName, + virtual void Clicked( const String& aName, const String& aVal, void* pData); - virtual void Commit( const String& aName, + virtual void Commit( const String& aName, const String& aVal, void* pData); - virtual void Select( const String& aName, + virtual void Select( const String& aName, void* pData); - virtual void LinkClicked(const String& aName, + virtual void LinkClicked(const String& aName, void* pData); // TODO: Das muss raus, sehr unglueckliche Schnittstelle // PropertyBox erzwingt Zustand des Controllers - virtual String GetTheCorrectProperty() const; + virtual String GetTheCorrectProperty() const; }; // Methoden von XPropertyEditor diff --git a/svtools/source/dialogs/propctrl.hxx b/svtools/source/dialogs/propctrl.hxx index bc93914af014..0e449d62ab43 100644 --- a/svtools/source/dialogs/propctrl.hxx +++ b/svtools/source/dialogs/propctrl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,8 +91,8 @@ public: SMART_UNO_DECLARATION(ImplIntrospection,UsrObject); // Methoden von XInterface - XInterface * queryInterface( Uik aUik ); - XIdlClassRef getIdlClass(); + XInterface * queryInterface( Uik aUik ); + XIdlClassRef getIdlClass(); // Methoden von XPropertyEditor virtual void setObject(const UsrAny& aToInspectObj, const XubString& aObjName); diff --git a/svtools/source/dialogs/property.cxx b/svtools/source/dialogs/property.cxx index 6d93a885ec86..6a5c791aa176 100644 --- a/svtools/source/dialogs/property.cxx +++ b/svtools/source/dialogs/property.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ SvXPropertyControl::SvXPropertyControl( Window* pParent, WinBits nWinStyle) - : Control(pParent,nWinStyle) + : Control(pParent,nWinStyle) { } SvXPropertyControl::SvXPropertyControl( Window* pParent, const ResId& rResId ) - : Control(pParent,rResId ) + : Control(pParent,rResId ) { } //------------------------------------------------------------------ SvXPropertyEdit::SvXPropertyEdit( Window* pParent, WinBits nWinStyle) - : SvXPropertyControl(pParent,nWinStyle), + : SvXPropertyControl(pParent,nWinStyle), aEdit(this,WB_BORDER | WB_TABSTOP) { pListener=NULL; @@ -62,7 +62,7 @@ SvXPropertyEdit::SvXPropertyEdit( Window* pParent, WinBits nWinStyle) } SvXPropertyEdit::SvXPropertyEdit( Window* pParent, const ResId& rResId) - : SvXPropertyControl(pParent,rResId), + : SvXPropertyControl(pParent,rResId), aEdit(this,WB_BORDER | WB_TABSTOP) { pListener=NULL; @@ -176,7 +176,7 @@ IMPL_LINK( SvXPropertyEdit, LoseFocusHdl, Edit*, EMPTYARG ) //------------------------------------------------------------------ SvXPropertyListBox::SvXPropertyListBox( Window* pParent, WinBits nWinStyle) - : SvXPropertyControl(pParent,nWinStyle), + : SvXPropertyControl(pParent,nWinStyle), aListBox(this,WB_BORDER | WB_DROPDOWN | WB_TABSTOP) { pListener=NULL; @@ -190,7 +190,7 @@ SvXPropertyListBox::SvXPropertyListBox( Window* pParent, WinBits nWinStyle) } SvXPropertyListBox::SvXPropertyListBox( Window* pParent, const ResId& rResId) - : SvXPropertyControl(pParent,rResId), + : SvXPropertyControl(pParent,rResId), aListBox(this,WB_BORDER | WB_DROPDOWN | WB_TABSTOP) { pListener=NULL; @@ -305,7 +305,7 @@ IMPL_LINK( SvXPropertyListBox, LoseFocusHdl, ListBox*, EMPTYARG ) SvXPropertyComboBox::SvXPropertyComboBox( Window* pParent, WinBits nWinStyle) - : SvXPropertyControl(pParent,nWinStyle), + : SvXPropertyControl(pParent,nWinStyle), aComboBox(this,WB_BORDER | WB_DROPDOWN | WB_TABSTOP) { pListener=NULL; @@ -319,7 +319,7 @@ SvXPropertyComboBox::SvXPropertyComboBox( Window* pParent, WinBits nWinStyle) } SvXPropertyComboBox::SvXPropertyComboBox( Window* pParent, const ResId& rResId) - : SvXPropertyControl(pParent,rResId), + : SvXPropertyControl(pParent,rResId), aComboBox(this,WB_BORDER | WB_DROPDOWN | WB_TABSTOP) { pListener=NULL; @@ -369,7 +369,7 @@ void SvXPropertyComboBox::SetProperty(const String &rString) aComboBox.SetText(rString); } -String SvXPropertyComboBox::GetProperty() const +String SvXPropertyComboBox::GetProperty() const { return aComboBox.GetText(); } @@ -432,7 +432,7 @@ IMPL_LINK( SvXPropertyComboBox, LoseFocusHdl, ComboBox*, EMPTYARG ) //------------------------------------------------------------------ SvPropertyLine::SvPropertyLine( Window* pParent,WinBits nWinStyle) - : Control(pParent,nWinStyle), + : Control(pParent,nWinStyle), aName(this,WB_BORDER), pSvXPropertyControl(NULL), aXButton(this,WB_BORDER), @@ -451,10 +451,10 @@ SvPropertyLine::SvPropertyLine( Window* pParent,WinBits nWinStyle) } SvPropertyLine::SvPropertyLine( Window* pParent,const ResId& rResId ) - : Control(pParent,rResId), - aName (this,WB_BORDER), + : Control(pParent,rResId), + aName (this,WB_BORDER), pSvXPropertyControl(NULL), - aXButton (this,WB_BORDER), + aXButton (this,WB_BORDER), bIsLocked(FALSE), bIsHyperlink(FALSE) { @@ -515,8 +515,8 @@ void SvPropertyLine::Resize() aPos.X()=GetOutputSizePixel().Width() -nXButtonWidth; aSize.Width()=nXButtonWidth; - aXButton .SetSizePixel(aSize); - aXButton .SetPosPixel(aPos); + aXButton .SetSizePixel(aSize); + aXButton .SetPosPixel(aPos); } } @@ -649,7 +649,7 @@ void SvXPropEvListener::KeyInput (SvXPropertyControl *pSvXPCtr,const KeyCode& th aKeyInputLink.Call(this); } -SvXPropertyControl * SvXPropEvListener::GetPropertyControl() +SvXPropertyControl * SvXPropEvListener::GetPropertyControl() { return pTheActiveControl; } @@ -662,13 +662,13 @@ KeyCode SvXPropEvListener::GetKeyCode() const //------------------------------------------------------------------ SvListBoxForProperties::SvListBoxForProperties( Window* pParent, WinBits nWinStyle) - : Control(pParent,nWinStyle), + : Control(pParent,nWinStyle), aPlayGround(this,WB_DIALOGCONTROL), aVScroll(this,WB_VSCROLL|WB_REPEAT|WB_DRAG), pPropDataControl(NULL) { - aListener.SetModifyHdl (LINK( this, SvListBoxForProperties, ModifyHdl)); + aListener.SetModifyHdl (LINK( this, SvListBoxForProperties, ModifyHdl)); aListener.SetGetFocusHdl (LINK( this, SvListBoxForProperties, GetFocusHdl)); aListener.SetLoseFocusHdl(LINK( this, SvListBoxForProperties,LoseFocusHdl)); aListener.SetKeyInputHdl (LINK( this, SvListBoxForProperties, KeyInputHdl)); @@ -690,7 +690,7 @@ SvListBoxForProperties::SvListBoxForProperties( Window* pParent, WinBits nWinSty SvListBoxForProperties::SvListBoxForProperties( Window* pParent, const ResId& rResId ) - : Control(pParent,rResId), + : Control(pParent,rResId), aPlayGround(this,0), aVScroll(this,WB_VSCROLL|WB_REPEAT|WB_DRAG), pPropDataControl(NULL) @@ -723,9 +723,9 @@ void SvListBoxForProperties::Clear() switch(pPropLine->GetKindOfControl()) { - case KOC_LISTBOX: - case KOC_COMBOBOX: - case KOC_EDIT: delete pPropLine->GetSvXPropertyControl(); + case KOC_LISTBOX: + case KOC_COMBOBOX: + case KOC_EDIT: delete pPropLine->GetSvXPropertyControl(); break; default: break; @@ -936,9 +936,9 @@ void SvListBoxForProperties::ChangeEntry( const SvPropertyData& aPropData, USHOR switch(pPropLine->GetKindOfControl()) { - case KOC_LISTBOX: - case KOC_COMBOBOX: - case KOC_EDIT: delete pPropLine->GetSvXPropertyControl(); + case KOC_LISTBOX: + case KOC_COMBOBOX: + case KOC_EDIT: delete pPropLine->GetSvXPropertyControl(); break; default: break; @@ -946,22 +946,22 @@ void SvListBoxForProperties::ChangeEntry( const SvPropertyData& aPropData, USHOR switch(aPropData.eKind) { - case KOC_LISTBOX: + case KOC_LISTBOX: pPropLine->SetSvXPropertyControl( new SvXPropertyComboBox(pPropLine,WB_TABSTOP)); pPropLine->SetKindOfControl(aPropData.eKind); break; - case KOC_COMBOBOX: + case KOC_COMBOBOX: pPropLine->SetSvXPropertyControl( new SvXPropertyComboBox(pPropLine,WB_TABSTOP)); pPropLine->SetKindOfControl(aPropData.eKind); break; - case KOC_EDIT: + case KOC_EDIT: pPropLine->SetSvXPropertyControl( new SvXPropertyEdit(pPropLine,WB_TABSTOP)); pPropLine->SetKindOfControl(aPropData.eKind); break; - case KOC_USERDEFINED: + case KOC_USERDEFINED: pPropLine->SetSvXPropertyControl(aPropData.pControl); aPropData.pControl->SetParent(pPropLine); pPropLine->SetKindOfControl(aPropData.eKind); @@ -1131,7 +1131,7 @@ IMPL_LINK( SvListBoxForProperties, KeyInputHdl,SvXPropEvListener*, pSvXPEvL) SvTabPageForProperties::SvTabPageForProperties(Window* pParent,WinBits nWinStyle) - : TabPage(pParent,nWinStyle), + : TabPage(pParent,nWinStyle), aLbProp(this) { aLbProp.Show(); @@ -1341,9 +1341,9 @@ void SvBasicPropertyDataControl::Modified(const String& aName, aModifyLink.Call(this); } -void SvBasicPropertyDataControl::Clicked( const String& aName, +void SvBasicPropertyDataControl::Clicked( const String& aName, const String& aVal, - void* pData) //Xtension-Button pressed + void* pData) //Xtension-Button pressed { aEntryName=aName; aEntryProperty=aVal; @@ -1351,9 +1351,9 @@ void SvBasicPropertyDataControl::Clicked( const String& aName, aClickedLink.Call(this); } -void SvBasicPropertyDataControl::Commit( const String& aName, +void SvBasicPropertyDataControl::Commit( const String& aName, const String& aVal, - void* pData) //User accept changes + void* pData) //User accept changes { aEntryName=aName; aEntryProperty=aVal; @@ -1361,8 +1361,8 @@ void SvBasicPropertyDataControl::Commit( const String& aName, aCommitLink.Call(this); } -void SvBasicPropertyDataControl::Select( const String& aName, - void* pData) //User select new Row +void SvBasicPropertyDataControl::Select( const String& aName, + void* pData) //User select new Row { aEntryName=aName; pTheData=pData; @@ -1374,17 +1374,17 @@ void SvBasicPropertyDataControl::LinkClicked(const String&, void*) } -String SvBasicPropertyDataControl::GetName() const //Tell's the name of the Property +String SvBasicPropertyDataControl::GetName() const //Tell's the name of the Property { return aEntryName; } -String SvBasicPropertyDataControl::GetProperty() const //Tell's the content of the Property +String SvBasicPropertyDataControl::GetProperty() const //Tell's the content of the Property { return aEntryProperty; } -void* SvBasicPropertyDataControl::GetData() //Tell's the storage +void* SvBasicPropertyDataControl::GetData() //Tell's the storage { return pTheData; } @@ -1414,13 +1414,13 @@ void SvBasicPropertyDataControl::SetIsCorrect(BOOL nFlag) //======================================================================== /* ScPropertyDlg::ScPropertyDlg( Window* pParent) : - ModalDialog ( pParent, ScResId( RID_SCDLG_PROPERTIES) ), - aPropListBox ( this, ResId( CTR_PROPLINE) ), - aKindOfListBox (this,ResId( LB_KIND_OF_PROP)), - aModAnswer (this,ResId(FT_ANSMOD )), - aClickAnswer (this,ResId(FT_ANSCLICK )), - aCommitAnswer (this,ResId(FT_ANSCOMMIT)), - aSelectAnswer (this,ResId(FT_ANSSELECT)), + ModalDialog ( pParent, ScResId( RID_SCDLG_PROPERTIES) ), + aPropListBox ( this, ResId( CTR_PROPLINE) ), + aKindOfListBox (this,ResId( LB_KIND_OF_PROP)), + aModAnswer (this,ResId(FT_ANSMOD )), + aClickAnswer (this,ResId(FT_ANSCLICK )), + aCommitAnswer (this,ResId(FT_ANSCOMMIT)), + aSelectAnswer (this,ResId(FT_ANSSELECT)), anOk(this,ResId( BTN_OK)), aCancel(this,ResId( BTN_CANCEL)) { @@ -1435,9 +1435,9 @@ ScPropertyDlg::ScPropertyDlg( Window* pParent) : String aString("Don't know "); aBaProDatCtr.SetModifyHdl (LINK( this, ScPropertyDlg, RowModifiedHdl )); - aBaProDatCtr.SetClickedHdl(LINK( this, ScPropertyDlg, ClickHdl )); - aBaProDatCtr.SetCommitHdl (LINK( this, ScPropertyDlg, SelectHdl )); - aBaProDatCtr.SetSelectHdl (LINK( this, ScPropertyDlg, CommitHdl )); + aBaProDatCtr.SetClickedHdl(LINK( this, ScPropertyDlg, ClickHdl )); + aBaProDatCtr.SetCommitHdl (LINK( this, ScPropertyDlg, SelectHdl )); + aBaProDatCtr.SetSelectHdl (LINK( this, ScPropertyDlg, CommitHdl )); aPropListBox.SetController(&aBaProDatCtr); diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx index c700e896dce8..4f3235058ec2 100644 --- a/svtools/source/dialogs/roadmapwizard.cxx +++ b/svtools/source/dialogs/roadmapwizard.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ namespace svt StateDescriptions aStateDescriptors; StateSet aDisabledStates; bool bActivePathIsDefinite; - FixedLine* pFixedLine; + FixedLine* pFixedLine; RoadmapWizardImpl() :pRoadmap( NULL ) @@ -234,7 +234,7 @@ namespace svt } //-------------------------------------------------------------------- - const BitmapEx& RoadmapWizard::GetRoadmapBitmap( ) const + const BitmapEx& RoadmapWizard::GetRoadmapBitmap( ) const { return m_pImpl->pRoadmap->GetRoadmapBitmap(); } diff --git a/svtools/source/dialogs/so3res.src b/svtools/source/dialogs/so3res.src index 524b58e0a5df..7373f6278ebf 100644 --- a/svtools/source/dialogs/so3res.src +++ b/svtools/source/dialogs/so3res.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 "sores.hxx" #define __RSC #include "soerr.hxx" -#define S_MAX 0x7fff +#define S_MAX 0x7fff Resource RID_SO_ERROR_HANDLER { String ERRCODE_SO_GENERALERROR&S_MAX @@ -178,9 +178,9 @@ Resource RID_SO_ERROR_HANDLER Text [ en-US ] = "The specified file could not be opened." ; }; /* - String & S_MAX + String & S_MAX { - Text = ""; + Text = ""; }; */ }; diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx index 9068b493df9d..b66931190515 100644 --- a/svtools/source/dialogs/wizardmachine.cxx +++ b/svtools/source/dialogs/wizardmachine.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ namespace svt // the WizardDialog does not allow non-linear transitions (e.g. it's // not possible to add pages in a non-linear order), so we need some own maintainance data - sal_Bool m_bAutoNextButtonState; + sal_Bool m_bAutoNextButtonState; bool m_bTravelingSuspended; @@ -202,7 +202,7 @@ namespace svt m_pPrevPage->Show(); if (_nButtonFlags & WZB_NEXT) - AddButton( m_pPrevPage, ( WIZARDDIALOG_BUTTON_SMALLSTDOFFSET_X) ); // half x-offset to the next button + AddButton( m_pPrevPage, ( WIZARDDIALOG_BUTTON_SMALLSTDOFFSET_X) ); // half x-offset to the next button else AddButton( m_pPrevPage, WIZARDDIALOG_BUTTON_STDOFFSET_X ); SetPrevButton( m_pPrevPage ); @@ -372,14 +372,14 @@ namespace svt // is it a button? WindowType eType = pChildLoop->GetType(); - if ( (WINDOW_BUTTON == eType) - || (WINDOW_PUSHBUTTON == eType) - || (WINDOW_OKBUTTON == eType) - || (WINDOW_CANCELBUTTON == eType) - || (WINDOW_HELPBUTTON == eType) - || (WINDOW_IMAGEBUTTON == eType) - || (WINDOW_MENUBUTTON == eType) - || (WINDOW_MOREBUTTON == eType) + if ( (WINDOW_BUTTON == eType) + || (WINDOW_PUSHBUTTON == eType) + || (WINDOW_OKBUTTON == eType) + || (WINDOW_CANCELBUTTON == eType) + || (WINDOW_HELPBUTTON == eType) + || (WINDOW_IMAGEBUTTON == eType) + || (WINDOW_MENUBUTTON == eType) + || (WINDOW_MOREBUTTON == eType) ) { pChildLoop->SetStyle(pChildLoop->GetStyle() & ~WB_DEFBUTTON); @@ -745,7 +745,7 @@ namespace svt } //......................................................................... -} // namespace svt +} // namespace svt //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/dialogs/wizardmachine.src b/svtools/source/dialogs/wizardmachine.src index 9c82ea30071f..b3c7e5e1a515 100644 --- a/svtools/source/dialogs/wizardmachine.src +++ b/svtools/source/dialogs/wizardmachine.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/svtools/source/dialogs/wizdlg.cxx b/svtools/source/dialogs/wizdlg.cxx index 6197ccb81949..e8d3c789c3cd 100644 --- a/svtools/source/dialogs/wizdlg.cxx +++ b/svtools/source/dialogs/wizdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -244,7 +244,7 @@ void WizardDialog::ImplPosCtrls() long WizardDialog::LogicalCoordinateToPixel(int iCoordinate){ - Size aLocSize = LogicToPixel(Size( iCoordinate, 0 ), MAP_APPFONT ); + Size aLocSize = LogicToPixel(Size( iCoordinate, 0 ), MAP_APPFONT ); int iPixelCoordinate = aLocSize.Width(); return iPixelCoordinate; } diff --git a/svtools/source/edit/editsyntaxhighlighter.cxx b/svtools/source/edit/editsyntaxhighlighter.cxx index 96989a6ff30a..f515c7516462 100644 --- a/svtools/source/edit/editsyntaxhighlighter.cxx +++ b/svtools/source/edit/editsyntaxhighlighter.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,14 +35,14 @@ #include "../../inc/txtattr.hxx" -MultiLineEditSyntaxHighlight::MultiLineEditSyntaxHighlight( Window* pParent, WinBits nWinStyle, +MultiLineEditSyntaxHighlight::MultiLineEditSyntaxHighlight( Window* pParent, WinBits nWinStyle, HighlighterLanguage aLanguage): MultiLineEdit(pParent,nWinStyle), mbDoBracketHilight(true) { EnableUpdateData(300); aHighlighter.initialize( aLanguage ); } -MultiLineEditSyntaxHighlight::MultiLineEditSyntaxHighlight( Window* pParent, const ResId& rResId , +MultiLineEditSyntaxHighlight::MultiLineEditSyntaxHighlight( Window* pParent, const ResId& rResId , HighlighterLanguage aLanguage): MultiLineEdit(pParent,rResId), mbDoBracketHilight(true) { EnableUpdateData(300); @@ -62,7 +62,7 @@ bool MultiLineEditSyntaxHighlight::IsBracketHilight() { return mbDoBracketHilight; } - + void MultiLineEditSyntaxHighlight::SetText(const String& rNewText) { MultiLineEdit::SetText(rNewText); @@ -79,8 +79,8 @@ void MultiLineEditSyntaxHighlight::DoBracketHilight(USHORT aKey) switch (aKey) { - case '\'': // no break - case '"': + case '\'': // no break + case '"': { aChar = aKey; break; @@ -111,7 +111,7 @@ void MultiLineEditSyntaxHighlight::DoBracketHilight(USHORT aKey) String aLine( GetTextEngine()->GetText( aPara ) ); for (USHORT i = ((unsigned long)aPara==nStartPara) ? aStartPos-1 : (USHORT)(aLine.Len()-1); i>0; --i) - { + { if (aLine.GetChar(i)==aChar) { if (!aCount) @@ -149,14 +149,14 @@ Color MultiLineEditSyntaxHighlight::GetColorValue(TokenTypes aToken) { switch (aToken) { - case TT_IDENTIFIER: aColor = (ColorData)m_aColorConfig.GetColorValue(svtools::SQLIDENTIFIER).nColor; break; - case TT_NUMBER: aColor = (ColorData)m_aColorConfig.GetColorValue(svtools::SQLNUMBER).nColor; break; - case TT_STRING: aColor = (ColorData)m_aColorConfig.GetColorValue(svtools::SQLSTRING).nColor; break; - case TT_OPERATOR: aColor = (ColorData)m_aColorConfig.GetColorValue(svtools::SQLOPERATOR).nColor; break; - case TT_KEYWORDS: aColor = (ColorData)m_aColorConfig.GetColorValue(svtools::SQLKEYWORD).nColor; break; + case TT_IDENTIFIER: aColor = (ColorData)m_aColorConfig.GetColorValue(svtools::SQLIDENTIFIER).nColor; break; + case TT_NUMBER: aColor = (ColorData)m_aColorConfig.GetColorValue(svtools::SQLNUMBER).nColor; break; + case TT_STRING: aColor = (ColorData)m_aColorConfig.GetColorValue(svtools::SQLSTRING).nColor; break; + case TT_OPERATOR: aColor = (ColorData)m_aColorConfig.GetColorValue(svtools::SQLOPERATOR).nColor; break; + case TT_KEYWORDS: aColor = (ColorData)m_aColorConfig.GetColorValue(svtools::SQLKEYWORD).nColor; break; case TT_PARAMETER: aColor = (ColorData)m_aColorConfig.GetColorValue(svtools::SQLPARAMETER).nColor; break; - case TT_COMMENT: aColor = (ColorData)m_aColorConfig.GetColorValue(svtools::SQLCOMMENT).nColor; break; - default: aColor = Color(0,0,0); + case TT_COMMENT: aColor = (ColorData)m_aColorConfig.GetColorValue(svtools::SQLCOMMENT).nColor; break; + default: aColor = Color(0,0,0); } break; } @@ -164,14 +164,14 @@ Color MultiLineEditSyntaxHighlight::GetColorValue(TokenTypes aToken) { switch (aToken) { - case TT_IDENTIFIER: aColor = Color(255,0,0); break; - case TT_COMMENT: aColor = Color(0,0,45); break; - case TT_NUMBER: aColor = Color(204,102,204); break; - case TT_STRING: aColor = Color(0,255,45); break; - case TT_OPERATOR: aColor = Color(0,0,100); break; - case TT_KEYWORDS: aColor = Color(0,0,255); break; - case TT_ERROR : aColor = Color(0,255,255); break; - default: aColor = Color(0,0,0); + case TT_IDENTIFIER: aColor = Color(255,0,0); break; + case TT_COMMENT: aColor = Color(0,0,45); break; + case TT_NUMBER: aColor = Color(204,102,204); break; + case TT_STRING: aColor = Color(0,255,45); break; + case TT_OPERATOR: aColor = Color(0,0,100); break; + case TT_KEYWORDS: aColor = Color(0,0,255); break; + case TT_ERROR : aColor = Color(0,255,255); break; + default: aColor = Color(0,0,0); } break; } @@ -190,7 +190,7 @@ void MultiLineEditSyntaxHighlight::UpdateData() { String aLine( GetTextEngine()->GetText( nLine ) ); Range aChanges = aHighlighter.notifyChange( nLine, 0, &aLine, 1 ); - + GetTextEngine()->RemoveAttribs( nLine, TRUE ); HighlightPortions aPortions; aHighlighter.getHighlightPortions( nLine, aLine, aPortions ); diff --git a/svtools/source/edit/svmedit.cxx b/svtools/source/edit/svmedit.cxx index 78467140c181..f4301735b631 100644 --- a/svtools/source/edit/svmedit.cxx +++ b/svtools/source/edit/svmedit.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ // IDs erstmal aus VCL geklaut, muss mal richtig delivert werden... -#define SV_MENU_EDIT_UNDO 1 -#define SV_MENU_EDIT_CUT 2 -#define SV_MENU_EDIT_COPY 3 -#define SV_MENU_EDIT_PASTE 4 -#define SV_MENU_EDIT_DELETE 5 -#define SV_MENU_EDIT_SELECTALL 6 -#define SV_MENU_EDIT_INSERTSYMBOL 7 +#define SV_MENU_EDIT_UNDO 1 +#define SV_MENU_EDIT_CUT 2 +#define SV_MENU_EDIT_COPY 3 +#define SV_MENU_EDIT_PASTE 4 +#define SV_MENU_EDIT_DELETE 5 +#define SV_MENU_EDIT_SELECTALL 6 +#define SV_MENU_EDIT_INSERTSYMBOL 7 #include <vcl/scrbar.hxx> namespace css = ::com::sun::star; @@ -63,40 +63,40 @@ namespace css = ::com::sun::star; class TextWindow : public Window { private: - ExtTextEngine* mpExtTextEngine; - ExtTextView* mpExtTextView; + ExtTextEngine* mpExtTextEngine; + ExtTextView* mpExtTextView; - BOOL mbInMBDown; - BOOL mbFocusSelectionHide; - BOOL mbIgnoreTab; - BOOL mbActivePopup; + BOOL mbInMBDown; + BOOL mbFocusSelectionHide; + BOOL mbIgnoreTab; + BOOL mbActivePopup; BOOL mbSelectOnTab; public: TextWindow( Window* pParent ); ~TextWindow(); - ExtTextEngine* GetTextEngine() const { return mpExtTextEngine; } - ExtTextView* GetTextView() const { return mpExtTextView; } + ExtTextEngine* GetTextEngine() const { return mpExtTextEngine; } + ExtTextView* GetTextView() const { return mpExtTextView; } - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void KeyInput( const KeyEvent& rKEvent ); + virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void KeyInput( const KeyEvent& rKEvent ); - virtual void Command( const CommandEvent& rCEvt ); + virtual void Command( const CommandEvent& rCEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); + virtual void Paint( const Rectangle& rRect ); + virtual void Resize(); - virtual void GetFocus(); - virtual void LoseFocus(); + virtual void GetFocus(); + virtual void LoseFocus(); - BOOL IsAutoFocusHide() const { return mbFocusSelectionHide; } - void SetAutoFocusHide( BOOL bAutoHide ) { mbFocusSelectionHide = bAutoHide; } + BOOL IsAutoFocusHide() const { return mbFocusSelectionHide; } + void SetAutoFocusHide( BOOL bAutoHide ) { mbFocusSelectionHide = bAutoHide; } - BOOL IsIgnoreTab() const { return mbIgnoreTab; } - void SetIgnoreTab( BOOL bIgnore ) { mbIgnoreTab = bIgnore; } + BOOL IsIgnoreTab() const { return mbIgnoreTab; } + void SetIgnoreTab( BOOL bIgnore ) { mbIgnoreTab = bIgnore; } void DisableSelectionOnFocus() {mbSelectOnTab = sal_False;} @@ -109,78 +109,78 @@ public: class ImpSvMEdit : public SfxListener { private: - MultiLineEdit* pSvMultiLineEdit; + MultiLineEdit* pSvMultiLineEdit; - TextWindow* mpTextWindow; - ScrollBar* mpHScrollBar; - ScrollBar* mpVScrollBar; - ScrollBarBox* mpScrollBox; + TextWindow* mpTextWindow; + ScrollBar* mpHScrollBar; + ScrollBar* mpVScrollBar; + ScrollBarBox* mpScrollBox; - Point maTextWindowOffset; - xub_StrLen mnTextWidth; + Point maTextWindowOffset; + xub_StrLen mnTextWidth; mutable Selection maSelection; protected: - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); - void ImpUpdateSrollBarVis( WinBits nWinStyle ); - void ImpInitScrollBars(); - void ImpSetScrollBarRanges(); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + void ImpUpdateSrollBarVis( WinBits nWinStyle ); + void ImpInitScrollBars(); + void ImpSetScrollBarRanges(); void ImpSetHScrollBarThumbPos(); - DECL_LINK( ScrollHdl, ScrollBar* ); + DECL_LINK( ScrollHdl, ScrollBar* ); public: ImpSvMEdit( MultiLineEdit* pSvMultiLineEdit, WinBits nWinStyle ); ~ImpSvMEdit(); - void SetModified( BOOL bMod ); - BOOL IsModified() const; + void SetModified( BOOL bMod ); + BOOL IsModified() const; - void SetReadOnly( BOOL bRdOnly ); - BOOL IsReadOnly() const; + void SetReadOnly( BOOL bRdOnly ); + BOOL IsReadOnly() const; - void SetMaxTextLen( xub_StrLen nLen ); - xub_StrLen GetMaxTextLen() const; + void SetMaxTextLen( xub_StrLen nLen ); + xub_StrLen GetMaxTextLen() const; - void SetInsertMode( BOOL bInsert ); - BOOL IsInsertMode() const; + void SetInsertMode( BOOL bInsert ); + BOOL IsInsertMode() const; - void InsertText( const String& rStr ); - String GetSelected() const; - String GetSelected( LineEnd aSeparator ) const; + void InsertText( const String& rStr ); + String GetSelected() const; + String GetSelected( LineEnd aSeparator ) const; - void SetSelection( const Selection& rSelection ); + void SetSelection( const Selection& rSelection ); const Selection& GetSelection() const; - void Cut(); - void Copy(); - void Paste(); + void Cut(); + void Copy(); + void Paste(); - void SetText( const String& rStr ); - String GetText() const; - String GetText( LineEnd aSeparator ) const; - String GetTextLines() const; - String GetTextLines( LineEnd aSeparator ) const; + void SetText( const String& rStr ); + String GetText() const; + String GetText( LineEnd aSeparator ) const; + String GetTextLines() const; + String GetTextLines( LineEnd aSeparator ) const; - void Resize(); - void GetFocus(); + void Resize(); + void GetFocus(); - BOOL HandleCommand( const CommandEvent& rCEvt ); + BOOL HandleCommand( const CommandEvent& rCEvt ); - void Enable( BOOL bEnable ); + void Enable( BOOL bEnable ); - Size CalcMinimumSize() const; - Size CalcSize( USHORT nColumns, USHORT nLines ) const; - void GetMaxVisColumnsAndLines( USHORT& rnCols, USHORT& rnLines ) const; + Size CalcMinimumSize() const; + Size CalcSize( USHORT nColumns, USHORT nLines ) const; + void GetMaxVisColumnsAndLines( USHORT& rnCols, USHORT& rnLines ) const; - void SetAlign( WinBits nWinStyle ); + void SetAlign( WinBits nWinStyle ); - void InitFromStyle( WinBits nWinStyle ); + void InitFromStyle( WinBits nWinStyle ); TextWindow* GetTextWindow() { return mpTextWindow; } ScrollBar* GetHScrollBar() { return mpHScrollBar; } ScrollBar* GetVScrollBar() { return mpVScrollBar; } - void SetTextWindowOffset( const Point& rOffset ); + void SetTextWindowOffset( const Point& rOffset ); }; ImpSvMEdit::ImpSvMEdit( MultiLineEdit* pEdt, WinBits nWinStyle ) @@ -310,10 +310,10 @@ void ImpSvMEdit::ImpSetScrollBarRanges() } if ( mpHScrollBar ) { -// ULONG nTextWidth = mpTextWindow->GetTextEngine()->CalcTextWidth(); +// ULONG nTextWidth = mpTextWindow->GetTextEngine()->CalcTextWidth(); // Es gibt kein Notify bei Breiten-Aenderung... -// ULONG nW = Max( (ULONG)mpTextWindow->GetOutputSizePixel().Width()*5, (ULONG)nTextWidth ); -// mpHScrollBar->SetRange( Range( 0, (long)nW ) ); +// ULONG nW = Max( (ULONG)mpTextWindow->GetOutputSizePixel().Width()*5, (ULONG)nTextWidth ); +// mpHScrollBar->SetRange( Range( 0, (long)nW ) ); mpHScrollBar->SetRange( Range( 0, (long)mnTextWidth-1 ) ); } } @@ -373,8 +373,8 @@ IMPL_LINK( ImpSvMEdit, ScrollHdl, ScrollBar*, pCurScrollBar ) // void ImpSvMEdit::ImpModified() // { -// // Wann wird das gerufen ????????????????????? -// pSvMultiLineEdit->Modify(); +// // Wann wird das gerufen ????????????????????? +// pSvMultiLineEdit->Modify(); // } void ImpSvMEdit::SetAlign( WinBits nWinStyle ) @@ -681,7 +681,7 @@ const Selection& ImpSvMEdit::GetSelection() const Size ImpSvMEdit::CalcMinimumSize() const { - Size aSz( mpTextWindow->GetTextEngine()->CalcTextWidth(), + Size aSz( mpTextWindow->GetTextEngine()->CalcTextWidth(), mpTextWindow->GetTextEngine()->GetTextHeight() ); if ( mpHScrollBar ) @@ -791,7 +791,7 @@ void TextWindow::MouseMove( const MouseEvent& rMEvt ) void TextWindow::MouseButtonDown( const MouseEvent& rMEvt ) { - mbInMBDown = TRUE; // Dann im GetFocus nicht alles selektieren wird + mbInMBDown = TRUE; // Dann im GetFocus nicht alles selektieren wird mpExtTextView->MouseButtonDown( rMEvt ); Window::MouseButtonDown( rMEvt ); GrabFocus(); @@ -808,7 +808,7 @@ void TextWindow::KeyInput( const KeyEvent& rKEvent ) { BOOL bDone = FALSE; USHORT nCode = rKEvent.GetKeyCode().GetCode(); - if ( nCode == com::sun::star::awt::Key::SELECT_ALL || + if ( nCode == com::sun::star::awt::Key::SELECT_ALL || ( (nCode == KEY_A) && rKEvent.GetKeyCode().IsMod1() && !rKEvent.GetKeyCode().IsMod2() ) ) { @@ -879,10 +879,10 @@ void TextWindow::Command( const CommandEvent& rCEvt ) { pPopup->EnableItem( SV_MENU_EDIT_UNDO, FALSE ); } -// if ( ( maSelection.Min() == 0 ) && ( maSelection.Max() == maText.Len() ) ) -// { -// pPopup->EnableItem( SV_MENU_EDIT_SELECTALL, FALSE ); -// } +// if ( ( maSelection.Min() == 0 ) && ( maSelection.Max() == maText.Len() ) ) +// { +// pPopup->EnableItem( SV_MENU_EDIT_SELECTALL, FALSE ); +// } if ( !Edit::GetGetSpecialCharsFunction() ) { USHORT nPos = pPopup->GetItemPos( SV_MENU_EDIT_INSERTSYMBOL ); @@ -898,30 +898,30 @@ void TextWindow::Command( const CommandEvent& rCEvt ) Size aSize = GetOutputSizePixel(); aPos = Point( aSize.Width()/2, aSize.Height()/2 ); } -// pPopup->RemoveDisabledEntries(); +// pPopup->RemoveDisabledEntries(); USHORT n = pPopup->Execute( this, aPos ); Edit::DeletePopupMenu( pPopup ); switch ( n ) { - case SV_MENU_EDIT_UNDO: mpExtTextView->Undo(); + case SV_MENU_EDIT_UNDO: mpExtTextView->Undo(); mpExtTextEngine->SetModified( TRUE ); mpExtTextEngine->Broadcast( TextHint( TEXT_HINT_MODIFIED ) ); break; - case SV_MENU_EDIT_CUT: mpExtTextView->Cut(); + case SV_MENU_EDIT_CUT: mpExtTextView->Cut(); mpExtTextEngine->SetModified( TRUE ); mpExtTextEngine->Broadcast( TextHint( TEXT_HINT_MODIFIED ) ); break; - case SV_MENU_EDIT_COPY: mpExtTextView->Copy(); + case SV_MENU_EDIT_COPY: mpExtTextView->Copy(); break; - case SV_MENU_EDIT_PASTE: mpExtTextView->Paste(); + case SV_MENU_EDIT_PASTE: mpExtTextView->Paste(); mpExtTextEngine->SetModified( TRUE ); mpExtTextEngine->Broadcast( TextHint( TEXT_HINT_MODIFIED ) ); break; - case SV_MENU_EDIT_DELETE: mpExtTextView->DeleteSelected(); + case SV_MENU_EDIT_DELETE: mpExtTextView->DeleteSelected(); mpExtTextEngine->SetModified( TRUE ); mpExtTextEngine->Broadcast( TextHint( TEXT_HINT_MODIFIED ) ); break; - case SV_MENU_EDIT_SELECTALL: mpExtTextView->SetSelection( TextSelection( TextPaM( 0, 0 ), TextPaM( 0xFFFFFFFF, 0xFFFF ) ) ); + case SV_MENU_EDIT_SELECTALL: mpExtTextView->SetSelection( TextSelection( TextPaM( 0, 0 ), TextPaM( 0xFFFFFFFF, 0xFFFF ) ) ); break; case SV_MENU_EDIT_INSERTSYMBOL: { @@ -1515,7 +1515,7 @@ long MultiLineEdit::PreNotify( NotifyEvent& rNEvt ) pImpSvMEdit->GetVScrollBar()->DoScrollAction( SCROLL_LINEDOWN ); } break; - case KEY_PAGEUP : + case KEY_PAGEUP : { if ( pImpSvMEdit->GetVScrollBar() ) pImpSvMEdit->GetVScrollBar()->DoScrollAction( SCROLL_PAGEUP ); diff --git a/svtools/source/edit/svmedit2.cxx b/svtools/source/edit/svmedit2.cxx index 1241eef2089e..068d47a662d2 100644 --- a/svtools/source/edit/svmedit2.cxx +++ b/svtools/source/edit/svmedit2.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/svtools/source/edit/sychconv.cxx b/svtools/source/edit/sychconv.cxx index bc969b53aee8..a40eb7f94a41 100644 --- a/svtools/source/edit/sychconv.cxx +++ b/svtools/source/edit/sychconv.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,44 +34,44 @@ BOOL SymCharConverter::Convert( Font& rFont, UniString& rString, OutputDevice* pDev ) { // hibyte 0 = exact matching - // 1 = little differences, - // 2 = the converted character does not look like the original but got the same meaning - // 3 = the destination does not match looking and meaning of the original + // 1 = little differences, + // 2 = the converted character does not look like the original but got the same meaning + // 3 = the destination does not match looking and meaning of the original static USHORT __READONLY_DATA aWingdingsToStarBatsTable[ 256 - 32 ] = { - 0x0020, 0x0238, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0174, 0x02BA, 0x017B, 0x017C, 0x037C, 0x037C, 0x037C, 0x037C, - 0x0000, 0x0000, 0x0372, 0x0272, 0x0372, 0x0000, 0x0000, 0x0374, 0x0279, 0x0000, 0x027A, 0x0000, 0x0178, 0x0278, 0x0000, 0x0137, - 0x027E, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x017D, 0x0000, 0x0000, 0x0000, 0x0021, 0x03AC, 0x00AD, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x01C0, 0x0000, 0x0000, 0x0286, 0x0286, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0022, 0x0023, 0x0024, 0x0025, - 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x0133, 0x0000, 0x0000, 0x0000, 0x0000, 0x0193, 0x0194, 0x0000, - 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, 0x0070, 0x0071, 0x005C, 0x005D, 0x005E, 0x005F, 0x0060, - 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x01A5, 0x0095, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x002E, 0x0024, 0x0125, 0x0000, 0x0000, 0x0000, 0x014B, 0x024D, 0x014E, 0x014A, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x002F, 0x0000, 0x0000, 0x0000, 0x0035, 0x0000, 0x0000, 0x0000, - 0x0030, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0031, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x01B1, - 0x01AF, 0x01B2, 0x01B0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0150, 0x0032, 0x0033, 0x0034, 0x01C8 + 0x0020, 0x0238, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0174, 0x02BA, 0x017B, 0x017C, 0x037C, 0x037C, 0x037C, 0x037C, + 0x0000, 0x0000, 0x0372, 0x0272, 0x0372, 0x0000, 0x0000, 0x0374, 0x0279, 0x0000, 0x027A, 0x0000, 0x0178, 0x0278, 0x0000, 0x0137, + 0x027E, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x017D, 0x0000, 0x0000, 0x0000, 0x0021, 0x03AC, 0x00AD, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x01C0, 0x0000, 0x0000, 0x0286, 0x0286, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0022, 0x0023, 0x0024, 0x0025, + 0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x0133, 0x0000, 0x0000, 0x0000, 0x0000, 0x0193, 0x0194, 0x0000, + 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, 0x0070, 0x0071, 0x005C, 0x005D, 0x005E, 0x005F, 0x0060, + 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x01A5, 0x0095, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x002E, 0x0024, 0x0125, 0x0000, 0x0000, 0x0000, 0x014B, 0x024D, 0x014E, 0x014A, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x002F, 0x0000, 0x0000, 0x0000, 0x0035, 0x0000, 0x0000, 0x0000, + 0x0030, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0031, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x01B1, + 0x01AF, 0x01B2, 0x01B0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0150, 0x0032, 0x0033, 0x0034, 0x01C8 }; static USHORT __READONLY_DATA aMonotypeSortsToStarBatsTable[ 256 - 32 ]= { - 0x0020, 0x00cb, 0x00cb, 0x00cb, 0x00cb, 0x0074, 0x00ba, 0x0021, 0x00cc, 0x007b, 0x0036, 0x007d, 0x007e, 0x0037, 0x0038, 0x0038, - 0x0039, 0x0038, 0x0038, 0x0039, 0x003a, 0x004f, 0x0050, 0x004f, 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0086, 0x0086, 0x0086, - 0x0052, 0x00cd, 0x0044, 0x0045, 0x0046, 0x0047, 0x0041, 0x0041, 0x0058, 0x0057, 0x0075, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, - 0x005a, 0x004b, 0x004b, 0x0048, 0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004e, 0x004b, 0x004b, 0x00ce, 0x00ce, 0x00ce, - 0x00ce, 0x00ce, 0x00ce, 0x00ce, 0x00cf, 0x00cf, 0x00cf, 0x00cf, 0x00cf, 0x00cf, 0x00b9, 0x00b9, 0x003b, 0x003c, 0x003d, 0x003e, - 0x003f, 0x003e, 0x0040, 0x00c5, 0x00c4, 0x002b, 0x002c, 0x00d0, 0x00d1, 0x00d1, 0x00d1, 0x0091, 0x0092, 0x0093, 0x0094, 0x0000, - 0x00d2, 0x00d3, 0x00d2, 0x00d3, 0x00d2, 0x00d3, 0x00d2, 0x00d3, 0x00d2, 0x00d3, 0x00d2, 0x00d3, 0x00d2, 0x00d3, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x00d4, 0x00d4, 0x00d4, 0x00d6, 0x00d6, 0x00d4, 0x00d4, 0x00d5, 0x002a, 0x00d6, 0x00d7, 0x0068, 0x0069, 0x006a, 0x006b, - 0x006c, 0x006d, 0x006e, 0x006f, 0x0070, 0x0071, 0x005d, 0x005e, 0x005f, 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, - 0x0068, 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f, 0x0070, 0x0071, 0x005d, 0x005e, 0x005f, 0x0060, 0x0061, 0x0062, - 0x0063, 0x0064, 0x0065, 0x0066, 0x0030, 0x0031, 0x00d8, 0x00d9, 0x00da, 0x00bc, 0x00db, 0x00bc, 0x00bc, 0x00bc, 0x00bc, 0x0031, - 0x0031, 0x0031, 0x002f, 0x002f, 0x002f, 0x00be, 0x00be, 0x0031, 0x0031, 0x00af, 0x00af, 0x00af, 0x00af, 0x00af, 0x00af, 0x00af, - 0x0000, 0x00af, 0x0035, 0x00dc, 0x00da, 0x00dc, 0x00db, 0x00da, 0x00dc, 0x00db, 0x00dc, 0x00dc, 0x00dc, 0x00dc, 0x00af, 0x0000 + 0x0020, 0x00cb, 0x00cb, 0x00cb, 0x00cb, 0x0074, 0x00ba, 0x0021, 0x00cc, 0x007b, 0x0036, 0x007d, 0x007e, 0x0037, 0x0038, 0x0038, + 0x0039, 0x0038, 0x0038, 0x0039, 0x003a, 0x004f, 0x0050, 0x004f, 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0086, 0x0086, 0x0086, + 0x0052, 0x00cd, 0x0044, 0x0045, 0x0046, 0x0047, 0x0041, 0x0041, 0x0058, 0x0057, 0x0075, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, + 0x005a, 0x004b, 0x004b, 0x0048, 0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004e, 0x004b, 0x004b, 0x00ce, 0x00ce, 0x00ce, + 0x00ce, 0x00ce, 0x00ce, 0x00ce, 0x00cf, 0x00cf, 0x00cf, 0x00cf, 0x00cf, 0x00cf, 0x00b9, 0x00b9, 0x003b, 0x003c, 0x003d, 0x003e, + 0x003f, 0x003e, 0x0040, 0x00c5, 0x00c4, 0x002b, 0x002c, 0x00d0, 0x00d1, 0x00d1, 0x00d1, 0x0091, 0x0092, 0x0093, 0x0094, 0x0000, + 0x00d2, 0x00d3, 0x00d2, 0x00d3, 0x00d2, 0x00d3, 0x00d2, 0x00d3, 0x00d2, 0x00d3, 0x00d2, 0x00d3, 0x00d2, 0x00d3, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x00d4, 0x00d4, 0x00d4, 0x00d6, 0x00d6, 0x00d4, 0x00d4, 0x00d5, 0x002a, 0x00d6, 0x00d7, 0x0068, 0x0069, 0x006a, 0x006b, + 0x006c, 0x006d, 0x006e, 0x006f, 0x0070, 0x0071, 0x005d, 0x005e, 0x005f, 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, + 0x0068, 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f, 0x0070, 0x0071, 0x005d, 0x005e, 0x005f, 0x0060, 0x0061, 0x0062, + 0x0063, 0x0064, 0x0065, 0x0066, 0x0030, 0x0031, 0x00d8, 0x00d9, 0x00da, 0x00bc, 0x00db, 0x00bc, 0x00bc, 0x00bc, 0x00bc, 0x0031, + 0x0031, 0x0031, 0x002f, 0x002f, 0x002f, 0x00be, 0x00be, 0x0031, 0x0031, 0x00af, 0x00af, 0x00af, 0x00af, 0x00af, 0x00af, 0x00af, + 0x0000, 0x00af, 0x0035, 0x00dc, 0x00da, 0x00dc, 0x00db, 0x00da, 0x00dc, 0x00db, 0x00dc, 0x00dc, 0x00dc, 0x00dc, 0x00af, 0x0000 }; const USHORT* pTransTable = NULL; @@ -92,8 +92,8 @@ BOOL SymCharConverter::Convert( Font& rFont, UniString& rString, OutputDevice* p c = rString.GetChar( i ); c -= 32; c = ( ((UINT16)c) >= 224 ) ? 0 : (sal_Unicode) pTransTable[ c ]; - if ( !c ) // if character is out of range or not matching - c = 0xA5; // we will default a StarBats-Bullet + if ( !c ) // if character is out of range or not matching + c = 0xA5; // we will default a StarBats-Bullet rString.SetChar( i, c ); } rFont.SetCharSet( RTL_TEXTENCODING_SYMBOL ); diff --git a/svtools/source/edit/syntaxhighlight.cxx b/svtools/source/edit/syntaxhighlight.cxx index ec112d100277..2d583017e20e 100644 --- a/svtools/source/edit/syntaxhighlight.cxx +++ b/svtools/source/edit/syntaxhighlight.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -189,9 +189,9 @@ static const char* strListSqlKeyWords[] = { "drop", "escape", "except", - "exists", + "exists", "false", - "from", + "from", "full", "global", "group", @@ -242,7 +242,7 @@ extern "C" int CDECL compare_strings( const void *arg1, const void *arg2 ) class LetterTable { - bool IsLetterTab[256]; + bool IsLetterTab[256]; public: LetterTable( void ); @@ -262,7 +262,7 @@ class BasicSimpleCharClass public: static BOOL isAlpha( sal_Unicode c, bool bCompatible ) { - BOOL bRet = (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') + BOOL bRet = (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (bCompatible && aLetterTable.isLetter( c )); return bRet; } @@ -287,68 +287,68 @@ LetterTable::LetterTable( void ) for( int i = 0 ; i < 256 ; ++i ) IsLetterTab[i] = false; - IsLetterTab[0xC0] = true; // À , CAPITAL LETTER A WITH GRAVE ACCENT - IsLetterTab[0xC1] = true; // Á , CAPITAL LETTER A WITH ACUTE ACCENT - IsLetterTab[0xC2] = true; // Â , CAPITAL LETTER A WITH CIRCUMFLEX ACCENT - IsLetterTab[0xC3] = true; // Ã , CAPITAL LETTER A WITH TILDE - IsLetterTab[0xC4] = true; // Ä , CAPITAL LETTER A WITH DIAERESIS - IsLetterTab[0xC5] = true; // Å , CAPITAL LETTER A WITH RING ABOVE - IsLetterTab[0xC6] = true; // Æ , CAPITAL LIGATURE AE - IsLetterTab[0xC7] = true; // Ç , CAPITAL LETTER C WITH CEDILLA - IsLetterTab[0xC8] = true; // È , CAPITAL LETTER E WITH GRAVE ACCENT - IsLetterTab[0xC9] = true; // É , CAPITAL LETTER E WITH ACUTE ACCENT - IsLetterTab[0xCA] = true; // Ê , CAPITAL LETTER E WITH CIRCUMFLEX ACCENT - IsLetterTab[0xCB] = true; // Ë , CAPITAL LETTER E WITH DIAERESIS - IsLetterTab[0xCC] = true; // Ì , CAPITAL LETTER I WITH GRAVE ACCENT - IsLetterTab[0xCD] = true; // Í , CAPITAL LETTER I WITH ACUTE ACCENT - IsLetterTab[0xCE] = true; // Î , CAPITAL LETTER I WITH CIRCUMFLEX ACCENT - IsLetterTab[0xCF] = true; // Ï , CAPITAL LETTER I WITH DIAERESIS - IsLetterTab[0xD0] = true; // Ð , CAPITAL LETTER ETH - IsLetterTab[0xD1] = true; // Ñ , CAPITAL LETTER N WITH TILDE - IsLetterTab[0xD2] = true; // Ò , CAPITAL LETTER O WITH GRAVE ACCENT - IsLetterTab[0xD3] = true; // Ó , CAPITAL LETTER O WITH ACUTE ACCENT - IsLetterTab[0xD4] = true; // Ô , CAPITAL LETTER O WITH CIRCUMFLEX ACCENT - IsLetterTab[0xD5] = true; // Õ , CAPITAL LETTER O WITH TILDE - IsLetterTab[0xD6] = true; // Ö , CAPITAL LETTER O WITH DIAERESIS - IsLetterTab[0xD8] = true; // Ø , CAPITAL LETTER O WITH STROKE - IsLetterTab[0xD9] = true; // Ù , CAPITAL LETTER U WITH GRAVE ACCENT - IsLetterTab[0xDA] = true; // Ú , CAPITAL LETTER U WITH ACUTE ACCENT - IsLetterTab[0xDB] = true; // Û , CAPITAL LETTER U WITH CIRCUMFLEX ACCENT - IsLetterTab[0xDC] = true; // Ü , CAPITAL LETTER U WITH DIAERESIS - IsLetterTab[0xDD] = true; // Ý , CAPITAL LETTER Y WITH ACUTE ACCENT - IsLetterTab[0xDE] = true; // Þ , CAPITAL LETTER THORN - IsLetterTab[0xDF] = true; // ß , SMALL LETTER SHARP S - IsLetterTab[0xE0] = true; // à , SMALL LETTER A WITH GRAVE ACCENT - IsLetterTab[0xE1] = true; // á , SMALL LETTER A WITH ACUTE ACCENT - IsLetterTab[0xE2] = true; // â , SMALL LETTER A WITH CIRCUMFLEX ACCENT - IsLetterTab[0xE3] = true; // ã , SMALL LETTER A WITH TILDE - IsLetterTab[0xE4] = true; // ä , SMALL LETTER A WITH DIAERESIS - IsLetterTab[0xE5] = true; // å , SMALL LETTER A WITH RING ABOVE - IsLetterTab[0xE6] = true; // æ , SMALL LIGATURE AE - IsLetterTab[0xE7] = true; // ç , SMALL LETTER C WITH CEDILLA - IsLetterTab[0xE8] = true; // è , SMALL LETTER E WITH GRAVE ACCENT - IsLetterTab[0xE9] = true; // é , SMALL LETTER E WITH ACUTE ACCENT - IsLetterTab[0xEA] = true; // ê , SMALL LETTER E WITH CIRCUMFLEX ACCENT - IsLetterTab[0xEB] = true; // ë , SMALL LETTER E WITH DIAERESIS - IsLetterTab[0xEC] = true; // ì , SMALL LETTER I WITH GRAVE ACCENT - IsLetterTab[0xED] = true; // í , SMALL LETTER I WITH ACUTE ACCENT - IsLetterTab[0xEE] = true; // î , SMALL LETTER I WITH CIRCUMFLEX ACCENT - IsLetterTab[0xEF] = true; // ï , SMALL LETTER I WITH DIAERESIS - IsLetterTab[0xF0] = true; // ð , SMALL LETTER ETH - IsLetterTab[0xF1] = true; // ñ , SMALL LETTER N WITH TILDE - IsLetterTab[0xF2] = true; // ò , SMALL LETTER O WITH GRAVE ACCENT - IsLetterTab[0xF3] = true; // ó , SMALL LETTER O WITH ACUTE ACCENT - IsLetterTab[0xF4] = true; // ô , SMALL LETTER O WITH CIRCUMFLEX ACCENT - IsLetterTab[0xF5] = true; // õ , SMALL LETTER O WITH TILDE - IsLetterTab[0xF6] = true; // ö , SMALL LETTER O WITH DIAERESIS - IsLetterTab[0xF8] = true; // ø , SMALL LETTER O WITH OBLIQUE BAR - IsLetterTab[0xF9] = true; // ù , SMALL LETTER U WITH GRAVE ACCENT - IsLetterTab[0xFA] = true; // ú , SMALL LETTER U WITH ACUTE ACCENT - IsLetterTab[0xFB] = true; // û , SMALL LETTER U WITH CIRCUMFLEX ACCENT - IsLetterTab[0xFC] = true; // ü , SMALL LETTER U WITH DIAERESIS - IsLetterTab[0xFD] = true; // ý , SMALL LETTER Y WITH ACUTE ACCENT - IsLetterTab[0xFE] = true; // þ , SMALL LETTER THORN - IsLetterTab[0xFF] = true; // ÿ , SMALL LETTER Y WITH DIAERESIS + IsLetterTab[0xC0] = true; // À , CAPITAL LETTER A WITH GRAVE ACCENT + IsLetterTab[0xC1] = true; // Á , CAPITAL LETTER A WITH ACUTE ACCENT + IsLetterTab[0xC2] = true; // Â , CAPITAL LETTER A WITH CIRCUMFLEX ACCENT + IsLetterTab[0xC3] = true; // Ã , CAPITAL LETTER A WITH TILDE + IsLetterTab[0xC4] = true; // Ä , CAPITAL LETTER A WITH DIAERESIS + IsLetterTab[0xC5] = true; // Å , CAPITAL LETTER A WITH RING ABOVE + IsLetterTab[0xC6] = true; // Æ , CAPITAL LIGATURE AE + IsLetterTab[0xC7] = true; // Ç , CAPITAL LETTER C WITH CEDILLA + IsLetterTab[0xC8] = true; // È , CAPITAL LETTER E WITH GRAVE ACCENT + IsLetterTab[0xC9] = true; // É , CAPITAL LETTER E WITH ACUTE ACCENT + IsLetterTab[0xCA] = true; // Ê , CAPITAL LETTER E WITH CIRCUMFLEX ACCENT + IsLetterTab[0xCB] = true; // Ë , CAPITAL LETTER E WITH DIAERESIS + IsLetterTab[0xCC] = true; // Ì , CAPITAL LETTER I WITH GRAVE ACCENT + IsLetterTab[0xCD] = true; // Í , CAPITAL LETTER I WITH ACUTE ACCENT + IsLetterTab[0xCE] = true; // Î , CAPITAL LETTER I WITH CIRCUMFLEX ACCENT + IsLetterTab[0xCF] = true; // Ï , CAPITAL LETTER I WITH DIAERESIS + IsLetterTab[0xD0] = true; // Ð , CAPITAL LETTER ETH + IsLetterTab[0xD1] = true; // Ñ , CAPITAL LETTER N WITH TILDE + IsLetterTab[0xD2] = true; // Ò , CAPITAL LETTER O WITH GRAVE ACCENT + IsLetterTab[0xD3] = true; // Ó , CAPITAL LETTER O WITH ACUTE ACCENT + IsLetterTab[0xD4] = true; // Ô , CAPITAL LETTER O WITH CIRCUMFLEX ACCENT + IsLetterTab[0xD5] = true; // Õ , CAPITAL LETTER O WITH TILDE + IsLetterTab[0xD6] = true; // Ö , CAPITAL LETTER O WITH DIAERESIS + IsLetterTab[0xD8] = true; // Ø , CAPITAL LETTER O WITH STROKE + IsLetterTab[0xD9] = true; // Ù , CAPITAL LETTER U WITH GRAVE ACCENT + IsLetterTab[0xDA] = true; // Ú , CAPITAL LETTER U WITH ACUTE ACCENT + IsLetterTab[0xDB] = true; // Û , CAPITAL LETTER U WITH CIRCUMFLEX ACCENT + IsLetterTab[0xDC] = true; // Ü , CAPITAL LETTER U WITH DIAERESIS + IsLetterTab[0xDD] = true; // Ý , CAPITAL LETTER Y WITH ACUTE ACCENT + IsLetterTab[0xDE] = true; // Þ , CAPITAL LETTER THORN + IsLetterTab[0xDF] = true; // ß , SMALL LETTER SHARP S + IsLetterTab[0xE0] = true; // à , SMALL LETTER A WITH GRAVE ACCENT + IsLetterTab[0xE1] = true; // á , SMALL LETTER A WITH ACUTE ACCENT + IsLetterTab[0xE2] = true; // â , SMALL LETTER A WITH CIRCUMFLEX ACCENT + IsLetterTab[0xE3] = true; // ã , SMALL LETTER A WITH TILDE + IsLetterTab[0xE4] = true; // ä , SMALL LETTER A WITH DIAERESIS + IsLetterTab[0xE5] = true; // å , SMALL LETTER A WITH RING ABOVE + IsLetterTab[0xE6] = true; // æ , SMALL LIGATURE AE + IsLetterTab[0xE7] = true; // ç , SMALL LETTER C WITH CEDILLA + IsLetterTab[0xE8] = true; // è , SMALL LETTER E WITH GRAVE ACCENT + IsLetterTab[0xE9] = true; // é , SMALL LETTER E WITH ACUTE ACCENT + IsLetterTab[0xEA] = true; // ê , SMALL LETTER E WITH CIRCUMFLEX ACCENT + IsLetterTab[0xEB] = true; // ë , SMALL LETTER E WITH DIAERESIS + IsLetterTab[0xEC] = true; // ì , SMALL LETTER I WITH GRAVE ACCENT + IsLetterTab[0xED] = true; // í , SMALL LETTER I WITH ACUTE ACCENT + IsLetterTab[0xEE] = true; // î , SMALL LETTER I WITH CIRCUMFLEX ACCENT + IsLetterTab[0xEF] = true; // ï , SMALL LETTER I WITH DIAERESIS + IsLetterTab[0xF0] = true; // ð , SMALL LETTER ETH + IsLetterTab[0xF1] = true; // ñ , SMALL LETTER N WITH TILDE + IsLetterTab[0xF2] = true; // ò , SMALL LETTER O WITH GRAVE ACCENT + IsLetterTab[0xF3] = true; // ó , SMALL LETTER O WITH ACUTE ACCENT + IsLetterTab[0xF4] = true; // ô , SMALL LETTER O WITH CIRCUMFLEX ACCENT + IsLetterTab[0xF5] = true; // õ , SMALL LETTER O WITH TILDE + IsLetterTab[0xF6] = true; // ö , SMALL LETTER O WITH DIAERESIS + IsLetterTab[0xF8] = true; // ø , SMALL LETTER O WITH OBLIQUE BAR + IsLetterTab[0xF9] = true; // ù , SMALL LETTER U WITH GRAVE ACCENT + IsLetterTab[0xFA] = true; // ú , SMALL LETTER U WITH ACUTE ACCENT + IsLetterTab[0xFB] = true; // û , SMALL LETTER U WITH CIRCUMFLEX ACCENT + IsLetterTab[0xFC] = true; // ü , SMALL LETTER U WITH DIAERESIS + IsLetterTab[0xFD] = true; // ý , SMALL LETTER Y WITH ACUTE ACCENT + IsLetterTab[0xFE] = true; // þ , SMALL LETTER THORN + IsLetterTab[0xFF] = true; // ÿ , SMALL LETTER Y WITH DIAERESIS } bool LetterTable::isLetterUnicode( sal_Unicode c ) @@ -469,7 +469,7 @@ BOOL SimpleTokenizer_Impl::getNextToken( /*out*/TokenTypes& reType, } } - // Operator? + // Operator? // only for BASIC '\'' should be a comment, otherwise it is a normal string and handled there else if ( ( testCharFlags( c, CHAR_OPERATOR ) == TRUE ) || ( (c == '\'') && (aLanguage==HIGHLIGHT_BASIC)) ) { @@ -524,7 +524,7 @@ BOOL SimpleTokenizer_Impl::getNextToken( /*out*/TokenTypes& reType, // Kommentar ? if ( c == '\'' ) { - c = getChar(); // '/' entfernen + c = getChar(); // '/' entfernen // Alle Zeichen bis Zeilen-Ende oder EOF entfernen sal_Unicode cPeek = peekChar(); @@ -570,7 +570,7 @@ BOOL SimpleTokenizer_Impl::getNextToken( /*out*/TokenTypes& reType, { // o entfernen getChar(); - nRadix = 8; // Octal-Basis + nRadix = 8; // Octal-Basis // Alle Ziffern einlesen while( testCharFlags( peekChar(), CHAR_IN_OCT_NUMBER ) ) @@ -581,7 +581,7 @@ BOOL SimpleTokenizer_Impl::getNextToken( /*out*/TokenTypes& reType, { // x entfernen getChar(); - nRadix = 16; // Hex-Basis + nRadix = 16; // Hex-Basis // Alle Ziffern einlesen und puffern while( testCharFlags( peekChar(), CHAR_IN_HEX_NUMBER ) ) @@ -605,7 +605,7 @@ BOOL SimpleTokenizer_Impl::getNextToken( /*out*/TokenTypes& reType, (bAfterExpChar && peekChar() == '-' ) ) // Nach Exponent auch +/- OK { - c = getChar(); // Zeichen lesen + c = getChar(); // Zeichen lesen bAfterExpChar = ( c == 'e' || c == 'E' ); } } @@ -640,7 +640,7 @@ BOOL SimpleTokenizer_Impl::getNextToken( /*out*/TokenTypes& reType, } } - // Zeichen lesen + // Zeichen lesen if( reType != TT_ERROR ) { getChar(); @@ -688,17 +688,17 @@ String SimpleTokenizer_Impl::getFullTokenStr( /*out*/TokenTypes eType, String aOut; switch( eType ) { - case TT_UNKNOWN: aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_UNKNOWN:") ); break; - case TT_IDENTIFIER: aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_IDENTIFIER:") ); break; - case TT_WHITESPACE: aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_WHITESPACE:") ); break; - case TT_NUMBER: aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_NUMBER:") ); break; - case TT_STRING: aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_STRING:") ); break; - case TT_EOL: aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_EOL:") ); break; - case TT_COMMENT: aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_COMMENT:") ); break; - case TT_ERROR: aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_ERROR:") ); break; - case TT_OPERATOR: aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_OPERATOR:") ); break; - case TT_KEYWORDS: aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_KEYWORD:") ); break; - case TT_PARAMETER: aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_PARAMETER:") ); break; + case TT_UNKNOWN: aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_UNKNOWN:") ); break; + case TT_IDENTIFIER: aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_IDENTIFIER:") ); break; + case TT_WHITESPACE: aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_WHITESPACE:") ); break; + case TT_NUMBER: aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_NUMBER:") ); break; + case TT_STRING: aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_STRING:") ); break; + case TT_EOL: aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_EOL:") ); break; + case TT_COMMENT: aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_COMMENT:") ); break; + case TT_ERROR: aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_ERROR:") ); break; + case TT_OPERATOR: aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_OPERATOR:") ); break; + case TT_KEYWORDS: aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_KEYWORD:") ); break; + case TT_PARAMETER: aOut = String( RTL_CONSTASCII_USTRINGPARAM("TT_PARAMETER:") ); break; } if( eType != TT_EOL ) { @@ -758,7 +758,7 @@ SimpleTokenizer_Impl::SimpleTokenizer_Impl( HighlighterLanguage aLang ): aLangua // Operator-Zeichen aCharTypeTab[(int)'!'] |= CHAR_OPERATOR; aCharTypeTab[(int)'%'] |= CHAR_OPERATOR; - // aCharTypeTab[(int)'&'] |= CHAR_OPERATOR; Removed because of #i14140 + // aCharTypeTab[(int)'&'] |= CHAR_OPERATOR; Removed because of #i14140 aCharTypeTab[(int)'('] |= CHAR_OPERATOR; aCharTypeTab[(int)')'] |= CHAR_OPERATOR; aCharTypeTab[(int)'*'] |= CHAR_OPERATOR; @@ -776,7 +776,7 @@ SimpleTokenizer_Impl::SimpleTokenizer_Impl( HighlighterLanguage aLang ): aLangua aCharTypeTab[(int)'~'] |= CHAR_OPERATOR; aCharTypeTab[(int)'{'] |= CHAR_OPERATOR; aCharTypeTab[(int)'}'] |= CHAR_OPERATOR; - // aCharTypeTab[(int)'['] |= CHAR_OPERATOR; Removed because of #i17826 + // aCharTypeTab[(int)'['] |= CHAR_OPERATOR; Removed because of #i17826 aCharTypeTab[(int)']'] |= CHAR_OPERATOR; aCharTypeTab[(int)';'] |= CHAR_OPERATOR; @@ -896,7 +896,7 @@ const Range SyntaxHighlighter::notifyChange( UINT32 nLine, INT32 nLineCountDiffe const String* pChangedLines, UINT32 nArrayLength) { (void)nLineCountDifference; - + for( UINT32 i=0 ; i < nArrayLength ; i++ ) m_pSimpleTokenizer->parseLine(nLine+i, &pChangedLines[i]); diff --git a/svtools/source/edit/textdat2.hxx b/svtools/source/edit/textdat2.hxx index eb129fc5bca1..414d4355f433 100644 --- a/svtools/source/edit/textdat2.hxx +++ b/svtools/source/edit/textdat2.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,53 +39,53 @@ class TextNode; class TextView; -#define PORTIONKIND_TEXT 0 +#define PORTIONKIND_TEXT 0 #define PORTIONKIND_TAB 1 -#define DELMODE_SIMPLE 0 -#define DELMODE_RESTOFWORD 1 -#define DELMODE_RESTOFCONTENT 2 +#define DELMODE_SIMPLE 0 +#define DELMODE_RESTOFWORD 1 +#define DELMODE_RESTOFCONTENT 2 -#define DEL_LEFT 1 -#define DEL_RIGHT 2 -#define TRAVEL_X_DONTKNOW 0xFFFF -#define MAXCHARSINPARA 0x3FFF-CHARPOSGROW +#define DEL_LEFT 1 +#define DEL_RIGHT 2 +#define TRAVEL_X_DONTKNOW 0xFFFF +#define MAXCHARSINPARA 0x3FFF-CHARPOSGROW -#define LINE_SEP 0x0A +#define LINE_SEP 0x0A class TETextPortion { private: - USHORT nLen; - long nWidth; - BYTE nKind; + USHORT nLen; + long nWidth; + BYTE nKind; BYTE nRightToLeft; - TETextPortion() { nLen = 0; nKind = PORTIONKIND_TEXT; nWidth = -1; nRightToLeft = 0;} + TETextPortion() { nLen = 0; nKind = PORTIONKIND_TEXT; nWidth = -1; nRightToLeft = 0;} public: - TETextPortion( USHORT nL ) { + TETextPortion( USHORT nL ) { nLen = nL; nKind = PORTIONKIND_TEXT; nWidth= -1; nRightToLeft = 0; } - USHORT GetLen() const { return nLen; } - USHORT& GetLen() { return nLen; } + USHORT GetLen() const { return nLen; } + USHORT& GetLen() { return nLen; } - long GetWidth()const { return nWidth; } - long& GetWidth() { return nWidth; } + long GetWidth()const { return nWidth; } + long& GetWidth() { return nWidth; } - BYTE GetKind() const { return nKind; } - BYTE& GetKind() { return nKind; } + BYTE GetKind() const { return nKind; } + BYTE& GetKind() { return nKind; } - BYTE GetRightToLeft() const { return nRightToLeft; } - BYTE& GetRightToLeft() { return nRightToLeft; } + BYTE GetRightToLeft() const { return nRightToLeft; } + BYTE& GetRightToLeft() { return nRightToLeft; } BOOL IsRightToLeft() const { return (nRightToLeft&1); } - BOOL HasValidSize() const { return nWidth != (-1); } + BOOL HasValidSize() const { return nWidth != (-1); } }; @@ -99,10 +99,10 @@ public: TETextPortionList(); ~TETextPortionList(); - void Reset(); - USHORT FindPortion( USHORT nCharPos, USHORT& rPortionStart, BOOL bPreferStartingPortion = FALSE ); + void Reset(); + USHORT FindPortion( USHORT nCharPos, USHORT& rPortionStart, BOOL bPreferStartingPortion = FALSE ); USHORT GetPortionStartIndex( USHORT nPortion ); - void DeleteFromPortion( USHORT nDelFrom ); + void DeleteFromPortion( USHORT nDelFrom ); }; struct TEWritingDirectionInfo @@ -123,56 +123,56 @@ SV_DECL_VARARR( TEWritingDirectionInfos, TEWritingDirectionInfo, 0, 4 ) class TextLine { private: - USHORT mnStart; - USHORT mnEnd; - USHORT mnStartPortion; - USHORT mnEndPortion; + USHORT mnStart; + USHORT mnEnd; + USHORT mnStartPortion; + USHORT mnEndPortion; - short mnStartX; + short mnStartX; - BOOL mbInvalid; // fuer geschickte Formatierung/Ausgabe + BOOL mbInvalid; // fuer geschickte Formatierung/Ausgabe public: - TextLine() { + TextLine() { mnStart = mnEnd = 0; mnStartPortion = mnEndPortion = 0; mnStartX = 0; mbInvalid = TRUE; } - BOOL IsIn( USHORT nIndex ) const + BOOL IsIn( USHORT nIndex ) const { return ( (nIndex >= mnStart ) && ( nIndex < mnEnd ) ); } - BOOL IsIn( USHORT nIndex, BOOL bInclEnd ) const + BOOL IsIn( USHORT nIndex, BOOL bInclEnd ) const { return ( ( nIndex >= mnStart ) && ( bInclEnd ? ( nIndex <= mnEnd ) : ( nIndex < mnEnd ) ) ); } - void SetStart( USHORT n ) { mnStart = n; } - USHORT GetStart() const { return mnStart; } - USHORT& GetStart() { return mnStart; } + void SetStart( USHORT n ) { mnStart = n; } + USHORT GetStart() const { return mnStart; } + USHORT& GetStart() { return mnStart; } - void SetEnd( USHORT n ) { mnEnd = n; } - USHORT GetEnd() const { return mnEnd; } - USHORT& GetEnd() { return mnEnd; } + void SetEnd( USHORT n ) { mnEnd = n; } + USHORT GetEnd() const { return mnEnd; } + USHORT& GetEnd() { return mnEnd; } - void SetStartPortion( USHORT n ) { mnStartPortion = n; } - USHORT GetStartPortion() const { return mnStartPortion; } - USHORT& GetStartPortion() { return mnStartPortion; } + void SetStartPortion( USHORT n ) { mnStartPortion = n; } + USHORT GetStartPortion() const { return mnStartPortion; } + USHORT& GetStartPortion() { return mnStartPortion; } - void SetEndPortion( USHORT n ) { mnEndPortion = n; } - USHORT GetEndPortion() const { return mnEndPortion; } - USHORT& GetEndPortion() { return mnEndPortion; } + void SetEndPortion( USHORT n ) { mnEndPortion = n; } + USHORT GetEndPortion() const { return mnEndPortion; } + USHORT& GetEndPortion() { return mnEndPortion; } - USHORT GetLen() const { return mnEnd - mnStart; } + USHORT GetLen() const { return mnEnd - mnStart; } - BOOL IsInvalid() const { return mbInvalid; } - BOOL IsValid() const { return !mbInvalid; } - void SetInvalid() { mbInvalid = TRUE; } - void SetValid() { mbInvalid = FALSE; } + BOOL IsInvalid() const { return mbInvalid; } + BOOL IsValid() const { return !mbInvalid; } + void SetInvalid() { mbInvalid = TRUE; } + void SetValid() { mbInvalid = FALSE; } - BOOL IsEmpty() const { return (mnEnd > mnStart) ? FALSE : TRUE; } + BOOL IsEmpty() const { return (mnEnd > mnStart) ? FALSE : TRUE; } - short GetStartX() const { return mnStartX; } - void SetStartX( short n ) { mnStartX = n; } + short GetStartX() const { return mnStartX; } + void SetStartX( short n ) { mnStartX = n; } inline BOOL operator == ( const TextLine& rLine ) const; inline BOOL operator != ( const TextLine& rLine ) const; @@ -183,7 +183,7 @@ typedef TextLine* TextLinePtr; inline BOOL TextLine::operator == ( const TextLine& rLine ) const { - return ( ( mnStart == rLine.mnStart ) && + return ( ( mnStart == rLine.mnStart ) && ( mnEnd == rLine.mnEnd ) && ( mnStartPortion == rLine.mnStartPortion ) && ( mnEndPortion == rLine.mnEndPortion ) ); @@ -199,18 +199,18 @@ inline BOOL TextLine::operator != ( const TextLine& rLine ) const class TEParaPortion { private: - TextNode* mpNode; + TextNode* mpNode; - TextLines maLines; + TextLines maLines; TETextPortionList maTextPortions; TEWritingDirectionInfos maWritingDirectionInfos; - USHORT mnInvalidPosStart; - short mnInvalidDiff; + USHORT mnInvalidPosStart; + short mnInvalidDiff; - BOOL mbInvalid; - BOOL mbSimple; // nur lineares Tippen + BOOL mbInvalid; + BOOL mbSimple; // nur lineares Tippen TEParaPortion( const TEParaPortion& ) {;} @@ -220,25 +220,25 @@ public: ~TEParaPortion(); - BOOL IsInvalid() const { return mbInvalid; } - BOOL IsSimpleInvalid() const { return mbSimple; } - void SetNotSimpleInvalid() { mbSimple = FALSE; } - void SetValid() { mbInvalid = FALSE; mbSimple = TRUE;} + BOOL IsInvalid() const { return mbInvalid; } + BOOL IsSimpleInvalid() const { return mbSimple; } + void SetNotSimpleInvalid() { mbSimple = FALSE; } + void SetValid() { mbInvalid = FALSE; mbSimple = TRUE;} - void MarkInvalid( USHORT nStart, short nDiff); - void MarkSelectionInvalid( USHORT nStart, USHORT nEnd ); + void MarkInvalid( USHORT nStart, short nDiff); + void MarkSelectionInvalid( USHORT nStart, USHORT nEnd ); - USHORT GetInvalidPosStart() const { return mnInvalidPosStart; } - short GetInvalidDiff() const { return mnInvalidDiff; } + USHORT GetInvalidPosStart() const { return mnInvalidPosStart; } + short GetInvalidDiff() const { return mnInvalidDiff; } - TextNode* GetNode() const { return mpNode; } - TextLines& GetLines() { return maLines; } - TETextPortionList& GetTextPortions() { return maTextPortions; } + TextNode* GetNode() const { return mpNode; } + TextLines& GetLines() { return maLines; } + TETextPortionList& GetTextPortions() { return maTextPortions; } TEWritingDirectionInfos& GetWritingDirectionInfos() { return maWritingDirectionInfos; } - USHORT GetLineNumber( USHORT nIndex, BOOL bInclEnd ); - void CorrectValuesBehindLastFormattedLine( USHORT nLastFormattedLine ); + USHORT GetLineNumber( USHORT nIndex, BOOL bInclEnd ); + void CorrectValuesBehindLastFormattedLine( USHORT nLastFormattedLine ); }; @@ -247,54 +247,54 @@ class TEParaPortions : public ToolsList<TEParaPortion*> public: TEParaPortions(); ~TEParaPortions(); - void Reset(); + void Reset(); }; class TextSelFunctionSet: public FunctionSet { private: - TextView* mpView; + TextView* mpView; public: TextSelFunctionSet( TextView* pView ); - virtual void BeginDrag(); + virtual void BeginDrag(); - virtual void CreateAnchor(); + virtual void CreateAnchor(); - virtual BOOL SetCursorAtPoint( const Point& rPointPixel, BOOL bDontSelectAtCursor = FALSE ); + virtual BOOL SetCursorAtPoint( const Point& rPointPixel, BOOL bDontSelectAtCursor = FALSE ); - virtual BOOL IsSelectionAtPoint( const Point& rPointPixel ); - virtual void DeselectAll(); + virtual BOOL IsSelectionAtPoint( const Point& rPointPixel ); + virtual void DeselectAll(); - virtual void DeselectAtPoint( const Point& ); - virtual void DestroyAnchor(); + virtual void DeselectAtPoint( const Point& ); + virtual void DestroyAnchor(); }; class IdleFormatter : public Timer { private: - TextView* mpView; - USHORT mnRestarts; + TextView* mpView; + USHORT mnRestarts; public: IdleFormatter(); ~IdleFormatter(); - void DoIdleFormat( TextView* pV, USHORT nMaxRestarts ); - void ForceTimeout(); - TextView* GetView() { return mpView; } + void DoIdleFormat( TextView* pV, USHORT nMaxRestarts ); + void ForceTimeout(); + TextView* GetView() { return mpView; } }; struct TextDDInfo { - Cursor maCursor; - TextPaM maDropPos; + Cursor maCursor; + TextPaM maDropPos; - BOOL mbStarterOfDD; - BOOL mbVisCursor; + BOOL mbStarterOfDD; + BOOL mbVisCursor; TextDDInfo() { diff --git a/svtools/source/edit/textdata.cxx b/svtools/source/edit/textdata.cxx index f98e8c7cdc80..7ea355038774 100644 --- a/svtools/source/edit/textdata.cxx +++ b/svtools/source/edit/textdata.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,12 +185,12 @@ void TEParaPortion::MarkSelectionInvalid( USHORT nStart, USHORT /*nEnd*/ ) if ( mbInvalid == FALSE ) { mnInvalidPosStart = nStart; -// nInvalidPosEnd = nEnd; +// nInvalidPosEnd = nEnd; } else { mnInvalidPosStart = Min( mnInvalidPosStart, nStart ); -// nInvalidPosEnd = pNode->Len(); +// nInvalidPosEnd = pNode->Len(); } maWritingDirectionInfos.Remove( 0, maWritingDirectionInfos.Count() ); @@ -229,7 +229,7 @@ void TEParaPortion::CorrectValuesBehindLastFormattedLine( USHORT nLastFormattedL const TextLine* pUnformatted = maLines[ nLastFormattedLine+1 ]; short nPortionDiff = pUnformatted->GetStartPortion() - pLastFormatted->GetEndPortion(); short nTextDiff = pUnformatted->GetStart() - pLastFormatted->GetEnd(); - nTextDiff++; // LastFormatted->GetEnd() war incl. => 1 zuviel abgezogen! + nTextDiff++; // LastFormatted->GetEnd() war incl. => 1 zuviel abgezogen! // Die erste unformatierte muss genau eine Portion hinter der letzten der // formatierten beginnen: diff --git a/svtools/source/edit/textdoc.cxx b/svtools/source/edit/textdoc.cxx index cf6313976d47..128335b6d2a1 100644 --- a/svtools/source/edit/textdoc.cxx +++ b/svtools/source/edit/textdoc.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -162,8 +162,8 @@ TextCharAttrib* TextCharAttribList::FindNextAttrib( USHORT nWhich, USHORT nFromP for ( USHORT nAttr = 0; nAttr < nAttribs; nAttr++ ) { TextCharAttrib* pAttr = GetObject( nAttr ); - if ( ( pAttr->GetStart() >= nFromPos ) && - ( pAttr->GetEnd() <= nMaxPos ) && + if ( ( pAttr->GetStart() >= nFromPos ) && + ( pAttr->GetEnd() <= nMaxPos ) && ( pAttr->Which() == nWhich ) ) return pAttr; } @@ -281,7 +281,7 @@ void TextNode::ExpandAttribs( USHORT nIndex, USHORT nNew ) // Wenn spaeter doch Ueberpruefung: // Spezialfall: Start == 0; AbsLen == 1, nNew = 1 => Expand, weil durch Absatzumbruch! // Start <= nIndex, End >= nIndex => Start=End=nIndex! -// if ( pAttrib->GetStart() == nIndex ) +// if ( pAttrib->GetStart() == nIndex ) pAttrib->Expand( nNew ); } // 1: Attribut startet davor, geht bis Index... @@ -308,7 +308,7 @@ void TextNode::ExpandAttribs( USHORT nIndex, USHORT nNew ) if ( nIndex == 0 ) { pAttrib->Expand( nNew ); -// bResort = TRUE; // es gibt ja keine Features mehr... +// bResort = TRUE; // es gibt ja keine Features mehr... } else pAttrib->MoveForward( nNew ); @@ -353,17 +353,17 @@ void TextNode::CollapsAttribs( USHORT nIndex, USHORT nDeleted ) // Spezialfall: Attrubt deckt genau den Bereich ab // => als leeres Attribut behalten. if ( ( pAttrib->GetStart() == nIndex ) && ( pAttrib->GetEnd() == nEndChanges ) ) - pAttrib->GetEnd() = nIndex; // leer + pAttrib->GetEnd() = nIndex; // leer else bDelAttr = TRUE; } // 2. Attribut beginnt davor, endet drinnen oder dahinter... else if ( ( pAttrib->GetStart() <= nIndex ) && ( pAttrib->GetEnd() > nIndex ) ) { - if ( pAttrib->GetEnd() <= nEndChanges ) // endet drinnen + if ( pAttrib->GetEnd() <= nEndChanges ) // endet drinnen pAttrib->GetEnd() = nIndex; else - pAttrib->Collaps( nDeleted ); // endet dahinter + pAttrib->Collaps( nDeleted ); // endet dahinter } // 3. Attribut beginnt drinnen, endet dahinter... else if ( ( pAttrib->GetStart() >= nIndex ) && ( pAttrib->GetEnd() > nEndChanges ) ) @@ -500,7 +500,7 @@ void TextNode::Append( const TextNode& rNode ) pTmpAttrib->GetEnd() = pTmpAttrib->GetEnd() + pAttrib->GetLen(); bMelted = TRUE; - break; // es kann nur eins von der Sorte an der Stelle geben + break; // es kann nur eins von der Sorte an der Stelle geben } } } @@ -764,9 +764,9 @@ BOOL TextDoc::RemoveAttribs( TextNode* pNode, USHORT nStart, USHORT nEnd, TextCh bChanged = TRUE; if ( pAttr->GetEnd() > nEnd ) { - pAttr->GetStart() = nEnd; // dann faengt es dahinter an + pAttr->GetStart() = nEnd; // dann faengt es dahinter an rpStarting = pAttr; - break; // es kann kein weiteres Attrib hier liegen + break; // es kann kein weiteres Attrib hier liegen } else if ( !pAttr->IsFeature() || ( pAttr->GetStart() == nStart ) ) { @@ -781,7 +781,7 @@ BOOL TextDoc::RemoveAttribs( TextNode* pNode, USHORT nStart, USHORT nEnd, TextCh bChanged = TRUE; if ( ( pAttr->GetStart() < nStart ) && !pAttr->IsFeature() ) { - pAttr->GetEnd() = nStart; // dann hoert es hier auf + pAttr->GetEnd() = nStart; // dann hoert es hier auf rpEnding = pAttr; } else if ( !pAttr->IsFeature() || ( pAttr->GetStart() == nStart ) ) @@ -798,23 +798,23 @@ BOOL TextDoc::RemoveAttribs( TextNode* pNode, USHORT nStart, USHORT nEnd, TextCh { pAttr->GetStart() = nEnd; rpStarting = pAttr; - break; // es kann weitere Attribute geben! + break; // es kann weitere Attribute geben! } else if ( pAttr->GetEnd() == nEnd ) { pAttr->GetEnd() = nStart; rpEnding = pAttr; - break; // es kann weitere Attribute geben! + break; // es kann weitere Attribute geben! } else // Attribut muss gesplittet werden... { USHORT nOldEnd = pAttr->GetEnd(); pAttr->GetEnd() = nStart; rpEnding = pAttr; -// ULONG nSavePos = pNode->GetCharAttribs().GetStartList().GetCurPos(); +// ULONG nSavePos = pNode->GetCharAttribs().GetStartList().GetCurPos(); InsertAttrib( *pAttr->GetItem(), pNode, nEnd, nOldEnd ); -// pNode->GetCharAttribs().GetStartList().Seek( nSavePos ); - break; // es kann weitere Attribute geben! +// pNode->GetCharAttribs().GetStartList().Seek( nSavePos ); + break; // es kann weitere Attribute geben! } } } @@ -840,17 +840,17 @@ void TextDoc::InsertAttrib( const SfxPoolItem& rPoolItem, TextNode* pNode, USHOR // schon an der Stelle existiert! // pruefen, ob neues Attrib oder einfach nur Ende eines Attribs... -// const SfxPoolItem& rDefItem = pNode->GetContentAttribs().GetItem( rPoolItem.Which() ); -// BOOL bCreateAttrib = ( rDefItem != rPoolItem ); +// const SfxPoolItem& rDefItem = pNode->GetContentAttribs().GetItem( rPoolItem.Which() ); +// BOOL bCreateAttrib = ( rDefItem != rPoolItem ); // Durch den Verlust der Exclude-Liste geht es nicht mehr, dass ich // kein neues Attribut benoetige und nur das alte nicht expandiere... -// if ( !bCreateAttrib ) +// if ( !bCreateAttrib ) { // => Wenn schon Default-Item, dann wenigstens nur dann einstellen, // wenn davor wirklich ein entsprechendes Attribut. -// if ( pNode->GetCharAttribs().FindAttrib( rPoolItem.Which(), nStart ) ) -// bCreateAttrib = TRUE; +// if ( pNode->GetCharAttribs().FindAttrib( rPoolItem.Which(), nStart ) ) +// bCreateAttrib = TRUE; // Aber kleiner Trost: // Die wenigsten schreiben, aendern das Attr, schreiben, und // stellen dann wieder das Default-Attr ein. @@ -860,21 +860,21 @@ void TextDoc::InsertAttrib( const SfxPoolItem& rPoolItem, TextNode* pNode, USHOR // Die Uberlegung, einfach das andere Attribut nicht zu expandieren, war // sowieso falsch, da das DefAttr aus einer Vorlage kommen kann, // die irgendwann verschwindet! -// if ( bCreateAttrib ) -// { +// if ( bCreateAttrib ) +// { TextCharAttrib* pAttrib = MakeCharAttrib( *pCurPool, rPoolItem, nStart, nEnd ); DBG_ASSERT( pAttrib, "MakeCharAttrib fehlgeschlagen!" ); pNode->GetCharAttribs().InsertAttrib( pAttrib ); -// } -// else -// { -// TextCharAttrib* pTmpAttrib = -// pNode->GetCharAttribs().FindAnyAttrib( rPoolItem.Which() ); -// if ( pTmpAttrib ) // sonst benoetige ich es sowieso nicht.... -// { -// aExcludeList.Insert( pTmpAttrib->GetItem() ); -// } -// } +// } +// else +// { +// TextCharAttrib* pTmpAttrib = +// pNode->GetCharAttribs().FindAnyAttrib( rPoolItem.Which() ); +// if ( pTmpAttrib ) // sonst benoetige ich es sowieso nicht.... +// { +// aExcludeList.Insert( pTmpAttrib->GetItem() ); +// } +// } } #pragma SEG_FUNCDEF(editdoc_40) @@ -900,7 +900,7 @@ void TextDoc::InsertAttrib( TextNode* pNode, USHORT nStart, USHORT nEnd, const S pAttr = pNode->GetCharAttribs().FindAttrib( rPoolItem.Which(), nStart ); if ( pAttr ) { - if ( pAttr->IsInside( nStart ) ) // splitten + if ( pAttr->IsInside( nStart ) ) // splitten { // ??????????????????????????????? // eigentlich noch pruefen, ob wirklich splittet, oder return ! @@ -949,15 +949,15 @@ void TextDoc::FindAttribs( TextNode* pNode, USHORT nStartPos, USHORT nEndPos, Sf // Attribut endet hier, ist leer else if ( ( pAttr->GetStart() == nStartPos ) && ( pAttr->GetEnd() == nStartPos ) ) { -// if ( aExcludeList.FindAttrib( pAttr->GetItem()->Which() ) ) +// if ( aExcludeList.FindAttrib( pAttr->GetItem()->Which() ) ) pItem = pAttr->GetItem(); -// else if ( pNode->Len() == 0 ) // Sonderfall -// pItem = pAttr->GetItem(); +// else if ( pNode->Len() == 0 ) // Sonderfall +// pItem = pAttr->GetItem(); } // Attribut beginnt hier else if ( ( pAttr->GetStart() == nStartPos ) && ( pAttr->GetEnd() > nStartPos ) ) { - if ( nStartPos == 0 ) // Sonderfall + if ( nStartPos == 0 ) // Sonderfall pItem = pAttr->GetItem(); } @@ -981,7 +981,7 @@ void TextDoc::FindAttribs( TextNode* pNode, USHORT nStartPos, USHORT nEndPos, Sf pAttr = GetAttrib( pNode->GetCharAttribs().GetAttribs(), nAttr ); } } - else // Selektion + else // Selektion { while ( pAttr && ( pAttr->GetStart() < nEndPos) ) { @@ -1015,7 +1015,7 @@ void TextDoc::FindAttribs( TextNode* pNode, USHORT nStartPos, USHORT nEndPos, Sf // Ist falsch, wenn das gleiche Attribut sofort wieder // eingestellt wird! // => Sollte am besten nicht vorkommen, also gleich beim - // Setzen von Attributen richtig machen! + // Setzen von Attributen richtig machen! // -------------------------------------------------- rCurSet.InvalidateItem( pAttr->GetItem()->Which() ); } diff --git a/svtools/source/edit/textdoc.hxx b/svtools/source/edit/textdoc.hxx index ed8919a5cb22..f81648751104 100644 --- a/svtools/source/edit/textdoc.hxx +++ b/svtools/source/edit/textdoc.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ SV_DECL_PTRARR_DEL( TextCharAttribs, TextCharAttribPtr, 0, 4 ) class TextCharAttribList : private TextCharAttribs { private: - BOOL mbHasEmptyAttribs; + BOOL mbHasEmptyAttribs; TextCharAttribList( const TextCharAttribList& ) : TextCharAttribs() {} @@ -51,28 +51,28 @@ public: TextCharAttribList(); ~TextCharAttribList(); - void Clear( BOOL bDestroyAttribs ); - USHORT Count() const { return TextCharAttribs::Count(); } + void Clear( BOOL bDestroyAttribs ); + USHORT Count() const { return TextCharAttribs::Count(); } - TextCharAttrib* GetAttrib( USHORT n ) const { return TextCharAttribs::GetObject( n ); } - void RemoveAttrib( USHORT n ) { TextCharAttribs::Remove( n, 1 ); } + TextCharAttrib* GetAttrib( USHORT n ) const { return TextCharAttribs::GetObject( n ); } + void RemoveAttrib( USHORT n ) { TextCharAttribs::Remove( n, 1 ); } - void InsertAttrib( TextCharAttrib* pAttrib ); + void InsertAttrib( TextCharAttrib* pAttrib ); - void DeleteEmptyAttribs(); - void ResortAttribs(); + void DeleteEmptyAttribs(); + void ResortAttribs(); - BOOL HasEmptyAttribs() const { return mbHasEmptyAttribs; } - BOOL& HasEmptyAttribs() { return mbHasEmptyAttribs; } + BOOL HasEmptyAttribs() const { return mbHasEmptyAttribs; } + BOOL& HasEmptyAttribs() { return mbHasEmptyAttribs; } - TextCharAttrib* FindAttrib( USHORT nWhich, USHORT nPos ); - TextCharAttrib* FindNextAttrib( USHORT nWhich, USHORT nFromPos, USHORT nMaxPos = 0xFFFF ) const; - TextCharAttrib* FindEmptyAttrib( USHORT nWhich, USHORT nPos ); - BOOL HasAttrib( USHORT nWhich ) const; - BOOL HasBoundingAttrib( USHORT nBound ); + TextCharAttrib* FindAttrib( USHORT nWhich, USHORT nPos ); + TextCharAttrib* FindNextAttrib( USHORT nWhich, USHORT nFromPos, USHORT nMaxPos = 0xFFFF ) const; + TextCharAttrib* FindEmptyAttrib( USHORT nWhich, USHORT nPos ); + BOOL HasAttrib( USHORT nWhich ) const; + BOOL HasBoundingAttrib( USHORT nBound ); #ifdef DBG_UTIL - BOOL DbgCheckAttribs(); + BOOL DbgCheckAttribs(); #endif }; @@ -80,70 +80,70 @@ public: class TextNode { private: - String maText; - TextCharAttribList maCharAttribs; + String maText; + TextCharAttribList maCharAttribs; TextNode( const TextNode& ) {;} protected: - void ExpandAttribs( USHORT nIndex, USHORT nNewChars ); - void CollapsAttribs( USHORT nIndex, USHORT nDelChars ); + void ExpandAttribs( USHORT nIndex, USHORT nNewChars ); + void CollapsAttribs( USHORT nIndex, USHORT nDelChars ); public: TextNode( const String& rText ); - const String& GetText() const { return maText; } + const String& GetText() const { return maText; } - const TextCharAttribList& GetCharAttribs() const { return maCharAttribs; } - TextCharAttribList& GetCharAttribs() { return maCharAttribs; } + const TextCharAttribList& GetCharAttribs() const { return maCharAttribs; } + TextCharAttribList& GetCharAttribs() { return maCharAttribs; } - void InsertText( USHORT nPos, const String& rText ); - void InsertText( USHORT nPos, sal_Unicode c ); - void RemoveText( USHORT nPos, USHORT nChars ); + void InsertText( USHORT nPos, const String& rText ); + void InsertText( USHORT nPos, sal_Unicode c ); + void RemoveText( USHORT nPos, USHORT nChars ); - TextNode* Split( USHORT nPos, BOOL bKeepEndigAttribs ); - void Append( const TextNode& rNode ); + TextNode* Split( USHORT nPos, BOOL bKeepEndigAttribs ); + void Append( const TextNode& rNode ); }; class TextDoc { private: ToolsList<TextNode*> maTextNodes; - USHORT mnLeftMargin; + USHORT mnLeftMargin; protected: - void DestroyTextNodes(); + void DestroyTextNodes(); public: TextDoc(); ~TextDoc(); - void Clear(); + void Clear(); - ToolsList<TextNode*>& GetNodes() { return maTextNodes; } - const ToolsList<TextNode*>& GetNodes() const { return maTextNodes; } + ToolsList<TextNode*>& GetNodes() { return maTextNodes; } + const ToolsList<TextNode*>& GetNodes() const { return maTextNodes; } - TextPaM RemoveChars( const TextPaM& rPaM, USHORT nChars ); - TextPaM InsertText( const TextPaM& rPaM, sal_Unicode c ); - TextPaM InsertText( const TextPaM& rPaM, const String& rStr ); + TextPaM RemoveChars( const TextPaM& rPaM, USHORT nChars ); + TextPaM InsertText( const TextPaM& rPaM, sal_Unicode c ); + TextPaM InsertText( const TextPaM& rPaM, const String& rStr ); - TextPaM InsertParaBreak( const TextPaM& rPaM, BOOL bKeepEndingAttribs ); - TextPaM ConnectParagraphs( TextNode* pLeft, TextNode* pRight ); + TextPaM InsertParaBreak( const TextPaM& rPaM, BOOL bKeepEndingAttribs ); + TextPaM ConnectParagraphs( TextNode* pLeft, TextNode* pRight ); - ULONG GetTextLen( const sal_Unicode* pSep, const TextSelection* pSel = NULL ) const; - String GetText( const sal_Unicode* pSep ) const; - String GetText( ULONG nPara ) const; + ULONG GetTextLen( const sal_Unicode* pSep, const TextSelection* pSel = NULL ) const; + String GetText( const sal_Unicode* pSep ) const; + String GetText( ULONG nPara ) const; - void SetLeftMargin( USHORT n ) { mnLeftMargin = n; } - USHORT GetLeftMargin() const { return mnLeftMargin; } + void SetLeftMargin( USHORT n ) { mnLeftMargin = n; } + USHORT GetLeftMargin() const { return mnLeftMargin; } -// BOOL RemoveAttribs( TextNode* pNode, USHORT nStart, USHORT nEnd ), USHORT nWhich = 0 ); -// BOOL RemoveAttribs( TextNode* pNode, USHORT nStart, USHORT nEnd, TextCharAttrib*& rpStarting, TextCharAttrib*& rpEnding, USHORT nWhich = 0 ); -// void InsertAttrib( const EditCharAttrib* pAttr ); -// void InsertAttribInSelection( const EditCharAttrib* pAttr ); -// void FindAttribs( TextNode* pNode, USHORT nStartPos, USHORT nEndPos, SfxItemSet& rCurSet ); +// BOOL RemoveAttribs( TextNode* pNode, USHORT nStart, USHORT nEnd ), USHORT nWhich = 0 ); +// BOOL RemoveAttribs( TextNode* pNode, USHORT nStart, USHORT nEnd, TextCharAttrib*& rpStarting, TextCharAttrib*& rpEnding, USHORT nWhich = 0 ); +// void InsertAttrib( const EditCharAttrib* pAttr ); +// void InsertAttribInSelection( const EditCharAttrib* pAttr ); +// void FindAttribs( TextNode* pNode, USHORT nStartPos, USHORT nEndPos, SfxItemSet& rCurSet ); - BOOL IsValidPaM( const TextPaM& rPaM ); + BOOL IsValidPaM( const TextPaM& rPaM ); }; #endif // _TEXTDOC_HXX diff --git a/svtools/source/edit/texteng.cxx b/svtools/source/edit/texteng.cxx index 9a3497303c83..a4a51422821b 100644 --- a/svtools/source/edit/texteng.cxx +++ b/svtools/source/edit/texteng.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,8 +77,8 @@ SV_DECL_PTRARR( TextViews, TextViewPtr, 0, 1 ) SV_DECL_VARARR_SORT( TESortedPositions, ULONG, 16, 8 ) SV_IMPL_VARARR_SORT( TESortedPositions, ULONG ) -#define RESDIFF 10 -#define SCRLRANGE 20 // 1/20 der Breite/Hoehe scrollen, wenn im QueryDrop +#define RESDIFF 10 +#define SCRLRANGE 20 // 1/20 der Breite/Hoehe scrollen, wenn im QueryDrop // ------------------------------------------------------------------------- @@ -92,25 +92,25 @@ TextEngine::TextEngine() mpViews = new TextViews; mpActiveView = NULL; - mbIsFormatting = FALSE; - mbFormatted = FALSE; - mbUpdate = TRUE; - mbModified = FALSE; - mbUndoEnabled = FALSE; - mbIsInUndo = FALSE; - mbDowning = FALSE; - mbRightToLeft = FALSE; + mbIsFormatting = FALSE; + mbFormatted = FALSE; + mbUpdate = TRUE; + mbModified = FALSE; + mbUndoEnabled = FALSE; + mbIsInUndo = FALSE; + mbDowning = FALSE; + mbRightToLeft = FALSE; mbHasMultiLineParas = FALSE; - meAlign = TXTALIGN_LEFT; + meAlign = TXTALIGN_LEFT; - mnMaxTextWidth = 0; - mnMaxTextLen = 0; - mnCurTextWidth = 0xFFFFFFFF; - mnCurTextHeight = 0; + mnMaxTextWidth = 0; + mnMaxTextLen = 0; + mnCurTextWidth = 0xFFFFFFFF; + mnCurTextHeight = 0; - mpUndoManager = NULL; - mpIMEInfos = NULL; + mpUndoManager = NULL; + mpIMEInfos = NULL; mpLocaleDataWrapper = NULL; mpIdleFormatter = new IdleFormatter; @@ -138,7 +138,7 @@ TextEngine::~TextEngine() delete mpIdleFormatter; delete mpDoc; delete mpTEParaPortions; - delete mpViews; // nur die Liste, nicht die Vies + delete mpViews; // nur die Liste, nicht die Vies delete mpRefDev; delete mpUndoManager; delete mpIMEInfos; @@ -292,7 +292,7 @@ static inline const sal_Unicode* static_getLineEndText( LineEnd aLineEnd ) } void TextEngine::ReplaceText(const TextSelection& rSel, const String& rText) -{ +{ ImpInsertText( rSel, rText ); } @@ -394,9 +394,9 @@ BOOL TextEngine::DoesKeyChangeText( const KeyEvent& rKeyEvent ) case KEYFUNC_UNDO: case KEYFUNC_REDO: case KEYFUNC_CUT: - case KEYFUNC_PASTE: bDoesChange = TRUE; + case KEYFUNC_PASTE: bDoesChange = TRUE; break; - default: // wird dann evtl. unten bearbeitet. + default: // wird dann evtl. unten bearbeitet. eFunc = KEYFUNC_DONTKNOW; } } @@ -531,7 +531,7 @@ void TextEngine::SetText( const XubString& rText ) pView->Invalidate(); } - if( !rText.Len() ) // sonst muss spaeter noch invalidiert werden, !bFormatted reicht. + if( !rText.Len() ) // sonst muss spaeter noch invalidiert werden, !bFormatted reicht. mnCurTextHeight = 0; FormatAndUpdate(); @@ -566,16 +566,16 @@ void TextEngine::ImpRemoveChars( const TextPaM& rPaM, USHORT nChars, SfxUndoActi TextCharAttrib* pAttr = pNode->GetCharAttribs().GetAttrib( --nAttr ); if ( ( pAttr->GetEnd() >= nStart ) && ( pAttr->GetStart() < nEnd ) ) { -// TextSelection aSel( rPaM ); -// aSel.GetEnd().GetIndex() += nChars; -// TextUndoSetAttribs* pAttrUndo = CreateAttribUndo( aSel ); -// InsertUndo( pAttrUndo ); - break; // for +// TextSelection aSel( rPaM ); +// aSel.GetEnd().GetIndex() += nChars; +// TextUndoSetAttribs* pAttrUndo = CreateAttribUndo( aSel ); +// InsertUndo( pAttrUndo ); + break; // for } } -// if ( pCurUndo && ( CreateTextPaM( pCurUndo->GetEPaM() ) == rPaM ) ) -// pCurUndo->GetStr() += aStr; -// else +// if ( pCurUndo && ( CreateTextPaM( pCurUndo->GetEPaM() ) == rPaM ) ) +// pCurUndo->GetStr() += aStr; +// else InsertUndo( new TextUndoRemoveChars( this, rPaM, aStr ) ); } @@ -622,7 +622,7 @@ TextPaM TextEngine::ImpDeleteText( const TextSelection& rSel ) TextPaM aEndPaM( aSel.GetEnd() ); CursorMoved( aStartPaM.GetPara() ); // nur damit neu eingestellte Attribute verschwinden... - CursorMoved( aEndPaM.GetPara() ); // nur damit neu eingestellte Attribute verschwinden... + CursorMoved( aEndPaM.GetPara() ); // nur damit neu eingestellte Attribute verschwinden... DBG_ASSERT( mpDoc->IsValidPaM( aStartPaM ), "Index im Wald in ImpDeleteText" ); DBG_ASSERT( mpDoc->IsValidPaM( aEndPaM ), "Index im Wald in ImpDeleteText" ); @@ -651,7 +651,7 @@ TextPaM TextEngine::ImpDeleteText( const TextSelection& rSel ) } // Den Anfang des EndNodes.... - nEndNode = nStartNode+1; // Die anderen Absaetze wurden geloescht + nEndNode = nStartNode+1; // Die anderen Absaetze wurden geloescht nChars = aEndPaM.GetIndex(); if ( nChars ) { @@ -676,7 +676,7 @@ TextPaM TextEngine::ImpDeleteText( const TextSelection& rSel ) pPortion->MarkInvalid( aEndPaM.GetIndex(), aStartPaM.GetIndex() - aEndPaM.GetIndex() ); } -// UpdateSelections(); +// UpdateSelections(); TextModified(); return aStartPaM; } @@ -725,13 +725,13 @@ BOOL TextEngine::IsInputSequenceCheckingRequired( sal_Unicode c, const TextSelec USHORT nMaxPos = rCurSel.GetEnd().GetIndex(); if (nMaxPos < nFirstPos) nFirstPos = nMaxPos; - - sal_Bool bIsSequenceChecking = + + sal_Bool bIsSequenceChecking = aCTLOptions.IsCTLFontEnabled() && - aCTLOptions.IsCTLSequenceChecking() && + aCTLOptions.IsCTLSequenceChecking() && nFirstPos != 0 && /* first char needs not to be checked */ xBI.is() && i18n::ScriptType::COMPLEX == xBI->getScriptType( rtl::OUString( c ), 0 ); - + return bIsSequenceChecking; } @@ -778,10 +778,10 @@ TextPaM TextEngine::ImpInsertText( sal_Unicode c, const TextSelection& rCurSel, if (xISC.is()) { xub_StrLen nTmpPos = aPaM.GetIndex(); - sal_Int16 nCheckMode = aCTLOptions.IsCTLSequenceCheckingRestricted() ? + sal_Int16 nCheckMode = aCTLOptions.IsCTLSequenceCheckingRestricted() ? i18n::InputSequenceCheckMode::STRICT : i18n::InputSequenceCheckMode::BASIC; - // the text that needs to be checked is only the one + // the text that needs to be checked is only the one // before the current cursor position rtl::OUString aOldText( mpDoc->GetText( aPaM.GetPara() ).Copy(0, nTmpPos) ); rtl::OUString aNewText( aOldText ); @@ -866,7 +866,7 @@ TextPaM TextEngine::ImpInsertText( const TextSelection& rCurSel, const XubString { USHORT nEnd = aText.Search( LINE_SEP, nStart ); if ( nEnd == STRING_NOTFOUND ) - nEnd = aText.Len(); // nicht dereferenzieren! + nEnd = aText.Len(); // nicht dereferenzieren! // Start == End => Leerzeile if ( nEnd > nStart ) @@ -896,8 +896,8 @@ TextPaM TextEngine::ImpInsertText( const TextSelection& rCurSel, const XubString aPaM = ImpInsertParaBreak( aPaM ); nStart = nEnd+1; - - if ( nStart < nEnd ) // #108611# overflow + + if ( nStart < nEnd ) // #108611# overflow break; } @@ -937,7 +937,7 @@ TextPaM TextEngine::ImpInsertParaBreak( const TextPaM& rPaM, BOOL bKeepEndingAtt mpTEParaPortions->Insert( pNewPortion, aPaM.GetPara() ); ImpParagraphInserted( aPaM.GetPara() ); - CursorMoved( rPaM.GetPara() ); // falls leeres Attribut entstanden. + CursorMoved( rPaM.GetPara() ); // falls leeres Attribut entstanden. TextModified(); if ( bFirstParaContentChanged ) @@ -981,9 +981,9 @@ Rectangle TextEngine::GetEditCursor( const TextPaM& rPaM, BOOL bSpecial, BOOL bP //TextNode* pNode = mpDoc->GetNodes().GetObject( rPaM.GetPara() ); /* - bSpecial: Wenn hinter dem letzten Zeichen einer umgebrochenen Zeile, + bSpecial: Wenn hinter dem letzten Zeichen einer umgebrochenen Zeile, am Ende der Zeile bleiben, nicht am Anfang der naechsten. - Zweck: - END => wirklich hinter das letzte Zeichen + Zweck: - END => wirklich hinter das letzte Zeichen - Selektion.... bSpecial: If behind the last character of a made up line, stay at the end of the line, not at the start of the next line. @@ -1059,7 +1059,7 @@ long TextEngine::ImpGetXPos( ULONG nPara, TextLine* pLine, USHORT nIndex, BOOL b if ( nIndex == ( nTextPortionStart + pPortion->GetLen() ) ) { // End of Portion - if ( ( pPortion->GetKind() == PORTIONKIND_TAB ) || + if ( ( pPortion->GetKind() == PORTIONKIND_TAB ) || ( !IsRightToLeft() && !pPortion->IsRightToLeft() ) || ( IsRightToLeft() && pPortion->IsRightToLeft() ) ) { @@ -1067,7 +1067,7 @@ long TextEngine::ImpGetXPos( ULONG nPara, TextLine* pLine, USHORT nIndex, BOOL b if ( ( pPortion->GetKind() == PORTIONKIND_TAB ) && ( (nTextPortion+1) < pParaPortion->GetTextPortions().Count() ) ) { TETextPortion* pNextPortion = pParaPortion->GetTextPortions().GetObject( nTextPortion+1 ); - if ( ( pNextPortion->GetKind() != PORTIONKIND_TAB ) && ( + if ( ( pNextPortion->GetKind() != PORTIONKIND_TAB ) && ( ( !IsRightToLeft() && pNextPortion->IsRightToLeft() ) || ( IsRightToLeft() && !pNextPortion->IsRightToLeft() ) ) ) { @@ -1181,10 +1181,10 @@ USHORT TextEngine::ImpFindIndex( ULONG nPortion, const Point& rPosInPara, BOOL b { TextLine* pTmpLine = pPortion->GetLines().GetObject( nLine ); nY += mnCharHeight; - if ( nY > rPosInPara.Y() ) // das war 'se + if ( nY > rPosInPara.Y() ) // das war 'se { pLine = pTmpLine; - break; // richtige Y-Position intressiert nicht + break; // richtige Y-Position intressiert nicht } } DBG_ASSERT( pLine, "ImpFindIndex: pLine ?" ); @@ -1222,7 +1222,7 @@ USHORT TextEngine::GetCharPos( ULONG nPortion, USHORT nLine, long nXPos, BOOL ) { if( pTextPortion->GetLen() > 1 ) { - nTmpX -= pTextPortion->GetWidth(); // vor die Portion stellen + nTmpX -= pTextPortion->GetWidth(); // vor die Portion stellen // Optimieren: Kein GetTextBreak, wenn feste Fontbreite... Font aFont; SeekCursor( nPortion, nCurIndex+1, aFont, NULL ); @@ -1292,7 +1292,7 @@ ULONG TextEngine::CalcTextWidth() { ULONG nParaWidth = CalcTextWidth( --nPara ); if ( nParaWidth > mnCurTextWidth ) - mnCurTextWidth = nParaWidth; + mnCurTextWidth = nParaWidth; } } return mnCurTextWidth+1;// Ein breiter, da in CreateLines bei >= umgebrochen wird. @@ -1547,8 +1547,8 @@ void TextEngine::SeekCursor( ULONG nPara, USHORT nPos, Font& rFont, OutputDevice else if ( nAttr & EXTTEXTINPUT_ATTR_GRAYWAVELINE ) { rFont.SetUnderline( UNDERLINE_WAVE ); -// if( pOut ) -// pOut->SetTextLineColor( Color( COL_LIGHTGRAY ) ); +// if( pOut ) +// pOut->SetTextLineColor( Color( COL_LIGHTGRAY ) ); } } } @@ -1642,7 +1642,7 @@ void TextEngine::FormatFullDoc() { for ( ULONG nPortion = 0; nPortion < mpTEParaPortions->Count(); nPortion++ ) { - TEParaPortion* pTEParaPortion = mpTEParaPortions->GetObject( nPortion ); USHORT nLen = pTEParaPortion->GetNode()->GetText().Len(); + TEParaPortion* pTEParaPortion = mpTEParaPortions->GetObject( nPortion ); USHORT nLen = pTEParaPortion->GetNode()->GetText().Len(); pTEParaPortion->MarkSelectionInvalid( 0, nLen ); } mbFormatted = FALSE; @@ -1660,7 +1660,7 @@ void TextEngine::FormatDoc() long nY = 0; BOOL bGrow = FALSE; - maInvalidRec = Rectangle(); // leermachen + maInvalidRec = Rectangle(); // leermachen for ( ULONG nPara = 0; nPara < mpTEParaPortions->Count(); nPara++ ) { TEParaPortion* pTEParaPortion = mpTEParaPortions->GetObject( nPara ); @@ -1695,7 +1695,7 @@ void TextEngine::FormatDoc() { ULONG nNewParaWidth = CalcTextWidth( nPara ); if ( nNewParaWidth >= mnCurTextWidth ) - mnCurTextWidth = nNewParaWidth; + mnCurTextWidth = nNewParaWidth; else if ( ( nOldParaWidth != 0xFFFFFFFF ) && ( nOldParaWidth >= mnCurTextWidth ) ) mnCurTextWidth = 0xFFFFFFFF; } @@ -1784,7 +1784,7 @@ void TextEngine::ImpBreakLine( ULONG nPara, TextLine* pLine, TETextPortion*, USH DBG_ASSERT( nMaxBreakPos < pNode->GetText().Len(), "Break?!" ); - if ( nMaxBreakPos == STRING_LEN ) // GetTextBreak() ist anderer Auffassung als GetTextSize() + if ( nMaxBreakPos == STRING_LEN ) // GetTextBreak() ist anderer Auffassung als GetTextSize() nMaxBreakPos = pNode->GetText().Len() - 1; uno::Reference < i18n::XBreakIterator > xBI = GetBreakIterator(); @@ -1804,7 +1804,7 @@ void TextEngine::ImpBreakLine( ULONG nPara, TextLine* pLine, TETextPortion*, USH { nBreakPos = nMaxBreakPos; if ( nBreakPos <= pLine->GetStart() ) - nBreakPos = pLine->GetStart() + 1; // Sonst Endlosschleife! + nBreakPos = pLine->GetStart() + 1; // Sonst Endlosschleife! } @@ -1844,7 +1844,7 @@ USHORT TextEngine::SplitTextPortion( ULONG nPara, USHORT nPos ) nTmpPos = nTmpPos + pTP->GetLen(); if ( nTmpPos >= nPos ) { - if ( nTmpPos == nPos ) // dann braucht nichts geteilt werden + if ( nTmpPos == nPos ) // dann braucht nichts geteilt werden return nSplitPortion; pTextPortion = pTP; break; @@ -1942,7 +1942,7 @@ void TextEngine::CreateTextPortions( ULONG nPara, USHORT nStartPos ) USHORT nInvPos; #ifdef DBG_UTIL - BOOL bFound = + BOOL bFound = #endif aPositions.Seek_Entry( nPortionStart, &nInvPos ); DBG_ASSERT( bFound && ( nInvPos < (aPositions.Count()-1) ), "InvPos ?!" ); @@ -1979,9 +1979,9 @@ void TextEngine::RecalcTextPortion( ULONG nPara, USHORT nStartPos, short nNewCha USHORT nNewPortionPos = 0; if ( nStartPos ) nNewPortionPos = SplitTextPortion( nPara, nStartPos ) + 1; -// else if ( ( pTEParaPortion->GetTextPortions().Count() == 1 ) && -// !pTEParaPortion->GetTextPortions()[0]->GetLen() ) -// pTEParaPortion->GetTextPortions().Reset(); // DummyPortion +// else if ( ( pTEParaPortion->GetTextPortions().Count() == 1 ) && +// !pTEParaPortion->GetTextPortions()[0]->GetLen() ) +// pTEParaPortion->GetTextPortions().Reset(); // DummyPortion // Eine leere Portion kann hier stehen, wenn der Absatz leer war, // oder eine Zeile durch einen harten Zeilenumbruch entstanden ist. @@ -2061,7 +2061,7 @@ void TextEngine::ImpPaint( OutputDevice* pOutDev, const Point& rStartPos, Rectan if ( !IsFormatted() ) FormatDoc(); - + bool bTransparent = false; Window* pOutWin = dynamic_cast<Window*>(pOutDev); bTransparent = (pOutWin && pOutWin->IsPaintTransparent()); @@ -2251,7 +2251,7 @@ void TextEngine::ImpPaint( OutputDevice* pOutDev, const Point& rStartPos, Rectan #endif } break; - default: DBG_ERROR( "ImpPaint: Unknown Portion-Type !" ); + default: DBG_ERROR( "ImpPaint: Unknown Portion-Type !" ); } } @@ -2262,7 +2262,7 @@ void TextEngine::ImpPaint( OutputDevice* pOutDev, const Point& rStartPos, Rectan nY += mnCharHeight; if ( pPaintArea && ( nY >= pPaintArea->Bottom() ) ) - break; // keine sichtbaren Aktionen mehr... + break; // keine sichtbaren Aktionen mehr... } } else @@ -2271,7 +2271,7 @@ void TextEngine::ImpPaint( OutputDevice* pOutDev, const Point& rStartPos, Rectan } if ( pPaintArea && ( nY > pPaintArea->Bottom() ) ) - break; // keine sichtbaren Aktionen mehr... + break; // keine sichtbaren Aktionen mehr... } } @@ -2327,7 +2327,7 @@ BOOL TextEngine::CreateLines( ULONG nPara ) else if ( ( pTEParaPortion->IsSimpleInvalid() ) && ( nInvalidDiff < 0 ) ) { // pruefen, ob loeschen ueber Portiongrenzen erfolgte... - USHORT nStart = nInvalidStart; // DOPPELT !!!!!!!!!!!!!!! + USHORT nStart = nInvalidStart; // DOPPELT !!!!!!!!!!!!!!! USHORT nEnd = nStart - nInvalidDiff; // neg. bQuickFormat = TRUE; USHORT nPos = 0; @@ -2397,7 +2397,7 @@ BOOL TextEngine::CreateLines( ULONG nPara ) USHORT nTmpPos = nIndex; USHORT nTmpPortion = pLine->GetStartPortion(); long nTmpWidth = mpDoc->GetLeftMargin(); -// long nXWidth = mnMaxTextWidth ? ( mnMaxTextWidth - mpDoc->GetLeftMargin() ) : 0x7FFFFFFF; +// long nXWidth = mnMaxTextWidth ? ( mnMaxTextWidth - mpDoc->GetLeftMargin() ) : 0x7FFFFFFF; // Margin nicht abziehen, ist schon in TmpWidth enthalten. long nXWidth = mnMaxTextWidth ? mnMaxTextWidth : 0x7FFFFFFF; if ( nXWidth < nTmpWidth ) @@ -2505,7 +2505,7 @@ BOOL TextEngine::CreateLines( ULONG nPara ) { if ( ImpGetAlign() == TXTALIGN_CENTER ) pLine->SetStartX( (USHORT)(nSpace / 2) ); - else // TXTALIGN_RIGHT + else // TXTALIGN_RIGHT pLine->SetStartX( (USHORT)nSpace ); } } @@ -2568,7 +2568,7 @@ BOOL TextEngine::CreateLines( ULONG nPara ) } } - nIndex = pLine->GetEnd(); // naechste Zeile Start = letzte Zeile Ende + nIndex = pLine->GetEnd(); // naechste Zeile Start = letzte Zeile Ende // weil nEnd hinter das letzte Zeichen zeigt! USHORT nEndPortion = pLine->GetEndPortion(); @@ -2595,7 +2595,7 @@ BOOL TextEngine::CreateLines( ULONG nPara ) pLine->SetStartPortion( nEndPortion+1 ); pLine->SetEndPortion( nEndPortion+1 ); } - } // while ( Index < Len ) + } // while ( Index < Len ) if ( nDelFromLine != 0xFFFF ) pTEParaPortion->GetLines().DeleteAndDestroy( nDelFromLine, pTEParaPortion->GetLines().Count() - nDelFromLine ); @@ -2804,7 +2804,7 @@ void TextEngine::RemoveAttribs( ULONG nPara, USHORT nWhich, BOOL bIdleFormatAndU FormatAndUpdate( NULL ); } } -} +} void TextEngine::RemoveAttrib( ULONG nPara, const TextCharAttrib& rAttrib ) { if ( nPara < mpDoc->GetNodes().Count() ) @@ -2817,7 +2817,7 @@ void TextEngine::RemoveAttrib( ULONG nPara, const TextCharAttrib& rAttrib ) for(USHORT nAttr = nAttrCount; nAttr; --nAttr) { if(rAttribs.GetAttrib( nAttr - 1 ) == &rAttrib) - { + { rAttribs.RemoveAttrib( nAttr -1 ); break; } @@ -2828,7 +2828,7 @@ void TextEngine::RemoveAttrib( ULONG nPara, const TextCharAttrib& rAttrib ) FormatAndUpdate( NULL ); } } -} +} void TextEngine::SetAttrib( const TextAttrib& rAttr, ULONG nPara, USHORT nStart, USHORT nEnd, BOOL bIdleFormatAndUpdate ) { @@ -2906,14 +2906,14 @@ void TextEngine::ImpParagraphInserted( ULONG nPara ) TextView* pView = mpViews->GetObject( --nView ); if ( pView != GetActiveView() ) { -// BOOL bInvers = pView->maSelection.GetEnd() < pView->maSelection.GetStart(); -// TextPaM& rMin = !bInvers ? pView->maSelection.GetStart(): pView->maSelection.GetEnd(); -// TextPaM& rMax = bInvers ? pView->maSelection.GetStart() : pView->maSelection.GetEnd(); +// BOOL bInvers = pView->maSelection.GetEnd() < pView->maSelection.GetStart(); +// TextPaM& rMin = !bInvers ? pView->maSelection.GetStart(): pView->maSelection.GetEnd(); +// TextPaM& rMax = bInvers ? pView->maSelection.GetStart() : pView->maSelection.GetEnd(); // -// if ( rMin.GetPara() >= nPara ) -// rMin.GetPara()++; -// if ( rMax.GetPara() >= nPara ) -// rMax.GetPara()++; +// if ( rMin.GetPara() >= nPara ) +// rMin.GetPara()++; +// if ( rMax.GetPara() >= nPara ) +// rMax.GetPara()++; for ( int n = 0; n <= 1; n++ ) { TextPaM& rPaM = n ? pView->GetSelection().GetStart(): pView->GetSelection().GetEnd(); @@ -3067,11 +3067,11 @@ LocaleDataWrapper* TextEngine::ImpGetLocaleDataWrapper() return mpLocaleDataWrapper; } -void TextEngine::SetRightToLeft( BOOL bR2L ) -{ +void TextEngine::SetRightToLeft( BOOL bR2L ) +{ if ( mbRightToLeft != bR2L ) { - mbRightToLeft = bR2L; + mbRightToLeft = bR2L; meAlign = bR2L ? TXTALIGN_RIGHT : TXTALIGN_LEFT; FormatFullDoc(); UpdateViews(); @@ -3096,7 +3096,7 @@ void TextEngine::ImpInitWritingDirections( ULONG nPara ) UBiDi* pBidi = ubidi_openSized( aText.Len(), 0, &nError ); nError = U_ZERO_ERROR; - ubidi_setPara( pBidi, reinterpret_cast<const UChar *>(aText.GetBuffer()), aText.Len(), nBidiLevel, NULL, &nError ); // UChar != sal_Unicode in MinGW + ubidi_setPara( pBidi, reinterpret_cast<const UChar *>(aText.GetBuffer()), aText.Len(), nBidiLevel, NULL, &nError ); // UChar != sal_Unicode in MinGW nError = U_ZERO_ERROR; long nCount = ubidi_countRuns( pBidi, &nError ); @@ -3133,7 +3133,7 @@ BYTE TextEngine::ImpGetRightToLeft( ULONG nPara, USHORT nPos, USHORT* pStart, US ImpInitWritingDirections( nPara ); TEWritingDirectionInfos& rDirInfos = pParaPortion->GetWritingDirectionInfos(); - for ( USHORT n = 0; n < rDirInfos.Count(); n++ ) + for ( USHORT n = 0; n < rDirInfos.Count(); n++ ) { if ( ( rDirInfos[n].nStartPos <= nPos ) && ( rDirInfos[n].nEndPos >= nPos ) ) { @@ -3232,11 +3232,11 @@ long TextEngine::ImpGetPortionXOffset( ULONG nPara, TextLine* pLine, USHORT nTex void TextEngine::ImpInitLayoutMode( OutputDevice* pOutDev, BOOL bDrawingR2LPortion ) { ULONG nLayoutMode = pOutDev->GetLayoutMode(); - + nLayoutMode &= ~(TEXT_LAYOUT_BIDI_RTL | TEXT_LAYOUT_COMPLEX_DISABLED | TEXT_LAYOUT_BIDI_STRONG ); if ( bDrawingR2LPortion ) nLayoutMode |= TEXT_LAYOUT_BIDI_RTL; - + pOutDev->SetLayoutMode( nLayoutMode ); } diff --git a/svtools/source/edit/textund2.hxx b/svtools/source/edit/textund2.hxx index b49619894670..0d8b7f8840a2 100644 --- a/svtools/source/edit/textund2.hxx +++ b/svtools/source/edit/textund2.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,101 +34,101 @@ class TextUndoDelPara : public TextUndo { private: - BOOL mbDelObject; - ULONG mnPara; - TextNode* mpNode; // Zeigt auf das gueltige, nicht zerstoerte Objekt! + BOOL mbDelObject; + ULONG mnPara; + TextNode* mpNode; // Zeigt auf das gueltige, nicht zerstoerte Objekt! public: TYPEINFO(); TextUndoDelPara( TextEngine* pTextEngine, TextNode* pNode, ULONG nPara ); ~TextUndoDelPara(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo(); + virtual void Redo(); }; class TextUndoConnectParas : public TextUndo { private: - ULONG mnPara; - USHORT mnSepPos; + ULONG mnPara; + USHORT mnSepPos; public: TYPEINFO(); TextUndoConnectParas( TextEngine* pTextEngine, ULONG nPara, USHORT nSepPos ); ~TextUndoConnectParas(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo(); + virtual void Redo(); }; class TextUndoSplitPara : public TextUndo { private: - ULONG mnPara; - USHORT mnSepPos; + ULONG mnPara; + USHORT mnSepPos; public: TYPEINFO(); TextUndoSplitPara( TextEngine* pTextEngine, ULONG nPara, USHORT nSepPos ); ~TextUndoSplitPara(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo(); + virtual void Redo(); }; class TextUndoInsertChars : public TextUndo { private: - TextPaM maTextPaM; - String maText; + TextPaM maTextPaM; + String maText; public: TYPEINFO(); TextUndoInsertChars( TextEngine* pTextEngine, const TextPaM& rTextPaM, const String& rStr ); -// const TextPaM& GetTextPaM() { return aTextPaM; } -// String& GetStr() { return aText; } +// const TextPaM& GetTextPaM() { return aTextPaM; } +// String& GetStr() { return aText; } - virtual void Undo(); - virtual void Redo(); + virtual void Undo(); + virtual void Redo(); - virtual BOOL Merge( SfxUndoAction *pNextAction ); + virtual BOOL Merge( SfxUndoAction *pNextAction ); }; class TextUndoRemoveChars : public TextUndo { private: - TextPaM maTextPaM; - String maText; + TextPaM maTextPaM; + String maText; public: TYPEINFO(); TextUndoRemoveChars( TextEngine* pTextEngine, const TextPaM& rTextPaM, const String& rStr ); -// const TextPaM& GetTextPaM() { return aTextPaM; } -// String& GetStr() { return aText; } +// const TextPaM& GetTextPaM() { return aTextPaM; } +// String& GetStr() { return aText; } - virtual void Undo(); - virtual void Redo(); + virtual void Undo(); + virtual void Redo(); }; class TextUndoSetAttribs: public TextUndo { private: - TextSelection maSelection; -// SfxItemSet aNewAttribs; -// TextInfoArray aPrevAttribs; -// BYTE nSpecial; -// BOOL bSetIsRemove; -// USHORT nRemoveWhich; + TextSelection maSelection; +// SfxItemSet aNewAttribs; +// TextInfoArray aPrevAttribs; +// BYTE nSpecial; +// BOOL bSetIsRemove; +// USHORT nRemoveWhich; // -// void ImpSetSelection( TextView* pView ); +// void ImpSetSelection( TextView* pView ); public: @@ -136,14 +136,14 @@ public: TextUndoSetAttribs( TextEngine* pTextEngine, const TextSelection& rESel ); ~TextUndoSetAttribs(); -// TextInfoArray& GetTextInfos() { return aPrevAttribs; } -// SfxItemSet& GetNewAttribs() { return aNewAttribs; } -// void SetSpecial( BYTE n ) { nSpecial = n; } -// void SetRemoveAttribs( BOOL b ) { bSetIsRemove = b; } -// void SetRemoveWhich( USHORT n ) { nRemoveWhich = n; } +// TextInfoArray& GetTextInfos() { return aPrevAttribs; } +// SfxItemSet& GetNewAttribs() { return aNewAttribs; } +// void SetSpecial( BYTE n ) { nSpecial = n; } +// void SetRemoveAttribs( BOOL b ) { bSetIsRemove = b; } +// void SetRemoveWhich( USHORT n ) { nRemoveWhich = n; } - virtual void Undo(); - virtual void Redo(); + virtual void Undo(); + virtual void Redo(); }; #endif // _TEXTUND2_HXX diff --git a/svtools/source/edit/textundo.cxx b/svtools/source/edit/textundo.cxx index fc8ffe127bf7..4670ae06ee6a 100644 --- a/svtools/source/edit/textundo.cxx +++ b/svtools/source/edit/textundo.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,8 +92,8 @@ void TextUndoManager::UndoRedoStart() { DBG_ASSERT( GetView(), "Undo/Redo: Active View?" ); -// if ( GetView() ) -// GetView()->HideSelection(); +// if ( GetView() ) +// GetView()->HideSelection(); } void TextUndoManager::UndoRedoEnd() @@ -129,7 +129,7 @@ USHORT __EXPORT TextUndo::GetId() const XubString __EXPORT TextUndo::GetComment() const { -// return mpTextEngine->GetUndoComment( this ); +// return mpTextEngine->GetUndoComment( this ); return String(); } @@ -157,7 +157,7 @@ TextUndoDelPara::~TextUndoDelPara() void __EXPORT TextUndoDelPara::Undo() { GetTextEngine()->InsertContent( mpNode, mnPara ); - mbDelObject = FALSE; // gehoert wieder der Engine + mbDelObject = FALSE; // gehoert wieder der Engine if ( GetView() ) { @@ -179,7 +179,7 @@ void __EXPORT TextUndoDelPara::Redo() GetDoc()->GetNodes().Remove( mnPara ); GetTextEngine()->ImpParagraphRemoved( mnPara ); - mbDelObject = TRUE; // gehoert wieder dem Undo + mbDelObject = TRUE; // gehoert wieder dem Undo ULONG nParas = GetDoc()->GetNodes().Count(); ULONG n = mnPara < nParas ? mnPara : (nParas-1); @@ -192,7 +192,7 @@ void __EXPORT TextUndoDelPara::Redo() // TextUndoConnectParas // ------------------------------------------------------------------------ TextUndoConnectParas::TextUndoConnectParas( TextEngine* pTextEngine, ULONG nPara, USHORT nPos ) - : TextUndo( TEXTUNDO_CONNECTPARAS, pTextEngine ) + : TextUndo( TEXTUNDO_CONNECTPARAS, pTextEngine ) { mnPara = nPara; mnSepPos = nPos; @@ -308,10 +308,10 @@ TextUndoSetAttribs::TextUndoSetAttribs( TextEngine* pTextEngine, const TextSelec : TextUndo( TEXTUNDO_ATTRIBS, pTextEngine ), maSelection( rSel ) { maSelection.Justify(); -// aNewAttribs.Set( rNewItems ); -// mbSetIsRemove = FALSE; -// mnRemoveWhich = 0; -// mnSpecial = 0; +// aNewAttribs.Set( rNewItems ); +// mbSetIsRemove = FALSE; +// mnRemoveWhich = 0; +// mnSpecial = 0; } TextUndoSetAttribs::~TextUndoSetAttribs() @@ -323,23 +323,23 @@ void __EXPORT TextUndoSetAttribs::Undo() { for ( ULONG nPara = maSelection.GetStart().GetPara(); nPara <= maSelection.GetEnd().GetPara(); nPara++ ) { -// ContentAttribsInfo* pInf = aPrevAttribs[ (USHORT)(nPara-aESel.nStartPara) ]; -// GetTextEngine()->RemoveCharAttribs( nPara ); -// TextNode* pNode = GetTextEngine()->GetTextDoc().GetObject( nPara ); -// for ( USHORT nAttr = 0; nAttr < pInf->GetPrevCharAttribs().Count(); nAttr++ ) -// { -// GetTextEngine()->GetTextDoc().InsertAttrib( pNode, pX->GetStart(), pX->GetEnd(), *pX->GetItem() ); -// } +// ContentAttribsInfo* pInf = aPrevAttribs[ (USHORT)(nPara-aESel.nStartPara) ]; +// GetTextEngine()->RemoveCharAttribs( nPara ); +// TextNode* pNode = GetTextEngine()->GetTextDoc().GetObject( nPara ); +// for ( USHORT nAttr = 0; nAttr < pInf->GetPrevCharAttribs().Count(); nAttr++ ) +// { +// GetTextEngine()->GetTextDoc().InsertAttrib( pNode, pX->GetStart(), pX->GetEnd(), *pX->GetItem() ); +// } } SetSelection( maSelection ); } void __EXPORT TextUndoSetAttribs::Redo() { -// if ( !bSetIsRemove ) -// GetTextEngine()->SetAttribs( aSel, aNewAttribs, nSpecial ); -// else -// GetTextEngine()->RemoveCharAttribs( aSel, bRemoveParaAttribs, nRemoveWhich ); +// if ( !bSetIsRemove ) +// GetTextEngine()->SetAttribs( aSel, aNewAttribs, nSpecial ); +// else +// GetTextEngine()->RemoveCharAttribs( aSel, bRemoveParaAttribs, nRemoveWhich ); SetSelection( maSelection ); } diff --git a/svtools/source/edit/textundo.hxx b/svtools/source/edit/textundo.hxx index 414f2f1f5db2..d3279fa244b1 100644 --- a/svtools/source/edit/textundo.hxx +++ b/svtools/source/edit/textundo.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,52 +34,52 @@ class TextEngine; class TextUndoManager : public SfxUndoManager { - TextEngine* mpTextEngine; + TextEngine* mpTextEngine; protected: - void UndoRedoStart(); - void UndoRedoEnd(); + void UndoRedoStart(); + void UndoRedoEnd(); - TextView* GetView() const { return mpTextEngine->GetActiveView(); } + TextView* GetView() const { return mpTextEngine->GetActiveView(); } public: TextUndoManager( TextEngine* pTextEngine ); ~TextUndoManager(); using SfxUndoManager::Undo; - virtual BOOL Undo( USHORT nCount=1 ); + virtual BOOL Undo( USHORT nCount=1 ); using SfxUndoManager::Redo; - virtual BOOL Redo( USHORT nCount=1 ); + virtual BOOL Redo( USHORT nCount=1 ); }; class TextUndo : public SfxUndoAction { private: - USHORT mnId; - TextEngine* mpTextEngine; + USHORT mnId; + TextEngine* mpTextEngine; protected: - TextView* GetView() const { return mpTextEngine->GetActiveView(); } - void SetSelection( const TextSelection& rSel ); + TextView* GetView() const { return mpTextEngine->GetActiveView(); } + void SetSelection( const TextSelection& rSel ); - TextDoc* GetDoc() const { return mpTextEngine->mpDoc; } - TEParaPortions* GetTEParaPortions() const { return mpTextEngine->mpTEParaPortions; } + TextDoc* GetDoc() const { return mpTextEngine->mpDoc; } + TEParaPortions* GetTEParaPortions() const { return mpTextEngine->mpTEParaPortions; } public: TYPEINFO(); TextUndo( USHORT nId, TextEngine* pTextEngine ); - virtual ~TextUndo(); + virtual ~TextUndo(); - TextEngine* GetTextEngine() const { return mpTextEngine; } + TextEngine* GetTextEngine() const { return mpTextEngine; } - virtual void Undo() = 0; - virtual void Redo() = 0; + virtual void Undo() = 0; + virtual void Redo() = 0; - virtual XubString GetComment() const; - virtual USHORT GetId() const; + virtual XubString GetComment() const; + virtual USHORT GetId() const; }; #endif // _TEXTUNDO_HXX diff --git a/svtools/source/edit/textview.cxx b/svtools/source/edit/textview.cxx index 5103e8362ee7..e67fefdcefcd 100644 --- a/svtools/source/edit/textview.cxx +++ b/svtools/source/edit/textview.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,25 +71,25 @@ using namespace ::com::sun::star; -class TETextDataObject : public ::com::sun::star::datatransfer::XTransferable, +class TETextDataObject : public ::com::sun::star::datatransfer::XTransferable, public ::cppu::OWeakObject { private: - String maText; - SvMemoryStream maHTMLStream; + String maText; + SvMemoryStream maHTMLStream; -public: +public: TETextDataObject( const String& rText ); ~TETextDataObject(); - String& GetText() { return maText; } - SvMemoryStream& GetHTMLStream() { return maHTMLStream; } - + String& GetText() { return maText; } + SvMemoryStream& GetHTMLStream() { return maHTMLStream; } + // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { OWeakObject::acquire(); } + void SAL_CALL release() throw() { OWeakObject::release(); } // ::com::sun::star::datatransfer::XTransferable ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw(::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); @@ -104,7 +104,7 @@ TETextDataObject::TETextDataObject( const String& rText ) : maText( rText ) TETextDataObject::~TETextDataObject() { } - + // uno::XInterface uno::Any TETextDataObject::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException) { @@ -196,7 +196,7 @@ struct ImpTextView // ------------------------------------------------------------------------- // (+) class TextView // ------------------------------------------------------------------------- -TextView::TextView( TextEngine* pEng, Window* pWindow ) : +TextView::TextView( TextEngine* pEng, Window* pWindow ) : mpImpl(new ImpTextView) { pWindow->EnableRTL( FALSE ); @@ -215,7 +215,7 @@ TextView::TextView( TextEngine* pEng, Window* pWindow ) : mpImpl->mbClickedInSelection = FALSE; mpImpl->mbSupportProtectAttribute = FALSE; mpImpl->mbCursorAtEndOfLine = false; -// mbInSelection = FALSE; +// mbInSelection = FALSE; mpImpl->mnTravelXPos = TRAVEL_X_DONTKNOW; @@ -302,7 +302,7 @@ TextSelection& TextView::GetSelection() void TextView::DeleteSelected() { -// HideSelection(); +// HideSelection(); mpImpl->mpTextEngine->UndoActionStart( TEXTUNDO_DELETE ); TextPaM aPaM = mpImpl->mpTextEngine->ImpDeleteText( mpImpl->maSelection ); @@ -362,8 +362,8 @@ void TextView::ImpPaint( const Rectangle& rRect, BOOL bUseVirtDev ) BOOL bVDevValid = TRUE; Size aOutSz( pVDev->GetOutputSizePixel() ); - if ( ( aOutSz.Width() < rRect.GetWidth() ) || - ( aOutSz.Height() < rRect.GetHeight() ) ) + if ( ( aOutSz.Width() < rRect.GetWidth() ) || + ( aOutSz.Height() < rRect.GetHeight() ) ) { bVDevValid = pVDev->SetOutputSizePixel( rRect.GetSize() ); } @@ -394,7 +394,7 @@ void TextView::ImpPaint( const Rectangle& rRect, BOOL bUseVirtDev ) ImpPaint( pVDev, aStartPos, &aTmpRec, NULL, pDrawSelection ); mpImpl->mpWindow->DrawOutDev( rRect.TopLeft(), rRect.GetSize(), Point(0,0), rRect.GetSize(), *pVDev ); -// ShowSelection(); +// ShowSelection(); if ( mpImpl->mbHighlightSelection ) ImpHighlight( mpImpl->maSelection ); } @@ -403,7 +403,7 @@ void TextView::ImpPaint( const Rectangle& rRect, BOOL bUseVirtDev ) Point aStartPos = ImpGetOutputStartPos( mpImpl->maStartDocPos ); ImpPaint( mpImpl->mpWindow, aStartPos, &rRect, NULL, pDrawSelection ); -// ShowSelection(); +// ShowSelection(); if ( mpImpl->mbHighlightSelection ) ImpHighlight( mpImpl->maSelection ); } @@ -553,10 +553,10 @@ void TextView::EraseVirtualDevice() BOOL TextView::KeyInput( const KeyEvent& rKeyEvent ) { - BOOL bDone = TRUE; - BOOL bModified = FALSE; - BOOL bMoved = FALSE; - BOOL bEndKey = FALSE; // spezielle CursorPosition + BOOL bDone = TRUE; + BOOL bModified = FALSE; + BOOL bMoved = FALSE; + BOOL bEndKey = FALSE; // spezielle CursorPosition BOOL bAllowIdle = TRUE; // Um zu pruefen ob durch irgendeine Aktion mModified, das lokale @@ -604,7 +604,7 @@ BOOL TextView::KeyInput( const KeyEvent& rKeyEvent ) } break; - default: // wird dann evtl. unten bearbeitet. + default: // wird dann evtl. unten bearbeitet. eFunc = KEYFUNC_DONTKNOW; } } @@ -642,7 +642,7 @@ BOOL TextView::KeyInput( const KeyEvent& rKeyEvent ) { aCurSel = ImpMoveCursor( rKeyEvent ); if ( aCurSel.HasRange() ) { - uno::Reference<datatransfer::clipboard::XClipboard> aSelection(GetWindow()->GetPrimarySelection()); + uno::Reference<datatransfer::clipboard::XClipboard> aSelection(GetWindow()->GetPrimarySelection()); Copy( aSelection ); } bMoved = TRUE; @@ -692,13 +692,13 @@ BOOL TextView::KeyInput( const KeyEvent& rKeyEvent ) if(mpImpl->mbSupportProtectAttribute) { //expand selection to include all protected content - if there is any - const TextCharAttrib* pStartAttr = mpImpl->mpTextEngine->FindCharAttrib( - TextPaM(mpImpl->maSelection.GetStart().GetPara(), - mpImpl->maSelection.GetStart().GetIndex()), + const TextCharAttrib* pStartAttr = mpImpl->mpTextEngine->FindCharAttrib( + TextPaM(mpImpl->maSelection.GetStart().GetPara(), + mpImpl->maSelection.GetStart().GetIndex()), TEXTATTR_PROTECTED ); - const TextCharAttrib* pEndAttr = mpImpl->mpTextEngine->FindCharAttrib( - TextPaM(mpImpl->maSelection.GetEnd().GetPara(), - mpImpl->maSelection.GetEnd().GetIndex()), + const TextCharAttrib* pEndAttr = mpImpl->mpTextEngine->FindCharAttrib( + TextPaM(mpImpl->maSelection.GetEnd().GetPara(), + mpImpl->maSelection.GetEnd().GetIndex()), TEXTATTR_PROTECTED ); if(pStartAttr && pStartAttr->GetStart() < mpImpl->maSelection.GetStart().GetIndex()) { @@ -708,7 +708,7 @@ BOOL TextView::KeyInput( const KeyEvent& rKeyEvent ) { mpImpl->maSelection.GetEnd().GetIndex() = pEndAttr->GetEnd(); } - } + } aCurSel = ImpDelete( nDel, nMode ); mpImpl->mpTextEngine->UndoActionEnd( TEXTUNDO_DELETE ); bModified = TRUE; @@ -818,17 +818,17 @@ void TextView::MouseButtonUp( const MouseEvent& rMouseEvent ) mpImpl->mbClickedInSelection = FALSE; mpImpl->mnTravelXPos = TRAVEL_X_DONTKNOW; mpImpl->mpSelEngine->SelMouseButtonUp( rMouseEvent ); - if ( rMouseEvent.IsMiddle() && !IsReadOnly() && + if ( rMouseEvent.IsMiddle() && !IsReadOnly() && ( GetWindow()->GetSettings().GetMouseSettings().GetMiddleButtonAction() == MOUSE_MIDDLE_PASTESELECTION ) ) { - uno::Reference<datatransfer::clipboard::XClipboard> aSelection(GetWindow()->GetPrimarySelection()); + uno::Reference<datatransfer::clipboard::XClipboard> aSelection(GetWindow()->GetPrimarySelection()); Paste( aSelection ); if ( mpImpl->mpTextEngine->IsModified() ) mpImpl->mpTextEngine->Broadcast( TextHint( TEXT_HINT_MODIFIED ) ); } else if ( rMouseEvent.IsLeft() && GetSelection().HasRange() ) { - uno::Reference<datatransfer::clipboard::XClipboard> aSelection(GetWindow()->GetPrimarySelection()); + uno::Reference<datatransfer::clipboard::XClipboard> aSelection(GetWindow()->GetPrimarySelection()); Copy( aSelection ); } } @@ -856,7 +856,7 @@ void TextView::MouseButtonDown( const MouseEvent& rMouseEvent ) { HideSelection(); ImpSetSelection( mpImpl->maSelection.GetEnd() ); - SetCursorAtPoint( rMouseEvent.GetPosPixel() ); // Wird von SelectionEngine bei MOD2 nicht gesetzt + SetCursorAtPoint( rMouseEvent.GetPosPixel() ); // Wird von SelectionEngine bei MOD2 nicht gesetzt } if ( rMouseEvent.GetClicks() == 2 ) @@ -874,13 +874,13 @@ void TextView::MouseButtonDown( const MouseEvent& rMouseEvent ) if(mpImpl->mbSupportProtectAttribute) { //expand selection to include all protected content - if there is any - const TextCharAttrib* pStartAttr = mpImpl->mpTextEngine->FindCharAttrib( - TextPaM(aNewSel.GetStart().GetPara(), - (USHORT)aBoundary.startPos), + const TextCharAttrib* pStartAttr = mpImpl->mpTextEngine->FindCharAttrib( + TextPaM(aNewSel.GetStart().GetPara(), + (USHORT)aBoundary.startPos), TEXTATTR_PROTECTED ); - const TextCharAttrib* pEndAttr = mpImpl->mpTextEngine->FindCharAttrib( - TextPaM(aNewSel.GetEnd().GetPara(), - (USHORT)aBoundary.endPos), + const TextCharAttrib* pEndAttr = mpImpl->mpTextEngine->FindCharAttrib( + TextPaM(aNewSel.GetEnd().GetPara(), + (USHORT)aBoundary.endPos), TEXTATTR_PROTECTED ); if(pStartAttr && pStartAttr->GetStart() < aNewSel.GetStart().GetIndex()) { @@ -889,8 +889,8 @@ void TextView::MouseButtonDown( const MouseEvent& rMouseEvent ) if(pEndAttr && pEndAttr->GetEnd() > aNewSel.GetEnd().GetIndex()) { aNewSel.GetEnd().GetIndex() = pEndAttr->GetEnd(); - } - } + } + } ImpSetSelection( aNewSel ); ShowSelection(); ShowCursor( TRUE, TRUE ); @@ -941,13 +941,13 @@ void TextView::Command( const CommandEvent& rCEvt ) TEParaPortion* pPortion = mpImpl->mpTextEngine->mpTEParaPortions->GetObject( mpImpl->mpTextEngine->mpIMEInfos->aPos.GetPara() ); pPortion->MarkSelectionInvalid( mpImpl->mpTextEngine->mpIMEInfos->aPos.GetIndex(), 0 ); - BOOL bInsertMode = !mpImpl->mpTextEngine->mpIMEInfos->bWasCursorOverwrite; + BOOL bInsertMode = !mpImpl->mpTextEngine->mpIMEInfos->bWasCursorOverwrite; delete mpImpl->mpTextEngine->mpIMEInfos; mpImpl->mpTextEngine->mpIMEInfos = NULL; mpImpl->mpTextEngine->FormatAndUpdate( this ); - + SetInsertMode( bInsertMode ); if ( mpImpl->mpTextEngine->IsModified() ) @@ -1017,7 +1017,7 @@ void TextView::Command( const CommandEvent& rCEvt ) TextSelection aNewSel = TextPaM( mpImpl->mpTextEngine->mpIMEInfos->aPos.GetPara(), mpImpl->mpTextEngine->mpIMEInfos->aPos.GetIndex()+pData->GetCursorPos() ); SetSelection( aNewSel ); SetInsertMode( !pData->IsCursorOverwrite() ); - + if ( pData->IsCursorVisible() ) ShowCursor(); else @@ -1030,19 +1030,19 @@ void TextView::Command( const CommandEvent& rCEvt ) { TextPaM aPaM( GetSelection().GetEnd() ); Rectangle aR1 = mpImpl->mpTextEngine->PaMtoEditCursor( aPaM ); - + USHORT nInputEnd = mpImpl->mpTextEngine->mpIMEInfos->aPos.GetIndex() + mpImpl->mpTextEngine->mpIMEInfos->nLen; - + if ( !mpImpl->mpTextEngine->IsFormatted() ) mpImpl->mpTextEngine->FormatDoc(); - + TEParaPortion* pParaPortion = mpImpl->mpTextEngine->mpTEParaPortions->GetObject( aPaM.GetPara() ); USHORT nLine = pParaPortion->GetLineNumber( aPaM.GetIndex(), sal_True ); TextLine* pLine = pParaPortion->GetLines().GetObject( nLine ); if ( pLine && ( nInputEnd > pLine->GetEnd() ) ) nInputEnd = pLine->GetEnd(); Rectangle aR2 = mpImpl->mpTextEngine->PaMtoEditCursor( TextPaM( aPaM.GetPara(), nInputEnd ) ); - + long nWidth = aR2.Left()-aR1.Right(); aR1.Move( -GetStartDocPos().X(), -GetStartDocPos().Y() ); GetWindow()->SetCursorRect( &aR1, nWidth ); @@ -1161,7 +1161,7 @@ void TextView::Copy( uno::Reference< datatransfer::clipboard::XClipboard >& rxCl void TextView::Copy() { - uno::Reference<datatransfer::clipboard::XClipboard> aClipboard(GetWindow()->GetClipboard()); + uno::Reference<datatransfer::clipboard::XClipboard> aClipboard(GetWindow()->GetClipboard()); Copy( aClipboard ); } @@ -1199,7 +1199,7 @@ void TextView::Paste( uno::Reference< datatransfer::clipboard::XClipboard >& rxC bWasTruncated = ImplTruncateNewText( aText ); InsertNewText( aText, FALSE ); mpImpl->mpTextEngine->Broadcast( TextHint( TEXT_HINT_MODIFIED ) ); - + if( bWasTruncated ) Edit::ShowTruncationWarning( mpImpl->mpWindow ); } @@ -1213,7 +1213,7 @@ void TextView::Paste( uno::Reference< datatransfer::clipboard::XClipboard >& rxC void TextView::Paste() { - uno::Reference<datatransfer::clipboard::XClipboard> aClipboard(GetWindow()->GetClipboard()); + uno::Reference<datatransfer::clipboard::XClipboard> aClipboard(GetWindow()->GetClipboard()); Paste( aClipboard ); } @@ -1270,21 +1270,21 @@ TextSelection TextView::ImpMoveCursor( const KeyEvent& rKeyEvent ) bool bSelect = aTranslatedKeyEvent.GetKeyCode().IsShift(); switch ( nCode ) { - case KEY_UP: aPaM = CursorUp( aPaM ); + case KEY_UP: aPaM = CursorUp( aPaM ); break; - case KEY_DOWN: aPaM = CursorDown( aPaM ); + case KEY_DOWN: aPaM = CursorDown( aPaM ); break; - case KEY_HOME: aPaM = bCtrl ? CursorStartOfDoc() : CursorStartOfLine( aPaM ); + case KEY_HOME: aPaM = bCtrl ? CursorStartOfDoc() : CursorStartOfLine( aPaM ); break; - case KEY_END: aPaM = bCtrl ? CursorEndOfDoc() : CursorEndOfLine( aPaM ); + case KEY_END: aPaM = bCtrl ? CursorEndOfDoc() : CursorEndOfLine( aPaM ); break; - case KEY_PAGEUP: aPaM = bCtrl ? CursorStartOfDoc() : PageUp( aPaM ); + case KEY_PAGEUP: aPaM = bCtrl ? CursorStartOfDoc() : PageUp( aPaM ); break; - case KEY_PAGEDOWN: aPaM = bCtrl ? CursorEndOfDoc() : PageDown( aPaM ); + case KEY_PAGEDOWN: aPaM = bCtrl ? CursorEndOfDoc() : PageDown( aPaM ); break; - case KEY_LEFT: aPaM = bCtrl ? CursorWordLeft( aPaM ) : CursorLeft( aPaM, aTranslatedKeyEvent.GetKeyCode().IsMod2() ? (USHORT)i18n::CharacterIteratorMode::SKIPCHARACTER : (USHORT)i18n::CharacterIteratorMode::SKIPCELL ); + case KEY_LEFT: aPaM = bCtrl ? CursorWordLeft( aPaM ) : CursorLeft( aPaM, aTranslatedKeyEvent.GetKeyCode().IsMod2() ? (USHORT)i18n::CharacterIteratorMode::SKIPCHARACTER : (USHORT)i18n::CharacterIteratorMode::SKIPCELL ); break; - case KEY_RIGHT: aPaM = bCtrl ? CursorWordRight( aPaM ) : CursorRight( aPaM, aTranslatedKeyEvent.GetKeyCode().IsMod2() ? (USHORT)i18n::CharacterIteratorMode::SKIPCHARACTER : (USHORT)i18n::CharacterIteratorMode::SKIPCELL ); + case KEY_RIGHT: aPaM = bCtrl ? CursorWordRight( aPaM ) : CursorRight( aPaM, aTranslatedKeyEvent.GetKeyCode().IsMod2() ? (USHORT)i18n::CharacterIteratorMode::SKIPCHARACTER : (USHORT)i18n::CharacterIteratorMode::SKIPCELL ); break; case com::sun::star::awt::Key::SELECT_WORD_FORWARD: bSelect = true; // fallthrough intentional @@ -1362,13 +1362,13 @@ void TextView::InsertText( const XubString& rStr, BOOL bSelect ) void TextView::InsertNewText( const rtl::OUString& rStr, BOOL bSelect ) { -// HideSelection(); +// HideSelection(); mpImpl->mpTextEngine->UndoActionStart( TEXTUNDO_INSERT ); /* #i87633# break inserted text into chunks that fit into the underlying String based API (which has a maximum length of 65534 elements - + note: this will of course still cause problems for lines longer than those 65534 elements, but those cases will hopefully be few. In the long run someone should switch the TextEngine to OUString instead of String @@ -1379,11 +1379,11 @@ void TextView::InsertNewText( const rtl::OUString& rStr, BOOL bSelect ) { sal_Int32 nChunkLen = nLen > 65534 ? 65534 : nLen; String aChunk( rStr.copy( nPos, nChunkLen ) ); - + TextSelection aNewSel( mpImpl->maSelection ); - + TextPaM aPaM = mpImpl->mpTextEngine->ImpInsertText( mpImpl->maSelection, aChunk ); - + if ( bSelect ) { aNewSel.Justify(); @@ -1393,7 +1393,7 @@ void TextView::InsertNewText( const rtl::OUString& rStr, BOOL bSelect ) { aNewSel = aPaM; } - + ImpSetSelection( aNewSel ); nLen -= nChunkLen; nPos += nChunkLen; @@ -1406,7 +1406,7 @@ void TextView::InsertNewText( const rtl::OUString& rStr, BOOL bSelect ) /* void TextView::InsertText( const XubString& rStr, BOOL bSelect ) { -// HideSelection(); +// HideSelection(); TextSelection aNewSel( mpImpl->maSelection ); @@ -1423,7 +1423,7 @@ void TextView::InsertText( const XubString& rStr, BOOL bSelect ) { aNewSel = aPaM; } - + ImpSetSelection( aNewSel ); mpImpl->mpTextEngine->FormatAndUpdate( this ); @@ -1553,7 +1553,7 @@ TextPaM TextView::ImpDelete( BYTE nMode, BYTE nDelMode ) // #i63506# startPos is -1 when the paragraph starts with a tab aEndPaM.GetIndex() = (aBoundary.startPos >= 0) ? (USHORT)aBoundary.startPos : 0; } - else // DELMODE_RESTOFCONTENT + else // DELMODE_RESTOFCONTENT { if ( aEndPaM.GetIndex() != 0 ) aEndPaM.GetIndex() = 0; @@ -1578,7 +1578,7 @@ TextPaM TextView::ImpDelete( BYTE nMode, BYTE nDelMode ) i18n::Boundary aBoundary = xBI->nextWord( pNode->GetText(), mpImpl->maSelection.GetEnd().GetIndex(), mpImpl->mpTextEngine->GetLocale(), i18n::WordType::ANYWORD_IGNOREWHITESPACES ); aEndPaM.GetIndex() = (USHORT)aBoundary.startPos; } - else // DELMODE_RESTOFCONTENT + else // DELMODE_RESTOFCONTENT { TextNode* pNode = mpImpl->mpTextEngine->mpDoc->GetNodes().GetObject( aEndPaM.GetPara() ); if ( aEndPaM.GetIndex() < pNode->GetText().Len() ) @@ -1613,7 +1613,7 @@ TextPaM TextView::CursorUp( const TextPaM& rPaM ) TEParaPortion* pPPortion = mpImpl->mpTextEngine->mpTEParaPortions->GetObject( rPaM.GetPara() ); USHORT nLine = pPPortion->GetLineNumber( rPaM.GetIndex(), FALSE ); - if ( nLine ) // gleicher Absatz + if ( nLine ) // gleicher Absatz { USHORT nCharPos = mpImpl->mpTextEngine->GetCharPos( rPaM.GetPara(), nLine-1, nX ); aPaM.GetIndex() = nCharPos; @@ -1624,7 +1624,7 @@ TextPaM TextView::CursorUp( const TextPaM& rPaM ) if ( aPaM.GetIndex() && ( aPaM.GetIndex() == pLine->GetEnd() ) ) aPaM.GetIndex()--; } - else if ( rPaM.GetPara() ) // vorheriger Absatz + else if ( rPaM.GetPara() ) // vorheriger Absatz { aPaM.GetPara()--; pPPortion = mpImpl->mpTextEngine->mpTEParaPortions->GetObject( aPaM.GetPara() ); @@ -1696,7 +1696,7 @@ TextPaM TextView::CursorEndOfLine( const TextPaM& rPaM ) TextLine* pLine = pPPortion->GetLines().GetObject( nLine ); aPaM.GetIndex() = pLine->GetEnd(); - if ( pLine->GetEnd() > pLine->GetStart() ) // Leerzeile + if ( pLine->GetEnd() > pLine->GetStart() ) // Leerzeile { xub_Unicode cLastChar = pPPortion->GetNode()->GetText().GetChar((USHORT)(aPaM.GetIndex()-1) ); if ( ( cLastChar == ' ' ) && ( aPaM.GetIndex() != pPPortion->GetNode()->GetText().Len() ) ) @@ -1782,16 +1782,16 @@ void TextView::ImpShowCursor( BOOL bGotoCursor, BOOL bForceVisCursor, BOOL bSpec TextPaM aPaM( mpImpl->maSelection.GetEnd() ); Rectangle aEditCursor = mpImpl->mpTextEngine->PaMtoEditCursor( aPaM, bSpecial ); - + // Remember that we placed the cursor behind the last character of a line mpImpl->mbCursorAtEndOfLine = false; if( bSpecial ) { TEParaPortion* pParaPortion = mpImpl->mpTextEngine->mpTEParaPortions->GetObject( aPaM.GetPara() ); - mpImpl->mbCursorAtEndOfLine = + mpImpl->mbCursorAtEndOfLine = pParaPortion->GetLineNumber( aPaM.GetIndex(), TRUE ) != pParaPortion->GetLineNumber( aPaM.GetIndex(), FALSE ); } - + if ( !IsInsertMode() && !mpImpl->maSelection.HasRange() ) { TextNode* pNode = mpImpl->mpTextEngine->mpDoc->GetNodes().GetObject( aPaM.GetPara() ); @@ -1809,7 +1809,7 @@ void TextView::ImpShowCursor( BOOL bGotoCursor, BOOL bForceVisCursor, BOOL bSpec { if ( mpImpl->mpTextEngine->IsRightToLeft() ) { - + } aEditCursor.Right() += pTextPortion->GetWidth(); } @@ -1866,9 +1866,9 @@ void TextView::ImpShowCursor( BOOL bGotoCursor, BOOL bForceVisCursor, BOOL bSpec // X kann durch das 'bischen mehr' falsch sein: // ULONG nMaxTextWidth = mpImpl->mpTextEngine->GetMaxTextWidth(); -// if ( !nMaxTextWidth || ( nMaxTextWidth > 0x7FFFFFFF ) ) -// nMaxTextWidth = 0x7FFFFFFF; -// long nMaxX = (long)nMaxTextWidth - aOutSz.Width(); +// if ( !nMaxTextWidth || ( nMaxTextWidth > 0x7FFFFFFF ) ) +// nMaxTextWidth = 0x7FFFFFFF; +// long nMaxX = (long)nMaxTextWidth - aOutSz.Width(); long nMaxX = mpImpl->mpTextEngine->CalcTextWidth() - aOutSz.Width(); if ( nMaxX < 0 ) nMaxX = 0; @@ -1937,7 +1937,7 @@ BOOL TextView::SetCursorAtPoint( const Point& rPosPixel ) BOOL TextView::IsSelectionAtPoint( const Point& rPosPixel ) { // if ( !Rectangle( Point(), mpImpl->mpWindow->GetOutputSizePixel() ).IsInside( rPosPixel ) && !mbInSelection ) -// return FALSE; +// return FALSE; Point aDocPos = GetDocPos( rPosPixel ); TextPaM aPaM = mpImpl->mpTextEngine->GetPaM( aDocPos, FALSE ); @@ -2033,19 +2033,19 @@ BOOL TextView::Write( SvStream& rOutput ) bool TextView::ImplTruncateNewText( rtl::OUString& rNewText ) const { bool bTruncated = false; - + if( rNewText.getLength() > 65534 ) // limit to String API { rNewText = rNewText.copy( 0, 65534 ); bTruncated = true; } - + ULONG nMaxLen = mpImpl->mpTextEngine->GetMaxTextLen(); // 0 means unlimited, there is just the String API limit handled above if( nMaxLen != 0 ) { ULONG nCurLen = mpImpl->mpTextEngine->GetTextLen(); - + sal_uInt32 nNewLen = rNewText.getLength(); if ( nCurLen + nNewLen > nMaxLen ) { @@ -2187,14 +2187,14 @@ void TextView::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEv if ( ImplCheckTextLen( aText ) ) ImpSetSelection( mpImpl->mpTextEngine->ImpInsertText( mpImpl->mpDDInfo->maDropPos, aText ) ); if(mpImpl->mbSupportProtectAttribute) - { - mpImpl->mpTextEngine->SetAttrib( TextAttribProtect(), - aTempStart.GetPara(), - aTempStart.GetIndex(), + { + mpImpl->mpTextEngine->SetAttrib( TextAttribProtect(), + aTempStart.GetPara(), + aTempStart.GetIndex(), mpImpl->maSelection.GetEnd().GetIndex(), FALSE ); } - if ( aPrevSel.HasRange() && + if ( aPrevSel.HasRange() && !mpImpl->mbSupportProtectAttribute && // don't remove currently selected element (( rDTDE.DropAction & datatransfer::dnd::DNDConstants::ACTION_MOVE ) || !bStarterOfDD) ) { @@ -2282,16 +2282,16 @@ void TextView::dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDr // Scroll? // No, I will not receive events for this... } -*/ +*/ sal_Bool bProtected = sal_False; if(mpImpl->mbSupportProtectAttribute) { - const TextCharAttrib* pStartAttr = mpImpl->mpTextEngine->FindCharAttrib( - mpImpl->mpDDInfo->maDropPos, + const TextCharAttrib* pStartAttr = mpImpl->mpTextEngine->FindCharAttrib( + mpImpl->mpDDInfo->maDropPos, TEXTATTR_PROTECTED ); - bProtected = pStartAttr != 0 && - pStartAttr->GetStart() != mpImpl->mpDDInfo->maDropPos.GetIndex() && + bProtected = pStartAttr != 0 && + pStartAttr->GetStart() != mpImpl->mpDDInfo->maDropPos.GetIndex() && pStartAttr->GetEnd() != mpImpl->mpDDInfo->maDropPos.GetIndex(); } // Don't drop in selection or in read only engine @@ -2395,9 +2395,9 @@ void __EXPORT TextSelFunctionSet::BeginDrag() void __EXPORT TextSelFunctionSet::CreateAnchor() { -// TextSelection aSel( mpView->GetSelection() ); -// aSel.GetStart() = aSel.GetEnd(); -// mpView->SetSelection( aSel ); +// TextSelection aSel( mpView->GetSelection() ); +// aSel.GetStart() = aSel.GetEnd(); +// mpView->SetSelection( aSel ); // Es darf kein ShowCursor folgen: mpView->HideSelection(); @@ -2428,37 +2428,37 @@ void __EXPORT TextSelFunctionSet::DestroyAnchor() { // Nur bei Mehrfachselektion } -TextEngine* TextView::GetTextEngine() const +TextEngine* TextView::GetTextEngine() const { return mpImpl->mpTextEngine; } -Window* TextView::GetWindow() const +Window* TextView::GetWindow() const { return mpImpl->mpWindow; } -void TextView::EnableCursor( BOOL bEnable ) +void TextView::EnableCursor( BOOL bEnable ) { mpImpl->mbCursorEnabled = bEnable; } -BOOL TextView::IsCursorEnabled() const +BOOL TextView::IsCursorEnabled() const { return mpImpl->mbCursorEnabled; } -void TextView::SetStartDocPos( const Point& rPos ) +void TextView::SetStartDocPos( const Point& rPos ) { mpImpl->maStartDocPos = rPos; } -const Point& TextView::GetStartDocPos() const +const Point& TextView::GetStartDocPos() const { return mpImpl->maStartDocPos; } -void TextView::SetAutoIndentMode( BOOL bAutoIndent ) +void TextView::SetAutoIndentMode( BOOL bAutoIndent ) { mpImpl->mbAutoIndent = bAutoIndent; } -BOOL TextView::IsAutoIndentMode() const +BOOL TextView::IsAutoIndentMode() const { return mpImpl->mbAutoIndent; } -BOOL TextView::IsReadOnly() const +BOOL TextView::IsReadOnly() const { return mpImpl->mbReadOnly; } -void TextView::SetAutoScroll( BOOL bAutoScroll ) +void TextView::SetAutoScroll( BOOL bAutoScroll ) { mpImpl->mbAutoScroll = bAutoScroll; } -BOOL TextView::IsAutoScroll() const +BOOL TextView::IsAutoScroll() const { return mpImpl->mbAutoScroll; } -BOOL TextView::IsPaintSelection() const +BOOL TextView::IsPaintSelection() const { return mpImpl->mbPaintSelection; } -BOOL TextView::IsHighlightSelection() const +BOOL TextView::IsHighlightSelection() const { return mpImpl->mbHighlightSelection; } -BOOL TextView::HasSelection() const +BOOL TextView::HasSelection() const { return mpImpl->maSelection.HasRange(); } -BOOL TextView::IsInsertMode() const +BOOL TextView::IsInsertMode() const { return mpImpl->mbInsertMode; } -void TextView::SupportProtectAttribute(sal_Bool bSupport) +void TextView::SupportProtectAttribute(sal_Bool bSupport) { mpImpl->mbSupportProtectAttribute = bSupport;} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/edit/textwindowpeer.cxx b/svtools/source/edit/textwindowpeer.cxx index 00a439eb4cd7..b5afa3f97a14 100644 --- a/svtools/source/edit/textwindowpeer.cxx +++ b/svtools/source/edit/textwindowpeer.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/svtools/source/edit/txtattr.cxx b/svtools/source/edit/txtattr.cxx index 34fc88e3f7a6..8aafedc54b7a 100644 --- a/svtools/source/edit/txtattr.cxx +++ b/svtools/source/edit/txtattr.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/svtools/source/edit/xtextedt.cxx b/svtools/source/edit/xtextedt.cxx index e7c77e7e65ce..73a0a8c4a984 100644 --- a/svtools/source/edit/xtextedt.cxx +++ b/svtools/source/edit/xtextedt.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,7 +80,7 @@ TextSelection ExtTextEngine::MatchGroup( const TextPaM& rCursor ) const { nLevel--; if ( !nLevel ) - break; // while nCur... + break; // while nCur... } nCur++; } @@ -91,7 +91,7 @@ TextSelection ExtTextEngine::MatchGroup( const TextPaM& rCursor ) const nCur = 0; } } - if ( nLevel == 0 ) // gefunden + if ( nLevel == 0 ) // gefunden { aSel.GetStart() = rCursor; aSel.GetEnd() = TextPaM( nPara, nCur+1 ); @@ -116,7 +116,7 @@ TextSelection ExtTextEngine::MatchGroup( const TextPaM& rCursor ) const { nLevel--; if ( !nLevel ) - break; // while nCur... + break; // while nCur... } else if ( aStr.GetChar( nCur ) == nEC ) nLevel++; @@ -130,17 +130,17 @@ TextSelection ExtTextEngine::MatchGroup( const TextPaM& rCursor ) const if ( nPara ) { nPara--; - nCur = GetTextLen( nPara )-1; // egal ob negativ, weil if Len() + nCur = GetTextLen( nPara )-1; // egal ob negativ, weil if Len() } else break; } } - if ( nLevel == 0 ) // gefunden + if ( nLevel == 0 ) // gefunden { aSel.GetStart() = rCursor; - aSel.GetStart().GetIndex()++; // hinter das Zeichen + aSel.GetStart().GetIndex()++; // hinter das Zeichen aSel.GetEnd() = TextPaM( nPara, nCur ); } } @@ -230,7 +230,7 @@ BOOL ExtTextEngine::Search( TextSelection& rSel, const util::SearchOptions& rSea break; } - if ( !bForward && !nNode ) // Bei rueckwaertsuche, wenn nEndNode = 0: + if ( !bForward && !nNode ) // Bei rueckwaertsuche, wenn nEndNode = 0: break; } @@ -300,7 +300,7 @@ USHORT ExtTextView::Replace( const util::SearchOptions& rSearchOptions, BOOL bAl { InsertText( rSearchOptions.replaceString ); nFound = 1; - Search( rSearchOptions, bForward ); // gleich zum naechsten + Search( rSearchOptions, bForward ); // gleich zum naechsten } else { @@ -362,7 +362,7 @@ BOOL ExtTextView::ImpIndentBlock( BOOL bRight ) ULONG nEndPara = aSel.GetEnd().GetPara(); if ( aSel.HasRange() && !aSel.GetEnd().GetIndex() ) { - nEndPara--; // den dann nicht einruecken... + nEndPara--; // den dann nicht einruecken... } for ( ULONG nPara = nStartPara; nPara <= nEndPara; nPara++ ) diff --git a/svtools/source/filter.vcl/filter/FilterConfigCache.cxx b/svtools/source/filter.vcl/filter/FilterConfigCache.cxx index 324b267eb7c4..2aba8ff9f751 100644 --- a/svtools/source/filter.vcl/filter/FilterConfigCache.cxx +++ b/svtools/source/filter.vcl/filter/FilterConfigCache.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,11 +43,11 @@ // #define TOKEN_INDEX_FOR_HASDIALOG 2 using namespace ::com::sun::star::lang ; // XMultiServiceFactory -using namespace ::com::sun::star::container ; // XNameAccess -using namespace ::com::sun::star::uno ; // Reference -using namespace ::com::sun::star::beans ; // PropertyValue +using namespace ::com::sun::star::container ; // XNameAccess +using namespace ::com::sun::star::uno ; // Reference +using namespace ::com::sun::star::beans ; // PropertyValue using namespace ::utl ; // getProcessServiceFactory(); -using namespace ::rtl ; +using namespace ::rtl ; const char* FilterConfigCache::FilterConfigCacheEntry::InternalPixelFilterNameList[] = { @@ -313,9 +313,9 @@ void FilterConfigCache::ImplInitSmart() const char** pPtr; for ( pPtr = InternalFilterListForSvxLight; *pPtr; pPtr++ ) { - FilterConfigCacheEntry aEntry; + FilterConfigCacheEntry aEntry; - OUString sExtension( OUString::createFromAscii( *pPtr++ ) ); + OUString sExtension( OUString::createFromAscii( *pPtr++ ) ); aEntry.lExtensionList.realloc( 1 ); aEntry.lExtensionList[ 0 ] = sExtension; @@ -326,7 +326,7 @@ void FilterConfigCache::ImplInitSmart() ByteString sFlags( *pPtr++ ); aEntry.nFlags = sFlags.ToInt32(); - OUString sUserData( OUString::createFromAscii( *pPtr ) ); + OUString sUserData( OUString::createFromAscii( *pPtr ) ); aEntry.CreateFilterName( sUserData ); if ( aEntry.nFlags & 1 ) diff --git a/svtools/source/filter.vcl/filter/FilterConfigCache.hxx b/svtools/source/filter.vcl/filter/FilterConfigCache.hxx index b1579bec092a..9e663e329717 100644 --- a/svtools/source/filter.vcl/filter/FilterConfigCache.hxx +++ b/svtools/source/filter.vcl/filter/FilterConfigCache.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,27 +49,27 @@ class SVT_DLLPUBLIC FilterConfigCache ::rtl::OUString sInternalFilterName; ::rtl::OUString sType; ::com::sun::star::uno::Sequence< ::rtl::OUString > lExtensionList; - ::rtl::OUString sUIName; - ::rtl::OUString sDocumentService; + ::rtl::OUString sUIName; + ::rtl::OUString sDocumentService; ::rtl::OUString sFilterService; ::rtl::OUString sTemplateName; - ::rtl::OUString sMediaType; + ::rtl::OUString sMediaType; ::rtl::OUString sFilterType; - sal_Int32 nFlags; - sal_Int32 nFileFormatVersion; + sal_Int32 nFlags; + sal_Int32 nFileFormatVersion; // user data - String sFilterName; - sal_Bool bHasDialog : 1; - sal_Bool bIsInternalFilter : 1; - sal_Bool bIsPixelFormat : 1; + String sFilterName; + sal_Bool bHasDialog : 1; + sal_Bool bIsInternalFilter : 1; + sal_Bool bIsPixelFormat : 1; - sal_Bool IsValid(); - sal_Bool CreateFilterName( const ::rtl::OUString& rUserDataEntry ); + sal_Bool IsValid(); + sal_Bool CreateFilterName( const ::rtl::OUString& rUserDataEntry ); String GetShortName( ); - + static const char* InternalPixelFilterNameList[]; static const char* InternalVectorFilterNameList[]; static const char* ExternalPixelFilterNameList[]; @@ -78,9 +78,9 @@ class SVT_DLLPUBLIC FilterConfigCache typedef std::vector< FilterConfigCacheEntry > CacheVector; - CacheVector aImport; - CacheVector aExport; - sal_Bool bUseConfig; + CacheVector aImport; + CacheVector aExport; + sal_Bool bUseConfig; static sal_Bool bInitialized; static sal_Int32 nIndType; @@ -92,56 +92,56 @@ class SVT_DLLPUBLIC FilterConfigCache static sal_Int32 nIndFileFormatVersion; static sal_Int32 nIndTemplateName; - static const char* InternalFilterListForSvxLight[]; - - SVT_DLLPRIVATE void ImplInit(); - SVT_DLLPRIVATE void ImplInitSmart(); + static const char* InternalFilterListForSvxLight[]; + SVT_DLLPRIVATE void ImplInit(); + SVT_DLLPRIVATE void ImplInitSmart(); + public : - sal_uInt16 GetImportFormatCount() const + sal_uInt16 GetImportFormatCount() const { return sal::static_int_cast< sal_uInt16 >(aImport.size()); }; - sal_uInt16 GetImportFormatNumber( const String& rFormatName ); - sal_uInt16 GetImportFormatNumberForMediaType( const String& rMediaType ); - sal_uInt16 GetImportFormatNumberForShortName( const String& rShortName ); - sal_uInt16 GetImportFormatNumberForTypeName( const String& rType ); - String GetImportFilterName( sal_uInt16 nFormat ); - String GetImportFormatName( sal_uInt16 nFormat ); - String GetImportFormatExtension( sal_uInt16 nFormat, sal_Int32 nEntry = 0); - String GetImportFormatMediaType( sal_uInt16 nFormat ); - String GetImportFormatShortName( sal_uInt16 nFormat ); - String GetImportWildcard( sal_uInt16 nFormat, sal_Int32 nEntry ); + sal_uInt16 GetImportFormatNumber( const String& rFormatName ); + sal_uInt16 GetImportFormatNumberForMediaType( const String& rMediaType ); + sal_uInt16 GetImportFormatNumberForShortName( const String& rShortName ); + sal_uInt16 GetImportFormatNumberForTypeName( const String& rType ); + String GetImportFilterName( sal_uInt16 nFormat ); + String GetImportFormatName( sal_uInt16 nFormat ); + String GetImportFormatExtension( sal_uInt16 nFormat, sal_Int32 nEntry = 0); + String GetImportFormatMediaType( sal_uInt16 nFormat ); + String GetImportFormatShortName( sal_uInt16 nFormat ); + String GetImportWildcard( sal_uInt16 nFormat, sal_Int32 nEntry ); String GetImportFilterType( sal_uInt16 nFormat ); String GetImportFilterTypeName( sal_uInt16 nFormat ); - sal_Bool IsImportInternalFilter( sal_uInt16 nFormat ); - sal_Bool IsImportPixelFormat( sal_uInt16 nFormat ); - sal_Bool IsImportDialog( sal_uInt16 nFormat ); + sal_Bool IsImportInternalFilter( sal_uInt16 nFormat ); + sal_Bool IsImportPixelFormat( sal_uInt16 nFormat ); + sal_Bool IsImportDialog( sal_uInt16 nFormat ); - sal_uInt16 GetExportFormatCount() const + sal_uInt16 GetExportFormatCount() const { return sal::static_int_cast< sal_uInt16 >(aExport.size()); }; - sal_uInt16 GetExportFormatNumber( const String& rFormatName ); - sal_uInt16 GetExportFormatNumberForMediaType( const String& rMediaType ); - sal_uInt16 GetExportFormatNumberForShortName( const String& rShortName ); - sal_uInt16 GetExportFormatNumberForTypeName( const String& rType ); - String GetExportFilterName( sal_uInt16 nFormat ); - String GetExportFormatName( sal_uInt16 nFormat ); - String GetExportFormatExtension( sal_uInt16 nFormat, sal_Int32 nEntry = 0 ); - String GetExportFormatMediaType( sal_uInt16 nFormat ); - String GetExportFormatShortName( sal_uInt16 nFormat ); - String GetExportWildcard( sal_uInt16 nFormat, sal_Int32 nEntry ); + sal_uInt16 GetExportFormatNumber( const String& rFormatName ); + sal_uInt16 GetExportFormatNumberForMediaType( const String& rMediaType ); + sal_uInt16 GetExportFormatNumberForShortName( const String& rShortName ); + sal_uInt16 GetExportFormatNumberForTypeName( const String& rType ); + String GetExportFilterName( sal_uInt16 nFormat ); + String GetExportFormatName( sal_uInt16 nFormat ); + String GetExportFormatExtension( sal_uInt16 nFormat, sal_Int32 nEntry = 0 ); + String GetExportFormatMediaType( sal_uInt16 nFormat ); + String GetExportFormatShortName( sal_uInt16 nFormat ); + String GetExportWildcard( sal_uInt16 nFormat, sal_Int32 nEntry ); String GetExportFilterTypeName( sal_uInt16 nFormat ); String GetExportInternalFilterName( sal_uInt16 nFormat ); - sal_Bool IsExportInternalFilter( sal_uInt16 nFormat ); - sal_Bool IsExportPixelFormat( sal_uInt16 nFormat ); - sal_Bool IsExportDialog( sal_uInt16 nFormat ); + sal_Bool IsExportInternalFilter( sal_uInt16 nFormat ); + sal_Bool IsExportPixelFormat( sal_uInt16 nFormat ); + sal_Bool IsExportDialog( sal_uInt16 nFormat ); FilterConfigCache( sal_Bool bUseConfig ); ~FilterConfigCache(); }; -#endif // _FILTER_CONFIG_CACHE_HXX_ +#endif // _FILTER_CONFIG_CACHE_HXX_ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/filter.vcl/filter/FilterConfigItem.cxx b/svtools/source/filter.vcl/filter/FilterConfigItem.cxx index ee788458e609..d6b23770dc41 100644 --- a/svtools/source/filter.vcl/filter/FilterConfigItem.cxx +++ b/svtools/source/filter.vcl/filter/FilterConfigItem.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ #include <com/sun/star/container/XHierarchicalNameAccess.hpp> using namespace ::rtl; -using namespace ::utl ; // getProcessServiceFactory -using namespace ::com::sun::star::lang ; // XMultiServiceFactory -using namespace ::com::sun::star::beans ; // PropertyValue -using namespace ::com::sun::star::uno ; // Reference -using namespace ::com::sun::star::util ; // XChangesBatch -using namespace ::com::sun::star::awt ; // Size -using namespace ::com::sun::star::container ; // -using namespace ::com::sun::star::task ; // XStatusIndicator +using namespace ::utl ; // getProcessServiceFactory +using namespace ::com::sun::star::lang ; // XMultiServiceFactory +using namespace ::com::sun::star::beans ; // PropertyValue +using namespace ::com::sun::star::uno ; // Reference +using namespace ::com::sun::star::util ; // XChangesBatch +using namespace ::com::sun::star::awt ; // Size +using namespace ::com::sun::star::container ; // +using namespace ::com::sun::star::task ; // XStatusIndicator static sal_Bool ImpIsTreeAvailable( Reference< XMultiServiceFactory >& rXCfgProv, const String& rTree ) { - sal_Bool bAvailable = rTree.Len() != 0; + sal_Bool bAvailable = rTree.Len() != 0; if ( bAvailable ) { - xub_StrLen nTokenCount = rTree.GetTokenCount( (sal_Unicode)'/' ); - xub_StrLen i = 0; + xub_StrLen nTokenCount = rTree.GetTokenCount( (sal_Unicode)'/' ); + xub_StrLen i = 0; if ( rTree.GetChar( 0 ) == (sal_Unicode)'/' ) i++; @@ -65,7 +65,7 @@ static sal_Bool ImpIsTreeAvailable( Reference< XMultiServiceFactory >& rXCfgProv Any aAny; aAny <<= (OUString)rTree.GetToken( i++, (sal_Unicode)'/' ); - // creation arguments: nodepath + // creation arguments: nodepath PropertyValue aPathArgument; aPathArgument.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ) ); aPathArgument.Value = aAny; @@ -83,7 +83,7 @@ static sal_Bool ImpIsTreeAvailable( Reference< XMultiServiceFactory >& rXCfgProv catch ( ::com::sun::star::uno::Exception& ) { bAvailable = sal_False; - } + } if ( xReadAccess.is() ) { for ( ; bAvailable && ( i < nTokenCount ); i++ ) @@ -109,7 +109,7 @@ static sal_Bool ImpIsTreeAvailable( Reference< XMultiServiceFactory >& rXCfgProv { bAvailable = sal_False; } - } + } } } } @@ -123,9 +123,9 @@ void FilterConfigItem::ImpInitTree( const String& rSubTree ) OUString sTree( ConfigManager::GetConfigBaseURL() ); sTree += rSubTree; - Reference< XMultiServiceFactory > xSMGR = getProcessServiceFactory(); // get global uno service manager + Reference< XMultiServiceFactory > xSMGR = getProcessServiceFactory(); // get global uno service manager - Reference< XMultiServiceFactory > xCfgProv( + Reference< XMultiServiceFactory > xCfgProv( xSMGR->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationProvider" ) ) ), UNO_QUERY ); @@ -134,19 +134,19 @@ void FilterConfigItem::ImpInitTree( const String& rSubTree ) if ( ImpIsTreeAvailable( xCfgProv, String( sTree ) ) ) { Any aAny; - // creation arguments: nodepath + // creation arguments: nodepath PropertyValue aPathArgument; aAny <<= sTree; aPathArgument.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ) ); aPathArgument.Value = aAny; - // creation arguments: commit mode + // creation arguments: commit mode PropertyValue aModeArgument; sal_Bool bAsyncron = sal_True; aAny <<= bAsyncron; aModeArgument.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "lazywrite" ) ); aModeArgument.Value = aAny; - + Sequence< Any > aArguments( 2 ); aArguments[ 0 ] <<= aPathArgument; aArguments[ 1 ] <<= aModeArgument; @@ -178,7 +178,7 @@ FilterConfigItem::FilterConfigItem( ::com::sun::star::uno::Sequence< ::com::sun: aFilterData = *pFilterData; } -FilterConfigItem::FilterConfigItem( const OUString& rSubTree, +FilterConfigItem::FilterConfigItem( const OUString& rSubTree, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >* pFilterData ) { ImpInitTree( rSubTree ); diff --git a/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx index 6a5d9306241d..09cc71e50df4 100644 --- a/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx +++ b/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,9 +51,9 @@ #include "vcl/svapp.hxx" #if defined WIN || (defined OS2 && !defined ICC) -#define EXPDLG_FUNCTION_NAME "_DoExportDialog" +#define EXPDLG_FUNCTION_NAME "_DoExportDialog" #else -#define EXPDLG_FUNCTION_NAME "DoExportDialog" +#define EXPDLG_FUNCTION_NAME "DoExportDialog" #endif using namespace ::rtl; @@ -95,8 +95,8 @@ uno::Sequence< OUString > SAL_CALL SvFilterOptionsDialog_getSupportedServiceName // ----------------------------------------------------------------------------- SvFilterOptionsDialog::SvFilterOptionsDialog( const uno::Reference< lang::XMultiServiceFactory > & xMgr ) : - rxMgr ( xMgr ), - eFieldUnit ( FUNIT_CM ) + rxMgr ( xMgr ), + eFieldUnit ( FUNIT_CM ) { } @@ -151,7 +151,7 @@ uno::Sequence< beans::PropertyValue > SvFilterOptionsDialog::getPropertyValues() sal_Int32 i, nCount; for ( i = 0, nCount = aMediaDescriptor.getLength(); i < nCount; i++ ) { - if ( aMediaDescriptor[ i ].Name.equalsAscii( "FilterData" ) ) + if ( aMediaDescriptor[ i ].Name.equalsAscii( "FilterData" ) ) break; } if ( i == nCount ) @@ -164,7 +164,7 @@ uno::Sequence< beans::PropertyValue > SvFilterOptionsDialog::getPropertyValues() } void SvFilterOptionsDialog::setPropertyValues( const uno::Sequence< beans::PropertyValue > & aProps ) - throw ( beans::UnknownPropertyException, beans::PropertyVetoException, + throw ( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException ) { @@ -173,7 +173,7 @@ void SvFilterOptionsDialog::setPropertyValues( const uno::Sequence< beans::Prope sal_Int32 i, nCount; for ( i = 0, nCount = aMediaDescriptor.getLength(); i < nCount; i++ ) { - if ( aMediaDescriptor[ i ].Name.equalsAscii( "FilterData" ) ) + if ( aMediaDescriptor[ i ].Name.equalsAscii( "FilterData" ) ) { aMediaDescriptor[ i ].Value >>= aFilterDataSequence; break; @@ -207,14 +207,14 @@ sal_Int16 SvFilterOptionsDialog::execute() aInternalFilterName.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "impress_" ) ), String(), 0 ); break; } - } + } if ( aInternalFilterName.Len() ) { GraphicFilter aGraphicFilter( sal_True ); sal_uInt16 nFormat, nFilterCount = aGraphicFilter.pConfig->GetExportFormatCount(); for ( nFormat = 0; nFormat < nFilterCount; nFormat++ ) - { + { if ( aGraphicFilter.pConfig->GetExportInternalFilterName( nFormat ) == aInternalFilterName ) break; } @@ -223,7 +223,7 @@ sal_Int16 SvFilterOptionsDialog::execute() FltCallDialogParameter aFltCallDlgPara( Application::GetDefDialogParent(), NULL, eFieldUnit ); aFltCallDlgPara.aFilterData = aFilterDataSequence; - String aFilterName( aGraphicFilter.pConfig->GetExportFilterName( nFormat ) ); + String aFilterName( aGraphicFilter.pConfig->GetExportFilterName( nFormat ) ); if ( aGraphicFilter.pConfig->IsExportInternalFilter( nFormat ) ) { // Export-Dialog fuer Bitmap's, SVM's und WMF's @@ -234,8 +234,8 @@ sal_Int16 SvFilterOptionsDialog::execute() ( aFilterName.EqualsIgnoreCaseAscii( EXP_JPEG ) )|| ( aFilterName.EqualsIgnoreCaseAscii( EXP_PNG ) ) ) { - ByteString aResMgrName( "svt", 3 ); - ResMgr* pResMgr; + ByteString aResMgrName( "svt", 3 ); + ResMgr* pResMgr; pResMgr = ResMgr::CreateResMgr( aResMgrName.GetBuffer(), Application::GetSettings().GetUILocale() ); aFltCallDlgPara.pResMgr = pResMgr; @@ -258,15 +258,15 @@ sal_Int16 SvFilterOptionsDialog::execute() nRet = ui::dialogs::ExecutableDialogResults::OK; } else - { + { aFltCallDlgPara.aFilterExt = aGraphicFilter.pConfig->GetExportFormatShortName( nFormat ); if ( DlgExportVec( aFltCallDlgPara ).Execute() == RET_OK ) nRet = ui::dialogs::ExecutableDialogResults::OK; } delete pResMgr; } - } - else // ladbare Filter + } + else // ladbare Filter { xub_StrLen i, nTokenCount = aGraphicFilter.aFilterPath.GetTokenCount( ';' ); for ( i = 0; i < nTokenCount; i++ ) @@ -282,7 +282,7 @@ sal_Int16 SvFilterOptionsDialog::execute() aSystemPath += OUString( aFilterName ); osl::Module aLibrary( aSystemPath ); - PFilterDlgCall pFunc = (PFilterDlgCall) aLibrary.getFunctionSymbol( UniString::CreateFromAscii( EXPDLG_FUNCTION_NAME ) ); + PFilterDlgCall pFunc = (PFilterDlgCall) aLibrary.getFunctionSymbol( UniString::CreateFromAscii( EXPDLG_FUNCTION_NAME ) ); // Dialog in DLL ausfuehren if( pFunc ) { diff --git a/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.hxx b/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.hxx index 3e9fce6cf4ca..e6e27af1aadd 100644 --- a/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.hxx +++ b/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 SvFilterOptionsDialog : public cppu::WeakImplHelper5 com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aFilterDataSequence; rtl::OUString aDialogTitle; - FieldUnit eFieldUnit; + FieldUnit eFieldUnit; public: @@ -70,18 +70,18 @@ public: throw ( com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException ); // XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() + virtual rtl::OUString SAL_CALL getImplementationName() throw ( com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) throw ( com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw ( com::sun::star::uno::RuntimeException ); // XPropertyAccess virtual com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues() throw ( com::sun::star::uno::RuntimeException ); virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > & aProps ) - throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, + throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); @@ -92,7 +92,7 @@ public: throw ( ::com::sun::star::uno::RuntimeException ); // XExporter - virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) + virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); }; diff --git a/svtools/source/filter.vcl/filter/dlgejpg.cxx b/svtools/source/filter.vcl/filter/dlgejpg.cxx index 4cedaf70e509..1a0ae297402d 100644 --- a/svtools/source/filter.vcl/filter/dlgejpg.cxx +++ b/svtools/source/filter.vcl/filter/dlgejpg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,8 +33,8 @@ #include "strings.hrc" #include <svtools/FilterConfigItem.hxx> -#define KEY_QUALITY "Quality" -#define KEY_GRAYSCALES "ColorMode" +#define KEY_QUALITY "Quality" +#define KEY_GRAYSCALES "ColorMode" /************************************************************************* |* @@ -44,7 +44,7 @@ DlgExportEJPG::DlgExportEJPG( FltCallDialogParameter& rPara ) : ModalDialog ( rPara.pWindow, ResId( DLG_EXPORT_JPG, *rPara.pResMgr ) ), - rFltCallPara ( rPara ), + rFltCallPara ( rPara ), aFiDescr ( this, ResId( FI_DESCR, *rPara.pResMgr ) ), aNumFldQuality ( this, ResId( NUM_FLD_QUALITY, *rPara.pResMgr ) ), aGrpQuality ( this, ResId( GRP_QUALITY, *rPara.pResMgr ) ), @@ -56,7 +56,7 @@ DlgExportEJPG::DlgExportEJPG( FltCallDialogParameter& rPara ) : aBtnHelp ( this, ResId( BTN_HELP, *rPara.pResMgr ) ) { FreeResource(); - String aFilterConfigPath( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Export/JPG" ) ); + String aFilterConfigPath( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Export/JPG" ) ); pConfigItem = new FilterConfigItem( aFilterConfigPath, &rPara.aFilterData ); // reading filter options diff --git a/svtools/source/filter.vcl/filter/dlgejpg.hrc b/svtools/source/filter.vcl/filter/dlgejpg.hrc index 90a3c1d162be..c5fc85483532 100644 --- a/svtools/source/filter.vcl/filter/dlgejpg.hrc +++ b/svtools/source/filter.vcl/filter/dlgejpg.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/svtools/source/filter.vcl/filter/dlgejpg.hxx b/svtools/source/filter.vcl/filter/dlgejpg.hxx index efc5daa7105c..12a7922d7600 100644 --- a/svtools/source/filter.vcl/filter/dlgejpg.hxx +++ b/svtools/source/filter.vcl/filter/dlgejpg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,16 +51,16 @@ private: FltCallDialogParameter& rFltCallPara; - FixedInfo aFiDescr; - NumericField aNumFldQuality; + FixedInfo aFiDescr; + NumericField aNumFldQuality; FixedLine aGrpQuality; - RadioButton aRbGray; - RadioButton aRbRGB; + RadioButton aRbGray; + RadioButton aRbRGB; FixedLine aGrpColors; - OKButton aBtnOK; - CancelButton aBtnCancel; - HelpButton aBtnHelp; - FilterConfigItem* pConfigItem; + OKButton aBtnOK; + CancelButton aBtnCancel; + HelpButton aBtnHelp; + FilterConfigItem* pConfigItem; DECL_LINK( OK, void * ); diff --git a/svtools/source/filter.vcl/filter/dlgejpg.src b/svtools/source/filter.vcl/filter/dlgejpg.src index fd224f22c409..c0c58d7a1b82 100644 --- a/svtools/source/filter.vcl/filter/dlgejpg.src +++ b/svtools/source/filter.vcl/filter/dlgejpg.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/svtools/source/filter.vcl/filter/dlgepng.cxx b/svtools/source/filter.vcl/filter/dlgepng.cxx index 1b400cba87c6..95e25de06be5 100644 --- a/svtools/source/filter.vcl/filter/dlgepng.cxx +++ b/svtools/source/filter.vcl/filter/dlgepng.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ using namespace ::com::sun::star::uno; DlgExportEPNG::DlgExportEPNG( FltCallDialogParameter& rPara ) : ModalDialog ( rPara.pWindow, ResId( DLG_EXPORT_EPNG, *rPara.pResMgr ) ), - FilterConfigItem ( OUString( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Export/PNG" ) ), &rPara.aFilterData ), - rFltCallPara ( rPara ), + FilterConfigItem ( OUString( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Export/PNG" ) ), &rPara.aFilterData ), + rFltCallPara ( rPara ), aGrpCompression ( this, ResId( GRP_COMPRESSION, *rPara.pResMgr ) ), aFiCompression ( this, ResId( FI_COMPRESSION, *rPara.pResMgr ) ), aNumCompression ( this, ResId( NUM_COMPRESSION, *rPara.pResMgr ) ), @@ -53,18 +53,18 @@ DlgExportEPNG::DlgExportEPNG( FltCallDialogParameter& rPara ) : aBtnOK ( this, ResId( BTN_OK, *rPara.pResMgr ) ), aBtnCancel ( this, ResId( BTN_CANCEL, *rPara.pResMgr ) ), aBtnHelp ( this, ResId( BTN_HELP, *rPara.pResMgr ) ), - pMgr ( rPara.pResMgr ) + pMgr ( rPara.pResMgr ) { FreeResource(); // Config-Parameter lesen - sal_Int32 nCompression = ReadInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "Compression" ) ), 6 ); + sal_Int32 nCompression = ReadInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "Compression" ) ), 6 ); if ( ( nCompression < 0 ) || ( nCompression > 9 ) ) nCompression = 6; aNumCompression.SetValue( nCompression ); - sal_Int32 nInterlaced = ReadInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "Interlaced" ) ), 0 ); - sal_Bool bInterlaced = nInterlaced != 0; + sal_Int32 nInterlaced = ReadInt32( OUString( RTL_CONSTASCII_USTRINGPARAM( "Interlaced" ) ), 0 ); + sal_Bool bInterlaced = nInterlaced != 0; aCbxInterlaced.Check( bInterlaced ); aBtnOK.SetClickHdl( LINK( this, DlgExportEPNG, OK ) ); diff --git a/svtools/source/filter.vcl/filter/dlgepng.hrc b/svtools/source/filter.vcl/filter/dlgepng.hrc index b3ffaab3ab1e..d63234de40fb 100644 --- a/svtools/source/filter.vcl/filter/dlgepng.hrc +++ b/svtools/source/filter.vcl/filter/dlgepng.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/svtools/source/filter.vcl/filter/dlgepng.hxx b/svtools/source/filter.vcl/filter/dlgepng.hxx index b43feafc0d49..e4f9123b1190 100644 --- a/svtools/source/filter.vcl/filter/dlgepng.hxx +++ b/svtools/source/filter.vcl/filter/dlgepng.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ class DlgExportEPNG : public ModalDialog, FilterConfigItem FltCallDialogParameter& rFltCallPara; - FixedLine aGrpCompression; - FixedInfo aFiCompression; - NumericField aNumCompression; - CheckBox aCbxInterlaced; - OKButton aBtnOK; - CancelButton aBtnCancel; - HelpButton aBtnHelp; - ResMgr* pMgr; + FixedLine aGrpCompression; + FixedInfo aFiCompression; + NumericField aNumCompression; + CheckBox aCbxInterlaced; + OKButton aBtnOK; + CancelButton aBtnCancel; + HelpButton aBtnHelp; + ResMgr* pMgr; DECL_LINK( OK, void * ); diff --git a/svtools/source/filter.vcl/filter/dlgepng.src b/svtools/source/filter.vcl/filter/dlgepng.src index aa778842dc48..9924441fbfc3 100644 --- a/svtools/source/filter.vcl/filter/dlgepng.src +++ b/svtools/source/filter.vcl/filter/dlgepng.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/svtools/source/filter.vcl/filter/dlgexpor.cxx b/svtools/source/filter.vcl/filter/dlgexpor.cxx index 951dd2c1a551..0157549c8d89 100644 --- a/svtools/source/filter.vcl/filter/dlgexpor.cxx +++ b/svtools/source/filter.vcl/filter/dlgexpor.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 "precompiled_svtools.hxx" #ifndef GCC -# pragma hdrstop +# pragma hdrstop #endif #include <tools/ref.hxx> @@ -49,7 +49,7 @@ DlgExportPix::DlgExportPix( FltCallDialogParameter& rPara ) : ModalDialog ( rPara.pWindow, ResId( DLG_EXPORT_PIX, *rPara.pResMgr ) ), - rFltCallPara ( rPara ), + rFltCallPara ( rPara ), aBtnOK ( this, ResId( BTN_OK_PIX, *rPara.pResMgr ) ), aBtnCancel ( this, ResId( BTN_CANCEL_PIX, *rPara.pResMgr ) ), aBtnHelp ( this, ResId( BTN_HELP_PIX, *rPara.pResMgr ) ), @@ -65,15 +65,15 @@ DlgExportPix::DlgExportPix( FltCallDialogParameter& rPara ) : aMtfSizeY ( this, ResId( MTF_SIZEY_PIX, *rPara.pResMgr ) ), aGrpMode ( this, ResId( GRP_MODE_PIX, *rPara.pResMgr ) ), aCbbRes ( this, ResId( CBB_RES_PIX, *rPara.pResMgr ) ), - pMgr ( rPara.pResMgr ), - aExt ( rPara.aFilterExt ) + pMgr ( rPara.pResMgr ), + aExt ( rPara.aFilterExt ) { aExt.ToUpperAscii(); - String aFilterConfigPath( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Export/" ) ); + String aFilterConfigPath( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Export/" ) ); aFilterConfigPath.Append( aExt ); pConfigItem = new FilterConfigItem( aFilterConfigPath, &rPara.aFilterData ); - String aTitle( aExt ); + String aTitle( aExt ); FreeResource(); aBtnOK.SetClickHdl( LINK( this, DlgExportPix, OK ) ); @@ -112,13 +112,13 @@ DlgExportPix::DlgExportPix( FltCallDialogParameter& rPara ) : switch ( rPara.eFieldUnit ) { -// case FUNIT_NONE : -// case FUNIT_KM : -// case FUNIT_PERCENT : -// case FUNIT_CUSTOM : -// case FUNIT_MILE : -// case FUNIT_FOOT : -// case FUNIT_M : +// case FUNIT_NONE : +// case FUNIT_KM : +// case FUNIT_PERCENT : +// case FUNIT_CUSTOM : +// case FUNIT_MILE : +// case FUNIT_FOOT : +// case FUNIT_M : case FUNIT_MM : case FUNIT_CM : case FUNIT_TWIP : @@ -133,7 +133,7 @@ DlgExportPix::DlgExportPix( FltCallDialogParameter& rPara ) : break; default: - break; // -Wall multiple values not handled. + break; // -Wall multiple values not handled. } switch ( nMode ) @@ -176,7 +176,7 @@ IMPL_LINK( DlgExportPix, OK, void *, EMPTYARG ) { // Config-Parameter schreiben - sal_Int32 nRes = Max( Min( aCbbRes.GetText().ToInt32(), sal_Int32( 600 ) ), sal_Int32( 75 ) ); + sal_Int32 nRes = Max( Min( aCbbRes.GetText().ToInt32(), sal_Int32( 600 ) ), sal_Int32( 75 ) ); ::com::sun::star::awt::Size aSize( static_cast<long>(MetricField::ConvertDoubleValue( static_cast<double>(aMtfSizeX.GetValue()), 2, aMtfSizeX.GetUnit(), MAP_100TH_MM )), static_cast<long>(MetricField::ConvertDoubleValue( static_cast<double>(aMtfSizeY.GetValue()), 2, aMtfSizeY.GetUnit(), MAP_100TH_MM )) ); @@ -287,7 +287,7 @@ IMPL_LINK( DlgExportPix, SelectLbColors, void*, EMPTYARG ) DlgExportVec::DlgExportVec( FltCallDialogParameter& rPara ) : ModalDialog ( rPara.pWindow, ResId( DLG_EXPORT_VEC, *rPara.pResMgr ) ), - rFltCallPara ( rPara ), + rFltCallPara ( rPara ), aBtnOK ( this, ResId( BTN_OK_VEC, *rPara.pResMgr ) ), aBtnCancel ( this, ResId( BTN_CANCEL_VEC, *rPara.pResMgr ) ), aBtnHelp ( this, ResId( BTN_HELP_VEC, *rPara.pResMgr ) ), @@ -299,15 +299,15 @@ DlgExportVec::DlgExportVec( FltCallDialogParameter& rPara ) : aFtSizeY ( this, ResId( FT_SIZEY_VEC, *rPara.pResMgr ) ), aMtfSizeY ( this, ResId( MTF_SIZEY_VEC, *rPara.pResMgr ) ), aGrpSize ( this, ResId( GRP_SIZE_VEC, *rPara.pResMgr ) ), - pMgr ( rPara.pResMgr ), - aExt ( rPara.aFilterExt ) + pMgr ( rPara.pResMgr ), + aExt ( rPara.aFilterExt ) { aExt.ToUpperAscii(); - String aFilterConfigPath( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Export/" ) ); + String aFilterConfigPath( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Export/" ) ); aFilterConfigPath.Append( aExt ); pConfigItem = new FilterConfigItem( aFilterConfigPath, &rPara.aFilterData ); - String aTitle( aExt ); + String aTitle( aExt ); FreeResource(); aBtnOK.SetClickHdl( LINK( this, DlgExportVec, OK ) ); @@ -332,12 +332,12 @@ DlgExportVec::DlgExportVec( FltCallDialogParameter& rPara ) : switch ( rPara.eFieldUnit ) { -// case FUNIT_NONE : -// case FUNIT_KM : -// case FUNIT_PERCENT : -// case FUNIT_CUSTOM : -// case FUNIT_MILE : -// case FUNIT_FOOT : +// case FUNIT_NONE : +// case FUNIT_KM : +// case FUNIT_PERCENT : +// case FUNIT_CUSTOM : +// case FUNIT_MILE : +// case FUNIT_FOOT : case FUNIT_MM : case FUNIT_CM : case FUNIT_M : @@ -352,7 +352,7 @@ DlgExportVec::DlgExportVec( FltCallDialogParameter& rPara ) : } break; default: - break; // -Wall Multiple values not handled. + break; // -Wall Multiple values not handled. } switch ( nMode ) diff --git a/svtools/source/filter.vcl/filter/dlgexpor.hrc b/svtools/source/filter.vcl/filter/dlgexpor.hrc index 69870c9b00b0..d25380b6dd18 100644 --- a/svtools/source/filter.vcl/filter/dlgexpor.hrc +++ b/svtools/source/filter.vcl/filter/dlgexpor.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/svtools/source/filter.vcl/filter/dlgexpor.hxx b/svtools/source/filter.vcl/filter/dlgexpor.hxx index 4c8b926335cd..13a518c97938 100644 --- a/svtools/source/filter.vcl/filter/dlgexpor.hxx +++ b/svtools/source/filter.vcl/filter/dlgexpor.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,28 +50,28 @@ private: FltCallDialogParameter& rFltCallPara; - OKButton aBtnOK; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + OKButton aBtnOK; + CancelButton aBtnCancel; + HelpButton aBtnHelp; - ListBox aLbColors; - CheckBox aCbxRLE; - FixedLine aGrpColors; + ListBox aLbColors; + CheckBox aCbxRLE; + FixedLine aGrpColors; - RadioButton aRbOriginal; - RadioButton aRbRes; - RadioButton aRbSize; - FixedText aFtSizeX; - MetricField aMtfSizeX; - FixedText aFtSizeY; - MetricField aMtfSizeY; - FixedLine aGrpMode; - ComboBox aCbbRes; + RadioButton aRbOriginal; + RadioButton aRbRes; + RadioButton aRbSize; + FixedText aFtSizeX; + MetricField aMtfSizeX; + FixedText aFtSizeY; + MetricField aMtfSizeY; + FixedLine aGrpMode; + ComboBox aCbbRes; - FilterConfigItem* pConfigItem; - ResMgr* pMgr; + FilterConfigItem* pConfigItem; + ResMgr* pMgr; - String aExt; + String aExt; DECL_LINK( OK, void* p ); DECL_LINK( ClickRbOriginal,void* p ); @@ -96,24 +96,24 @@ private: FltCallDialogParameter& rFltCallPara; - OKButton aBtnOK; - CancelButton aBtnCancel; - HelpButton aBtnHelp; + OKButton aBtnOK; + CancelButton aBtnCancel; + HelpButton aBtnHelp; - RadioButton aRbOriginal; - RadioButton aRbSize; - FixedLine aGrpMode; + RadioButton aRbOriginal; + RadioButton aRbSize; + FixedLine aGrpMode; - FixedText aFtSizeX; - MetricField aMtfSizeX; - FixedText aFtSizeY; - MetricField aMtfSizeY; - FixedLine aGrpSize; + FixedText aFtSizeX; + MetricField aMtfSizeX; + FixedText aFtSizeY; + MetricField aMtfSizeY; + FixedLine aGrpSize; - FilterConfigItem* pConfigItem; - ResMgr* pMgr; + FilterConfigItem* pConfigItem; + ResMgr* pMgr; - String aExt; + String aExt; DECL_LINK( OK, void* p ); DECL_LINK( ClickRbOriginal,void* p ); diff --git a/svtools/source/filter.vcl/filter/dlgexpor.src b/svtools/source/filter.vcl/filter/dlgexpor.src index 7573b394d72f..1edef36ed5f7 100644 --- a/svtools/source/filter.vcl/filter/dlgexpor.src +++ b/svtools/source/filter.vcl/filter/dlgexpor.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 @@ -198,7 +198,7 @@ ModalDialog DLG_EXPORT_VEC RadioButton RB_SIZE_VEC { Pos = MAP_APPFONT ( 12 , 28 ) ; - Size = MAP_APPFONT ( 98 , 10 ) ; + Size = MAP_APPFONT ( 98 , 10 ) ; TabStop = TRUE ; Text [ en-US ] = "~Size" ; }; diff --git a/svtools/source/filter.vcl/filter/filter.cxx b/svtools/source/filter.vcl/filter/filter.cxx index 879bf684b5a6..e8ddf8828ea9 100644 --- a/svtools/source/filter.vcl/filter/filter.cxx +++ b/svtools/source/filter.vcl/filter/filter.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,21 +76,21 @@ #include "SvFilterOptionsDialog.hxx" -#define PMGCHUNG_msOG 0x6d734f47 // Microsoft Office Animated GIF +#define PMGCHUNG_msOG 0x6d734f47 // Microsoft Office Animated GIF #if defined WIN || (defined OS2 && !defined ICC) -#define IMPORT_FUNCTION_NAME "_GraphicImport" -#define EXPORT_FUNCTION_NAME "_GraphicExport" -#define IMPDLG_FUNCTION_NAME "_DoImportDialog" -#define EXPDLG_FUNCTION_NAME "_DoExportDialog" +#define IMPORT_FUNCTION_NAME "_GraphicImport" +#define EXPORT_FUNCTION_NAME "_GraphicExport" +#define IMPDLG_FUNCTION_NAME "_DoImportDialog" +#define EXPDLG_FUNCTION_NAME "_DoExportDialog" #else -#define IMPORT_FUNCTION_NAME "GraphicImport" -#define EXPORT_FUNCTION_NAME "GraphicExport" -#define IMPDLG_FUNCTION_NAME "DoImportDialog" -#define EXPDLG_FUNCTION_NAME "DoExportDialog" +#define IMPORT_FUNCTION_NAME "GraphicImport" +#define EXPORT_FUNCTION_NAME "GraphicExport" +#define IMPDLG_FUNCTION_NAME "DoImportDialog" +#define EXPDLG_FUNCTION_NAME "DoExportDialog" #endif @@ -106,11 +106,11 @@ using namespace ::rtl; using namespace ::com::sun::star; -static List* pFilterHdlList = NULL; +static List* pFilterHdlList = NULL; static ::osl::Mutex& getListMutex() { - static ::osl::Mutex s_aListProtection; + static ::osl::Mutex s_aListProtection; return s_aListProtection; } @@ -124,11 +124,11 @@ class ImpFilterOutputStream : public ::cppu::WeakImplHelper1< ::com::sun::star:: { protected: - SvStream& mrStm; + SvStream& mrStm; - virtual void SAL_CALL writeBytes( const ::com::sun::star::uno::Sequence< sal_Int8 >& rData ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) { mrStm.Write( rData.getConstArray(), rData.getLength() ); } - virtual void SAL_CALL flush() throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) { mrStm.Flush(); } - virtual void SAL_CALL closeOutput() throw() {} + virtual void SAL_CALL writeBytes( const ::com::sun::star::uno::Sequence< sal_Int8 >& rData ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) { mrStm.Write( rData.getConstArray(), rData.getLength() ); } + virtual void SAL_CALL flush() throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) { mrStm.Flush(); } + virtual void SAL_CALL closeOutput() throw() {} public: @@ -142,8 +142,8 @@ BOOL ImplDirEntryHelper::Exists( const INetURLObject& rObj ) try { - ::rtl::OUString aTitle; - ::ucbhelper::Content aCnt( rObj.GetMainURL( INetURLObject::NO_DECODE ), + ::rtl::OUString aTitle; + ::ucbhelper::Content aCnt( rObj.GetMainURL( INetURLObject::NO_DECODE ), ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >() ); bExists = aCnt.isDocument(); @@ -158,7 +158,7 @@ BOOL ImplDirEntryHelper::Exists( const INetURLObject& rObj ) } catch( ... ) { -// DBG_ERRORFILE( "Any other exception" ); +// DBG_ERRORFILE( "Any other exception" ); } return bExists; } @@ -212,8 +212,8 @@ BYTE* ImplSearchEntry( BYTE* pSource, BYTE* pDest, ULONG nComp, ULONG nSize ) inline String ImpGetExtension( const String &rPath ) { - String aExt; - INetURLObject aURL( rPath ); + String aExt; + INetURLObject aURL( rPath ); aExt = aURL.GetFileExtension().toAsciiUpperCase(); return aExt; } @@ -256,7 +256,7 @@ static BOOL ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtension, B USHORT i; BYTE sFirstBytes[ 256 ]; ULONG nFirstLong,nSecondLong; - ULONG nStreamPos = rStream.Tell(); + ULONG nStreamPos = rStream.Tell(); rStream.Seek( STREAM_SEEK_TO_END ); ULONG nStreamLen = rStream.Tell() - nStreamPos; @@ -552,7 +552,7 @@ static BOOL ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtension, B { bSomethingTested = TRUE; BYTE sBuf[4]; - sal_uInt32 nOffset; // in ms documents the pict format is used without the first 512 bytes + sal_uInt32 nOffset; // in ms documents the pict format is used without the first 512 bytes for ( nOffset = 10; ( nOffset <= 522 ) && ( ( nStreamPos + nOffset + 3 ) <= nStreamLen ); nOffset += 512 ) { rStream.Seek( nStreamPos + nOffset ); @@ -740,9 +740,9 @@ sal_uInt16 GraphicFilter::ImpTestOrFindFormat( const String& rPath, SvStream& rS static Graphic ImpGetScaledGraphic( const Graphic& rGraphic, FilterConfigItem& rConfigItem ) { - Graphic aGraphic; - ByteString aResMgrName( "svt", 3 ); - ResMgr* pResMgr; + Graphic aGraphic; + ByteString aResMgrName( "svt", 3 ); + ResMgr* pResMgr; pResMgr = ResMgr::CreateResMgr( aResMgrName.GetBuffer(), Application::GetSettings().GetUILocale() ); @@ -753,9 +753,9 @@ static Graphic ImpGetScaledGraphic( const Graphic& rGraphic, FilterConfigItem& r { sal_Int32 nMode = rConfigItem.ReadInt32( String( ResId( KEY_MODE, *pResMgr ) ), -1 ); - if ( nMode == -1 ) // the property is not there, this is possible, if the graphic filter - { // is called via UnoGraphicExporter and not from a graphic export Dialog - nMode = 0; // then we are defaulting this mode to 0 + if ( nMode == -1 ) // the property is not there, this is possible, if the graphic filter + { // is called via UnoGraphicExporter and not from a graphic export Dialog + nMode = 0; // then we are defaulting this mode to 0 if ( nLogicalWidth || nLogicalHeight ) nMode = 2; } @@ -778,11 +778,11 @@ static Graphic ImpGetScaledGraphic( const Graphic& rGraphic, FilterConfigItem& r // Aufloesung wird eingestellt if( nMode == 1 ) { - Bitmap aBitmap( rGraphic.GetBitmap() ); - MapMode aMap( MAP_100TH_INCH ); + Bitmap aBitmap( rGraphic.GetBitmap() ); + MapMode aMap( MAP_100TH_INCH ); sal_Int32 nDPI = rConfigItem.ReadInt32( String( ResId( KEY_RES, *pResMgr ) ), 75 ); - Fraction aFrac( 1, Min( Max( nDPI, sal_Int32( 75 ) ), sal_Int32( 600 ) ) ); + Fraction aFrac( 1, Min( Max( nDPI, sal_Int32( 75 ) ), sal_Int32( 600 ) ) ); aMap.SetScaleX( aFrac ); aMap.SetScaleY( aFrac ); @@ -817,7 +817,7 @@ static Graphic ImpGetScaledGraphic( const Graphic& rGraphic, FilterConfigItem& r { if( ( nMode == 1 ) || ( nMode == 2 ) ) { - GDIMetaFile aMtf( rGraphic.GetGDIMetaFile() ); + GDIMetaFile aMtf( rGraphic.GetGDIMetaFile() ); ::com::sun::star::awt::Size aDefaultSize( 10000, 10000 ); Size aNewSize( OutputDevice::LogicToLogic( Size( nLogicalWidth, nLogicalHeight ), MAP_100TH_MM, aMtf.GetPrefMapMode() ) ); @@ -844,12 +844,12 @@ static Graphic ImpGetScaledGraphic( const Graphic& rGraphic, FilterConfigItem& r static String ImpCreateFullFilterPath( const String& rPath, const String& rFilterName ) { - ::rtl::OUString aPathURL; + ::rtl::OUString aPathURL; ::osl::FileBase::getFileURLFromSystemPath( rPath, aPathURL ); aPathURL += String( '/' ); - ::rtl::OUString aSystemPath; + ::rtl::OUString aSystemPath; ::osl::FileBase::getSystemPathFromFileURL( aPathURL, aSystemPath ); aSystemPath += ::rtl::OUString( rFilterName ); @@ -865,29 +865,29 @@ class ImpFilterLibCache; struct ImpFilterLibCacheEntry { - ImpFilterLibCacheEntry* mpNext; - osl::Module maLibrary; - String maFiltername; - PFilterCall mpfnImport; - PFilterDlgCall mpfnImportDlg; + ImpFilterLibCacheEntry* mpNext; + osl::Module maLibrary; + String maFiltername; + PFilterCall mpfnImport; + PFilterDlgCall mpfnImportDlg; ImpFilterLibCacheEntry( const String& rPathname, const String& rFiltername ); - int operator==( const String& rFiltername ) const { return maFiltername == rFiltername; } + int operator==( const String& rFiltername ) const { return maFiltername == rFiltername; } - PFilterCall GetImportFunction(); - PFilterDlgCall GetImportDlgFunction(); - PFilterCall GetExportFunction() { return (PFilterCall) maLibrary.getFunctionSymbol( UniString::CreateFromAscii( EXPORT_FUNCTION_NAME ) ); } - PFilterDlgCall GetExportDlgFunction() { return (PFilterDlgCall) maLibrary.getFunctionSymbol( UniString::CreateFromAscii( EXPDLG_FUNCTION_NAME ) ); } + PFilterCall GetImportFunction(); + PFilterDlgCall GetImportDlgFunction(); + PFilterCall GetExportFunction() { return (PFilterCall) maLibrary.getFunctionSymbol( UniString::CreateFromAscii( EXPORT_FUNCTION_NAME ) ); } + PFilterDlgCall GetExportDlgFunction() { return (PFilterDlgCall) maLibrary.getFunctionSymbol( UniString::CreateFromAscii( EXPDLG_FUNCTION_NAME ) ); } }; // ------------------------------------------------------------------------ ImpFilterLibCacheEntry::ImpFilterLibCacheEntry( const String& rPathname, const String& rFiltername ) : - mpNext ( NULL ), - maLibrary ( rPathname ), - maFiltername ( rFiltername ), - mpfnImport ( NULL ), - mpfnImportDlg ( NULL ) + mpNext ( NULL ), + maLibrary ( rPathname ), + maFiltername ( rFiltername ), + mpfnImport ( NULL ), + mpfnImportDlg ( NULL ) { } @@ -917,21 +917,21 @@ PFilterDlgCall ImpFilterLibCacheEntry::GetImportDlgFunction() class ImpFilterLibCache { - ImpFilterLibCacheEntry* mpFirst; - ImpFilterLibCacheEntry* mpLast; + ImpFilterLibCacheEntry* mpFirst; + ImpFilterLibCacheEntry* mpLast; public: ImpFilterLibCache(); ~ImpFilterLibCache(); - ImpFilterLibCacheEntry* GetFilter( const String& rFilterPath, const String& rFiltername ); + ImpFilterLibCacheEntry* GetFilter( const String& rFilterPath, const String& rFiltername ); }; // ------------------------------------------------------------------------ ImpFilterLibCache::ImpFilterLibCache() : - mpFirst ( NULL ), - mpLast ( NULL ) + mpFirst ( NULL ), + mpLast ( NULL ) { } @@ -939,7 +939,7 @@ ImpFilterLibCache::ImpFilterLibCache() : ImpFilterLibCache::~ImpFilterLibCache() { - ImpFilterLibCacheEntry* pEntry = mpFirst; + ImpFilterLibCacheEntry* pEntry = mpFirst; while( pEntry ) { ImpFilterLibCacheEntry* pNext = pEntry->mpNext; @@ -952,7 +952,7 @@ ImpFilterLibCache::~ImpFilterLibCache() ImpFilterLibCacheEntry* ImpFilterLibCache::GetFilter( const String& rFilterPath, const String& rFilterName ) { - ImpFilterLibCacheEntry* pEntry = mpFirst; + ImpFilterLibCacheEntry* pEntry = mpFirst; while( pEntry ) { @@ -991,7 +991,7 @@ namespace { struct Cache : public rtl::Static<ImpFilterLibCache, Cache> {}; } // ----------------- GraphicFilter::GraphicFilter( sal_Bool bConfig ) : - bUseConfig ( bConfig ), + bUseConfig ( bConfig ), nExpGraphHint ( 0 ) { ImplInit(); @@ -1231,11 +1231,11 @@ BOOL GraphicFilter::IsExportPixelFormat( USHORT nFormat ) USHORT GraphicFilter::CanImportGraphic( const INetURLObject& rPath, USHORT nFormat, USHORT* pDeterminedFormat ) { - sal_uInt16 nRetValue = GRFILTER_FORMATERROR; + sal_uInt16 nRetValue = GRFILTER_FORMATERROR; DBG_ASSERT( rPath.GetProtocol() != INET_PROT_NOT_VALID, "GraphicFilter::CanImportGraphic() : ProtType == INET_PROT_NOT_VALID" ); - String aMainUrl( rPath.GetMainURL( INetURLObject::NO_DECODE ) ); - SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( aMainUrl, STREAM_READ | STREAM_SHARE_DENYNONE ); + String aMainUrl( rPath.GetMainURL( INetURLObject::NO_DECODE ) ); + SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( aMainUrl, STREAM_READ | STREAM_SHARE_DENYNONE ); if ( pStream ) { nRetValue = CanImportGraphic( aMainUrl, *pStream, nFormat, pDeterminedFormat ); @@ -1268,8 +1268,8 @@ USHORT GraphicFilter::ImportGraphic( Graphic& rGraphic, const INetURLObject& rPa sal_uInt16 nRetValue = GRFILTER_FORMATERROR; DBG_ASSERT( rPath.GetProtocol() != INET_PROT_NOT_VALID, "GraphicFilter::ImportGraphic() : ProtType == INET_PROT_NOT_VALID" ); - String aMainUrl( rPath.GetMainURL( INetURLObject::NO_DECODE ) ); - SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( aMainUrl, STREAM_READ | STREAM_SHARE_DENYNONE ); + String aMainUrl( rPath.GetMainURL( INetURLObject::NO_DECODE ) ); + SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( aMainUrl, STREAM_READ | STREAM_SHARE_DENYNONE ); if ( pStream ) { nRetValue = ImportGraphic( rGraphic, aMainUrl, *pStream, nFormat, pDeterminedFormat, nImportFlags ); @@ -1290,18 +1290,18 @@ USHORT GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath, SvS USHORT nFormat, USHORT* pDeterminedFormat, sal_uInt32 nImportFlags, com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData ) { - String aFilterName; - ULONG nStmBegin; - USHORT nStatus; - GraphicReader* pContext = rGraphic.GetContext(); - GfxLinkType eLinkType = GFX_LINK_TYPE_NONE; - BOOL bDummyContext = ( pContext == (GraphicReader*) 1 ); - const BOOL bLinkSet = rGraphic.IsLink(); + String aFilterName; + ULONG nStmBegin; + USHORT nStatus; + GraphicReader* pContext = rGraphic.GetContext(); + GfxLinkType eLinkType = GFX_LINK_TYPE_NONE; + BOOL bDummyContext = ( pContext == (GraphicReader*) 1 ); + const BOOL bLinkSet = rGraphic.IsLink(); FilterConfigItem* pFilterConfigItem = NULL; - Size aPreviewSizeHint( 0, 0 ); - sal_Bool bAllowPartialStreamRead = sal_False; - sal_Bool bCreateNativeLink = sal_True; + Size aPreviewSizeHint( 0, 0 ); + sal_Bool bAllowPartialStreamRead = sal_False; + sal_Bool bCreateNativeLink = sal_True; ResetLastError(); @@ -1496,8 +1496,8 @@ USHORT GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath, SvS else if( aFilterName.EqualsIgnoreCaseAscii( IMP_SVSGF ) || aFilterName.EqualsIgnoreCaseAscii( IMP_SVSGV ) ) { - USHORT nVersion; - unsigned char nTyp = CheckSgfTyp( rIStream, nVersion ); + USHORT nVersion; + unsigned char nTyp = CheckSgfTyp( rIStream, nVersion ); switch( nTyp ) { @@ -1560,7 +1560,7 @@ USHORT GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath, SvS } else { - ImpFilterLibCacheEntry* pFilter = NULL; + ImpFilterLibCacheEntry* pFilter = NULL; // find first filter in filter pathes xub_StrLen i, nTokenCount = aFilterPath.GetTokenCount( ';' ); @@ -1609,11 +1609,11 @@ USHORT GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath, SvS if( nStatus == GRFILTER_OK && bCreateNativeLink && ( eLinkType != GFX_LINK_TYPE_NONE ) && !rGraphic.GetContext() && !bLinkSet ) { const ULONG nStmEnd = rIStream.Tell(); - const ULONG nBufSize = nStmEnd - nStmBegin; + const ULONG nBufSize = nStmEnd - nStmBegin; if( nBufSize ) { - BYTE* pBuf=0; + BYTE* pBuf=0; try { pBuf = new BYTE[ nBufSize ]; @@ -1653,12 +1653,12 @@ USHORT GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath, SvS USHORT GraphicFilter::ExportGraphic( const Graphic& rGraphic, const INetURLObject& rPath, sal_uInt16 nFormat, const uno::Sequence< beans::PropertyValue >* pFilterData ) { - sal_uInt16 nRetValue = GRFILTER_FORMATERROR; + sal_uInt16 nRetValue = GRFILTER_FORMATERROR; DBG_ASSERT( rPath.GetProtocol() != INET_PROT_NOT_VALID, "GraphicFilter::ExportGraphic() : ProtType == INET_PROT_NOT_VALID" ); - BOOL bAlreadyExists = ImplDirEntryHelper::Exists( rPath ); + BOOL bAlreadyExists = ImplDirEntryHelper::Exists( rPath ); - String aMainUrl( rPath.GetMainURL( INetURLObject::NO_DECODE ) ); - SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( aMainUrl, STREAM_WRITE | STREAM_TRUNC ); + String aMainUrl( rPath.GetMainURL( INetURLObject::NO_DECODE ) ); + SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( aMainUrl, STREAM_WRITE | STREAM_TRUNC ); if ( pStream ) { nRetValue = ExportGraphic( rGraphic, aMainUrl, *pStream, nFormat, pFilterData ); @@ -1701,10 +1701,10 @@ USHORT GraphicFilter::ExportGraphic( const Graphic& rGraphic, const String& rPat FilterConfigItem aConfigItem( (uno::Sequence< beans::PropertyValue >*)pFilterData ); String aFilterName( pConfig->GetExportFilterName( nFormat ) ); - bAbort = FALSE; - USHORT nStatus = GRFILTER_OK; - GraphicType eType; - Graphic aGraphic( rGraphic ); + bAbort = FALSE; + USHORT nStatus = GRFILTER_OK; + GraphicType eType; + Graphic aGraphic( rGraphic ); aGraphic = ImpGetScaledGraphic( rGraphic, aConfigItem ); eType = aGraphic.GetType(); @@ -1718,9 +1718,9 @@ USHORT GraphicFilter::ExportGraphic( const Graphic& rGraphic, const String& rPat VirtualDevice aVirDev; // Maximalen Speicherbedarf fuer das Bildes holen: -// if( GetOptionsConfig() ) -// nMaxMem = (UINT32)GetOptionsConfig()->ReadKey( "VEC-TO-PIX-MAX-KB", "1024" ).ToInt32(); -// else +// if( GetOptionsConfig() ) +// nMaxMem = (UINT32)GetOptionsConfig()->ReadKey( "VEC-TO-PIX-MAX-KB", "1024" ).ToInt32(); +// else nMaxMem = 1024; nMaxMem *= 1024; // In Bytes @@ -1769,7 +1769,7 @@ USHORT GraphicFilter::ExportGraphic( const Graphic& rGraphic, const String& rPat if( !aBmp.Convert( (BmpConversion) nColorRes ) ) aBmp = aGraphic.GetBitmap(); } - ResMgr* pResMgr = CREATERESMGR( svt ); + ResMgr* pResMgr = CREATERESMGR( svt ); sal_Bool bRleCoding = aConfigItem.ReadBool( String( ResId( KEY_RLE_CODING, *pResMgr ) ), sal_True ); // Wollen wir RLE-Kodiert speichern? aBmp.Write( rOStm, bRleCoding ); @@ -1783,7 +1783,7 @@ USHORT GraphicFilter::ExportGraphic( const Graphic& rGraphic, const String& rPat sal_Int32 nVersion = aConfigItem.ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Version" ) ), 0 ) ; if ( nVersion ) rOStm.SetVersion( nVersion ); - GDIMetaFile aMTF; + GDIMetaFile aMTF; if ( eType != GRAPHIC_BITMAP ) aMTF = aGraphic.GetGDIMetaFile(); @@ -1810,9 +1810,9 @@ USHORT GraphicFilter::ExportGraphic( const Graphic& rGraphic, const String& rPat } else { - Bitmap aBmp( aGraphic.GetBitmap() ); - GDIMetaFile aMTF; - VirtualDevice aVirDev; + Bitmap aBmp( aGraphic.GetBitmap() ); + GDIMetaFile aMTF; + VirtualDevice aVirDev; aMTF.Record( &aVirDev ); aVirDev.DrawBitmap( Point(), aBmp ); @@ -1834,9 +1834,9 @@ USHORT GraphicFilter::ExportGraphic( const Graphic& rGraphic, const String& rPat } else { - Bitmap aBmp( aGraphic.GetBitmap() ); - GDIMetaFile aMTF; - VirtualDevice aVirDev; + Bitmap aBmp( aGraphic.GetBitmap() ); + GDIMetaFile aMTF; + VirtualDevice aVirDev; aMTF.Record( &aVirDev ); aVirDev.DrawBitmap( Point(), aBmp ); @@ -1933,7 +1933,7 @@ USHORT GraphicFilter::ExportGraphic( const Graphic& rGraphic, const String& rPat if( xActiveDataSource.is() ) { - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xStmIf( + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xStmIf( static_cast< ::cppu::OWeakObject* >( new ImpFilterOutputStream( rOStm ) ) ); SvMemoryStream aMemStm( 65535, 65535 ); @@ -2002,7 +2002,7 @@ BOOL GraphicFilter::Setup( USHORT ) BOOL GraphicFilter::HasImportDialog( USHORT ) { return sal_True; -// return pConfig->IsImportDialog( nFormat ); +// return pConfig->IsImportDialog( nFormat ); } // ------------------------------------------------------------------------ @@ -2084,8 +2084,8 @@ IMPL_LINK( GraphicFilter, FilterCallback, ConvertData*, pData ) if( pData ) { - USHORT nFormat = GRFILTER_FORMAT_DONTKNOW; - ByteString aShortName; + USHORT nFormat = GRFILTER_FORMAT_DONTKNOW; + ByteString aShortName; switch( pData->mnFormat ) { case( CVT_BMP ): aShortName = BMP_SHORTNAME; break; diff --git a/svtools/source/filter.vcl/filter/filter2.cxx b/svtools/source/filter.vcl/filter/filter2.cxx index 0220961b657a..985da72df106 100644 --- a/svtools/source/filter.vcl/filter/filter2.cxx +++ b/svtools/source/filter.vcl/filter/filter2.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 "FilterConfigCache.hxx" #include <unotools/ucbstreamhelper.hxx> -#define DATA_SIZE 640 +#define DATA_SIZE 640 BYTE* ImplSearchEntry( BYTE* , BYTE* , ULONG , ULONG ); @@ -51,7 +51,7 @@ BYTE* ImplSearchEntry( BYTE* , BYTE* , ULONG , ULONG ); \************************************************************************/ GraphicDescriptor::GraphicDescriptor( const String* pPath ) : - pFileStm ( NULL ) + pFileStm ( NULL ) { ImpConstruct(); @@ -96,7 +96,7 @@ GraphicDescriptor::GraphicDescriptor( const INetURLObject& rPath ) : \************************************************************************/ GraphicDescriptor::GraphicDescriptor( SvStream& rInStream, const String* pPath) : - pFileStm ( NULL ) + pFileStm ( NULL ) { ImpConstruct(); @@ -150,32 +150,32 @@ BOOL GraphicDescriptor::Detect( BOOL bExtendedInfo ) if ( bDataReady ) { - SvStream& rStm = GetSearchStream(); - UINT16 nOldFormat = rStm.GetNumberFormatInt(); - - if ( ImpDetectGIF( rStm, bExtendedInfo ) ) bRet = TRUE; - else if ( ImpDetectJPG( rStm, bExtendedInfo ) ) bRet = TRUE; - else if ( ImpDetectBMP( rStm, bExtendedInfo ) ) bRet = TRUE; - else if ( ImpDetectPNG( rStm, bExtendedInfo ) ) bRet = TRUE; - else if ( ImpDetectTIF( rStm, bExtendedInfo ) ) bRet = TRUE; - else if ( ImpDetectPCX( rStm, bExtendedInfo ) ) bRet = TRUE; - else if ( ImpDetectDXF( rStm, bExtendedInfo ) ) bRet = TRUE; - else if ( ImpDetectMET( rStm, bExtendedInfo ) ) bRet = TRUE; - else if ( ImpDetectSGF( rStm, bExtendedInfo ) ) bRet = TRUE; - else if ( ImpDetectSGV( rStm, bExtendedInfo ) ) bRet = TRUE; - else if ( ImpDetectSVM( rStm, bExtendedInfo ) ) bRet = TRUE; - else if ( ImpDetectWMF( rStm, bExtendedInfo ) ) bRet = TRUE; - else if ( ImpDetectEMF( rStm, bExtendedInfo ) ) bRet = TRUE; - else if ( ImpDetectPCT( rStm, bExtendedInfo ) ) bRet = TRUE; - else if ( ImpDetectXBM( rStm, bExtendedInfo ) ) bRet = TRUE; - else if ( ImpDetectXPM( rStm, bExtendedInfo ) ) bRet = TRUE; - else if ( ImpDetectPBM( rStm, bExtendedInfo ) ) bRet = TRUE; - else if ( ImpDetectPGM( rStm, bExtendedInfo ) ) bRet = TRUE; - else if ( ImpDetectPPM( rStm, bExtendedInfo ) ) bRet = TRUE; - else if ( ImpDetectRAS( rStm, bExtendedInfo ) ) bRet = TRUE; - else if ( ImpDetectTGA( rStm, bExtendedInfo ) ) bRet = TRUE; - else if ( ImpDetectPSD( rStm, bExtendedInfo ) ) bRet = TRUE; - else if ( ImpDetectEPS( rStm, bExtendedInfo ) ) bRet = TRUE; + SvStream& rStm = GetSearchStream(); + UINT16 nOldFormat = rStm.GetNumberFormatInt(); + + if ( ImpDetectGIF( rStm, bExtendedInfo ) ) bRet = TRUE; + else if ( ImpDetectJPG( rStm, bExtendedInfo ) ) bRet = TRUE; + else if ( ImpDetectBMP( rStm, bExtendedInfo ) ) bRet = TRUE; + else if ( ImpDetectPNG( rStm, bExtendedInfo ) ) bRet = TRUE; + else if ( ImpDetectTIF( rStm, bExtendedInfo ) ) bRet = TRUE; + else if ( ImpDetectPCX( rStm, bExtendedInfo ) ) bRet = TRUE; + else if ( ImpDetectDXF( rStm, bExtendedInfo ) ) bRet = TRUE; + else if ( ImpDetectMET( rStm, bExtendedInfo ) ) bRet = TRUE; + else if ( ImpDetectSGF( rStm, bExtendedInfo ) ) bRet = TRUE; + else if ( ImpDetectSGV( rStm, bExtendedInfo ) ) bRet = TRUE; + else if ( ImpDetectSVM( rStm, bExtendedInfo ) ) bRet = TRUE; + else if ( ImpDetectWMF( rStm, bExtendedInfo ) ) bRet = TRUE; + else if ( ImpDetectEMF( rStm, bExtendedInfo ) ) bRet = TRUE; + else if ( ImpDetectPCT( rStm, bExtendedInfo ) ) bRet = TRUE; + else if ( ImpDetectXBM( rStm, bExtendedInfo ) ) bRet = TRUE; + else if ( ImpDetectXPM( rStm, bExtendedInfo ) ) bRet = TRUE; + else if ( ImpDetectPBM( rStm, bExtendedInfo ) ) bRet = TRUE; + else if ( ImpDetectPGM( rStm, bExtendedInfo ) ) bRet = TRUE; + else if ( ImpDetectPPM( rStm, bExtendedInfo ) ) bRet = TRUE; + else if ( ImpDetectRAS( rStm, bExtendedInfo ) ) bRet = TRUE; + else if ( ImpDetectTGA( rStm, bExtendedInfo ) ) bRet = TRUE; + else if ( ImpDetectPSD( rStm, bExtendedInfo ) ) bRet = TRUE; + else if ( ImpDetectEPS( rStm, bExtendedInfo ) ) bRet = TRUE; // diese Formate lassen sich nur bei WideSearch im gesamten // Stream ermitteln @@ -262,8 +262,8 @@ ULONG GraphicDescriptor::GetRequestedByteCount() const /******************************************************************************/ -/* IMP-Methoden */ -/* */ +/* IMP-Methoden */ +/* */ /************************************************************************* @@ -296,8 +296,8 @@ void GraphicDescriptor::ImpConstruct() BOOL GraphicDescriptor::ImpDetectBMP( SvStream& rStm, BOOL bExtendedInfo ) { - UINT16 nTemp16; - BOOL bRet = FALSE; + UINT16 nTemp16; + BOOL bRet = FALSE; rStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); rStm.Seek( nStmPos ); @@ -319,8 +319,8 @@ BOOL GraphicDescriptor::ImpDetectBMP( SvStream& rStm, BOOL bExtendedInfo ) if ( bExtendedInfo ) { - UINT32 nTemp32; - UINT32 nCompression; + UINT32 nTemp32; + UINT32 nCompression; // bis zur ersten Information rStm.SeekRel( 0x10 ); @@ -378,10 +378,10 @@ BOOL GraphicDescriptor::ImpDetectBMP( SvStream& rStm, BOOL bExtendedInfo ) BOOL GraphicDescriptor::ImpDetectGIF( SvStream& rStm, BOOL bExtendedInfo ) { - UINT32 n32; - UINT16 n16; - BOOL bRet = FALSE; - BYTE cByte; + UINT32 n32; + UINT16 n16; + BOOL bRet = FALSE; + BYTE cByte; rStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); rStm.Seek( nStmPos ); @@ -426,10 +426,10 @@ BOOL GraphicDescriptor::ImpDetectGIF( SvStream& rStm, BOOL bExtendedInfo ) BOOL GraphicDescriptor::ImpDetectJPG( SvStream& rStm, BOOL bExtendedInfo ) { - UINT32 nTemp32; - BOOL bRet = FALSE; - BYTE cByte = 0; - BOOL bM_COM; + UINT32 nTemp32; + BOOL bRet = FALSE; + BYTE cByte = 0; + BOOL bM_COM; rStm.SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN ); rStm.Seek( nStmPos ); @@ -460,12 +460,12 @@ BOOL GraphicDescriptor::ImpDetectJPG( SvStream& rStm, BOOL bExtendedInfo ) if( bExtendedInfo ) { MapMode aMap; - UINT16 nTemp16; - ULONG nCount = 9; - ULONG nMax; - ULONG nResX; - ULONG nResY; - BYTE cUnit; + UINT16 nTemp16; + ULONG nCount = 9; + ULONG nMax; + ULONG nResX; + ULONG nResY; + BYTE cUnit; // Groesse des verbleibenden Puffers ermitteln if ( bLinked ) @@ -555,16 +555,16 @@ BOOL GraphicDescriptor::ImpDetectJPG( SvStream& rStm, BOOL bExtendedInfo ) BOOL GraphicDescriptor::ImpDetectPCD( SvStream& rStm, BOOL ) { - BOOL bRet = FALSE; + BOOL bRet = FALSE; rStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); rStm.Seek( nStmPos ); if ( bWideSearch ) { - UINT32 nTemp32; - UINT16 nTemp16; - BYTE cByte; + UINT32 nTemp32; + UINT16 nTemp16; + BYTE cByte; rStm.SeekRel( 2048 ); rStm >> nTemp32; @@ -606,8 +606,8 @@ BOOL GraphicDescriptor::ImpDetectPCX( SvStream& rStm, BOOL bExtendedInfo ) // We must detect the whole header. bExtendedInfo = TRUE; - BOOL bRet = FALSE; - BYTE cByte; + BOOL bRet = FALSE; + BYTE cByte; rStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); rStm.Seek( nStmPos ); @@ -620,13 +620,13 @@ BOOL GraphicDescriptor::ImpDetectPCX( SvStream& rStm, BOOL bExtendedInfo ) if ( bExtendedInfo ) { - UINT16 nTemp16; - USHORT nXmin; - USHORT nXmax; - USHORT nYmin; - USHORT nYmax; - USHORT nDPIx; - USHORT nDPIy; + UINT16 nTemp16; + USHORT nXmin; + USHORT nXmax; + USHORT nYmin; + USHORT nYmax; + USHORT nDPIx; + USHORT nDPIy; rStm.SeekRel( 1 ); @@ -661,7 +661,7 @@ BOOL GraphicDescriptor::ImpDetectPCX( SvStream& rStm, BOOL bExtendedInfo ) nDPIy = nTemp16; // logische Groesse setzen - MapMode aMap( MAP_INCH, Point(), + MapMode aMap( MAP_INCH, Point(), Fraction( 1, nDPIx ), Fraction( 1, nDPIy ) ); aLogSize = OutputDevice::LogicToLogic( aPixSize, aMap, MapMode( MAP_100TH_MM ) ); @@ -688,8 +688,8 @@ BOOL GraphicDescriptor::ImpDetectPCX( SvStream& rStm, BOOL bExtendedInfo ) BOOL GraphicDescriptor::ImpDetectPNG( SvStream& rStm, BOOL bExtendedInfo ) { - UINT32 nTemp32; - BOOL bRet = FALSE; + UINT32 nTemp32; + BOOL bRet = FALSE; rStm.SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN ); rStm.Seek( nStmPos ); @@ -729,7 +729,7 @@ BOOL GraphicDescriptor::ImpDetectPNG( SvStream& rStm, BOOL bExtendedInfo ) if ( bWideSearch ) { - UINT32 nLen32; + UINT32 nLen32; rStm.SeekRel( 8 ); @@ -746,8 +746,8 @@ BOOL GraphicDescriptor::ImpDetectPNG( SvStream& rStm, BOOL bExtendedInfo ) if ( nTemp32 == 0x70485973 ) { - ULONG nXRes; - ULONG nYRes; + ULONG nXRes; + ULONG nYRes; // horizontale Aufloesung rStm >> nTemp32; @@ -788,10 +788,10 @@ BOOL GraphicDescriptor::ImpDetectPNG( SvStream& rStm, BOOL bExtendedInfo ) BOOL GraphicDescriptor::ImpDetectTIF( SvStream& rStm, BOOL bExtendedInfo ) { - BOOL bDetectOk = FALSE; - BOOL bRet = FALSE; - BYTE cByte1; - BYTE cByte2; + BOOL bDetectOk = FALSE; + BOOL bRet = FALSE; + BYTE cByte1; + BYTE cByte2; rStm.Seek( nStmPos ); rStm >> cByte1; @@ -811,7 +811,7 @@ BOOL GraphicDescriptor::ImpDetectTIF( SvStream& rStm, BOOL bExtendedInfo ) if ( bDetectOk ) { - UINT16 nTemp16; + UINT16 nTemp16; rStm >> nTemp16; if ( nTemp16 == 0x2a ) @@ -821,10 +821,10 @@ BOOL GraphicDescriptor::ImpDetectTIF( SvStream& rStm, BOOL bExtendedInfo ) if ( bExtendedInfo ) { - ULONG nCount; - ULONG nMax = DATA_SIZE - 48; - UINT32 nTemp32; - BOOL bOk = FALSE; + ULONG nCount; + ULONG nMax = DATA_SIZE - 48; + UINT32 nTemp32; + BOOL bOk = FALSE; // Offset des ersten IFD einlesen rStm >> nTemp32; @@ -966,7 +966,7 @@ BOOL GraphicDescriptor::ImpDetectPBM( SvStream& rStm, BOOL ) bRet = TRUE; else { - BYTE nFirst, nSecond; + BYTE nFirst, nSecond; rStm.Seek( nStmPos ); rStm >> nFirst >> nSecond; if ( nFirst == 'P' && ( ( nSecond == '1' ) || ( nSecond == '4' ) ) ) @@ -993,7 +993,7 @@ BOOL GraphicDescriptor::ImpDetectPGM( SvStream& rStm, BOOL ) bRet = TRUE; else { - BYTE nFirst, nSecond; + BYTE nFirst, nSecond; rStm.Seek( nStmPos ); rStm >> nFirst >> nSecond; if ( nFirst == 'P' && ( ( nSecond == '2' ) || ( nSecond == '5' ) ) ) @@ -1020,7 +1020,7 @@ BOOL GraphicDescriptor::ImpDetectPPM( SvStream& rStm, BOOL ) bRet = TRUE; else { - BYTE nFirst, nSecond; + BYTE nFirst, nSecond; rStm.Seek( nStmPos ); rStm >> nFirst >> nSecond; if ( nFirst == 'P' && ( ( nSecond == '3' ) || ( nSecond == '6' ) ) ) @@ -1079,7 +1079,7 @@ BOOL GraphicDescriptor::ImpDetectPSD( SvStream& rStm, BOOL bExtendedInfo ) { BOOL bRet = FALSE; - UINT32 nMagicNumber; + UINT32 nMagicNumber; rStm.Seek( nStmPos ); rStm.SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN ); rStm >> nMagicNumber; @@ -1097,7 +1097,7 @@ BOOL GraphicDescriptor::ImpDetectPSD( SvStream& rStm, BOOL bExtendedInfo ) UINT32 nColumns; UINT16 nDepth; UINT16 nMode; - rStm.SeekRel( 6 ); // Pad + rStm.SeekRel( 6 ); // Pad rStm >> nChannels >> nRows >> nColumns >> nDepth >> nMode; if ( ( nDepth == 1 ) || ( nDepth == 8 ) || ( nDepth == 16 ) ) { @@ -1138,8 +1138,8 @@ BOOL GraphicDescriptor::ImpDetectEPS( SvStream& rStm, BOOL ) // es wird die EPS mit Vorschaubild Variante und die Extensionuebereinstimmung // geprueft - sal_uInt32 nFirstLong; - sal_uInt8 nFirstBytes[20]; + sal_uInt32 nFirstLong; + sal_uInt8 nFirstBytes[20]; rStm.Seek( nStmPos ); rStm.SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN ); @@ -1276,9 +1276,9 @@ BOOL GraphicDescriptor::ImpDetectSGV( SvStream&, BOOL ) BOOL GraphicDescriptor::ImpDetectSVM( SvStream& rStm, BOOL bExtendedInfo ) { - UINT32 n32; - BOOL bRet = FALSE; - BYTE cByte; + UINT32 n32; + BOOL bRet = FALSE; + BYTE cByte; rStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); rStm.Seek( nStmPos ); @@ -1294,8 +1294,8 @@ BOOL GraphicDescriptor::ImpDetectSVM( SvStream& rStm, BOOL bExtendedInfo ) if ( bExtendedInfo ) { - UINT32 nTemp32; - UINT16 nTemp16; + UINT32 nTemp32; + UINT16 nTemp16; rStm.SeekRel( 0x04 ); @@ -1386,34 +1386,34 @@ BOOL GraphicDescriptor::ImpDetectEMF( SvStream&, BOOL ) String GraphicDescriptor::GetImportFormatShortName( sal_uInt16 nFormat ) { - ByteString aKeyName; + ByteString aKeyName; switch( nFormat ) { - case( GFF_BMP ) : aKeyName = "bmp"; break; - case( GFF_GIF ) : aKeyName = "gif"; break; - case( GFF_JPG ) : aKeyName = "jpg"; break; - case( GFF_PCD ) : aKeyName = "pcd"; break; - case( GFF_PCX ) : aKeyName = "pcx"; break; - case( GFF_PNG ) : aKeyName = "png"; break; - case( GFF_XBM ) : aKeyName = "xbm"; break; - case( GFF_XPM ) : aKeyName = "xpm"; break; - case( GFF_PBM ) : aKeyName = "pbm"; break; - case( GFF_PGM ) : aKeyName = "pgm"; break; - case( GFF_PPM ) : aKeyName = "ppm"; break; - case( GFF_RAS ) : aKeyName = "ras"; break; - case( GFF_TGA ) : aKeyName = "tga"; break; - case( GFF_PSD ) : aKeyName = "psd"; break; - case( GFF_EPS ) : aKeyName = "eps"; break; - case( GFF_TIF ) : aKeyName = "tif"; break; - case( GFF_DXF ) : aKeyName = "dxf"; break; - case( GFF_MET ) : aKeyName = "met"; break; - case( GFF_PCT ) : aKeyName = "pct"; break; - case( GFF_SGF ) : aKeyName = "sgf"; break; - case( GFF_SGV ) : aKeyName = "sgv"; break; - case( GFF_SVM ) : aKeyName = "svm"; break; - case( GFF_WMF ) : aKeyName = "wmf"; break; - case( GFF_EMF ) : aKeyName = "emf"; break; + case( GFF_BMP ) : aKeyName = "bmp"; break; + case( GFF_GIF ) : aKeyName = "gif"; break; + case( GFF_JPG ) : aKeyName = "jpg"; break; + case( GFF_PCD ) : aKeyName = "pcd"; break; + case( GFF_PCX ) : aKeyName = "pcx"; break; + case( GFF_PNG ) : aKeyName = "png"; break; + case( GFF_XBM ) : aKeyName = "xbm"; break; + case( GFF_XPM ) : aKeyName = "xpm"; break; + case( GFF_PBM ) : aKeyName = "pbm"; break; + case( GFF_PGM ) : aKeyName = "pgm"; break; + case( GFF_PPM ) : aKeyName = "ppm"; break; + case( GFF_RAS ) : aKeyName = "ras"; break; + case( GFF_TGA ) : aKeyName = "tga"; break; + case( GFF_PSD ) : aKeyName = "psd"; break; + case( GFF_EPS ) : aKeyName = "eps"; break; + case( GFF_TIF ) : aKeyName = "tif"; break; + case( GFF_DXF ) : aKeyName = "dxf"; break; + case( GFF_MET ) : aKeyName = "met"; break; + case( GFF_PCT ) : aKeyName = "pct"; break; + case( GFF_SGF ) : aKeyName = "sgf"; break; + case( GFF_SGV ) : aKeyName = "sgv"; break; + case( GFF_SVM ) : aKeyName = "svm"; break; + case( GFF_WMF ) : aKeyName = "wmf"; break; + case( GFF_EMF ) : aKeyName = "emf"; break; } return String( aKeyName, RTL_TEXTENCODING_ASCII_US ); diff --git a/svtools/source/filter.vcl/filter/fldll.cxx b/svtools/source/filter.vcl/filter/fldll.cxx index a9559070a8b8..a744db615055 100644 --- a/svtools/source/filter.vcl/filter/fldll.cxx +++ b/svtools/source/filter.vcl/filter/fldll.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/svtools/source/filter.vcl/filter/gradwrap.cxx b/svtools/source/filter.vcl/filter/gradwrap.cxx index d1afb0dd743c..fb90e5fe9049 100644 --- a/svtools/source/filter.vcl/filter/gradwrap.cxx +++ b/svtools/source/filter.vcl/filter/gradwrap.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,8 +41,8 @@ GradientWrapper::GradientWrapper(const Link& rDrawPolyRecordHdl, const Link& rDrawPolyPolyRecordHdl, const Link& rSetFillInBrushRecordHdl) : - aDrawPolyRecordHdl (rDrawPolyRecordHdl), - aDrawPolyPolyRecordHdl (rDrawPolyPolyRecordHdl), + aDrawPolyRecordHdl (rDrawPolyRecordHdl), + aDrawPolyPolyRecordHdl (rDrawPolyPolyRecordHdl), aSetFillInBrushRecordHdl(rSetFillInBrushRecordHdl) { } @@ -266,7 +266,7 @@ void GradientWrapper::WriteLinearGradient(const Rectangle& rRect, void GradientWrapper::WriteRadialGradient(const Rectangle& rRect, const Gradient& rGradient) { - USHORT nStepCount = 100; + USHORT nStepCount = 100; Rectangle aClipRect = rRect; Rectangle aRect = rRect; long nZWidth = aRect.GetWidth() * (long)rGradient.GetOfsX() / 100; @@ -412,9 +412,9 @@ void GradientWrapper::WriteRadialGradient(const Rectangle& rRect, void GradientWrapper::WriteRectGradient(const Rectangle& rRect, const Gradient& rGradient) { - USHORT nStepCount = 100; + USHORT nStepCount = 100; Rectangle aClipRect = rRect; - Rectangle aRect = rRect; + Rectangle aRect = rRect; aRect.Left()--; aRect.Top()--; diff --git a/svtools/source/filter.vcl/filter/sgfbram.cxx b/svtools/source/filter.vcl/filter/sgfbram.cxx index f07c8a7dbf0c..a4166bb0686a 100644 --- a/svtools/source/filter.vcl/filter/sgfbram.cxx +++ b/svtools/source/filter.vcl/filter/sgfbram.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/svtools/source/filter.vcl/filter/sgvmain.cxx b/svtools/source/filter.vcl/filter/sgvmain.cxx index 5c72dc6ba04f..3269624918d9 100644 --- a/svtools/source/filter.vcl/filter/sgvmain.cxx +++ b/svtools/source/filter.vcl/filter/sgvmain.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -809,12 +809,12 @@ void CircType::Draw(OutputDevice& rOut) void BmapType::Draw(OutputDevice& rOut) { //ifstream aInp; - unsigned char nSgfTyp; - USHORT nVersion; - String aStr( + unsigned char nSgfTyp; + USHORT nVersion; + String aStr( reinterpret_cast< char const * >(&Filename[ 1 ]), (xub_StrLen)Filename[ 0 ], RTL_TEXTENCODING_UTF8 ); - INetURLObject aFNam( aStr ); + INetURLObject aFNam( aStr ); SvStream* pInp = ::utl::UcbStreamHelper::CreateStream( aFNam.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ ); if ( pInp ) @@ -1065,7 +1065,7 @@ BOOL SgfSDrwFilter(SvStream& rInp, GDIMetaFile& rMtf, INetURLObject aIniPath ) BOOL bRet=FALSE; // Returncode aIniPath.Append( String::CreateFromAscii( "sgf.ini", 7 ) ); -// aIniPath.ToAbs(); +// aIniPath.ToAbs(); pSgfFonts = new SgfFontLst; diff --git a/svtools/source/filter.vcl/filter/sgvspln.cxx b/svtools/source/filter.vcl/filter/sgvspln.cxx index 8bd09a4680dc..860fdb4dfe76 100644 --- a/svtools/source/filter.vcl/filter/sgvspln.cxx +++ b/svtools/source/filter.vcl/filter/sgvspln.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/svtools/source/filter.vcl/filter/sgvtext.cxx b/svtools/source/filter.vcl/filter/sgvtext.cxx index 1655c53a5393..cbb4e5684865 100644 --- a/svtools/source/filter.vcl/filter/sgvtext.cxx +++ b/svtools/source/filter.vcl/filter/sgvtext.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/svtools/source/filter.vcl/filter/strings.hrc b/svtools/source/filter.vcl/filter/strings.hrc index 0eea67fb2338..b4029f513830 100644 --- a/svtools/source/filter.vcl/filter/strings.hrc +++ b/svtools/source/filter.vcl/filter/strings.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/svtools/source/filter.vcl/filter/strings.src b/svtools/source/filter.vcl/filter/strings.src index 60e628ee0b5c..060570430021 100644 --- a/svtools/source/filter.vcl/filter/strings.src +++ b/svtools/source/filter.vcl/filter/strings.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/svtools/source/filter.vcl/igif/decode.cxx b/svtools/source/filter.vcl/igif/decode.cxx index d40cfab7cc50..5fde71796ab6 100644 --- a/svtools/source/filter.vcl/igif/decode.cxx +++ b/svtools/source/filter.vcl/igif/decode.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,21 +35,21 @@ struct GIFLZWTableEntry { - GIFLZWTableEntry* pPrev; - GIFLZWTableEntry* pFirst; - BYTE nData; + GIFLZWTableEntry* pPrev; + GIFLZWTableEntry* pFirst; + BYTE nData; }; // ------------------------------------------------------------------------ GIFLZWDecompressor::GIFLZWDecompressor( BYTE cDataSize ) : - nInputBitsBuf ( 0 ), - nOutBufDataLen ( 0 ), - nInputBitsBufSize ( 0 ), - bEOIFound ( FALSE ), - nDataSize ( cDataSize ) + nInputBitsBuf ( 0 ), + nOutBufDataLen ( 0 ), + nInputBitsBufSize ( 0 ), + bEOIFound ( FALSE ), + nDataSize ( cDataSize ) { - pOutBuf = new BYTE[ 4096 ]; + pOutBuf = new BYTE[ 4096 ]; nClearCode = 1 << nDataSize; nEOICode = nClearCode + 1; @@ -81,10 +81,10 @@ GIFLZWDecompressor::~GIFLZWDecompressor() HPBYTE GIFLZWDecompressor::DecompressBlock( HPBYTE pSrc, BYTE cBufSize, ULONG& rCount, BOOL& rEOI ) { - ULONG nTargetSize = 4096; - ULONG nCount = 0; - HPBYTE pTarget = (HPBYTE) rtl_allocateMemory( nTargetSize ); - HPBYTE pTmpTarget = pTarget; + ULONG nTargetSize = 4096; + ULONG nCount = 0; + HPBYTE pTarget = (HPBYTE) rtl_allocateMemory( nTargetSize ); + HPBYTE pTmpTarget = pTarget; nBlockBufSize = cBufSize; nBlockBufPos = 0; @@ -96,9 +96,9 @@ HPBYTE GIFLZWDecompressor::DecompressBlock( HPBYTE pSrc, BYTE cBufSize, if( nCount > nTargetSize ) { - ULONG nNewSize = nTargetSize << 1; - ULONG nOffset = pTmpTarget - pTarget; - HPBYTE pTmp = (HPBYTE) rtl_allocateMemory( nNewSize ); + ULONG nNewSize = nTargetSize << 1; + ULONG nOffset = pTmpTarget - pTarget; + HPBYTE pTmp = (HPBYTE) rtl_allocateMemory( nNewSize ); memcpy( pTmp, pTarget, nTargetSize ); rtl_freeMemory( pTarget ); @@ -145,10 +145,10 @@ void GIFLZWDecompressor::AddToTable( USHORT nPrevCode, USHORT nCodeFirstData ) BOOL GIFLZWDecompressor::ProcessOneCode() { - GIFLZWTableEntry* pE; - USHORT nCode; - BOOL bRet = FALSE; - BOOL bEndOfBlock = FALSE; + GIFLZWTableEntry* pE; + USHORT nCode; + BOOL bRet = FALSE; + BOOL bEndOfBlock = FALSE; while( nInputBitsBufSize < nCodeSize ) { diff --git a/svtools/source/filter.vcl/igif/decode.hxx b/svtools/source/filter.vcl/igif/decode.hxx index 5bce26b724f1..affe3a4d4f6a 100644 --- a/svtools/source/filter.vcl/igif/decode.hxx +++ b/svtools/source/filter.vcl/igif/decode.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,25 +35,25 @@ struct GIFLZWTableEntry; class GIFLZWDecompressor { - GIFLZWTableEntry* pTable; - HPBYTE pOutBuf; - HPBYTE pOutBufData; - HPBYTE pBlockBuf; - ULONG nInputBitsBuf; - USHORT nTableSize; - USHORT nClearCode; - USHORT nEOICode; - USHORT nCodeSize; - USHORT nOldCode; - USHORT nOutBufDataLen; - USHORT nInputBitsBufSize; - BOOL bEOIFound; - BYTE nDataSize; - BYTE nBlockBufSize; - BYTE nBlockBufPos; + GIFLZWTableEntry* pTable; + HPBYTE pOutBuf; + HPBYTE pOutBufData; + HPBYTE pBlockBuf; + ULONG nInputBitsBuf; + USHORT nTableSize; + USHORT nClearCode; + USHORT nEOICode; + USHORT nCodeSize; + USHORT nOldCode; + USHORT nOutBufDataLen; + USHORT nInputBitsBufSize; + BOOL bEOIFound; + BYTE nDataSize; + BYTE nBlockBufSize; + BYTE nBlockBufPos; - void AddToTable(USHORT nPrevCode, USHORT nCodeFirstData); - BOOL ProcessOneCode(); + void AddToTable(USHORT nPrevCode, USHORT nCodeFirstData); + BOOL ProcessOneCode(); public: @@ -61,7 +61,7 @@ public: GIFLZWDecompressor( BYTE cDataSize ); ~GIFLZWDecompressor(); - HPBYTE DecompressBlock( HPBYTE pSrc, BYTE cBufSize, ULONG& rCount, BOOL& rEOI ); + HPBYTE DecompressBlock( HPBYTE pSrc, BYTE cBufSize, ULONG& rCount, BOOL& rEOI ); }; #endif diff --git a/svtools/source/filter.vcl/igif/gifread.cxx b/svtools/source/filter.vcl/igif/gifread.cxx index 62d1413e145f..5a53eebed217 100644 --- a/svtools/source/filter.vcl/igif/gifread.cxx +++ b/svtools/source/filter.vcl/igif/gifread.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ // ------------- GIFReader::GIFReader( SvStream& rStm ) : - aGPalette ( 256 ), - aLPalette ( 256 ), - rIStm ( rStm ), - pAcc8 ( NULL ), - pAcc1 ( NULL ), - nLastPos ( rStm.Tell() ), - nLogWidth100 ( 0UL ), - nLogHeight100 ( 0UL ), - nLoops ( 1 ), - eActAction ( GLOBAL_HEADER_READING ), - bGCTransparent ( FALSE ), - bImGraphicReady ( FALSE ) + aGPalette ( 256 ), + aLPalette ( 256 ), + rIStm ( rStm ), + pAcc8 ( NULL ), + pAcc1 ( NULL ), + nLastPos ( rStm.Tell() ), + nLogWidth100 ( 0UL ), + nLogHeight100 ( 0UL ), + nLoops ( 1 ), + eActAction ( GLOBAL_HEADER_READING ), + bGCTransparent ( FALSE ), + bImGraphicReady ( FALSE ) { maUpperName = UniString::CreateFromAscii( "SVIGIF", 6 ); pSrcBuf = new BYTE[ 256 ]; @@ -134,10 +134,10 @@ BOOL GIFReader::CreateBitmaps( long nWidth, long nHeight, BitmapPalette* pPal, BOOL GIFReader::ReadGlobalHeader() { - char pBuf[ 7 ]; - BYTE nRF; - BYTE nAspect; - BOOL bRet = FALSE; + char pBuf[ 7 ]; + BYTE nRF; + BYTE nAspect; + BOOL bRet = FALSE; rIStm.Read( pBuf, 6 ); if( NO_PENDING( rIStm ) ) @@ -179,8 +179,8 @@ BOOL GIFReader::ReadGlobalHeader() void GIFReader::ReadPaletteEntries( BitmapPalette* pPal, ULONG nCount ) { - const ULONG nLen = 3UL * nCount; - BYTE* pBuf = new BYTE[ nLen ]; + const ULONG nLen = 3UL * nCount; + BYTE* pBuf = new BYTE[ nLen ]; rIStm.Read( pBuf, nLen ); if( NO_PENDING( rIStm ) ) @@ -213,11 +213,11 @@ void GIFReader::ReadPaletteEntries( BitmapPalette* pPal, ULONG nCount ) BOOL GIFReader::ReadExtension() { - BYTE cFunction; - BYTE cSize; - BYTE cByte; - BOOL bRet = FALSE; - BOOL bOverreadDataBlocks = FALSE; + BYTE cFunction; + BYTE cSize; + BYTE cByte; + BOOL bRet = FALSE; + BOOL bOverreadDataBlocks = FALSE; // Extension-Label rIStm >> cFunction; @@ -259,8 +259,8 @@ BOOL GIFReader::ReadExtension() // Appl.-Extension hat Laenge 11 if ( cSize == 0x0b ) { - ByteString aAppId; - ByteString aAppCode; + ByteString aAppId; + ByteString aAppCode; rIStm.Read( aAppId.AllocBuffer( 8 ), 8 ); rIStm.Read( aAppCode.AllocBuffer( 3 ), 3 ); @@ -328,8 +328,8 @@ BOOL GIFReader::ReadExtension() bRet = TRUE; while( cSize && bStatus && !rIStm.IsEof() ) { - USHORT nCount = (USHORT) cSize + 1; - char* pBuffer = new char[ nCount ]; + USHORT nCount = (USHORT) cSize + 1; + char* pBuffer = new char[ nCount ]; bRet = FALSE; rIStm.Read( pBuffer, nCount ); @@ -353,15 +353,15 @@ BOOL GIFReader::ReadExtension() BOOL GIFReader::ReadLocalHeader() { - BYTE pBuf[ 9 ]; - BOOL bRet = FALSE; + BYTE pBuf[ 9 ]; + BOOL bRet = FALSE; rIStm.Read( pBuf, 9 ); if( NO_PENDING( rIStm ) ) { - SvMemoryStream aMemStm; - BitmapPalette* pPal; - BYTE nFlags; + SvMemoryStream aMemStm; + BitmapPalette* pPal; + BYTE nFlags; aMemStm.SetBuffer( (char*) pBuf, 9, FALSE, 9 ); aMemStm >> nImagePosX; @@ -402,9 +402,9 @@ BOOL GIFReader::ReadLocalHeader() ULONG GIFReader::ReadNextBlock() { - ULONG nRet = 0UL; - ULONG nRead; - BYTE cBlockSize; + ULONG nRet = 0UL; + ULONG nRead; + BYTE cBlockSize; rIStm >> cBlockSize; @@ -424,8 +424,8 @@ ULONG GIFReader::ReadNextBlock() nRet = 3UL; else { - BOOL bEOI; - HPBYTE pTarget = pDecomp->DecompressBlock( pSrcBuf, cBlockSize, nRead, bEOI ); + BOOL bEOI; + HPBYTE pTarget = pDecomp->DecompressBlock( pSrcBuf, cBlockSize, nRead, bEOI ); nRet = ( bEOI ? 3 : 1 ); @@ -463,10 +463,10 @@ void GIFReader::FillImages( HPBYTE pBytes, ULONG nCount ) // nicht zusanmmenfallen ( kommt vorm wenn wir am Ende des Bildes sind ) if( ( nMinY > nLastImageY ) && ( nLastImageY < ( nImageHeight - 1 ) ) ) { - HPBYTE pScanline8 = pAcc8->GetScanline( nYAcc ); - ULONG nSize8 = pAcc8->GetScanlineSize(); - HPBYTE pScanline1 = 0; - ULONG nSize1 = 0; + HPBYTE pScanline8 = pAcc8->GetScanline( nYAcc ); + ULONG nSize8 = pAcc8->GetScanlineSize(); + HPBYTE pScanline1 = 0; + ULONG nSize1 = 0; if( bGCTransparent ) { @@ -550,7 +550,7 @@ void GIFReader::FillImages( HPBYTE pBytes, ULONG nCount ) void GIFReader::CreateNewBitmaps() { - AnimationBitmap aAnimBmp; + AnimationBitmap aAnimBmp; aBmp8.ReleaseAccess( pAcc8 ); pAcc8 = NULL; @@ -594,7 +594,7 @@ const Graphic& GIFReader::GetIntermediateGraphic() // vollstaendig eingelesen wurde if ( bImGraphicReady && !aAnimation.Count() ) { - Bitmap aBmp; + Bitmap aBmp; aBmp8.ReleaseAccess( pAcc8 ); @@ -715,9 +715,9 @@ BOOL GIFReader::ProcessGIF() // naechsten Datenblock lesen case( NEXT_BLOCK_READING ): { - USHORT nLastX = nImageX; - USHORT nLastY = nImageY; - ULONG nRet = ReadNextBlock(); + USHORT nLastX = nImageX; + USHORT nLastY = nImageY; + ULONG nRet = ReadNextBlock(); // Return: 0:Pending / 1:OK; / 2:OK und letzter Block: / 3:EOI / 4:HardAbort if( nRet ) @@ -827,10 +827,10 @@ ReadState GIFReader::ReadGIF( Graphic& rGraphic ) BOOL ImportGIF( SvStream & rStm, Graphic& rGraphic ) { - GIFReader* pGIFReader = (GIFReader*) rGraphic.GetContext(); - USHORT nOldFormat = rStm.GetNumberFormatInt(); - ReadState eReadState; - BOOL bRet = TRUE; + GIFReader* pGIFReader = (GIFReader*) rGraphic.GetContext(); + USHORT nOldFormat = rStm.GetNumberFormatInt(); + ReadState eReadState; + BOOL bRet = TRUE; rStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); diff --git a/svtools/source/filter.vcl/ixbm/xbmread.cxx b/svtools/source/filter.vcl/ixbm/xbmread.cxx index 6d0c34cc5c56..01bb7c4a8c02 100644 --- a/svtools/source/filter.vcl/ixbm/xbmread.cxx +++ b/svtools/source/filter.vcl/ixbm/xbmread.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,12 +40,12 @@ // ------------- XBMReader::XBMReader( SvStream& rStm ) : - rIStm ( rStm ), - pAcc1 ( NULL ), - nLastPos ( rStm.Tell() ), - nWidth ( 0 ), - nHeight ( 0 ), - bStatus ( TRUE ) + rIStm ( rStm ), + pAcc1 ( NULL ), + nLastPos ( rStm.Tell() ), + nWidth ( 0 ), + nHeight ( 0 ), + bStatus ( TRUE ) { pHexTable = new short[ 256 ]; maUpperName = String::CreateFromAscii( "SVIXBM", 6 ); @@ -92,7 +92,7 @@ void XBMReader::InitTable() pHexTable['e'] = 14; pHexTable['f'] = 15; pHexTable['x'] = 0; - pHexTable[' '] = -1; + pHexTable[' '] = -1; pHexTable[','] = -1; pHexTable['}'] = -1; pHexTable['\n'] = -1; @@ -105,10 +105,10 @@ void XBMReader::InitTable() ByteString XBMReader::FindTokenLine( SvStream* pInStm, const char* pTok1, const char* pTok2, const char* pTok3 ) { - ByteString aRet; - long nPos1; - long nPos2; - long nPos3; + ByteString aRet; + long nPos1; + long nPos2; + long nPos3; bStatus = FALSE; @@ -153,9 +153,9 @@ ByteString XBMReader::FindTokenLine( SvStream* pInStm, const char* pTok1, long XBMReader::ParseDefine( const sal_Char* pDefine ) { - long nRet = 0; - char* pTmp = (char*) pDefine; - unsigned char cTmp; + long nRet = 0; + char* pTmp = (char*) pDefine; + unsigned char cTmp; // bis zum Ende gehen pTmp += ( strlen( pDefine ) - 1 ); @@ -202,14 +202,14 @@ long XBMReader::ParseDefine( const sal_Char* pDefine ) BOOL XBMReader::ParseData( SvStream* pInStm, const ByteString& aLastLine, XBMFormat eFormat ) { - ByteString aLine; - long nRow = 0; - long nCol = 0; - long nBits = ( eFormat == XBM10 ) ? 16 : 8; - long nBit; - USHORT nValue; - USHORT nDigits; - BOOL bFirstLine = TRUE; + ByteString aLine; + long nRow = 0; + long nCol = 0; + long nBits = ( eFormat == XBM10 ) ? 16 : 8; + long nBit; + USHORT nValue; + USHORT nDigits; + BOOL bFirstLine = TRUE; while( nRow < nHeight ) { @@ -232,16 +232,16 @@ BOOL XBMReader::ParseData( SvStream* pInStm, const ByteString& aLastLine, XBMFor for( USHORT i = 0; ( i < nCount ) && ( nRow < nHeight ); i++ ) { - const ByteString aToken( aLine.GetToken( i, ',' ) ); + const ByteString aToken( aLine.GetToken( i, ',' ) ); const xub_StrLen nLen = aToken.Len(); - BOOL bProcessed = FALSE; + BOOL bProcessed = FALSE; nBit = nDigits = nValue = 0; for( xub_StrLen n = 0UL; n < nLen; n++ ) { const unsigned char cChar = aToken.GetChar( n ); - const short nTable = pHexTable[ cChar ]; + const short nTable = pHexTable[ cChar ]; if( isxdigit( cChar ) || !nTable ) { @@ -275,8 +275,8 @@ BOOL XBMReader::ParseData( SvStream* pInStm, const ByteString& aLastLine, XBMFor ReadState XBMReader::ReadXBM( Graphic& rGraphic ) { - ReadState eReadState; - BYTE cDummy; + ReadState eReadState; + BYTE cDummy; // sehen, ob wir _alles_ lesen koennen rIStm.Seek( STREAM_SEEK_TO_END ); @@ -286,8 +286,8 @@ ReadState XBMReader::ReadXBM( Graphic& rGraphic ) // kehren wir zurueck und warten auf neue Daten if ( rIStm.GetError() != ERRCODE_IO_PENDING ) { - ByteString aLine; - int nValue; + ByteString aLine; + int nValue; rIStm.Seek( nLastPos ); bStatus = FALSE; @@ -375,9 +375,9 @@ ReadState XBMReader::ReadXBM( Graphic& rGraphic ) BOOL ImportXBM( SvStream& rStm, Graphic& rGraphic ) { - XBMReader* pXBMReader = (XBMReader*) rGraphic.GetContext(); - ReadState eReadState; - BOOL bRet = TRUE; + XBMReader* pXBMReader = (XBMReader*) rGraphic.GetContext(); + ReadState eReadState; + BOOL bRet = TRUE; if( !pXBMReader ) pXBMReader = new XBMReader( rStm ); diff --git a/svtools/source/filter.vcl/ixpm/rgbtable.hxx b/svtools/source/filter.vcl/ixpm/rgbtable.hxx index f3506a1d0465..a222d9285a0e 100644 --- a/svtools/source/filter.vcl/ixpm/rgbtable.hxx +++ b/svtools/source/filter.vcl/ixpm/rgbtable.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,664 +35,664 @@ struct XPMRGBTab }; static XPMRGBTab pRGBTable[] = { -{ "white", 255, 255, 255 }, -{ "black", 0, 0, 0 }, -{ "snow", 255, 250, 250 }, -{ "GhostWhite", 248, 248, 255 }, -{ "WhiteSmoke", 245, 245, 245 }, -{ "gainsboro", 220, 220, 220 }, -{ "FloralWhite", 255, 250, 240 }, -{ "OldLace", 253, 245, 230 }, -{ "linen", 250, 240, 230 }, -{ "AntiqueWhite", 250, 235, 215 }, -{ "PapayaWhip", 255, 239, 213 }, -{ "BlanchedAlmond", 255, 235, 205 }, -{ "bisque", 255, 228, 196 }, -{ "PeachPuff", 255, 218, 185 }, -{ "NavajoWhite", 255, 222, 173 }, -{ "moccasin", 255, 228, 181 }, -{ "cornsilk", 255, 248, 220 }, -{ "ivory", 255, 255, 240 }, -{ "LemonChiffon", 255, 250, 205 }, -{ "seashell", 255, 245, 238 }, -{ "honeydew", 240, 255, 240 }, -{ "MintCream", 245, 255, 250 }, -{ "azure", 240, 255, 255 }, -{ "AliceBlue", 240, 248, 255 }, -{ "lavender", 230, 230, 250 }, -{ "LavenderBlush", 255, 240, 245 }, -{ "MistyRose", 255, 228, 225 }, -{ "DarkSlateGray", 47, 79, 79 }, -{ "DarkSlateGrey", 47, 79, 79 }, -{ "DimGray", 105, 105, 105 }, -{ "DimGrey", 105, 105, 105 }, -{ "SlateGray", 112, 128, 144 }, -{ "SlateGrey", 112, 128, 144 }, -{ "LightSlateGray", 119, 136, 153 }, -{ "LightSlateGrey", 119, 136, 153 }, -{ "gray", 190, 190, 190 }, -{ "grey", 190, 190, 190 }, -{ "LightGrey", 211, 211, 211 }, -{ "LightGray", 211, 211, 211 }, -{ "MidnightBlue", 25, 25, 112 }, -{ "navy", 0, 0, 128 }, -{ "NavyBlue", 0, 0, 128 }, -{ "CornflowerBlue", 100, 149, 237 }, -{ "DarkSlateBlue", 72, 61, 139 }, -{ "SlateBlue", 106, 90, 205 }, -{ "MediumSlateBlue", 123, 104, 238 }, -{ "LightSlateBlue", 132, 112, 255 }, -{ "MediumBlue", 0, 0, 205 }, -{ "RoyalBlue", 65, 105, 225 }, -{ "blue", 0, 0, 255 }, -{ "DodgerBlue", 30, 144, 255 }, -{ "DeepSkyBlue", 0, 191, 255 }, -{ "SkyBlue", 135, 206, 235 }, -{ "LightSkyBlue", 135, 206, 250 }, -{ "SteelBlue", 70, 130, 180 }, -{ "LightSteelBlue", 176, 196, 222 }, -{ "LightBlue", 173, 216, 230 }, -{ "PowderBlue", 176, 224, 230 }, -{ "PaleTurquoise", 175, 238, 238 }, -{ "DarkTurquoise", 0, 206, 209 }, -{ "MediumTurquoise", 72, 209, 204 }, -{ "turquoise", 64, 224, 208 }, -{ "cyan", 0, 255, 255 }, -{ "LightCyan", 224, 255, 255 }, -{ "CadetBlue", 95, 158, 160 }, -{ "MediumAquamarine", 102, 205, 170 }, -{ "aquamarine", 127, 255, 212 }, -{ "DarkGreen", 0, 100, 0 }, -{ "DarkOliveGreen", 85, 107, 47 }, -{ "DarkSeaGreen", 143, 188, 143 }, -{ "SeaGreen", 46, 139, 87 }, -{ "MediumSeaGreen", 60, 179, 113 }, -{ "LightSeaGreen", 32, 178, 170 }, -{ "PaleGreen", 152, 251, 152 }, -{ "SpringGreen", 0, 255, 127 }, -{ "LawnGreen", 124, 252, 0 }, -{ "green", 0, 255, 0 }, -{ "chartreuse", 127, 255, 0 }, -{ "MediumSpringGreen", 0, 250, 154 }, -{ "GreenYellow", 173, 255 , 47 }, -{ "LimeGreen", 50, 205, 50 }, -{ "YellowGreen", 154, 205, 50 }, -{ "ForestGreen", 34, 139, 34 }, -{ "OliveDrab", 107, 142, 35 }, -{ "DarkKhaki", 189, 183, 107 }, -{ "khaki", 240, 230, 140 }, -{ "PaleGoldenrod", 238, 232, 170 }, -{ "LightGoldenrodYellow", 250, 250, 210 }, -{ "LightYellow", 255, 255, 224 }, -{ "yellow", 255, 255, 0 }, -{ "gold", 255, 215, 0 }, -{ "LightGoldenrod", 238, 221, 130 }, -{ "goldenrod", 218, 165, 32 }, -{ "DarkGoldenrod", 184, 134, 11 }, -{ "RosyBrown", 188, 143, 143 }, -{ "IndianRed", 205, 92, 92 }, -{ "SaddleBrown", 139, 69, 19 }, -{ "sienna", 160, 82, 45 }, -{ "peru", 205, 133, 63 }, -{ "burlywood", 222, 184, 135 }, -{ "beige", 245, 245, 220 }, -{ "wheat", 245, 222, 179 }, -{ "SandyBrown", 244, 164, 96 }, -{ "tan", 210, 180, 140 }, -{ "chocolate", 210, 105, 30 }, -{ "firebrick", 178, 34, 34 }, -{ "brown", 165, 42, 42 }, -{ "DarkSalmon", 233, 150, 122 }, -{ "salmon", 250, 128, 114 }, -{ "LightSalmon", 255, 160, 122 }, -{ "orange", 255, 165, 0 }, -{ "DarkOrange", 255, 140, 0 }, -{ "coral", 255, 127, 80 }, -{ "LightCoral", 240, 128, 128 }, -{ "tomato", 255, 99, 71 }, -{ "OrangeRed", 255, 69, 0 }, -{ "red", 255, 0, 0 }, -{ "HotPink", 255, 105, 180 }, -{ "DeepPink", 255, 20, 147 }, -{ "pink", 255, 192, 203 }, -{ "LightPink", 255, 182, 193 }, -{ "PaleVioletRed", 219, 112, 147 }, -{ "maroon", 176, 48, 96 }, -{ "MediumVioletRed", 199, 21, 133 }, -{ "VioletRed", 208, 32, 144 }, -{ "magenta", 255, 0, 255 }, -{ "violet", 238, 130, 238 }, -{ "plum", 221, 160, 221 }, -{ "orchid", 218, 112, 214 }, -{ "MediumOrchid", 186, 85, 211 }, -{ "DarkOrchid", 153, 50, 204 }, -{ "DarkViolet", 148, 0, 211 }, -{ "BlueViolet", 138, 43, 226 }, -{ "purple", 160, 32, 240 }, -{ "MediumPurple", 147, 112, 219 }, -{ "thistle", 216, 191, 216 }, -{ "snow1", 255, 250, 250 }, -{ "snow2", 238, 233, 233 }, -{ "snow3", 205, 201, 201 }, -{ "snow4", 139, 137, 137 }, -{ "seashell1", 255, 245, 238 }, -{ "seashell2", 238, 229, 222 }, -{ "seashell3", 205, 197, 191 }, -{ "seashell4", 139, 134, 130 }, -{ "AntiqueWhite1", 255, 239, 219 }, -{ "AntiqueWhite2", 238, 223, 204 }, -{ "AntiqueWhite3", 205, 192, 176 }, -{ "AntiqueWhite4", 139, 131, 120 }, -{ "bisque1", 255, 228, 196 }, -{ "bisque2", 238, 213, 183 }, -{ "bisque3", 205, 183, 158 }, -{ "bisque4", 139, 125, 107 }, -{ "PeachPuff1", 255, 218, 185 }, -{ "PeachPuff2", 238, 203, 173 }, -{ "PeachPuff3", 205, 175, 149 }, -{ "PeachPuff4", 139, 119, 101 }, -{ "NavajoWhite1", 255, 222, 173 }, -{ "NavajoWhite2", 238, 207, 161 }, -{ "NavajoWhite3", 205, 179, 139 }, -{ "NavajoWhite4", 139, 121, 94 }, -{ "LemonChiffon1", 255, 250, 205 }, -{ "LemonChiffon2", 238, 233, 191 }, -{ "LemonChiffon3", 205, 201, 165 }, -{ "LemonChiffon4", 139, 137, 112 }, -{ "cornsilk1", 255, 248, 220 }, -{ "cornsilk2", 238, 232, 205 }, -{ "cornsilk3", 205, 200, 177 }, -{ "cornsilk4", 139, 136, 120 }, -{ "ivory1", 255, 255, 240 }, -{ "ivory2", 238, 238, 224 }, -{ "ivory3", 205, 205, 193 }, -{ "ivory4", 139, 139, 131 }, -{ "honeydew1", 240, 255, 240 }, -{ "honeydew2", 224, 238, 224 }, -{ "honeydew3", 193, 205, 193 }, -{ "honeydew4", 131, 139, 131 }, -{ "LavenderBlush1", 255, 240, 245 }, -{ "LavenderBlush2", 238, 224, 229 }, -{ "LavenderBlush3", 205, 193, 197 }, -{ "LavenderBlush4", 139, 131, 134 }, -{ "MistyRose1", 255, 228, 225 }, -{ "MistyRose2", 238, 213, 210 }, -{ "MistyRose3", 205, 183, 181 }, -{ "MistyRose4", 139, 125, 123 }, -{ "azure1", 240, 255, 255 }, -{ "azure2", 224, 238, 238 }, -{ "azure3", 193, 205, 205 }, -{ "azure4", 131, 139, 139 }, -{ "SlateBlue1", 131, 111, 255 }, -{ "SlateBlue2", 122, 103, 238 }, -{ "SlateBlue3", 105, 89, 205 }, -{ "SlateBlue4", 71, 60, 139 }, -{ "RoyalBlue1", 72, 118, 255 }, -{ "RoyalBlue2", 67, 110, 238 }, -{ "RoyalBlue3", 58, 95, 205 }, -{ "RoyalBlue4", 39, 64, 139 }, -{ "blue1", 0, 0, 255 }, -{ "blue2", 0, 0, 238 }, -{ "blue3", 0, 0, 205 }, -{ "blue4", 0, 0, 139 }, -{ "DodgerBlue1", 30, 144, 255 }, -{ "DodgerBlue2", 28, 134, 238 }, -{ "DodgerBlue3", 24, 116, 205 }, -{ "DodgerBlue4", 16, 78, 139 }, -{ "SteelBlue1", 99, 184, 255 }, -{ "SteelBlue2", 92, 172, 238 }, -{ "SteelBlue3", 79, 148, 205 }, -{ "SteelBlue4", 54, 100, 139 }, -{ "DeepSkyBlue1", 0, 191, 255 }, -{ "DeepSkyBlue2", 0, 178, 238 }, -{ "DeepSkyBlue3", 0, 154, 205 }, -{ "DeepSkyBlue4", 0, 104, 139 }, -{ "SkyBlue1", 135, 206, 255 }, -{ "SkyBlue2", 126, 192, 238 }, -{ "SkyBlue3", 108, 166, 205 }, -{ "SkyBlue4", 74, 112, 139 }, -{ "LightSkyBlue1", 176, 226, 255 }, -{ "LightSkyBlue2", 164, 211, 238 }, -{ "LightSkyBlue3", 141, 182, 205 }, -{ "LightSkyBlue4", 96, 123, 139 }, -{ "SlateGray1", 198, 226, 255 }, -{ "SlateGray2", 185, 211, 238 }, -{ "SlateGray3", 159, 182, 205 }, -{ "SlateGray4", 108, 123, 139 }, -{ "LightSteelBlue1", 202, 225, 255 }, -{ "LightSteelBlue2", 188, 210, 238 }, -{ "LightSteelBlue3", 162, 181, 205 }, -{ "LightSteelBlue4", 110, 123, 139 }, -{ "LightBlue1", 191, 239, 255 }, -{ "LightBlue2", 178, 223, 238 }, -{ "LightBlue3", 154, 192, 205 }, -{ "LightBlue4", 104, 131, 139 }, -{ "LightCyan1", 224, 255, 255 }, -{ "LightCyan2", 209, 238, 238 }, -{ "LightCyan3", 180, 205, 205 }, -{ "LightCyan4", 122, 139, 139 }, -{ "PaleTurquoise1", 187, 255, 255 }, -{ "PaleTurquoise2", 174, 238, 238 }, -{ "PaleTurquoise3", 150, 205, 205 }, -{ "PaleTurquoise4", 102, 139, 139 }, -{ "CadetBlue1", 152, 245, 255 }, -{ "CadetBlue2", 142, 229, 238 }, -{ "CadetBlue3", 122, 197, 205 }, -{ "CadetBlue4", 83, 134, 139 }, -{ "turquoise1", 0, 245, 255 }, -{ "turquoise2", 0, 229, 238 }, -{ "turquoise3", 0, 197, 205 }, -{ "turquoise4", 0, 134, 139 }, -{ "cyan1", 0, 255, 255 }, -{ "cyan2", 0, 238, 238 }, -{ "cyan3", 0, 205, 205 }, -{ "cyan4", 0, 139, 139 }, -{ "DarkSlateGray1", 151, 255, 255 }, -{ "DarkSlateGray2", 141, 238, 238 }, -{ "DarkSlateGray3", 121, 205, 205 }, -{ "DarkSlateGray4", 82, 139, 139 }, -{ "aquamarine1", 127, 255, 212 }, -{ "aquamarine2", 118, 238, 198 }, -{ "aquamarine3", 102, 205, 170 }, -{ "aquamarine4", 69, 139, 116 }, -{ "DarkSeaGreen1", 193, 255, 193 }, -{ "DarkSeaGreen2", 180, 238, 180 }, -{ "DarkSeaGreen3", 155, 205, 155 }, -{ "DarkSeaGreen4", 105, 139, 105 }, -{ "SeaGreen1", 84, 255, 159 }, -{ "SeaGreen2", 78, 238, 148 }, -{ "SeaGreen3", 67, 205, 128 }, -{ "SeaGreen4", 46, 139, 87 }, -{ "PaleGreen1", 154, 255, 154 }, -{ "PaleGreen2", 144, 238, 144 }, -{ "PaleGreen3", 124, 205, 124 }, -{ "PaleGreen4", 84, 139, 84 }, -{ "SpringGreen1", 0, 255, 127 }, -{ "SpringGreen2", 0, 238, 118 }, -{ "SpringGreen3", 0, 205, 102 }, -{ "SpringGreen4", 0, 139, 69 }, -{ "green1", 0, 255, 0 }, -{ "green2", 0, 238, 0 }, -{ "green3", 0, 205, 0 }, -{ "green4", 0, 139, 0 }, -{ "chartreuse1", 127, 255, 0 }, -{ "chartreuse2", 118, 238, 0 }, -{ "chartreuse3", 102, 205, 0 }, -{ "chartreuse4", 69, 139, 0 }, -{ "OliveDrab1", 192, 255, 62 }, -{ "OliveDrab2", 179, 238, 58 }, -{ "OliveDrab3", 154, 205, 50 }, -{ "OliveDrab4", 105, 139, 34 }, -{ "DarkOliveGreen1", 202, 255, 112 }, -{ "DarkOliveGreen2", 188, 238, 104 }, -{ "DarkOliveGreen3", 162, 205, 90 }, -{ "DarkOliveGreen4", 110, 139, 61 }, -{ "khaki1", 255, 246, 143 }, -{ "khaki2", 238, 230, 133 }, -{ "khaki3", 205, 198, 115 }, -{ "khaki4", 139, 134, 78 }, -{ "LightGoldenrod1", 255, 236, 139 }, -{ "LightGoldenrod2", 238, 220, 130 }, -{ "LightGoldenrod3", 205, 190, 112 }, -{ "LightGoldenrod4", 139, 129, 76 }, -{ "LightYellow1", 255, 255, 224 }, -{ "LightYellow2", 238, 238, 209 }, -{ "LightYellow3", 205, 205, 180 }, -{ "LightYellow4", 139, 139, 122 }, -{ "yellow1", 255, 255, 0 }, -{ "yellow2", 238, 238, 0 }, -{ "yellow3", 205, 205, 0 }, -{ "yellow4", 139, 139, 0 }, -{ "gold1", 255, 215, 0 }, -{ "gold2", 238, 201, 0 }, -{ "gold3", 205, 173, 0 }, -{ "gold4", 139, 117, 0 }, -{ "goldenrod1", 255, 193, 37 }, -{ "goldenrod2", 238, 180, 34 }, -{ "goldenrod3", 205, 155, 29 }, -{ "goldenrod4", 139, 105, 20 }, -{ "DarkGoldenrod1", 255, 185, 15 }, -{ "DarkGoldenrod2", 238, 173, 14 }, -{ "DarkGoldenrod3", 205, 149, 12 }, -{ "DarkGoldenrod4", 139, 101, 8 }, -{ "RosyBrown1", 255, 193, 193 }, -{ "RosyBrown2", 238, 180, 180 }, -{ "RosyBrown3", 205, 155, 155 }, -{ "RosyBrown4", 139, 105, 105 }, -{ "IndianRed1", 255, 106, 106 }, -{ "IndianRed2", 238, 99, 99 }, -{ "IndianRed3", 205, 85, 85 }, -{ "IndianRed4", 139, 58, 58 }, -{ "sienna1", 255, 130, 71 }, -{ "sienna2", 238, 121, 66 }, -{ "sienna3", 205, 104, 57 }, -{ "sienna4", 139, 71, 38 }, -{ "burlywood1", 255, 211, 155 }, -{ "burlywood2", 238, 197, 145 }, -{ "burlywood3", 205, 170, 125 }, -{ "burlywood4", 139, 115, 85 }, -{ "wheat1", 255, 231, 186 }, -{ "wheat2", 238, 216, 174 }, -{ "wheat3", 205, 186, 150 }, -{ "wheat4", 139, 126, 102 }, -{ "tan1", 255, 165, 79 }, -{ "tan2", 238, 154, 73 }, -{ "tan3", 205, 133, 63 }, -{ "tan4", 139 , 90, 43 }, -{ "chocolate1", 255, 127, 36 }, -{ "chocolate2", 238, 118, 33 }, -{ "chocolate3", 205, 102, 29 }, -{ "chocolate4", 139, 69, 19 }, -{ "firebrick1", 255, 48, 48 }, -{ "firebrick2", 238, 44, 44 }, -{ "firebrick3", 205, 38, 38 }, -{ "firebrick4", 139, 26, 26 }, -{ "brown1", 255, 64, 64 }, -{ "brown2", 238, 59, 59 }, -{ "brown3", 205, 51, 51 }, -{ "brown4", 139, 35, 35 }, -{ "salmon1", 255, 140, 105 }, -{ "salmon2", 238, 130, 98 }, -{ "salmon3", 205, 112, 84 }, -{ "salmon4", 139, 76, 57 }, -{ "LightSalmon1", 255, 160, 122 }, -{ "LightSalmon2", 238, 149, 114 }, -{ "LightSalmon3", 205, 129, 98 }, -{ "LightSalmon4", 139, 87, 66 }, -{ "orange1", 255, 165, 0 }, -{ "orange2", 238, 154, 0 }, -{ "orange3", 205, 133, 0 }, -{ "orange4", 139 , 90, 0 }, -{ "DarkOrange1", 255, 127, 0 }, -{ "DarkOrange2", 238, 118, 0 }, -{ "DarkOrange3", 205, 102, 0 }, -{ "DarkOrange4", 139 , 69, 0 }, -{ "coral1", 255, 114, 86 }, -{ "coral2", 238, 106, 80 }, -{ "coral3", 205, 91, 69 }, -{ "coral4", 139, 62, 47 }, -{ "tomato1", 255, 99, 71 }, -{ "tomato2", 238, 92, 66 }, -{ "tomato3", 205, 79, 57 }, -{ "tomato4", 139, 54, 38 }, -{ "OrangeRed1", 255, 69, 0 }, -{ "OrangeRed2", 238, 64, 0 }, -{ "OrangeRed3", 205, 55, 0 }, -{ "OrangeRed4", 139, 37, 0 }, -{ "red1", 255, 0, 0 }, -{ "red2", 238, 0, 0 }, -{ "red3", 205, 0, 0 }, -{ "red4", 139, 0, 0 }, -{ "DeepPink1", 255, 20, 147 }, -{ "DeepPink2", 238, 18, 137 }, -{ "DeepPink3", 205, 16, 118 }, -{ "DeepPink4", 139, 10, 80 }, -{ "HotPink1", 255, 110, 180 }, -{ "HotPink2", 238, 106, 167 }, -{ "HotPink3", 205, 96, 144 }, -{ "HotPink4", 139, 58, 98 }, -{ "pink1", 255, 181, 197 }, -{ "pink2", 238, 169, 184 }, -{ "pink3", 205, 145, 158 }, -{ "pink4", 139, 99, 108 }, -{ "LightPink1", 255, 174, 185 }, -{ "LightPink2", 238, 162, 173 }, -{ "LightPink3", 205, 140, 149 }, -{ "LightPink4", 139, 95, 101 }, -{ "PaleVioletRed1", 255, 130, 171 }, -{ "PaleVioletRed2", 238, 121, 159 }, -{ "PaleVioletRed3", 205, 104, 137 }, -{ "PaleVioletRed4", 139, 71, 93 }, -{ "maroon1", 255, 52, 179 }, -{ "maroon2", 238, 48, 167 }, -{ "maroon3", 205, 41, 144 }, -{ "maroon4", 139, 28, 98 }, -{ "VioletRed1", 255, 62, 150 }, -{ "VioletRed2", 238, 58, 140 }, -{ "VioletRed3", 205, 50, 120 }, -{ "VioletRed4", 139, 34, 82 }, -{ "magenta1", 255, 0, 255 }, -{ "magenta2", 238, 0, 238 }, -{ "magenta3", 205, 0, 205 }, -{ "magenta4", 139, 0, 139 }, -{ "orchid1", 255, 131, 250 }, -{ "orchid2", 238, 122, 233 }, -{ "orchid3", 205, 105, 201 }, -{ "orchid4", 139, 71, 137 }, -{ "plum1", 255, 187, 255 }, -{ "plum2", 238, 174, 238 }, -{ "plum3", 205, 150, 205 }, -{ "plum4", 139, 102, 139 }, -{ "MediumOrchid1", 224, 102, 255 }, -{ "MediumOrchid2", 209, 95, 238 }, -{ "MediumOrchid3", 180, 82, 205 }, -{ "MediumOrchid4", 122, 55, 139 }, -{ "DarkOrchid1", 191, 62, 255 }, -{ "DarkOrchid2", 178, 58, 238 }, -{ "DarkOrchid3", 154, 50, 205 }, -{ "DarkOrchid4", 104, 34, 139 }, -{ "purple1", 155, 48, 255 }, -{ "purple2", 145, 44, 238 }, -{ "purple3", 125, 38, 205 }, -{ "purple4", 85, 26, 139 }, -{ "MediumPurple1", 171, 130, 255 }, -{ "MediumPurple2", 159, 121, 238 }, -{ "MediumPurple3", 137, 104, 205 }, -{ "MediumPurple4", 93, 71, 139 }, -{ "thistle1", 255, 225, 255 }, -{ "thistle2", 238, 210, 238 }, -{ "thistle3", 205, 181, 205 }, -{ "thistle4", 139, 123, 139 }, -{ "gray0", 0, 0, 0 }, -{ "grey0", 0, 0, 0 }, -{ "gray1", 3, 3, 3 }, -{ "grey1", 3, 3, 3 }, -{ "gray2", 5, 5, 5 }, -{ "grey2", 5, 5, 5 }, -{ "gray3", 8, 8, 8 }, -{ "grey3", 8, 8, 8 }, -{ "gray4", 10, 10, 10 }, -{ "grey4", 10, 10, 10 }, -{ "gray5", 13, 13, 13 }, -{ "grey5", 13, 13, 13 }, -{ "gray6", 15, 15, 15 }, -{ "grey6", 15, 15, 15 }, -{ "gray7", 18, 18, 18 }, -{ "grey7", 18, 18, 18 }, -{ "gray8", 20, 20, 20 }, -{ "grey8", 20, 20, 20 }, -{ "gray9", 23, 23, 23 }, -{ "grey9", 23, 23, 23 }, -{ "gray10", 26, 26, 26 }, -{ "grey10", 26, 26, 26 }, -{ "gray11", 28, 28, 28 }, -{ "grey11", 28, 28, 28 }, -{ "gray12", 31, 31, 31 }, -{ "grey12", 31, 31, 31 }, -{ "gray13", 33, 33, 33 }, -{ "grey13", 33, 33, 33 }, -{ "gray14", 36, 36, 36 }, -{ "grey14", 36, 36, 36 }, -{ "gray15", 38, 38, 38 }, -{ "grey15", 38, 38, 38 }, -{ "gray16", 41, 41, 41 }, -{ "grey16", 41, 41, 41 }, -{ "gray17", 43, 43, 43 }, -{ "grey17", 43, 43, 43 }, -{ "gray18", 46, 46, 46 }, -{ "grey18", 46, 46, 46 }, -{ "gray19", 48, 48, 48 }, -{ "grey19", 48, 48, 48 }, -{ "gray20", 51, 51, 51 }, -{ "grey20", 51, 51, 51 }, -{ "gray21", 54, 54, 54 }, -{ "grey21", 54, 54, 54 }, -{ "gray22", 56, 56, 56 }, -{ "grey22", 56, 56, 56 }, -{ "gray23", 59, 59, 59 }, -{ "grey23", 59, 59, 59 }, -{ "gray24", 61, 61, 61 }, -{ "grey24", 61, 61, 61 }, -{ "gray25", 64, 64, 64 }, -{ "grey25", 64, 64, 64 }, -{ "gray26", 66, 66, 66 }, -{ "grey26", 66, 66, 66 }, -{ "gray27", 69, 69, 69 }, -{ "grey27", 69, 69, 69 }, -{ "gray28", 71, 71, 71 }, -{ "grey28", 71, 71, 71 }, -{ "gray29", 74, 74, 74 }, -{ "grey29", 74, 74, 74 }, -{ "gray30", 77, 77, 77 }, -{ "grey30", 77, 77, 77 }, -{ "gray31", 79, 79, 79 }, -{ "grey31", 79, 79, 79 }, -{ "gray32", 82, 82, 82 }, -{ "grey32", 82, 82, 82 }, -{ "gray33", 84, 84, 84 }, -{ "grey33", 84, 84, 84 }, -{ "gray34", 87, 87, 87 }, -{ "grey34", 87, 87, 87 }, -{ "gray35", 89, 89, 89 }, -{ "grey35", 89, 89, 89 }, -{ "gray36", 92, 92, 92 }, -{ "grey36", 92, 92, 92 }, -{ "gray37", 94, 94, 94 }, -{ "grey37", 94, 94, 94 }, -{ "gray38", 97, 97, 97 }, -{ "grey38", 97, 97, 97 }, -{ "gray39", 99, 99, 99 }, -{ "grey39", 99, 99, 99 }, -{ "gray40", 102, 102, 102 }, -{ "grey40", 102, 102, 102 }, -{ "gray41", 105, 105, 105 }, -{ "grey41", 105, 105, 105 }, -{ "gray42", 107, 107, 107 }, -{ "grey42", 107, 107, 107 }, -{ "gray43", 110, 110, 110 }, -{ "grey43", 110, 110, 110 }, -{ "gray44", 112, 112, 112 }, -{ "grey44", 112, 112, 112 }, -{ "gray45", 115, 115, 115 }, -{ "grey45", 115, 115, 115 }, -{ "gray46", 117, 117, 117 }, -{ "grey46", 117, 117, 117 }, -{ "gray47", 120, 120, 120 }, -{ "grey47", 120, 120, 120 }, -{ "gray48", 122, 122, 122 }, -{ "grey48", 122, 122, 122 }, -{ "gray49", 125, 125, 125 }, -{ "grey49", 125, 125, 125 }, -{ "gray50", 127, 127, 127 }, -{ "grey50", 127, 127, 127 }, -{ "gray51", 130, 130, 130 }, -{ "grey51", 130, 130, 130 }, -{ "gray52", 133, 133, 133 }, -{ "grey52", 133, 133, 133 }, -{ "gray53", 135, 135, 135 }, -{ "grey53", 135, 135, 135 }, -{ "gray54", 138, 138, 138 }, -{ "grey54", 138, 138, 138 }, -{ "gray55", 140, 140, 140 }, -{ "grey55", 140, 140, 140 }, -{ "gray56", 143, 143, 143 }, -{ "grey56", 143, 143, 143 }, -{ "gray57", 145, 145, 145 }, -{ "grey57", 145, 145, 145 }, -{ "gray58", 148, 148, 148 }, -{ "grey58", 148, 148, 148 }, -{ "gray59", 150, 150, 150 }, -{ "grey59", 150, 150, 150 }, -{ "gray60", 153, 153, 153 }, -{ "grey60", 153, 153, 153 }, -{ "gray61", 156, 156, 156 }, -{ "grey61", 156, 156, 156 }, -{ "gray62", 158, 158, 158 }, -{ "grey62", 158, 158, 158 }, -{ "gray63", 161, 161, 161 }, -{ "grey63", 161, 161, 161 }, -{ "gray64", 163, 163, 163 }, -{ "grey64", 163, 163, 163 }, -{ "gray65", 166, 166, 166 }, -{ "grey65", 166, 166, 166 }, -{ "gray66", 168, 168, 168 }, -{ "grey66", 168, 168, 168 }, -{ "gray67", 171, 171, 171 }, -{ "grey67", 171, 171, 171 }, -{ "gray68", 173, 173, 173 }, -{ "grey68", 173, 173, 173 }, -{ "gray69", 176, 176, 176 }, -{ "grey69", 176, 176, 176 }, -{ "gray70", 179, 179, 179 }, -{ "grey70", 179, 179, 179 }, -{ "gray71", 181, 181, 181 }, -{ "grey71", 181, 181, 181 }, -{ "gray72", 184, 184, 184 }, -{ "grey72", 184, 184, 184 }, -{ "gray73", 186, 186, 186 }, -{ "grey73", 186, 186, 186 }, -{ "gray74", 189, 189, 189 }, -{ "grey74", 189, 189, 189 }, -{ "gray75", 191, 191, 191 }, -{ "grey75", 191, 191, 191 }, -{ "gray76", 194, 194, 194 }, -{ "grey76", 194, 194, 194 }, -{ "gray77", 196, 196, 196 }, -{ "grey77", 196, 196, 196 }, -{ "gray78", 199, 199, 199 }, -{ "grey78", 199, 199, 199 }, -{ "gray79", 201, 201, 201 }, -{ "grey79", 201, 201, 201 }, -{ "gray80", 204, 204, 204 }, -{ "grey80", 204, 204, 204 }, -{ "gray81", 207, 207, 207 }, -{ "grey81", 207, 207, 207 }, -{ "gray82", 209, 209, 209 }, -{ "grey82", 209, 209, 209 }, -{ "gray83", 212, 212, 212 }, -{ "grey83", 212, 212, 212 }, -{ "gray84", 214, 214, 214 }, -{ "grey84", 214, 214, 214 }, -{ "gray85", 217, 217, 217 }, -{ "grey85", 217, 217, 217 }, -{ "gray86", 219, 219, 219 }, -{ "grey86", 219, 219, 219 }, -{ "gray87", 222, 222, 222 }, -{ "grey87", 222, 222, 222 }, -{ "gray88", 224, 224, 224 }, -{ "grey88", 224, 224, 224 }, -{ "gray89", 227, 227, 227 }, -{ "grey89", 227, 227, 227 }, -{ "gray90", 229, 229, 229 }, -{ "grey90", 229, 229, 229 }, -{ "gray91", 232, 232, 232 }, -{ "grey91", 232, 232, 232 }, -{ "gray92", 235, 235, 235 }, -{ "grey92", 235, 235, 235 }, -{ "gray93", 237, 237, 237 }, -{ "grey93", 237, 237, 237 }, -{ "gray94", 240, 240, 240 }, -{ "grey94", 240, 240, 240 }, -{ "gray95", 242, 242, 242 }, -{ "grey95", 242, 242, 242 }, -{ "gray96", 245, 245, 245 }, -{ "grey96", 245, 245, 245 }, -{ "gray97", 247, 247, 247 }, -{ "grey97", 247, 247, 247 }, -{ "gray98", 250, 250, 250 }, -{ "grey98", 250, 250, 250 }, -{ "gray99", 252, 252, 252 }, -{ "grey99", 252, 252, 252 }, -{ "gray100", 255, 255, 255 }, -{ "grey100", 255, 255, 255 }, -{ "DarkGrey", 169, 169, 169 }, -{ "DarkGray", 169, 169, 169 }, -{ "DarkBlue", 0, 0, 139 }, -{ "DarkCyan", 0, 139, 139 }, -{ "DarkMagenta", 139, 0, 139 }, -{ "DarkRed", 139, 0, 0 }, -{ "LightGreen", 144, 238, 144 }, -{ NULL, 0 , 0, 0} +{ "white", 255, 255, 255 }, +{ "black", 0, 0, 0 }, +{ "snow", 255, 250, 250 }, +{ "GhostWhite", 248, 248, 255 }, +{ "WhiteSmoke", 245, 245, 245 }, +{ "gainsboro", 220, 220, 220 }, +{ "FloralWhite", 255, 250, 240 }, +{ "OldLace", 253, 245, 230 }, +{ "linen", 250, 240, 230 }, +{ "AntiqueWhite", 250, 235, 215 }, +{ "PapayaWhip", 255, 239, 213 }, +{ "BlanchedAlmond", 255, 235, 205 }, +{ "bisque", 255, 228, 196 }, +{ "PeachPuff", 255, 218, 185 }, +{ "NavajoWhite", 255, 222, 173 }, +{ "moccasin", 255, 228, 181 }, +{ "cornsilk", 255, 248, 220 }, +{ "ivory", 255, 255, 240 }, +{ "LemonChiffon", 255, 250, 205 }, +{ "seashell", 255, 245, 238 }, +{ "honeydew", 240, 255, 240 }, +{ "MintCream", 245, 255, 250 }, +{ "azure", 240, 255, 255 }, +{ "AliceBlue", 240, 248, 255 }, +{ "lavender", 230, 230, 250 }, +{ "LavenderBlush", 255, 240, 245 }, +{ "MistyRose", 255, 228, 225 }, +{ "DarkSlateGray", 47, 79, 79 }, +{ "DarkSlateGrey", 47, 79, 79 }, +{ "DimGray", 105, 105, 105 }, +{ "DimGrey", 105, 105, 105 }, +{ "SlateGray", 112, 128, 144 }, +{ "SlateGrey", 112, 128, 144 }, +{ "LightSlateGray", 119, 136, 153 }, +{ "LightSlateGrey", 119, 136, 153 }, +{ "gray", 190, 190, 190 }, +{ "grey", 190, 190, 190 }, +{ "LightGrey", 211, 211, 211 }, +{ "LightGray", 211, 211, 211 }, +{ "MidnightBlue", 25, 25, 112 }, +{ "navy", 0, 0, 128 }, +{ "NavyBlue", 0, 0, 128 }, +{ "CornflowerBlue", 100, 149, 237 }, +{ "DarkSlateBlue", 72, 61, 139 }, +{ "SlateBlue", 106, 90, 205 }, +{ "MediumSlateBlue", 123, 104, 238 }, +{ "LightSlateBlue", 132, 112, 255 }, +{ "MediumBlue", 0, 0, 205 }, +{ "RoyalBlue", 65, 105, 225 }, +{ "blue", 0, 0, 255 }, +{ "DodgerBlue", 30, 144, 255 }, +{ "DeepSkyBlue", 0, 191, 255 }, +{ "SkyBlue", 135, 206, 235 }, +{ "LightSkyBlue", 135, 206, 250 }, +{ "SteelBlue", 70, 130, 180 }, +{ "LightSteelBlue", 176, 196, 222 }, +{ "LightBlue", 173, 216, 230 }, +{ "PowderBlue", 176, 224, 230 }, +{ "PaleTurquoise", 175, 238, 238 }, +{ "DarkTurquoise", 0, 206, 209 }, +{ "MediumTurquoise", 72, 209, 204 }, +{ "turquoise", 64, 224, 208 }, +{ "cyan", 0, 255, 255 }, +{ "LightCyan", 224, 255, 255 }, +{ "CadetBlue", 95, 158, 160 }, +{ "MediumAquamarine", 102, 205, 170 }, +{ "aquamarine", 127, 255, 212 }, +{ "DarkGreen", 0, 100, 0 }, +{ "DarkOliveGreen", 85, 107, 47 }, +{ "DarkSeaGreen", 143, 188, 143 }, +{ "SeaGreen", 46, 139, 87 }, +{ "MediumSeaGreen", 60, 179, 113 }, +{ "LightSeaGreen", 32, 178, 170 }, +{ "PaleGreen", 152, 251, 152 }, +{ "SpringGreen", 0, 255, 127 }, +{ "LawnGreen", 124, 252, 0 }, +{ "green", 0, 255, 0 }, +{ "chartreuse", 127, 255, 0 }, +{ "MediumSpringGreen", 0, 250, 154 }, +{ "GreenYellow", 173, 255 , 47 }, +{ "LimeGreen", 50, 205, 50 }, +{ "YellowGreen", 154, 205, 50 }, +{ "ForestGreen", 34, 139, 34 }, +{ "OliveDrab", 107, 142, 35 }, +{ "DarkKhaki", 189, 183, 107 }, +{ "khaki", 240, 230, 140 }, +{ "PaleGoldenrod", 238, 232, 170 }, +{ "LightGoldenrodYellow", 250, 250, 210 }, +{ "LightYellow", 255, 255, 224 }, +{ "yellow", 255, 255, 0 }, +{ "gold", 255, 215, 0 }, +{ "LightGoldenrod", 238, 221, 130 }, +{ "goldenrod", 218, 165, 32 }, +{ "DarkGoldenrod", 184, 134, 11 }, +{ "RosyBrown", 188, 143, 143 }, +{ "IndianRed", 205, 92, 92 }, +{ "SaddleBrown", 139, 69, 19 }, +{ "sienna", 160, 82, 45 }, +{ "peru", 205, 133, 63 }, +{ "burlywood", 222, 184, 135 }, +{ "beige", 245, 245, 220 }, +{ "wheat", 245, 222, 179 }, +{ "SandyBrown", 244, 164, 96 }, +{ "tan", 210, 180, 140 }, +{ "chocolate", 210, 105, 30 }, +{ "firebrick", 178, 34, 34 }, +{ "brown", 165, 42, 42 }, +{ "DarkSalmon", 233, 150, 122 }, +{ "salmon", 250, 128, 114 }, +{ "LightSalmon", 255, 160, 122 }, +{ "orange", 255, 165, 0 }, +{ "DarkOrange", 255, 140, 0 }, +{ "coral", 255, 127, 80 }, +{ "LightCoral", 240, 128, 128 }, +{ "tomato", 255, 99, 71 }, +{ "OrangeRed", 255, 69, 0 }, +{ "red", 255, 0, 0 }, +{ "HotPink", 255, 105, 180 }, +{ "DeepPink", 255, 20, 147 }, +{ "pink", 255, 192, 203 }, +{ "LightPink", 255, 182, 193 }, +{ "PaleVioletRed", 219, 112, 147 }, +{ "maroon", 176, 48, 96 }, +{ "MediumVioletRed", 199, 21, 133 }, +{ "VioletRed", 208, 32, 144 }, +{ "magenta", 255, 0, 255 }, +{ "violet", 238, 130, 238 }, +{ "plum", 221, 160, 221 }, +{ "orchid", 218, 112, 214 }, +{ "MediumOrchid", 186, 85, 211 }, +{ "DarkOrchid", 153, 50, 204 }, +{ "DarkViolet", 148, 0, 211 }, +{ "BlueViolet", 138, 43, 226 }, +{ "purple", 160, 32, 240 }, +{ "MediumPurple", 147, 112, 219 }, +{ "thistle", 216, 191, 216 }, +{ "snow1", 255, 250, 250 }, +{ "snow2", 238, 233, 233 }, +{ "snow3", 205, 201, 201 }, +{ "snow4", 139, 137, 137 }, +{ "seashell1", 255, 245, 238 }, +{ "seashell2", 238, 229, 222 }, +{ "seashell3", 205, 197, 191 }, +{ "seashell4", 139, 134, 130 }, +{ "AntiqueWhite1", 255, 239, 219 }, +{ "AntiqueWhite2", 238, 223, 204 }, +{ "AntiqueWhite3", 205, 192, 176 }, +{ "AntiqueWhite4", 139, 131, 120 }, +{ "bisque1", 255, 228, 196 }, +{ "bisque2", 238, 213, 183 }, +{ "bisque3", 205, 183, 158 }, +{ "bisque4", 139, 125, 107 }, +{ "PeachPuff1", 255, 218, 185 }, +{ "PeachPuff2", 238, 203, 173 }, +{ "PeachPuff3", 205, 175, 149 }, +{ "PeachPuff4", 139, 119, 101 }, +{ "NavajoWhite1", 255, 222, 173 }, +{ "NavajoWhite2", 238, 207, 161 }, +{ "NavajoWhite3", 205, 179, 139 }, +{ "NavajoWhite4", 139, 121, 94 }, +{ "LemonChiffon1", 255, 250, 205 }, +{ "LemonChiffon2", 238, 233, 191 }, +{ "LemonChiffon3", 205, 201, 165 }, +{ "LemonChiffon4", 139, 137, 112 }, +{ "cornsilk1", 255, 248, 220 }, +{ "cornsilk2", 238, 232, 205 }, +{ "cornsilk3", 205, 200, 177 }, +{ "cornsilk4", 139, 136, 120 }, +{ "ivory1", 255, 255, 240 }, +{ "ivory2", 238, 238, 224 }, +{ "ivory3", 205, 205, 193 }, +{ "ivory4", 139, 139, 131 }, +{ "honeydew1", 240, 255, 240 }, +{ "honeydew2", 224, 238, 224 }, +{ "honeydew3", 193, 205, 193 }, +{ "honeydew4", 131, 139, 131 }, +{ "LavenderBlush1", 255, 240, 245 }, +{ "LavenderBlush2", 238, 224, 229 }, +{ "LavenderBlush3", 205, 193, 197 }, +{ "LavenderBlush4", 139, 131, 134 }, +{ "MistyRose1", 255, 228, 225 }, +{ "MistyRose2", 238, 213, 210 }, +{ "MistyRose3", 205, 183, 181 }, +{ "MistyRose4", 139, 125, 123 }, +{ "azure1", 240, 255, 255 }, +{ "azure2", 224, 238, 238 }, +{ "azure3", 193, 205, 205 }, +{ "azure4", 131, 139, 139 }, +{ "SlateBlue1", 131, 111, 255 }, +{ "SlateBlue2", 122, 103, 238 }, +{ "SlateBlue3", 105, 89, 205 }, +{ "SlateBlue4", 71, 60, 139 }, +{ "RoyalBlue1", 72, 118, 255 }, +{ "RoyalBlue2", 67, 110, 238 }, +{ "RoyalBlue3", 58, 95, 205 }, +{ "RoyalBlue4", 39, 64, 139 }, +{ "blue1", 0, 0, 255 }, +{ "blue2", 0, 0, 238 }, +{ "blue3", 0, 0, 205 }, +{ "blue4", 0, 0, 139 }, +{ "DodgerBlue1", 30, 144, 255 }, +{ "DodgerBlue2", 28, 134, 238 }, +{ "DodgerBlue3", 24, 116, 205 }, +{ "DodgerBlue4", 16, 78, 139 }, +{ "SteelBlue1", 99, 184, 255 }, +{ "SteelBlue2", 92, 172, 238 }, +{ "SteelBlue3", 79, 148, 205 }, +{ "SteelBlue4", 54, 100, 139 }, +{ "DeepSkyBlue1", 0, 191, 255 }, +{ "DeepSkyBlue2", 0, 178, 238 }, +{ "DeepSkyBlue3", 0, 154, 205 }, +{ "DeepSkyBlue4", 0, 104, 139 }, +{ "SkyBlue1", 135, 206, 255 }, +{ "SkyBlue2", 126, 192, 238 }, +{ "SkyBlue3", 108, 166, 205 }, +{ "SkyBlue4", 74, 112, 139 }, +{ "LightSkyBlue1", 176, 226, 255 }, +{ "LightSkyBlue2", 164, 211, 238 }, +{ "LightSkyBlue3", 141, 182, 205 }, +{ "LightSkyBlue4", 96, 123, 139 }, +{ "SlateGray1", 198, 226, 255 }, +{ "SlateGray2", 185, 211, 238 }, +{ "SlateGray3", 159, 182, 205 }, +{ "SlateGray4", 108, 123, 139 }, +{ "LightSteelBlue1", 202, 225, 255 }, +{ "LightSteelBlue2", 188, 210, 238 }, +{ "LightSteelBlue3", 162, 181, 205 }, +{ "LightSteelBlue4", 110, 123, 139 }, +{ "LightBlue1", 191, 239, 255 }, +{ "LightBlue2", 178, 223, 238 }, +{ "LightBlue3", 154, 192, 205 }, +{ "LightBlue4", 104, 131, 139 }, +{ "LightCyan1", 224, 255, 255 }, +{ "LightCyan2", 209, 238, 238 }, +{ "LightCyan3", 180, 205, 205 }, +{ "LightCyan4", 122, 139, 139 }, +{ "PaleTurquoise1", 187, 255, 255 }, +{ "PaleTurquoise2", 174, 238, 238 }, +{ "PaleTurquoise3", 150, 205, 205 }, +{ "PaleTurquoise4", 102, 139, 139 }, +{ "CadetBlue1", 152, 245, 255 }, +{ "CadetBlue2", 142, 229, 238 }, +{ "CadetBlue3", 122, 197, 205 }, +{ "CadetBlue4", 83, 134, 139 }, +{ "turquoise1", 0, 245, 255 }, +{ "turquoise2", 0, 229, 238 }, +{ "turquoise3", 0, 197, 205 }, +{ "turquoise4", 0, 134, 139 }, +{ "cyan1", 0, 255, 255 }, +{ "cyan2", 0, 238, 238 }, +{ "cyan3", 0, 205, 205 }, +{ "cyan4", 0, 139, 139 }, +{ "DarkSlateGray1", 151, 255, 255 }, +{ "DarkSlateGray2", 141, 238, 238 }, +{ "DarkSlateGray3", 121, 205, 205 }, +{ "DarkSlateGray4", 82, 139, 139 }, +{ "aquamarine1", 127, 255, 212 }, +{ "aquamarine2", 118, 238, 198 }, +{ "aquamarine3", 102, 205, 170 }, +{ "aquamarine4", 69, 139, 116 }, +{ "DarkSeaGreen1", 193, 255, 193 }, +{ "DarkSeaGreen2", 180, 238, 180 }, +{ "DarkSeaGreen3", 155, 205, 155 }, +{ "DarkSeaGreen4", 105, 139, 105 }, +{ "SeaGreen1", 84, 255, 159 }, +{ "SeaGreen2", 78, 238, 148 }, +{ "SeaGreen3", 67, 205, 128 }, +{ "SeaGreen4", 46, 139, 87 }, +{ "PaleGreen1", 154, 255, 154 }, +{ "PaleGreen2", 144, 238, 144 }, +{ "PaleGreen3", 124, 205, 124 }, +{ "PaleGreen4", 84, 139, 84 }, +{ "SpringGreen1", 0, 255, 127 }, +{ "SpringGreen2", 0, 238, 118 }, +{ "SpringGreen3", 0, 205, 102 }, +{ "SpringGreen4", 0, 139, 69 }, +{ "green1", 0, 255, 0 }, +{ "green2", 0, 238, 0 }, +{ "green3", 0, 205, 0 }, +{ "green4", 0, 139, 0 }, +{ "chartreuse1", 127, 255, 0 }, +{ "chartreuse2", 118, 238, 0 }, +{ "chartreuse3", 102, 205, 0 }, +{ "chartreuse4", 69, 139, 0 }, +{ "OliveDrab1", 192, 255, 62 }, +{ "OliveDrab2", 179, 238, 58 }, +{ "OliveDrab3", 154, 205, 50 }, +{ "OliveDrab4", 105, 139, 34 }, +{ "DarkOliveGreen1", 202, 255, 112 }, +{ "DarkOliveGreen2", 188, 238, 104 }, +{ "DarkOliveGreen3", 162, 205, 90 }, +{ "DarkOliveGreen4", 110, 139, 61 }, +{ "khaki1", 255, 246, 143 }, +{ "khaki2", 238, 230, 133 }, +{ "khaki3", 205, 198, 115 }, +{ "khaki4", 139, 134, 78 }, +{ "LightGoldenrod1", 255, 236, 139 }, +{ "LightGoldenrod2", 238, 220, 130 }, +{ "LightGoldenrod3", 205, 190, 112 }, +{ "LightGoldenrod4", 139, 129, 76 }, +{ "LightYellow1", 255, 255, 224 }, +{ "LightYellow2", 238, 238, 209 }, +{ "LightYellow3", 205, 205, 180 }, +{ "LightYellow4", 139, 139, 122 }, +{ "yellow1", 255, 255, 0 }, +{ "yellow2", 238, 238, 0 }, +{ "yellow3", 205, 205, 0 }, +{ "yellow4", 139, 139, 0 }, +{ "gold1", 255, 215, 0 }, +{ "gold2", 238, 201, 0 }, +{ "gold3", 205, 173, 0 }, +{ "gold4", 139, 117, 0 }, +{ "goldenrod1", 255, 193, 37 }, +{ "goldenrod2", 238, 180, 34 }, +{ "goldenrod3", 205, 155, 29 }, +{ "goldenrod4", 139, 105, 20 }, +{ "DarkGoldenrod1", 255, 185, 15 }, +{ "DarkGoldenrod2", 238, 173, 14 }, +{ "DarkGoldenrod3", 205, 149, 12 }, +{ "DarkGoldenrod4", 139, 101, 8 }, +{ "RosyBrown1", 255, 193, 193 }, +{ "RosyBrown2", 238, 180, 180 }, +{ "RosyBrown3", 205, 155, 155 }, +{ "RosyBrown4", 139, 105, 105 }, +{ "IndianRed1", 255, 106, 106 }, +{ "IndianRed2", 238, 99, 99 }, +{ "IndianRed3", 205, 85, 85 }, +{ "IndianRed4", 139, 58, 58 }, +{ "sienna1", 255, 130, 71 }, +{ "sienna2", 238, 121, 66 }, +{ "sienna3", 205, 104, 57 }, +{ "sienna4", 139, 71, 38 }, +{ "burlywood1", 255, 211, 155 }, +{ "burlywood2", 238, 197, 145 }, +{ "burlywood3", 205, 170, 125 }, +{ "burlywood4", 139, 115, 85 }, +{ "wheat1", 255, 231, 186 }, +{ "wheat2", 238, 216, 174 }, +{ "wheat3", 205, 186, 150 }, +{ "wheat4", 139, 126, 102 }, +{ "tan1", 255, 165, 79 }, +{ "tan2", 238, 154, 73 }, +{ "tan3", 205, 133, 63 }, +{ "tan4", 139 , 90, 43 }, +{ "chocolate1", 255, 127, 36 }, +{ "chocolate2", 238, 118, 33 }, +{ "chocolate3", 205, 102, 29 }, +{ "chocolate4", 139, 69, 19 }, +{ "firebrick1", 255, 48, 48 }, +{ "firebrick2", 238, 44, 44 }, +{ "firebrick3", 205, 38, 38 }, +{ "firebrick4", 139, 26, 26 }, +{ "brown1", 255, 64, 64 }, +{ "brown2", 238, 59, 59 }, +{ "brown3", 205, 51, 51 }, +{ "brown4", 139, 35, 35 }, +{ "salmon1", 255, 140, 105 }, +{ "salmon2", 238, 130, 98 }, +{ "salmon3", 205, 112, 84 }, +{ "salmon4", 139, 76, 57 }, +{ "LightSalmon1", 255, 160, 122 }, +{ "LightSalmon2", 238, 149, 114 }, +{ "LightSalmon3", 205, 129, 98 }, +{ "LightSalmon4", 139, 87, 66 }, +{ "orange1", 255, 165, 0 }, +{ "orange2", 238, 154, 0 }, +{ "orange3", 205, 133, 0 }, +{ "orange4", 139 , 90, 0 }, +{ "DarkOrange1", 255, 127, 0 }, +{ "DarkOrange2", 238, 118, 0 }, +{ "DarkOrange3", 205, 102, 0 }, +{ "DarkOrange4", 139 , 69, 0 }, +{ "coral1", 255, 114, 86 }, +{ "coral2", 238, 106, 80 }, +{ "coral3", 205, 91, 69 }, +{ "coral4", 139, 62, 47 }, +{ "tomato1", 255, 99, 71 }, +{ "tomato2", 238, 92, 66 }, +{ "tomato3", 205, 79, 57 }, +{ "tomato4", 139, 54, 38 }, +{ "OrangeRed1", 255, 69, 0 }, +{ "OrangeRed2", 238, 64, 0 }, +{ "OrangeRed3", 205, 55, 0 }, +{ "OrangeRed4", 139, 37, 0 }, +{ "red1", 255, 0, 0 }, +{ "red2", 238, 0, 0 }, +{ "red3", 205, 0, 0 }, +{ "red4", 139, 0, 0 }, +{ "DeepPink1", 255, 20, 147 }, +{ "DeepPink2", 238, 18, 137 }, +{ "DeepPink3", 205, 16, 118 }, +{ "DeepPink4", 139, 10, 80 }, +{ "HotPink1", 255, 110, 180 }, +{ "HotPink2", 238, 106, 167 }, +{ "HotPink3", 205, 96, 144 }, +{ "HotPink4", 139, 58, 98 }, +{ "pink1", 255, 181, 197 }, +{ "pink2", 238, 169, 184 }, +{ "pink3", 205, 145, 158 }, +{ "pink4", 139, 99, 108 }, +{ "LightPink1", 255, 174, 185 }, +{ "LightPink2", 238, 162, 173 }, +{ "LightPink3", 205, 140, 149 }, +{ "LightPink4", 139, 95, 101 }, +{ "PaleVioletRed1", 255, 130, 171 }, +{ "PaleVioletRed2", 238, 121, 159 }, +{ "PaleVioletRed3", 205, 104, 137 }, +{ "PaleVioletRed4", 139, 71, 93 }, +{ "maroon1", 255, 52, 179 }, +{ "maroon2", 238, 48, 167 }, +{ "maroon3", 205, 41, 144 }, +{ "maroon4", 139, 28, 98 }, +{ "VioletRed1", 255, 62, 150 }, +{ "VioletRed2", 238, 58, 140 }, +{ "VioletRed3", 205, 50, 120 }, +{ "VioletRed4", 139, 34, 82 }, +{ "magenta1", 255, 0, 255 }, +{ "magenta2", 238, 0, 238 }, +{ "magenta3", 205, 0, 205 }, +{ "magenta4", 139, 0, 139 }, +{ "orchid1", 255, 131, 250 }, +{ "orchid2", 238, 122, 233 }, +{ "orchid3", 205, 105, 201 }, +{ "orchid4", 139, 71, 137 }, +{ "plum1", 255, 187, 255 }, +{ "plum2", 238, 174, 238 }, +{ "plum3", 205, 150, 205 }, +{ "plum4", 139, 102, 139 }, +{ "MediumOrchid1", 224, 102, 255 }, +{ "MediumOrchid2", 209, 95, 238 }, +{ "MediumOrchid3", 180, 82, 205 }, +{ "MediumOrchid4", 122, 55, 139 }, +{ "DarkOrchid1", 191, 62, 255 }, +{ "DarkOrchid2", 178, 58, 238 }, +{ "DarkOrchid3", 154, 50, 205 }, +{ "DarkOrchid4", 104, 34, 139 }, +{ "purple1", 155, 48, 255 }, +{ "purple2", 145, 44, 238 }, +{ "purple3", 125, 38, 205 }, +{ "purple4", 85, 26, 139 }, +{ "MediumPurple1", 171, 130, 255 }, +{ "MediumPurple2", 159, 121, 238 }, +{ "MediumPurple3", 137, 104, 205 }, +{ "MediumPurple4", 93, 71, 139 }, +{ "thistle1", 255, 225, 255 }, +{ "thistle2", 238, 210, 238 }, +{ "thistle3", 205, 181, 205 }, +{ "thistle4", 139, 123, 139 }, +{ "gray0", 0, 0, 0 }, +{ "grey0", 0, 0, 0 }, +{ "gray1", 3, 3, 3 }, +{ "grey1", 3, 3, 3 }, +{ "gray2", 5, 5, 5 }, +{ "grey2", 5, 5, 5 }, +{ "gray3", 8, 8, 8 }, +{ "grey3", 8, 8, 8 }, +{ "gray4", 10, 10, 10 }, +{ "grey4", 10, 10, 10 }, +{ "gray5", 13, 13, 13 }, +{ "grey5", 13, 13, 13 }, +{ "gray6", 15, 15, 15 }, +{ "grey6", 15, 15, 15 }, +{ "gray7", 18, 18, 18 }, +{ "grey7", 18, 18, 18 }, +{ "gray8", 20, 20, 20 }, +{ "grey8", 20, 20, 20 }, +{ "gray9", 23, 23, 23 }, +{ "grey9", 23, 23, 23 }, +{ "gray10", 26, 26, 26 }, +{ "grey10", 26, 26, 26 }, +{ "gray11", 28, 28, 28 }, +{ "grey11", 28, 28, 28 }, +{ "gray12", 31, 31, 31 }, +{ "grey12", 31, 31, 31 }, +{ "gray13", 33, 33, 33 }, +{ "grey13", 33, 33, 33 }, +{ "gray14", 36, 36, 36 }, +{ "grey14", 36, 36, 36 }, +{ "gray15", 38, 38, 38 }, +{ "grey15", 38, 38, 38 }, +{ "gray16", 41, 41, 41 }, +{ "grey16", 41, 41, 41 }, +{ "gray17", 43, 43, 43 }, +{ "grey17", 43, 43, 43 }, +{ "gray18", 46, 46, 46 }, +{ "grey18", 46, 46, 46 }, +{ "gray19", 48, 48, 48 }, +{ "grey19", 48, 48, 48 }, +{ "gray20", 51, 51, 51 }, +{ "grey20", 51, 51, 51 }, +{ "gray21", 54, 54, 54 }, +{ "grey21", 54, 54, 54 }, +{ "gray22", 56, 56, 56 }, +{ "grey22", 56, 56, 56 }, +{ "gray23", 59, 59, 59 }, +{ "grey23", 59, 59, 59 }, +{ "gray24", 61, 61, 61 }, +{ "grey24", 61, 61, 61 }, +{ "gray25", 64, 64, 64 }, +{ "grey25", 64, 64, 64 }, +{ "gray26", 66, 66, 66 }, +{ "grey26", 66, 66, 66 }, +{ "gray27", 69, 69, 69 }, +{ "grey27", 69, 69, 69 }, +{ "gray28", 71, 71, 71 }, +{ "grey28", 71, 71, 71 }, +{ "gray29", 74, 74, 74 }, +{ "grey29", 74, 74, 74 }, +{ "gray30", 77, 77, 77 }, +{ "grey30", 77, 77, 77 }, +{ "gray31", 79, 79, 79 }, +{ "grey31", 79, 79, 79 }, +{ "gray32", 82, 82, 82 }, +{ "grey32", 82, 82, 82 }, +{ "gray33", 84, 84, 84 }, +{ "grey33", 84, 84, 84 }, +{ "gray34", 87, 87, 87 }, +{ "grey34", 87, 87, 87 }, +{ "gray35", 89, 89, 89 }, +{ "grey35", 89, 89, 89 }, +{ "gray36", 92, 92, 92 }, +{ "grey36", 92, 92, 92 }, +{ "gray37", 94, 94, 94 }, +{ "grey37", 94, 94, 94 }, +{ "gray38", 97, 97, 97 }, +{ "grey38", 97, 97, 97 }, +{ "gray39", 99, 99, 99 }, +{ "grey39", 99, 99, 99 }, +{ "gray40", 102, 102, 102 }, +{ "grey40", 102, 102, 102 }, +{ "gray41", 105, 105, 105 }, +{ "grey41", 105, 105, 105 }, +{ "gray42", 107, 107, 107 }, +{ "grey42", 107, 107, 107 }, +{ "gray43", 110, 110, 110 }, +{ "grey43", 110, 110, 110 }, +{ "gray44", 112, 112, 112 }, +{ "grey44", 112, 112, 112 }, +{ "gray45", 115, 115, 115 }, +{ "grey45", 115, 115, 115 }, +{ "gray46", 117, 117, 117 }, +{ "grey46", 117, 117, 117 }, +{ "gray47", 120, 120, 120 }, +{ "grey47", 120, 120, 120 }, +{ "gray48", 122, 122, 122 }, +{ "grey48", 122, 122, 122 }, +{ "gray49", 125, 125, 125 }, +{ "grey49", 125, 125, 125 }, +{ "gray50", 127, 127, 127 }, +{ "grey50", 127, 127, 127 }, +{ "gray51", 130, 130, 130 }, +{ "grey51", 130, 130, 130 }, +{ "gray52", 133, 133, 133 }, +{ "grey52", 133, 133, 133 }, +{ "gray53", 135, 135, 135 }, +{ "grey53", 135, 135, 135 }, +{ "gray54", 138, 138, 138 }, +{ "grey54", 138, 138, 138 }, +{ "gray55", 140, 140, 140 }, +{ "grey55", 140, 140, 140 }, +{ "gray56", 143, 143, 143 }, +{ "grey56", 143, 143, 143 }, +{ "gray57", 145, 145, 145 }, +{ "grey57", 145, 145, 145 }, +{ "gray58", 148, 148, 148 }, +{ "grey58", 148, 148, 148 }, +{ "gray59", 150, 150, 150 }, +{ "grey59", 150, 150, 150 }, +{ "gray60", 153, 153, 153 }, +{ "grey60", 153, 153, 153 }, +{ "gray61", 156, 156, 156 }, +{ "grey61", 156, 156, 156 }, +{ "gray62", 158, 158, 158 }, +{ "grey62", 158, 158, 158 }, +{ "gray63", 161, 161, 161 }, +{ "grey63", 161, 161, 161 }, +{ "gray64", 163, 163, 163 }, +{ "grey64", 163, 163, 163 }, +{ "gray65", 166, 166, 166 }, +{ "grey65", 166, 166, 166 }, +{ "gray66", 168, 168, 168 }, +{ "grey66", 168, 168, 168 }, +{ "gray67", 171, 171, 171 }, +{ "grey67", 171, 171, 171 }, +{ "gray68", 173, 173, 173 }, +{ "grey68", 173, 173, 173 }, +{ "gray69", 176, 176, 176 }, +{ "grey69", 176, 176, 176 }, +{ "gray70", 179, 179, 179 }, +{ "grey70", 179, 179, 179 }, +{ "gray71", 181, 181, 181 }, +{ "grey71", 181, 181, 181 }, +{ "gray72", 184, 184, 184 }, +{ "grey72", 184, 184, 184 }, +{ "gray73", 186, 186, 186 }, +{ "grey73", 186, 186, 186 }, +{ "gray74", 189, 189, 189 }, +{ "grey74", 189, 189, 189 }, +{ "gray75", 191, 191, 191 }, +{ "grey75", 191, 191, 191 }, +{ "gray76", 194, 194, 194 }, +{ "grey76", 194, 194, 194 }, +{ "gray77", 196, 196, 196 }, +{ "grey77", 196, 196, 196 }, +{ "gray78", 199, 199, 199 }, +{ "grey78", 199, 199, 199 }, +{ "gray79", 201, 201, 201 }, +{ "grey79", 201, 201, 201 }, +{ "gray80", 204, 204, 204 }, +{ "grey80", 204, 204, 204 }, +{ "gray81", 207, 207, 207 }, +{ "grey81", 207, 207, 207 }, +{ "gray82", 209, 209, 209 }, +{ "grey82", 209, 209, 209 }, +{ "gray83", 212, 212, 212 }, +{ "grey83", 212, 212, 212 }, +{ "gray84", 214, 214, 214 }, +{ "grey84", 214, 214, 214 }, +{ "gray85", 217, 217, 217 }, +{ "grey85", 217, 217, 217 }, +{ "gray86", 219, 219, 219 }, +{ "grey86", 219, 219, 219 }, +{ "gray87", 222, 222, 222 }, +{ "grey87", 222, 222, 222 }, +{ "gray88", 224, 224, 224 }, +{ "grey88", 224, 224, 224 }, +{ "gray89", 227, 227, 227 }, +{ "grey89", 227, 227, 227 }, +{ "gray90", 229, 229, 229 }, +{ "grey90", 229, 229, 229 }, +{ "gray91", 232, 232, 232 }, +{ "grey91", 232, 232, 232 }, +{ "gray92", 235, 235, 235 }, +{ "grey92", 235, 235, 235 }, +{ "gray93", 237, 237, 237 }, +{ "grey93", 237, 237, 237 }, +{ "gray94", 240, 240, 240 }, +{ "grey94", 240, 240, 240 }, +{ "gray95", 242, 242, 242 }, +{ "grey95", 242, 242, 242 }, +{ "gray96", 245, 245, 245 }, +{ "grey96", 245, 245, 245 }, +{ "gray97", 247, 247, 247 }, +{ "grey97", 247, 247, 247 }, +{ "gray98", 250, 250, 250 }, +{ "grey98", 250, 250, 250 }, +{ "gray99", 252, 252, 252 }, +{ "grey99", 252, 252, 252 }, +{ "gray100", 255, 255, 255 }, +{ "grey100", 255, 255, 255 }, +{ "DarkGrey", 169, 169, 169 }, +{ "DarkGray", 169, 169, 169 }, +{ "DarkBlue", 0, 0, 139 }, +{ "DarkCyan", 0, 139, 139 }, +{ "DarkMagenta", 139, 0, 139 }, +{ "DarkRed", 139, 0, 0 }, +{ "LightGreen", 144, 238, 144 }, +{ NULL, 0 , 0, 0} }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/filter.vcl/ixpm/xpmread.cxx b/svtools/source/filter.vcl/ixpm/xpmread.cxx index e0bbad0f0ceb..e42fb3b014f9 100644 --- a/svtools/source/filter.vcl/ixpm/xpmread.cxx +++ b/svtools/source/filter.vcl/ixpm/xpmread.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ // ------------- XPMReader::XPMReader( SvStream& rStm ) : - mrIStm ( rStm ), - mpAcc ( NULL ), - mpMaskAcc ( NULL ), - mnLastPos ( rStm.Tell() ), - mnWidth ( 0 ), - mnHeight ( 0 ), - mnColors ( 0 ), - mnCpp ( 0 ), - mbTransparent ( FALSE ), - mbStatus ( TRUE ), - mnStatus ( 0 ), - mnIdentifier ( XPMIDENTIFIER ), - mcThisByte ( 0 ), - mnTempAvail ( 0 ), + mrIStm ( rStm ), + mpAcc ( NULL ), + mpMaskAcc ( NULL ), + mnLastPos ( rStm.Tell() ), + mnWidth ( 0 ), + mnHeight ( 0 ), + mnColors ( 0 ), + mnCpp ( 0 ), + mbTransparent ( FALSE ), + mbStatus ( TRUE ), + mnStatus ( 0 ), + mnIdentifier ( XPMIDENTIFIER ), + mcThisByte ( 0 ), + mnTempAvail ( 0 ), mpFastColorTable( NULL ), - mpColMap ( NULL ) + mpColMap ( NULL ) { } @@ -76,8 +76,8 @@ XPMReader::~XPMReader() ReadState XPMReader::ReadXPM( Graphic& rGraphic ) { - ReadState eReadState; - BYTE cDummy; + ReadState eReadState; + BYTE cDummy; // sehen, ob wir _alles_ lesen koennen mrIStm.Seek( STREAM_SEEK_TO_END ); @@ -97,7 +97,7 @@ ReadState XPMReader::ReadXPM( Graphic& rGraphic ) if ( ( mbStatus = ImplGetString() ) == TRUE ) { - mnIdentifier = XPMVALUES; // Bitmap informationen einholen + mnIdentifier = XPMVALUES; // Bitmap informationen einholen mnWidth = ImplGetULONG( 0 ); mnHeight = ImplGetULONG( 1 ); mnColors = ImplGetULONG( 2 ); @@ -112,9 +112,9 @@ ReadState XPMReader::ReadXPM( Graphic& rGraphic ) mnIdentifier = XPMCOLORS; // mpColMap beinhaltet fuer jede vorhandene - // Farbe: ( mnCpp )Byte(s)-> ASCII Eintrag der der Farbe zugeordnet ist - // 1 Byte -> 0xff wenn Farbe transparent ist - // 3 Bytes -> RGB Wert der Farbe + // Farbe: ( mnCpp )Byte(s)-> ASCII Eintrag der der Farbe zugeordnet ist + // 1 Byte -> 0xff wenn Farbe transparent ist + // 3 Bytes -> RGB Wert der Farbe mpColMap = new BYTE[ mnColors * ( 4 + mnCpp ) ]; if ( mpColMap ) { @@ -151,15 +151,15 @@ ReadState XPMReader::ReadXPM( Graphic& rGraphic ) { maMaskBmp = Bitmap( Size( mnWidth, mnHeight ), 1 ); if ( ( mpMaskAcc = maMaskBmp.AcquireWriteAccess() ) == NULL ) - mbStatus = FALSE; + mbStatus = FALSE; } if( mpAcc && mbStatus ) { - ULONG i; - if ( mnColors <=256 ) // palette is only needed by using less than 257 - { // colors + ULONG i; + if ( mnColors <=256 ) // palette is only needed by using less than 257 + { // colors - BYTE* pPtr = &mpColMap[mnCpp]; + BYTE* pPtr = &mpColMap[mnCpp]; for ( i = 0; i < mnColors; i++ ) { @@ -167,12 +167,12 @@ ReadState XPMReader::ReadXPM( Graphic& rGraphic ) pPtr += ( mnCpp + 4 ); } // using 2 charakters per pixel and less than 257 Colors we speed up - if ( mnCpp == 2 ) // by using a 64kb indexing table + if ( mnCpp == 2 ) // by using a 64kb indexing table { mpFastColorTable = new BYTE[ 256 * 256 ]; for ( pPtr = mpColMap, i = 0; i < mnColors; i++, pPtr += mnCpp + 4 ) { - ULONG j = pPtr[ 0 ] << 8; + ULONG j = pPtr[ 0 ] << 8; j += pPtr[ 1 ]; mpFastColorTable[ j ] = (BYTE)i; } @@ -239,9 +239,9 @@ ReadState XPMReader::ReadXPM( Graphic& rGraphic ) BOOL XPMReader::ImplGetColor( ULONG nNumb ) { - BYTE* pString = mpStringBuf; - BYTE* pPtr = ( mpColMap + nNumb * ( 4 + mnCpp ) ); - BOOL bStatus = ImplGetString(); + BYTE* pString = mpStringBuf; + BYTE* pPtr = ( mpColMap + nNumb * ( 4 + mnCpp ) ); + BOOL bStatus = ImplGetString(); if ( bStatus ) { @@ -258,11 +258,11 @@ BOOL XPMReader::ImplGetColor( ULONG nNumb ) BOOL XPMReader::ImplGetScanLine( ULONG nY ) { - BOOL bStatus = ImplGetString(); - BYTE* pString = mpStringBuf; - BYTE* pColor; - BitmapColor aWhite; - BitmapColor aBlack; + BOOL bStatus = ImplGetString(); + BYTE* pString = mpStringBuf; + BYTE* pColor; + BitmapColor aWhite; + BitmapColor aBlack; if ( bStatus ) { @@ -336,9 +336,9 @@ BOOL XPMReader::ImplGetColSub( BYTE* pDest ) { *pDest++ = 0; bColStatus = TRUE; - switch ( mnParaSize ) + switch ( mnParaSize ) { - case 25 : + case 25 : ImplGetRGBHex ( pDest, 6 ); break; case 13 : @@ -360,7 +360,7 @@ BOOL XPMReader::ImplGetColSub( BYTE* pDest ) mbTransparent = TRUE; } // last we will try to get the colorname - else if ( mnParaSize > 2 ) // name must enlarge the minimum size + else if ( mnParaSize > 2 ) // name must enlarge the minimum size { ULONG i = 0; while ( TRUE ) @@ -434,15 +434,15 @@ BOOL XPMReader::ImplGetColKey( BYTE nKey ) // ImplGetRGBHex uebersetzt den ASCII-Hexadezimalwert der sich bei mpPara befindet // in einen RGB wert und schreibt diesen nach pDest // folgende Formate muessen sich bei mpPara befinden: -// wenn nAdd = 0 : '#12ab12' -> RGB = 0x12, 0xab, 0x12 -// 2 : '#1234abcd1234' " " " " -// 6 : '#12345678abcdefab12345678' " " " " +// wenn nAdd = 0 : '#12ab12' -> RGB = 0x12, 0xab, 0x12 +// 2 : '#1234abcd1234' " " " " +// 6 : '#12345678abcdefab12345678' " " " " void XPMReader::ImplGetRGBHex( BYTE* pDest,ULONG nAdd ) { - BYTE* pPtr = mpPara+1; - BYTE nHex, nTemp; + BYTE* pPtr = mpPara+1; + BYTE nHex, nTemp; for ( ULONG i = 0; i < 3; i++ ) { @@ -474,7 +474,7 @@ ULONG XPMReader::ImplGetULONG( ULONG nPara ) for ( ULONG i = 0; i < mnParaSize; i++ ) { BYTE j = (*pPtr++) - 48; - if ( j > 9 ) return 0; // ascii is invalid + if ( j > 9 ) return 0; // ascii is invalid nRetValue*=10; nRetValue+=j; } @@ -522,10 +522,10 @@ BOOL XPMReader::ImplCompare( BYTE* pSource, BYTE* pDest, ULONG nSize, ULONG nMod BOOL XPMReader::ImplGetPara ( ULONG nNumb ) { - BYTE nByte; - ULONG pSize = 0; - BYTE* pPtr = mpStringBuf; - ULONG nCount = 0; + BYTE nByte; + ULONG pSize = 0; + BYTE* pPtr = mpStringBuf; + ULONG nCount = 0; if ( ( *pPtr != ' ' ) && ( *pPtr != 0x09 ) ) { @@ -577,8 +577,8 @@ BOOL XPMReader::ImplGetPara ( ULONG nNumb ) BOOL XPMReader::ImplGetString( void ) { - BYTE sID[] = "/* XPM */"; - BYTE* pString = mpStringBuf; + BYTE sID[] = "/* XPM */"; + BYTE* pString = mpStringBuf; mnStringSize = 0; mpStringBuf[0] = 0; @@ -597,10 +597,10 @@ BOOL XPMReader::ImplGetString( void ) { if ( mnTempAvail <= 50 ) { - mbStatus = FALSE; // file is too short to be a correct XPM format + mbStatus = FALSE; // file is too short to be a correct XPM format break; } - for ( int i = 0; i < 9; i++ ) // searching for "/* XPM */" + for ( int i = 0; i < 9; i++ ) // searching for "/* XPM */" if ( *mpTempPtr++ != sID[i] ) { mbStatus = FALSE; @@ -626,11 +626,11 @@ BOOL XPMReader::ImplGetString( void ) mnStatus &=~XPMREMARK; continue; } - if ( mnStatus & XPMSTRING ) // characters in string + if ( mnStatus & XPMSTRING ) // characters in string { if ( mcThisByte == '"' ) { - mnStatus &=~XPMSTRING; // end of parameter by eol + mnStatus &=~XPMSTRING; // end of parameter by eol break; } if ( mnStringSize >= ( XPMSTRINGBUF - 1 ) ) @@ -644,7 +644,7 @@ BOOL XPMReader::ImplGetString( void ) continue; } else - { // characters beside string + { // characters beside string switch ( mcThisByte ) { case '*' : @@ -675,9 +675,9 @@ BOOL XPMReader::ImplGetString( void ) BOOL ImportXPM( SvStream& rStm, Graphic& rGraphic ) { - XPMReader* pXPMReader = (XPMReader*) rGraphic.GetContext(); - ReadState eReadState; - BOOL bRet = TRUE; + XPMReader* pXPMReader = (XPMReader*) rGraphic.GetContext(); + ReadState eReadState; + BOOL bRet = TRUE; if( !pXPMReader ) pXPMReader = new XPMReader( rStm ); diff --git a/svtools/source/filter.vcl/jpeg/jpeg.cxx b/svtools/source/filter.vcl/jpeg/jpeg.cxx index 146beff287bc..439efb9e632d 100644 --- a/svtools/source/filter.vcl/jpeg/jpeg.cxx +++ b/svtools/source/filter.vcl/jpeg/jpeg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ extern "C" long JPEGCallback( void* pCallbackData, long nPercent ) #define BUF_SIZE 4096 -typedef struct +typedef struct { struct jpeg_destination_mgr pub; /* public fields */ @@ -308,12 +308,12 @@ extern "C" void jpeg_svstream_src (j_decompress_ptr cinfo, void * in) // -------------- JPEGReader::JPEGReader( SvStream& rStm, void* /*pCallData*/, sal_Bool bSetLS ) : - rIStm ( rStm ), - pAcc ( NULL ), - pAcc1 ( NULL ), - pBuffer ( NULL ), - nLastPos ( rStm.Tell() ), - nLastLines ( 0 ), + rIStm ( rStm ), + pAcc ( NULL ), + pAcc1 ( NULL ), + pBuffer ( NULL ), + nLastPos ( rStm.Tell() ), + nLastLines ( 0 ), bSetLogSize ( bSetLS ) { maUpperName = String::CreateFromAscii( "SVIJPEG", 7 ); @@ -361,26 +361,26 @@ void* JPEGReader::CreateBitmap( void* pParam ) } else aBmp = Bitmap( aSize, 24 ); - + if ( bSetLogSize ) { unsigned long nUnit = ((JPEGCreateBitmapParam*)pParam)->density_unit; - - if( ( ( 1 == nUnit ) || ( 2 == nUnit ) ) && - ( (JPEGCreateBitmapParam*) pParam )->X_density && + + if( ( ( 1 == nUnit ) || ( 2 == nUnit ) ) && + ( (JPEGCreateBitmapParam*) pParam )->X_density && ( (JPEGCreateBitmapParam*) pParam )->Y_density ) { Point aEmptyPoint; - Fraction aFractX( 1, ((JPEGCreateBitmapParam*)pParam)->X_density ); - Fraction aFractY( 1, ((JPEGCreateBitmapParam*)pParam)->Y_density ); - MapMode aMapMode( nUnit == 1 ? MAP_INCH : MAP_CM, aEmptyPoint, aFractX, aFractY ); - Size aPrefSize = OutputDevice::LogicToLogic( aSize, aMapMode, MAP_100TH_MM ); + Fraction aFractX( 1, ((JPEGCreateBitmapParam*)pParam)->X_density ); + Fraction aFractY( 1, ((JPEGCreateBitmapParam*)pParam)->Y_density ); + MapMode aMapMode( nUnit == 1 ? MAP_INCH : MAP_CM, aEmptyPoint, aFractX, aFractY ); + Size aPrefSize = OutputDevice::LogicToLogic( aSize, aMapMode, MAP_100TH_MM ); aBmp.SetPrefSize( aPrefSize ); aBmp.SetPrefMapMode( MapMode( MAP_100TH_MM ) ); } } - + pAcc = aBmp.AcquireWriteAccess(); if( pAcc ) @@ -416,11 +416,11 @@ void JPEGReader::FillBitmap() { if( pBuffer && pAcc ) { - HPBYTE pTmp; - BitmapColor aColor; - long nAlignedWidth; - long nWidth = pAcc->Width(); - long nHeight = pAcc->Height(); + HPBYTE pTmp; + BitmapColor aColor; + long nAlignedWidth; + long nWidth = pAcc->Width(); + long nHeight = pAcc->Height(); if( pAcc->GetBitCount() == 8 ) { @@ -468,8 +468,8 @@ void JPEGReader::FillBitmap() Graphic JPEGReader::CreateIntermediateGraphic( const Bitmap& rBitmap, long nLines ) { - Graphic aGraphic; - const Size aSizePix( rBitmap.GetSizePixel() ); + Graphic aGraphic; + const Size aSizePix( rBitmap.GetSizePixel() ); if( !nLastLines ) { @@ -513,11 +513,11 @@ Graphic JPEGReader::CreateIntermediateGraphic( const Bitmap& rBitmap, long nLine ReadState JPEGReader::Read( Graphic& rGraphic ) { - long nEndPos; - long nLines; - ReadState eReadState; - BOOL bRet = FALSE; - BYTE cDummy; + long nEndPos; + long nLines; + ReadState eReadState; + BOOL bRet = FALSE; + BYTE cDummy; #if 1 // TODO: is it possible to get rid of this seek to the end? // check if the stream's end is already available @@ -592,9 +592,9 @@ ReadState JPEGReader::Read( Graphic& rGraphic ) // -------------- JPEGWriter::JPEGWriter( SvStream& rStm, const uno::Sequence< beans::PropertyValue >* pFilterData, bool* pExportWasGrey ) : - rOStm ( rStm ), - pAcc ( NULL ), - pBuffer ( NULL ), + rOStm ( rStm ), + pAcc ( NULL ), + pBuffer ( NULL ), pExpWasGrey ( pExportWasGrey ) { FilterConfigItem aConfigItem( (uno::Sequence< beans::PropertyValue >*)pFilterData ); @@ -629,8 +629,8 @@ void* JPEGWriter::GetScanline( long nY ) else if( pBuffer ) { BitmapColor aColor; - long nWidth = pAcc->Width(); - BYTE* pTmp = pBuffer; + long nWidth = pAcc->Width(); + BYTE* pTmp = pBuffer; if( pAcc->HasPalette() ) { @@ -686,8 +686,8 @@ BOOL JPEGWriter::Write( const Graphic& rGraphic ) pAcc = aGraphicBmp.AcquireReadAccess(); - if ( !bGreys ) // bitmap was not explicitely converted into greyscale, - { // check if source is greyscale only + if ( !bGreys ) // bitmap was not explicitely converted into greyscale, + { // check if source is greyscale only sal_Bool bIsGrey = sal_True; @@ -705,7 +705,7 @@ BOOL JPEGWriter::Write( const Graphic& rGraphic ) if ( bIsGrey ) bGreys = sal_True; } - + if( pExpWasGrey ) *pExpWasGrey = bGreys; @@ -738,9 +738,9 @@ BOOL JPEGWriter::Write( const Graphic& rGraphic ) BOOL ImportJPEG( SvStream& rStm, Graphic& rGraphic, void* pCallerData, sal_Int32 nImportFlags ) { - JPEGReader* pJPEGReader = (JPEGReader*) rGraphic.GetContext(); - ReadState eReadState; - BOOL bRet = TRUE; + JPEGReader* pJPEGReader = (JPEGReader*) rGraphic.GetContext(); + ReadState eReadState; + BOOL bRet = TRUE; if( !pJPEGReader ) pJPEGReader = new JPEGReader( rStm, pCallerData, ( nImportFlags & GRFILTER_I_FLAGS_SET_LOGSIZE_FOR_JPEG ) != 0 ); diff --git a/svtools/source/filter.vcl/jpeg/jpeg.h b/svtools/source/filter.vcl/jpeg/jpeg.h index c5284e968a8d..038c0b90cd61 100644 --- a/svtools/source/filter.vcl/jpeg/jpeg.h +++ b/svtools/source/filter.vcl/jpeg/jpeg.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,29 +45,29 @@ struct JPEGCreateBitmapParam unsigned long X_density; unsigned long Y_density; long bGray; - + long nAlignedWidth; // these members will be filled by the long bTopDown; // CreateBitmap method in svtools }; -typedef struct my_error_mgr* my_error_ptr; -typedef unsigned char BYTE; +typedef struct my_error_mgr* my_error_ptr; +typedef unsigned char BYTE; #ifdef WIN -typedef unsigned char _huge* HPBYTE; +typedef unsigned char _huge* HPBYTE; #else -typedef unsigned char* HPBYTE; +typedef unsigned char* HPBYTE; #endif -void* JPEGMalloc( size_t size ); -void JPEGFree( void *ptr ); -long JPEGCallback( void* pCallbackData, long nPercent ); +void* JPEGMalloc( size_t size ); +void JPEGFree( void *ptr ); +long JPEGCallback( void* pCallbackData, long nPercent ); -long WriteJPEG( void* pJPEGWriter, void* pOStm, long nWidth, long nHeight, long bGreyScale, +long WriteJPEG( void* pJPEGWriter, void* pOStm, long nWidth, long nHeight, long bGreyScale, long nQualityPercent, void* pCallbackData ); -void* GetScanline( void* pJPEGWriter, long nY ); +void* GetScanline( void* pJPEGWriter, long nY ); -void ReadJPEG( void* pJPEGReader, void* pIStm, long* pLines ); -void* CreateBitmap( void* pJPEGReader, void* pJPEGCreateBitmapParam ); +void ReadJPEG( void* pJPEGReader, void* pIStm, long* pLines ); +void* CreateBitmap( void* pJPEGReader, void* pJPEGCreateBitmapParam ); /* TODO: when incompatible changes are possible again the preview size hint should be redone */ diff --git a/svtools/source/filter.vcl/jpeg/jpegc.c b/svtools/source/filter.vcl/jpeg/jpegc.c index f94d7039920f..3517e6cb08a9 100644 --- a/svtools/source/filter.vcl/jpeg/jpegc.c +++ b/svtools/source/filter.vcl/jpeg/jpegc.c @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,11 +72,11 @@ void SetJpegPreviewSizeHint( int nWidth, int nHeight ) void ReadJPEG( void* pJPEGReader, void* pIStm, long* pLines ) { - struct jpeg_decompress_struct cinfo; - struct my_error_mgr jerr; + struct jpeg_decompress_struct cinfo; + struct my_error_mgr jerr; struct JPEGCreateBitmapParam aCreateBitmapParam; - HPBYTE pDIB; - HPBYTE pTmp; + HPBYTE pDIB; + HPBYTE pTmp; long nWidth; long nHeight; long nAlignedWidth; @@ -85,7 +85,7 @@ void ReadJPEG( void* pJPEGReader, void* pIStm, long* pLines ) long nScanLineBufferComponents = 0; // declare bDecompCreated volatile because of gcc // warning: variable 'bDecompCreated' might be clobbered by `longjmp' or `vfork' - volatile long bDecompCreated = 0; + volatile long bDecompCreated = 0; /* Falls der Stream nicht ausreicht (IO_PENDING) wird ueber ein longjmp in der Schleife nach Exit @@ -198,7 +198,7 @@ void ReadJPEG( void* pJPEGReader, void* pIStm, long* pLines ) /* PENDING ??? */ if ( cinfo.err->msg_code == 113 ) break; - + pTmp += nAlignedWidth; } } @@ -219,14 +219,14 @@ long WriteJPEG( void* pJPEGWriter, void* pOStm, long nWidth, long nHeight, long bGreys, long nQualityPercent, void* pCallbackData ) { - struct jpeg_compress_struct cinfo; - struct my_error_mgr jerr; - void* pScanline; - long nY; + struct jpeg_compress_struct cinfo; + struct my_error_mgr jerr; + void* pScanline; + long nY; // declare bCompCreated, bRet volatile because of gcc // warning: variable 'bCompCreated' might be clobbered by `longjmp' or `vfork' - volatile long bCompCreated = 0; - volatile long bRet = 0; + volatile long bCompCreated = 0; + volatile long bRet = 0; if ( setjmp( jerr.setjmp_buffer ) ) goto Exit; diff --git a/svtools/source/filter.vcl/wmf/emfwr.cxx b/svtools/source/filter.vcl/wmf/emfwr.cxx index c87ad02ed63e..ab59f1bf332e 100644 --- a/svtools/source/filter.vcl/wmf/emfwr.cxx +++ b/svtools/source/filter.vcl/wmf/emfwr.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,33 +137,33 @@ #define WIN_EMR_POLYTEXTOUTA 96 #define WIN_EMR_POLYTEXTOUTW 97 -#define WIN_SRCCOPY 0x00CC0020L -#define WIN_SRCPAINT 0x00EE0086L -#define WIN_SRCAND 0x008800C6L -#define WIN_SRCINVERT 0x00660046L +#define WIN_SRCCOPY 0x00CC0020L +#define WIN_SRCPAINT 0x00EE0086L +#define WIN_SRCAND 0x008800C6L +#define WIN_SRCINVERT 0x00660046L -#define HANDLE_INVALID 0xffffffff -#define MAXHANDLES 65000 +#define HANDLE_INVALID 0xffffffff +#define MAXHANDLES 65000 -#define LINE_SELECT 0x00000001 -#define FILL_SELECT 0x00000002 -#define TEXT_SELECT 0x00000004 +#define LINE_SELECT 0x00000001 +#define FILL_SELECT 0x00000002 +#define TEXT_SELECT 0x00000004 /* Text Alignment Options */ -#define TA_NOUPDATECP 0 -#define TA_UPDATECP 1 +#define TA_NOUPDATECP 0 +#define TA_UPDATECP 1 -#define TA_LEFT 0 -#define TA_RIGHT 2 -#define TA_CENTER 6 +#define TA_LEFT 0 +#define TA_RIGHT 2 +#define TA_CENTER 6 -#define TA_TOP 0 -#define TA_BOTTOM 8 -#define TA_BASELINE 24 -#define TA_RTLREADING 256 -#define TA_MASK (TA_BASELINE+TA_CENTER+TA_UPDATECP+TA_RTLREADING) +#define TA_TOP 0 +#define TA_BOTTOM 8 +#define TA_BASELINE 24 +#define TA_RTLREADING 256 +#define TA_MASK (TA_BASELINE+TA_CENTER+TA_UPDATECP+TA_RTLREADING) -#define MM_ANISOTROPIC 8 +#define MM_ANISOTROPIC 8 // ------------- // - EMFWriter - @@ -178,21 +178,21 @@ BOOL EMFWriter::WriteEMF( const GDIMetaFile& rMtf, SvStream& rOStm, FilterConfig mnHorTextAlign = mnHandleCount = mnLastPercent = mnRecordPos = mnRecordCount = 0; mnLineHandle = mnFillHandle = mnTextHandle = HANDLE_INVALID; mbRecordOpen = FALSE; - + mpStm = &rOStm; maVDev.EnableOutput( FALSE ); maVDev.SetMapMode( rMtf.GetPrefMapMode() ); mpFilterConfigItem = pFilterConfigItem; // don't work with pixel as destination map mode -> higher resolution preferrable - maDestMapMode.SetMapUnit( MAP_100TH_MM ); + maDestMapMode.SetMapUnit( MAP_100TH_MM ); const Size aMtfSizePix( maVDev.LogicToPixel( rMtf.GetPrefSize(), rMtf.GetPrefMapMode() ) ); const Size aMtfSizeLog( maVDev.LogicToLogic( rMtf.GetPrefSize(), rMtf.GetPrefMapMode(), MAP_100TH_MM ) ); - + // seek over header // use [MS-EMF 2.2.11] HeaderExtension2 Object, otherwise resulting EMF cannot be converted with GetWinMetaFileBits() - rOStm.SeekRel( 108 ); + rOStm.SeekRel( 108 ); // write initial values @@ -227,16 +227,16 @@ BOOL EMFWriter::WriteEMF( const GDIMetaFile& rMtf, SvStream& rOStm, FilterConfig ImplWrite( rMtf ); ImplBeginRecord( WIN_EMR_EOF ); - (*mpStm)<< (sal_uInt32)0 // nPalEntries - << (sal_uInt32)0x10 // offPalEntries - << (sal_uInt32)0x14; // nSizeLast + (*mpStm)<< (sal_uInt32)0 // nPalEntries + << (sal_uInt32)0x10 // offPalEntries + << (sal_uInt32)0x14; // nSizeLast ImplEndRecord(); // write header const ULONG nEndPos = mpStm->Tell(); mpStm->Seek( nHeaderPos ); - - (*mpStm) << (UINT32) 0x00000001 << (UINT32) 108 //use [MS-EMF 2.2.11] HeaderExtension2 Object + + (*mpStm) << (UINT32) 0x00000001 << (UINT32) 108 //use [MS-EMF 2.2.11] HeaderExtension2 Object << (INT32) 0 << (INT32) 0 << (INT32) ( aMtfSizePix.Width() - 1 ) << (INT32) ( aMtfSizePix.Height() - 1 ) << (INT32) 0 << (INT32) 0 << (INT32) ( aMtfSizeLog.Width() - 1 ) << (INT32) ( aMtfSizeLog.Height() - 1 ) << (UINT32) 0x464d4520 << (UINT32) 0x10000 << (UINT32) ( nEndPos - nHeaderPos ) @@ -247,7 +247,7 @@ BOOL EMFWriter::WriteEMF( const GDIMetaFile& rMtf, SvStream& rOStm, FilterConfig << (INT32) ( aMtfSizeLog.Width() * 10 ) << (INT32) ( aMtfSizeLog.Height() * 10 ); //use [MS-EMF 2.2.11] HeaderExtension2 Object mpStm->Seek( nEndPos ); - delete[] mpHandlesUsed; + delete[] mpHandlesUsed; return( mpStm->GetError() == ERRCODE_NONE ); } @@ -308,7 +308,7 @@ void EMFWriter::ImplEndRecord() sal_Int32 nFillBytes, nActPos = mpStm->Tell(); mpStm->Seek( mnRecordPos + 4 ); nFillBytes = nActPos - mnRecordPos; - nFillBytes += 3; // each record has to be dword aligned + nFillBytes += 3; // each record has to be dword aligned nFillBytes ^= 3; nFillBytes &= 3; *mpStm << (sal_uInt32)( ( nActPos - mnRecordPos ) + nFillBytes ); @@ -328,7 +328,7 @@ BOOL EMFWriter::ImplPrepareHandleSelect( sal_uInt32& rHandle, ULONG nSelectType { UINT32 nStockObject = 0x80000000; - if( LINE_SELECT == nSelectType ) + if( LINE_SELECT == nSelectType ) nStockObject |= 0x00000007; else if( FILL_SELECT == nSelectType ) nStockObject |= 0x00000001; @@ -339,13 +339,13 @@ BOOL EMFWriter::ImplPrepareHandleSelect( sal_uInt32& rHandle, ULONG nSelectType ImplBeginRecord( WIN_EMR_SELECTOBJECT ); ( *mpStm ) << nStockObject; ImplEndRecord(); - + // destroy handle of created object ImplBeginRecord( WIN_EMR_DELETEOBJECT ); ( *mpStm ) << rHandle; ImplEndRecord(); - // mark handle as free + // mark handle as free ImplReleaseHandle( rHandle ); } @@ -401,11 +401,11 @@ void EMFWriter::ImplCheckTextAttr() { if( mbTextChanged && ImplPrepareHandleSelect( mnTextHandle, TEXT_SELECT ) ) { - const Font& rFont = maVDev.GetFont(); - String aFontName( rFont.GetName() ); - sal_Int32 nWeight; - sal_uInt16 i; - sal_uInt8 nPitchAndFamily; + const Font& rFont = maVDev.GetFont(); + String aFontName( rFont.GetName() ); + sal_Int32 nWeight; + sal_uInt16 i; + sal_uInt8 nPitchAndFamily; ImplBeginRecord( WIN_EMR_EXTCREATEFONTINDIRECTW ); (*mpStm) << mnTextHandle; @@ -413,7 +413,7 @@ void EMFWriter::ImplCheckTextAttr() ImplWriteExtent( rFont.GetSize().Width() ); (*mpStm) << (INT32) rFont.GetOrientation() << (INT32) rFont.GetOrientation(); - switch( rFont.GetWeight() ) + switch( rFont.GetWeight() ) { case WEIGHT_THIN: nWeight = 100; break; case WEIGHT_ULTRALIGHT: nWeight = 200; break; @@ -425,9 +425,9 @@ void EMFWriter::ImplCheckTextAttr() case WEIGHT_BOLD: nWeight = 700; break; case WEIGHT_ULTRABOLD: nWeight = 800; break; case WEIGHT_BLACK: nWeight = 900; break; - default: nWeight = 0; break; + default: nWeight = 0; break; } - + (*mpStm) << nWeight; (*mpStm) << (BYTE) ( ( ITALIC_NONE == rFont.GetItalic() ) ? 0 : 1 ); (*mpStm) << (BYTE) ( ( UNDERLINE_NONE == rFont.GetUnderline() ) ? 0 : 1 ); @@ -435,14 +435,14 @@ void EMFWriter::ImplCheckTextAttr() (*mpStm) << (BYTE) ( ( RTL_TEXTENCODING_SYMBOL == rFont.GetCharSet() ) ? 2 : 0 ); (*mpStm) << (BYTE) 0 << (BYTE) 0 << (BYTE) 0; - switch( rFont.GetPitch() ) + switch( rFont.GetPitch() ) { case PITCH_FIXED: nPitchAndFamily = 0x01; break; case PITCH_VARIABLE: nPitchAndFamily = 0x02; break; default: nPitchAndFamily = 0x00; break; } - switch( rFont.GetFamily() ) + switch( rFont.GetFamily() ) { case FAMILY_DECORATIVE: nPitchAndFamily |= 0x50; break; case FAMILY_MODERN: nPitchAndFamily |= 0x30; break; @@ -528,8 +528,8 @@ void EMFWriter::ImplWriteRasterOp( RasterOp eRop ) switch( eRop ) { - case ROP_INVERT: nROP2 = 6; break; - case ROP_XOR: nROP2 = 7; break; + case ROP_INVERT: nROP2 = 6; break; + case ROP_XOR: nROP2 = 7; break; default: nROP2 = 13;break; } @@ -609,8 +609,8 @@ void EMFWriter::ImplWritePolyPolygonRecord( const PolyPolygon& rPolyPoly ) ImplWritePolygonRecord( rPolyPoly[ 0 ], TRUE ); else { - sal_Bool bHasFlags = sal_False; - sal_uInt32 nTotalPoints = 0; + sal_Bool bHasFlags = sal_False; + sal_uInt32 nTotalPoints = 0; for( i = 0; i < nPolyCount; i++ ) { @@ -674,12 +674,12 @@ void EMFWriter::ImplWritePath( const PolyPolygon& rPolyPoly, sal_Bool bClosed ) n++; continue; } - + sal_uInt16 nBezPoints = 0; - + while ( ( ( nBezPoints + n + 2 ) < rPoly.GetSize() ) && ( rPoly.GetFlags( nBezPoints + n ) == POLY_CONTROL ) ) nBezPoints += 3; - + if ( nBezPoints ) { ImplBeginRecord( WIN_EMR_POLYBEZIERTO ); @@ -699,12 +699,12 @@ void EMFWriter::ImplWritePath( const PolyPolygon& rPolyPoly, sal_Bool bClosed ) sal_uInt16 nPoints = 1; while( ( nPoints + n ) < rPoly.GetSize() && ( rPoly.GetFlags( nPoints + n ) != POLY_CONTROL ) ) nPoints++; - + if ( nPoints > 1 ) { ImplBeginRecord( WIN_EMR_POLYLINETO ); Polygon aNewPoly( nPoints + 1 ); - aNewPoly[ 0 ] = rPoly[ n - 1]; + aNewPoly[ 0 ] = rPoly[ n - 1]; for ( o = 1; o <= nPoints; o++ ) aNewPoly[ o ] = rPoly[ n - 1 + o ]; ImplWriteRect( aNewPoly.GetBoundRect() ); @@ -737,19 +737,19 @@ void EMFWriter::ImplWritePath( const PolyPolygon& rPolyPoly, sal_Bool bClosed ) // ----------------------------------------------------------------------------- -void EMFWriter::ImplWriteBmpRecord( const Bitmap& rBmp, const Point& rPt, +void EMFWriter::ImplWriteBmpRecord( const Bitmap& rBmp, const Point& rPt, const Size& rSz, UINT32 nROP ) { if( !!rBmp ) { - SvMemoryStream aMemStm( 65535, 65535 ); - const Size aBmpSizePixel( rBmp.GetSizePixel() ); + SvMemoryStream aMemStm( 65535, 65535 ); + const Size aBmpSizePixel( rBmp.GetSizePixel() ); ImplBeginRecord( WIN_EMR_STRETCHDIBITS ); ImplWriteRect( Rectangle( rPt, rSz ) ); ImplWritePoint( rPt ); (*mpStm) << (INT32) 0 << (INT32) 0 << (INT32) aBmpSizePixel.Width() << (INT32) aBmpSizePixel.Height(); - + // write offset positions and sizes later const ULONG nOffPos = mpStm->Tell(); mpStm->SeekRel( 16 ); @@ -759,8 +759,8 @@ void EMFWriter::ImplWriteBmpRecord( const Bitmap& rBmp, const Point& rPt, rBmp.Write( aMemStm, TRUE, FALSE ); - UINT32 nDIBSize = aMemStm.Tell(), nHeaderSize, nCompression, nColsUsed, nPalCount, nImageSize; - UINT16 nBitCount; + UINT32 nDIBSize = aMemStm.Tell(), nHeaderSize, nCompression, nColsUsed, nPalCount, nImageSize; + UINT16 nBitCount; // get DIB parameters aMemStm.Seek( 0 ); @@ -770,7 +770,7 @@ void EMFWriter::ImplWriteBmpRecord( const Bitmap& rBmp, const Point& rPt, aMemStm.SeekRel( 8 ); aMemStm >> nColsUsed; - nPalCount = ( nBitCount <= 8 ) ? ( nColsUsed ? nColsUsed : ( 1 << (UINT32) nBitCount ) ) : + nPalCount = ( nBitCount <= 8 ) ? ( nColsUsed ? nColsUsed : ( 1 << (UINT32) nBitCount ) ) : ( ( 3 == nCompression ) ? 12 : 0 ); mpStm->Write( aMemStm.GetData(), nDIBSize ); @@ -793,9 +793,9 @@ void EMFWriter::ImplWriteTextRecord( const Point& rPos, const String rText, cons if( nLen ) { - sal_uInt32 nNormWidth; - sal_Int32* pOwnArray; - sal_Int32* pDX; + sal_uInt32 nNormWidth; + sal_Int32* pOwnArray; + sal_Int32* pDX; // get text sizes if( pDXArray ) @@ -805,7 +805,7 @@ void EMFWriter::ImplWriteTextRecord( const Point& rPos, const String rText, cons pDX = (sal_Int32*) pDXArray; } else - { + { pOwnArray = new sal_Int32[ nLen ]; nNormWidth = maVDev.GetTextArray( rText, pOwnArray ); pDX = pOwnArray; @@ -905,12 +905,12 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) { for( ULONG j = 0, nActionCount = rMtf.GetActionCount(); j < nActionCount; j++ ) { - const MetaAction* pAction = rMtf.GetAction( j ); - const USHORT nType = pAction->GetType(); + const MetaAction* pAction = rMtf.GetAction( j ); + const USHORT nType = pAction->GetType(); switch( nType ) { - case( META_PIXEL_ACTION ): + case( META_PIXEL_ACTION ): { const MetaPixelAction* pA = (const MetaPixelAction*) pAction; @@ -922,7 +922,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) } break; - case( META_POINT_ACTION ): + case( META_POINT_ACTION ): { if( maVDev.IsLineColor() ) { @@ -946,7 +946,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) if(pA->GetLineInfo().IsDefault()) { ImplCheckLineAttr(); - + ImplBeginRecord( WIN_EMR_MOVETOEX ); ImplWritePoint( pA->GetStartPoint() ); ImplEndRecord(); @@ -988,7 +988,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) } break; - case( META_ROUNDRECT_ACTION ): + case( META_ROUNDRECT_ACTION ): { if( maVDev.IsLineColor() || maVDev.IsFillColor() ) { @@ -1023,7 +1023,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) case( META_ARC_ACTION ): case( META_PIE_ACTION ): - case( META_CHORD_ACTION ): + case( META_CHORD_ACTION ): case( META_POLYGON_ACTION ): { if( maVDev.IsLineColor() || maVDev.IsFillColor() ) @@ -1046,13 +1046,13 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) } break; - case( META_CHORD_ACTION ): + case( META_CHORD_ACTION ): { const MetaChordAction* pA = (const MetaChordAction*) pAction; aPoly = Polygon( pA->GetRect(), pA->GetStartPoint(), pA->GetEndPoint(), POLY_CHORD ); } break; - + case( META_POLYGON_ACTION ): aPoly = ( (const MetaPolygonAction*) pAction )->GetPolygon(); break; @@ -1067,8 +1067,8 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) { if( maVDev.IsLineColor() ) { - const MetaPolyLineAction* pA = (const MetaPolyLineAction*) pAction; - const Polygon& rPoly = pA->GetPolygon(); + const MetaPolyLineAction* pA = (const MetaPolyLineAction*) pAction; + const Polygon& rPoly = pA->GetPolygon(); if( rPoly.GetSize() ) { @@ -1095,8 +1095,8 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) case( META_GRADIENT_ACTION ): { - const MetaGradientAction* pA = (const MetaGradientAction*) pAction; - GDIMetaFile aTmpMtf; + const MetaGradientAction* pA = (const MetaGradientAction*) pAction; + GDIMetaFile aTmpMtf; maVDev.AddGradientActions( pA->GetRect(), pA->GetGradient(), aTmpMtf ); ImplWrite( aTmpMtf ); @@ -1105,8 +1105,8 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) case META_HATCH_ACTION: { - const MetaHatchAction* pA = (const MetaHatchAction*) pAction; - GDIMetaFile aTmpMtf; + const MetaHatchAction* pA = (const MetaHatchAction*) pAction; + GDIMetaFile aTmpMtf; maVDev.AddHatchActions( pA->GetPolyPolygon(), pA->GetHatch(), aTmpMtf ); ImplWrite( aTmpMtf ); @@ -1124,15 +1124,15 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) case META_FLOATTRANSPARENT_ACTION: { const MetaFloatTransparentAction* pA = (const MetaFloatTransparentAction*) pAction; - - GDIMetaFile aTmpMtf( pA->GetGDIMetaFile() ); - Point aSrcPt( aTmpMtf.GetPrefMapMode().GetOrigin() ); - const Size aSrcSize( aTmpMtf.GetPrefSize() ); - const Point aDestPt( pA->GetPoint() ); - const Size aDestSize( pA->GetSize() ); - const double fScaleX = aSrcSize.Width() ? (double) aDestSize.Width() / aSrcSize.Width() : 1.0; - const double fScaleY = aSrcSize.Height() ? (double) aDestSize.Height() / aSrcSize.Height() : 1.0; - long nMoveX, nMoveY; + + GDIMetaFile aTmpMtf( pA->GetGDIMetaFile() ); + Point aSrcPt( aTmpMtf.GetPrefMapMode().GetOrigin() ); + const Size aSrcSize( aTmpMtf.GetPrefSize() ); + const Point aDestPt( pA->GetPoint() ); + const Size aDestSize( pA->GetSize() ); + const double fScaleX = aSrcSize.Width() ? (double) aDestSize.Width() / aSrcSize.Width() : 1.0; + const double fScaleY = aSrcSize.Height() ? (double) aDestSize.Height() / aSrcSize.Height() : 1.0; + long nMoveX, nMoveY; if( fScaleX != 1.0 || fScaleY != 1.0 ) { @@ -1154,8 +1154,8 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) case( META_EPS_ACTION ): { - const MetaEPSAction* pA = (const MetaEPSAction*) pAction; - const GDIMetaFile aSubstitute( pA->GetSubstitute() ); + const MetaEPSAction* pA = (const MetaEPSAction*) pAction; + const GDIMetaFile aSubstitute( pA->GetSubstitute() ); for( ULONG i = 0, nCount = aSubstitute.GetActionCount(); i < nCount; i++ ) { @@ -1166,7 +1166,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) ImplBeginRecord( WIN_EMR_SAVEDC ); ImplEndRecord(); - MapMode aMapMode( aSubstitute.GetPrefMapMode() ); + MapMode aMapMode( aSubstitute.GetPrefMapMode() ); Size aOutSize( maVDev.LogicToLogic( pA->GetSize(), maVDev.GetMapMode(), aMapMode ) ); aMapMode.SetScaleX( Fraction( aOutSize.Width(), aSubstitute.GetPrefSize().Width() ) ); aMapMode.SetScaleY( Fraction( aOutSize.Height(), aSubstitute.GetPrefSize().Height() ) ); @@ -1200,8 +1200,8 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) case META_BMPSCALEPART_ACTION: { - const MetaBmpScalePartAction* pA = (const MetaBmpScalePartAction*) pAction; - Bitmap aTmp( pA->GetBitmap() ); + const MetaBmpScalePartAction* pA = (const MetaBmpScalePartAction*) pAction; + Bitmap aTmp( pA->GetBitmap() ); if( aTmp.Crop( Rectangle( pA->GetSrcPoint(), pA->GetSrcSize() ) ) ) ImplWriteBmpRecord( aTmp, pA->GetDestPoint(), pA->GetDestSize(), WIN_SRCCOPY ); @@ -1210,9 +1210,9 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) case META_BMPEX_ACTION: { - const MetaBmpExAction* pA = (const MetaBmpExAction *) pAction; - Bitmap aBmp( pA->GetBitmapEx().GetBitmap() ); - Bitmap aMsk( pA->GetBitmapEx().GetMask() ); + const MetaBmpExAction* pA = (const MetaBmpExAction *) pAction; + Bitmap aBmp( pA->GetBitmapEx().GetBitmap() ); + Bitmap aMsk( pA->GetBitmapEx().GetMask() ); if( !!aMsk ) { @@ -1228,9 +1228,9 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) case META_BMPEXSCALE_ACTION: { - const MetaBmpExScaleAction* pA = (const MetaBmpExScaleAction*) pAction; - Bitmap aBmp( pA->GetBitmapEx().GetBitmap() ); - Bitmap aMsk( pA->GetBitmapEx().GetMask() ); + const MetaBmpExScaleAction* pA = (const MetaBmpExScaleAction*) pAction; + Bitmap aBmp( pA->GetBitmapEx().GetBitmap() ); + Bitmap aMsk( pA->GetBitmapEx().GetMask() ); if( !!aMsk ) { @@ -1246,11 +1246,11 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) case META_BMPEXSCALEPART_ACTION: { - const MetaBmpExScalePartAction* pA = (const MetaBmpExScalePartAction*) pAction; - BitmapEx aBmpEx( pA->GetBitmapEx() ); + const MetaBmpExScalePartAction* pA = (const MetaBmpExScalePartAction*) pAction; + BitmapEx aBmpEx( pA->GetBitmapEx() ); aBmpEx.Crop( Rectangle( pA->GetSrcPoint(), pA->GetSrcSize() ) ); - Bitmap aBmp( aBmpEx.GetBitmap() ); - Bitmap aMsk( aBmpEx.GetMask() ); + Bitmap aBmp( aBmpEx.GetBitmap() ); + Bitmap aMsk( aBmpEx.GetMask() ); if( !!aMsk ) { @@ -1266,8 +1266,8 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) case META_TEXT_ACTION: { - const MetaTextAction* pA = (const MetaTextAction*) pAction; - const String aText( pA->GetText(), pA->GetIndex(), pA->GetLen() ); + const MetaTextAction* pA = (const MetaTextAction*) pAction; + const String aText( pA->GetText(), pA->GetIndex(), pA->GetLen() ); ImplCheckTextAttr(); ImplWriteTextRecord( pA->GetPoint(), aText, NULL, 0 ); @@ -1276,8 +1276,8 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) case META_TEXTRECT_ACTION: { - const MetaTextRectAction* pA = (const MetaTextRectAction*) pAction; - const String aText( pA->GetText() ); + const MetaTextRectAction* pA = (const MetaTextRectAction*) pAction; + const String aText( pA->GetText() ); ImplCheckTextAttr(); ImplWriteTextRecord( pA->GetRect().TopLeft(), aText, NULL, 0 ); @@ -1286,8 +1286,8 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) case META_TEXTARRAY_ACTION: { - const MetaTextArrayAction* pA = (const MetaTextArrayAction*) pAction; - const String aText( pA->GetText(), pA->GetIndex(), pA->GetLen() ); + const MetaTextArrayAction* pA = (const MetaTextArrayAction*) pAction; + const String aText( pA->GetText(), pA->GetIndex(), pA->GetLen() ); ImplCheckTextAttr(); ImplWriteTextRecord( pA->GetPoint(), aText, pA->GetDXArray(), 0 ); @@ -1296,32 +1296,32 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) case META_STRETCHTEXT_ACTION: { - const MetaStretchTextAction* pA = (const MetaStretchTextAction*) pAction; - const String aText( pA->GetText(), pA->GetIndex(), pA->GetLen() ); + const MetaStretchTextAction* pA = (const MetaStretchTextAction*) pAction; + const String aText( pA->GetText(), pA->GetIndex(), pA->GetLen() ); ImplCheckTextAttr(); ImplWriteTextRecord( pA->GetPoint(), aText, NULL, pA->GetWidth() ); } break; - - case( META_LINECOLOR_ACTION ): + + case( META_LINECOLOR_ACTION ): { ( (MetaAction*) pAction )->Execute( &maVDev ); mbLineChanged = TRUE; } break; - - case( META_FILLCOLOR_ACTION ): + + case( META_FILLCOLOR_ACTION ): { ( (MetaAction*) pAction )->Execute( &maVDev ); mbFillChanged = TRUE; } break; - case( META_TEXTCOLOR_ACTION ): + case( META_TEXTCOLOR_ACTION ): case( META_TEXTLINECOLOR_ACTION ): - case( META_TEXTFILLCOLOR_ACTION ): - case( META_TEXTALIGN_ACTION ): + case( META_TEXTFILLCOLOR_ACTION ): + case( META_TEXTALIGN_ACTION ): case( META_FONT_ACTION ): { ( (MetaAction*) pAction )->Execute( &maVDev ); @@ -1332,7 +1332,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) case( META_ISECTRECTCLIPREGION_ACTION ): { ( (MetaAction*) pAction )->Execute( &maVDev ); - + ImplBeginRecord( WIN_EMR_INTERSECTCLIPRECT ); ImplWriteRect( ( (MetaISectRectClipRegionAction*) pAction )->GetRect() ); ImplEndRecord(); @@ -1340,7 +1340,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) break; case( META_CLIPREGION_ACTION ): - case( META_ISECTREGIONCLIPREGION_ACTION ): + case( META_ISECTREGIONCLIPREGION_ACTION ): case( META_MOVECLIPREGION_ACTION ): { ( (MetaAction*) pAction )->Execute( &maVDev ); @@ -1355,7 +1355,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) case( META_PUSH_ACTION ): { ( (MetaAction*) pAction )->Execute( &maVDev ); - + ImplBeginRecord( WIN_EMR_SAVEDC ); ImplEndRecord(); } @@ -1364,11 +1364,11 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) case( META_POP_ACTION ): { ( (MetaAction*) pAction )->Execute( &maVDev ); - + ImplBeginRecord( WIN_EMR_RESTOREDC ); (*mpStm) << (INT32) -1; ImplEndRecord(); - + ImplWriteRasterOp( maVDev.GetRasterOp() ); mbLineChanged = mbFillChanged = mbTextChanged = TRUE; } @@ -1397,9 +1397,9 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) } case( META_MASK_ACTION ): - case( META_MASKSCALE_ACTION ): - case( META_MASKSCALEPART_ACTION ): - case( META_WALLPAPER_ACTION ): + case( META_MASKSCALE_ACTION ): + case( META_MASKSCALEPART_ACTION ): + case( META_WALLPAPER_ACTION ): case( META_TEXTLINE_ACTION ): case( META_COMMENT_ACTION ): case( META_GRADIENTEX_ACTION ): diff --git a/svtools/source/filter.vcl/wmf/emfwr.hxx b/svtools/source/filter.vcl/wmf/emfwr.hxx index d95176aef406..1fc77da16d39 100644 --- a/svtools/source/filter.vcl/wmf/emfwr.hxx +++ b/svtools/source/filter.vcl/wmf/emfwr.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,55 +47,55 @@ class EMFWriter { private: - VirtualDevice maVDev; - MapMode maDestMapMode; - FilterConfigItem* mpFilterConfigItem; - SvStream* mpStm; - BOOL* mpHandlesUsed; - ULONG mnHandleCount; - ULONG mnLastPercent; - ULONG mnRecordCount; - ULONG mnRecordPos; - BOOL mbRecordOpen; - BOOL mbLineChanged; - sal_uInt32 mnLineHandle; - BOOL mbFillChanged; - sal_uInt32 mnFillHandle; - BOOL mbTextChanged; - sal_uInt32 mnTextHandle; - sal_uInt32 mnHorTextAlign; - - void ImplBeginRecord( sal_uInt32 nType ); - void ImplEndRecord(); - - ULONG ImplAcquireHandle(); - void ImplReleaseHandle( ULONG nHandle ); - - BOOL ImplPrepareHandleSelect( sal_uInt32& rHandle, ULONG nSelectType ); - void ImplCheckLineAttr(); - void ImplCheckFillAttr(); - void ImplCheckTextAttr(); - - void ImplWriteColor( const Color& rColor ); - void ImplWriteRasterOp( RasterOp eRop ); - void ImplWriteExtent( long nExtent ); - void ImplWritePoint( const Point& rPoint ); - void ImplWriteSize( const Size& rSize); - void ImplWriteRect( const Rectangle& rRect ); - void ImplWritePath( const PolyPolygon& rPolyPoly, sal_Bool bClose ); - void ImplWritePolygonRecord( const Polygon& rPoly, BOOL bClose ); - void ImplWritePolyPolygonRecord( const PolyPolygon& rPolyPoly ); - void ImplWriteBmpRecord( const Bitmap& rBmp, const Point& rPt, const Size& rSz, UINT32 nROP ); - void ImplWriteTextRecord( const Point& rPos, const String rText, const sal_Int32* pDXArray, sal_uInt32 nWidth ); + VirtualDevice maVDev; + MapMode maDestMapMode; + FilterConfigItem* mpFilterConfigItem; + SvStream* mpStm; + BOOL* mpHandlesUsed; + ULONG mnHandleCount; + ULONG mnLastPercent; + ULONG mnRecordCount; + ULONG mnRecordPos; + BOOL mbRecordOpen; + BOOL mbLineChanged; + sal_uInt32 mnLineHandle; + BOOL mbFillChanged; + sal_uInt32 mnFillHandle; + BOOL mbTextChanged; + sal_uInt32 mnTextHandle; + sal_uInt32 mnHorTextAlign; + + void ImplBeginRecord( sal_uInt32 nType ); + void ImplEndRecord(); + + ULONG ImplAcquireHandle(); + void ImplReleaseHandle( ULONG nHandle ); + + BOOL ImplPrepareHandleSelect( sal_uInt32& rHandle, ULONG nSelectType ); + void ImplCheckLineAttr(); + void ImplCheckFillAttr(); + void ImplCheckTextAttr(); + + void ImplWriteColor( const Color& rColor ); + void ImplWriteRasterOp( RasterOp eRop ); + void ImplWriteExtent( long nExtent ); + void ImplWritePoint( const Point& rPoint ); + void ImplWriteSize( const Size& rSize); + void ImplWriteRect( const Rectangle& rRect ); + void ImplWritePath( const PolyPolygon& rPolyPoly, sal_Bool bClose ); + void ImplWritePolygonRecord( const Polygon& rPoly, BOOL bClose ); + void ImplWritePolyPolygonRecord( const PolyPolygon& rPolyPoly ); + void ImplWriteBmpRecord( const Bitmap& rBmp, const Point& rPt, const Size& rSz, UINT32 nROP ); + void ImplWriteTextRecord( const Point& rPos, const String rText, const sal_Int32* pDXArray, sal_uInt32 nWidth ); void Impl_handleLineInfoPolyPolygons(const LineInfo& rInfo, const basegfx::B2DPolygon& rLinePolygon); - void ImplWrite( const GDIMetaFile& rMtf ); + void ImplWrite( const GDIMetaFile& rMtf ); public: EMFWriter() {} - BOOL WriteEMF( const GDIMetaFile& rMtf, SvStream& rOStm, FilterConfigItem* pConfigItem = NULL ); + BOOL WriteEMF( const GDIMetaFile& rMtf, SvStream& rOStm, FilterConfigItem* pConfigItem = NULL ); }; #endif // _EMFWR_HXX diff --git a/svtools/source/filter.vcl/wmf/enhwmf.cxx b/svtools/source/filter.vcl/wmf/enhwmf.cxx index 65fdb1b1c6df..cc50b1bee454 100644 --- a/svtools/source/filter.vcl/wmf/enhwmf.cxx +++ b/svtools/source/filter.vcl/wmf/enhwmf.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -138,8 +138,8 @@ #define EMR_SETCOLORSPACE 100 #define EMR_DELETECOLORSPACE 101 #define EMR_GLSRECORD 102 -#define EMR_GLSBOUNDEDRECORD 103 -#define EMR_PIXELFORMAT 104 +#define EMR_GLSBOUNDEDRECORD 103 +#define EMR_PIXELFORMAT 104 // WINDOWS VERSION >= 0x500 #define EMR_DRAWESCAPE 105 @@ -168,9 +168,9 @@ // currently unused static float GetSwapFloat( SvStream& rSt ) { - float fTmp; + float fTmp; sal_Int8* pPtr = (sal_Int8*)&fTmp; - rSt >> pPtr[3] >> pPtr[2] >> pPtr[1] >> pPtr[0]; // Little Endian <-> Big Endian switch + rSt >> pPtr[3] >> pPtr[2] >> pPtr[1] >> pPtr[0]; // Little Endian <-> Big Endian switch return fTmp; } #endif @@ -186,7 +186,7 @@ SvStream& operator>>( SvStream& rIn, XForm& rXForm ) { #ifdef OSL_BIGENDIAN rXForm.eM11 = GetSwapFloat( rIn ); - rXForm.eM12 = GetSwapFloat( rIn ); + rXForm.eM12 = GetSwapFloat( rIn ); rXForm.eM21 = GetSwapFloat( rIn ); rXForm.eM22 = GetSwapFloat( rIn ); rXForm.eDx = GetSwapFloat( rIn ); @@ -341,7 +341,7 @@ BOOL EnhWMFReader::ReadEnhWMF() sal_Int32 nX32, nY32, nx32, ny32; sal_Int16 nX16, nY16; - sal_Bool bFlag, bStatus = ReadHeader(); + sal_Bool bFlag, bStatus = ReadHeader(); sal_Bool bHaveDC = false; #ifdef UNX @@ -355,7 +355,7 @@ BOOL EnhWMFReader::ReadEnhWMF() { *pWMF >> nRecType >> nRecSize; - if ( ( nRecSize < 8 ) || ( nRecSize & 3 ) ) // Parameter sind immer durch 4 teilbar + if ( ( nRecSize < 8 ) || ( nRecSize & 3 ) ) // Parameter sind immer durch 4 teilbar { bStatus = FALSE; break; @@ -464,9 +464,9 @@ BOOL EnhWMFReader::ReadEnhWMF() case EMR_POLYPOLYLINE : { - UINT16* pnPoints; + UINT16* pnPoints; - INT32 i, nPoly; + INT32 i, nPoly; pWMF->SeekRel( 0x10 ); // Anzahl der Polygone: @@ -505,10 +505,10 @@ BOOL EnhWMFReader::ReadEnhWMF() case EMR_POLYPOLYGON : { - UINT16* pnPoints; - Point* pPtAry; + UINT16* pnPoints; + Point* pPtAry; - UINT32 i, nPoly, nGesPoints; + UINT32 i, nPoly, nGesPoints; pWMF->SeekRel( 0x10 ); // Anzahl der Polygone: @@ -519,7 +519,7 @@ BOOL EnhWMFReader::ReadEnhWMF() if ( ( nPoly * sizeof(UINT16) ) <= ( nEndPos - pWMF->Tell() ) ) { pnPoints = new UINT16[ nPoly ]; - + for ( i = 0; i < nPoly; i++ ) { *pWMF >> nPoints; @@ -530,7 +530,7 @@ BOOL EnhWMFReader::ReadEnhWMF() { // Polygonpunkte holen: pPtAry = new Point[ nGesPoints ]; - + for ( i = 0; i < nGesPoints; i++ ) { *pWMF >> nX32 >> nY32; @@ -548,7 +548,7 @@ BOOL EnhWMFReader::ReadEnhWMF() break; case EMR_SETWINDOWEXTEX : - { // #75383# + { // #75383# *pWMF >> nW >> nH; pOut->SetWinExt( Size( nW, nH ) ); } @@ -590,7 +590,7 @@ BOOL EnhWMFReader::ReadEnhWMF() break; case EMR_EOF : - nRecordCount = 0; // #76846# + nRecordCount = 0; // #76846# break; case EMR_SETPIXELV : @@ -693,8 +693,8 @@ BOOL EnhWMFReader::ReadEnhWMF() case EMR_MODIFYWORLDTRANSFORM : { - UINT32 nMode; - XForm aTempXForm; + UINT32 nMode; + XForm aTempXForm; *pWMF >> aTempXForm >> nMode; pOut->ModifyWorldTransform( aTempXForm, nMode ); } @@ -713,9 +713,9 @@ BOOL EnhWMFReader::ReadEnhWMF() if ( ( nIndex & ENHMETA_STOCK_OBJECT ) == 0 ) { - LineInfo aLineInfo; - UINT32 nStyle; - Size aSize; + LineInfo aLineInfo; + UINT32 nStyle; + Size aSize; *pWMF >> nStyle >> aSize.Width() >> aSize.Height(); @@ -762,7 +762,7 @@ BOOL EnhWMFReader::ReadEnhWMF() sal_Int32 elpHatch; sal_uInt32 offBmi, cbBmi, offBits, cbBits, nStyle, nWidth, nBrushStyle, elpNumEntries; Color aColorRef; - + *pWMF >> nIndex; if ( ( nIndex & ENHMETA_STOCK_OBJECT ) == 0 ) { @@ -770,7 +770,7 @@ BOOL EnhWMFReader::ReadEnhWMF() aColorRef = ReadColor(); *pWMF >> elpHatch >> elpNumEntries; - LineInfo aLineInfo; + LineInfo aLineInfo; if ( nWidth ) aLineInfo.SetWidth( nWidth ); @@ -813,7 +813,7 @@ BOOL EnhWMFReader::ReadEnhWMF() case EMR_CREATEBRUSHINDIRECT : { - UINT32 nStyle; + UINT32 nStyle; *pWMF >> nIndex; if ( ( nIndex & ENHMETA_STOCK_OBJECT ) == 0 ) { @@ -949,14 +949,14 @@ BOOL EnhWMFReader::ReadEnhWMF() } break; - case EMR_BITBLT : // PASSTHROUGH INTENDED + case EMR_BITBLT : // PASSTHROUGH INTENDED case EMR_STRETCHBLT : { - INT32 xDest, yDest, cxDest, cyDest, xSrc, ySrc, cxSrc, cySrc; - UINT32 dwRop, iUsageSrc, offBmiSrc, cbBmiSrc, offBitsSrc, cbBitsSrc; - XForm xformSrc; + INT32 xDest, yDest, cxDest, cyDest, xSrc, ySrc, cxSrc, cySrc; + UINT32 dwRop, iUsageSrc, offBmiSrc, cbBmiSrc, offBitsSrc, cbBitsSrc; + XForm xformSrc; - UINT32 nStart = pWMF->Tell() - 8; + UINT32 nStart = pWMF->Tell() - 8; pWMF->SeekRel( 0x10 ); *pWMF >> xDest >> yDest >> cxDest >> cyDest >> dwRop >> xSrc >> ySrc @@ -968,11 +968,11 @@ BOOL EnhWMFReader::ReadEnhWMF() else cxSrc = cySrc = 0; - Bitmap aBitmap; - Rectangle aRect( Point( xDest, yDest ), Size( cxDest+1, cyDest+1 ) ); + Bitmap aBitmap; + Rectangle aRect( Point( xDest, yDest ), Size( cxDest+1, cyDest+1 ) ); - cxDest = abs( (int)cxDest ); // sj: i37894, size can be negative - cyDest = abs( (int)cyDest ); // and also 122889 + cxDest = abs( (int)cxDest ); // sj: i37894, size can be negative + cyDest = abs( (int)cyDest ); // and also 122889 if ( (cbBitsSrc > (SAL_MAX_UINT32 - 14)) || ((SAL_MAX_UINT32 - 14) - cbBitsSrc < cbBmiSrc) ) bStatus = FALSE; @@ -998,7 +998,7 @@ BOOL EnhWMFReader::ReadEnhWMF() aBitmap.Read( aTmp, TRUE ); // test if it is sensible to crop - if ( ( cxSrc > 0 ) && ( cySrc > 0 ) && + if ( ( cxSrc > 0 ) && ( cySrc > 0 ) && ( xSrc >= 0 ) && ( ySrc >= 0 ) && ( xSrc + cxSrc <= aBitmap.GetSizePixel().Width() ) && ( ySrc + cySrc <= aBitmap.GetSizePixel().Height() ) ) @@ -1017,19 +1017,19 @@ BOOL EnhWMFReader::ReadEnhWMF() case EMR_STRETCHDIBITS : { - INT32 xDest, yDest, xSrc, ySrc, cxSrc, cySrc, cxDest, cyDest; - UINT32 offBmiSrc, cbBmiSrc, offBitsSrc, cbBitsSrc, iUsageSrc, dwRop; - UINT32 nStart = pWMF->Tell() - 8; + INT32 xDest, yDest, xSrc, ySrc, cxSrc, cySrc, cxDest, cyDest; + UINT32 offBmiSrc, cbBmiSrc, offBitsSrc, cbBitsSrc, iUsageSrc, dwRop; + UINT32 nStart = pWMF->Tell() - 8; pWMF->SeekRel( 0x10 ); *pWMF >> xDest >> yDest >> xSrc >> ySrc >> cxSrc >> cySrc >> offBmiSrc >> cbBmiSrc >> offBitsSrc >> cbBitsSrc >> iUsageSrc >> dwRop >> cxDest >> cyDest; - Bitmap aBitmap; - Rectangle aRect( Point( xDest, yDest ), Size( cxDest+1, cyDest+1 ) ); + Bitmap aBitmap; + Rectangle aRect( Point( xDest, yDest ), Size( cxDest+1, cyDest+1 ) ); - cxDest = abs( (int)cxDest ); // sj: i37894, size can be negative - cyDest = abs( (int)cyDest ); // and also 122889 + cxDest = abs( (int)cxDest ); // sj: i37894, size can be negative + cyDest = abs( (int)cyDest ); // and also 122889 if ( (cbBitsSrc > (SAL_MAX_UINT32 - 14)) || ((SAL_MAX_UINT32 - 14) - cbBitsSrc < cbBmiSrc) ) bStatus = FALSE; @@ -1055,7 +1055,7 @@ BOOL EnhWMFReader::ReadEnhWMF() aBitmap.Read( aTmp, TRUE ); // test if it is sensible to crop - if ( ( cxSrc > 0 ) && ( cySrc > 0 ) && + if ( ( cxSrc > 0 ) && ( cySrc > 0 ) && ( xSrc >= 0 ) && ( ySrc >= 0 ) && ( xSrc + cxSrc <= aBitmap.GetSizePixel().Width() ) && ( ySrc + cySrc <= aBitmap.GetSizePixel().Height() ) ) @@ -1077,7 +1077,7 @@ BOOL EnhWMFReader::ReadEnhWMF() { LOGFONTW aLogFont; *pWMF >> aLogFont.lfHeight >> aLogFont.lfWidth >> aLogFont.lfEscapement >> aLogFont.lfOrientation >> aLogFont.lfWeight >> aLogFont.lfItalic - >> aLogFont.lfUnderline >> aLogFont.lfStrikeOut >> aLogFont.lfCharSet >> aLogFont.lfOutPrecision >> aLogFont.lfClipPrecision + >> aLogFont.lfUnderline >> aLogFont.lfStrikeOut >> aLogFont.lfCharSet >> aLogFont.lfOutPrecision >> aLogFont.lfClipPrecision >> aLogFont.lfQuality >> aLogFont.lfPitchAndFamily; sal_Unicode lfFaceName[ LF_FACESIZE ]; @@ -1098,9 +1098,9 @@ BOOL EnhWMFReader::ReadEnhWMF() bFlag = sal_True; case EMR_EXTTEXTOUTW : { - sal_Int32 nLeft, nTop, nRight, nBottom, ptlReferenceX, ptlReferenceY, nGfxMode, nXScale, nYScale; - sal_uInt32 nCurPos, nLen, nOffString, nOptions, offDx; - sal_Int32* pDX = NULL; + sal_Int32 nLeft, nTop, nRight, nBottom, ptlReferenceX, ptlReferenceY, nGfxMode, nXScale, nYScale; + sal_uInt32 nCurPos, nLen, nOffString, nOptions, offDx; + sal_Int32* pDX = NULL; nCurPos = pWMF->Tell() - 8; @@ -1200,7 +1200,7 @@ BOOL EnhWMFReader::ReadEnhWMF() *pWMF >> nX16 >> nY16; aPoly[ i ] = Point( nX16, nY16 ); } - pOut->DrawPolyBezier( aPoly, bFlag, bRecordPath ); // Line( aPoly, bFlag ); + pOut->DrawPolyBezier( aPoly, bFlag, bRecordPath ); // Line( aPoly, bFlag ); } break; @@ -1243,9 +1243,9 @@ BOOL EnhWMFReader::ReadEnhWMF() case EMR_POLYPOLYLINE16 : { - UINT16* pnPoints; + UINT16* pnPoints; - INT32 i, nPoly, nGesPoints; + INT32 i, nPoly, nGesPoints; pWMF->SeekRel( 0x10 ); // Anzahl der Polygone: *pWMF >> nPoly >> nGesPoints; @@ -1280,10 +1280,10 @@ BOOL EnhWMFReader::ReadEnhWMF() case EMR_POLYPOLYGON16 : { - UINT16* pnPoints; - Point* pPtAry; + UINT16* pnPoints; + Point* pPtAry; - UINT32 i, nPoly, nGesPoints; + UINT32 i, nPoly, nGesPoints; pWMF->SeekRel( 0x10 ); // Anzahl der Polygone: *pWMF >> nPoly >> nGesPoints; @@ -1306,7 +1306,7 @@ BOOL EnhWMFReader::ReadEnhWMF() *pWMF >> nX16 >> nY16; pPtAry[ i ] = Point( nX16, nY16 ); } - + // PolyPolygon Actions erzeugen PolyPolygon aPolyPoly( (UINT16)nPoly, pnPoints, pPtAry ); pOut->DrawPolyPolygon( aPolyPoly, bRecordPath ); @@ -1337,7 +1337,7 @@ BOOL EnhWMFReader::ReadEnhWMF() case EMR_CREATEDIBPATTERNBRUSHPT : { - UINT32 nStart = pWMF->Tell() - 8; + UINT32 nStart = pWMF->Tell() - 8; Bitmap aBitmap; *pWMF >> nIndex; @@ -1356,10 +1356,10 @@ BOOL EnhWMFReader::ReadEnhWMF() bStatus = FALSE; else if ( offBmi ) { - UINT32 nSize = cbBmi + cbBits + 14; + UINT32 nSize = cbBmi + cbBits + 14; if ( nSize <= ( nEndPos - nStartPos ) ) { - char* pBuf = new char[ nSize ]; + char* pBuf = new char[ nSize ]; SvMemoryStream aTmp( pBuf, nSize, STREAM_READ | STREAM_WRITE ); aTmp.ObjectOwnsMemory( TRUE ); @@ -1391,24 +1391,24 @@ BOOL EnhWMFReader::ReadEnhWMF() case EMR_FRAMERGN : WinMtfAssertHandler( "FrameRgn" ); break; case EMR_INVERTRGN : WinMtfAssertHandler( "InvertRgn" ); break; case EMR_PAINTRGN : WinMtfAssertHandler( "PaintRgn" ); break; - case EMR_FLATTENPATH : WinMtfAssertHandler( "FlattenPath" ); break; + case EMR_FLATTENPATH : WinMtfAssertHandler( "FlattenPath" ); break; case EMR_WIDENPATH : WinMtfAssertHandler( "WidenPath" ); break; - case EMR_POLYDRAW : WinMtfAssertHandler( "Polydraw" ); break; - case EMR_SETARCDIRECTION : WinMtfAssertHandler( "SetArcDirection" ); break; + case EMR_POLYDRAW : WinMtfAssertHandler( "Polydraw" ); break; + case EMR_SETARCDIRECTION : WinMtfAssertHandler( "SetArcDirection" ); break; case EMR_SETPALETTEENTRIES : WinMtfAssertHandler( "SetPaletteEntries" ); break; - case EMR_RESIZEPALETTE : WinMtfAssertHandler( "ResizePalette" ); break; - case EMR_EXTFLOODFILL : WinMtfAssertHandler( "ExtFloodFill" ); break; - case EMR_ANGLEARC : WinMtfAssertHandler( "AngleArc" ); break; - case EMR_SETCOLORADJUSTMENT : WinMtfAssertHandler( "SetColorAdjustment" ); break; - case EMR_POLYDRAW16 : WinMtfAssertHandler( "PolyDraw16" ); break; - case EMR_POLYTEXTOUTA : WinMtfAssertHandler( "PolyTextOutA" ); break; - case EMR_POLYTEXTOUTW : WinMtfAssertHandler( "PolyTextOutW" ); break; - case EMR_CREATECOLORSPACE : WinMtfAssertHandler( "CreateColorSpace" ); break; - case EMR_SETCOLORSPACE : WinMtfAssertHandler( "SetColorSpace" ); break; - case EMR_DELETECOLORSPACE : WinMtfAssertHandler( "DeleteColorSpace" ); break; - case EMR_GLSRECORD : WinMtfAssertHandler( "GlsRecord" ); break; - case EMR_GLSBOUNDEDRECORD : WinMtfAssertHandler( "GlsBoundRecord" ); break; - case EMR_PIXELFORMAT : WinMtfAssertHandler( "PixelFormat" ); break; + case EMR_RESIZEPALETTE : WinMtfAssertHandler( "ResizePalette" ); break; + case EMR_EXTFLOODFILL : WinMtfAssertHandler( "ExtFloodFill" ); break; + case EMR_ANGLEARC : WinMtfAssertHandler( "AngleArc" ); break; + case EMR_SETCOLORADJUSTMENT : WinMtfAssertHandler( "SetColorAdjustment" ); break; + case EMR_POLYDRAW16 : WinMtfAssertHandler( "PolyDraw16" ); break; + case EMR_POLYTEXTOUTA : WinMtfAssertHandler( "PolyTextOutA" ); break; + case EMR_POLYTEXTOUTW : WinMtfAssertHandler( "PolyTextOutW" ); break; + case EMR_CREATECOLORSPACE : WinMtfAssertHandler( "CreateColorSpace" ); break; + case EMR_SETCOLORSPACE : WinMtfAssertHandler( "SetColorSpace" ); break; + case EMR_DELETECOLORSPACE : WinMtfAssertHandler( "DeleteColorSpace" ); break; + case EMR_GLSRECORD : WinMtfAssertHandler( "GlsRecord" ); break; + case EMR_GLSBOUNDEDRECORD : WinMtfAssertHandler( "GlsBoundRecord" ); break; + case EMR_PIXELFORMAT : WinMtfAssertHandler( "PixelFormat" ); break; case EMR_DRAWESCAPE : WinMtfAssertHandler( "DrawEscape" ); break; case EMR_EXTESCAPE : WinMtfAssertHandler( "ExtEscape" ); break; case EMR_STARTDOC : WinMtfAssertHandler( "StartDoc" ); break; @@ -1424,21 +1424,21 @@ BOOL EnhWMFReader::ReadEnhWMF() case EMR_GRADIENTFILL : WinMtfAssertHandler( "GradientFill" ); break; case EMR_SETLINKEDUFIS : WinMtfAssertHandler( "SetLinkedUFIS" ); break; - case EMR_SETMAPPERFLAGS : WinMtfAssertHandler( "SetMapperFlags", 0 ); break; - case EMR_SETICMMODE : WinMtfAssertHandler( "SetICMMode", 0 ); break; + case EMR_SETMAPPERFLAGS : WinMtfAssertHandler( "SetMapperFlags", 0 ); break; + case EMR_SETICMMODE : WinMtfAssertHandler( "SetICMMode", 0 ); break; case EMR_CREATEMONOBRUSH : WinMtfAssertHandler( "CreateMonoBrush", 0 ); break; - case EMR_SETBRUSHORGEX : WinMtfAssertHandler( "SetBrushOrgEx", 0 ); break; - case EMR_SETMETARGN : WinMtfAssertHandler( "SetMetArgn", 0 ); break; - case EMR_SETMITERLIMIT : WinMtfAssertHandler( "SetMiterLimit", 0 ); break; + case EMR_SETBRUSHORGEX : WinMtfAssertHandler( "SetBrushOrgEx", 0 ); break; + case EMR_SETMETARGN : WinMtfAssertHandler( "SetMetArgn", 0 ); break; + case EMR_SETMITERLIMIT : WinMtfAssertHandler( "SetMiterLimit", 0 ); break; case EMR_EXCLUDECLIPRECT : WinMtfAssertHandler( "ExcludeClipRect", 0 ); break; - case EMR_REALIZEPALETTE : WinMtfAssertHandler( "RealizePalette", 0 ); break; - case EMR_SELECTPALETTE : WinMtfAssertHandler( "SelectPalette", 0 ); break; - case EMR_CREATEPALETTE : WinMtfAssertHandler( "CreatePalette", 0 ); break; + case EMR_REALIZEPALETTE : WinMtfAssertHandler( "RealizePalette", 0 ); break; + case EMR_SELECTPALETTE : WinMtfAssertHandler( "SelectPalette", 0 ); break; + case EMR_CREATEPALETTE : WinMtfAssertHandler( "CreatePalette", 0 ); break; case EMR_ALPHADIBBLEND : WinMtfAssertHandler( "AlphaDibBlend", 0 ); break; case EMR_SETTEXTJUSTIFICATION : WinMtfAssertHandler( "SetTextJustification", 0 ); break; case EMR_GDICOMMENT : - case EMR_HEADER : // has already been read at ReadHeader() + case EMR_HEADER : // has already been read at ReadHeader() break; #endif } @@ -1457,17 +1457,17 @@ BOOL EnhWMFReader::ReadEnhWMF() BOOL EnhWMFReader::ReadHeader() { - UINT32 nUINT32, nHeaderSize, nPalEntries; - INT32 nLeft, nTop, nRight, nBottom; + UINT32 nUINT32, nHeaderSize, nPalEntries; + INT32 nLeft, nTop, nRight, nBottom; // METAFILEHEADER SPARE ICH MIR HIER // Einlesen des METAHEADER *pWMF >> nUINT32 >> nHeaderSize; - if ( nUINT32 != 1 ) // Typ + if ( nUINT32 != 1 ) // Typ return FALSE; // bound size - Rectangle rclBounds; // rectangle in logical units 1/100th mm + Rectangle rclBounds; // rectangle in logical units 1/100th mm *pWMF >> nLeft >> nTop >> nRight >> nBottom; rclBounds.Left() = nLeft; rclBounds.Top() = nTop; @@ -1475,23 +1475,23 @@ BOOL EnhWMFReader::ReadHeader() rclBounds.Bottom() = nBottom; // picture frame size - Rectangle rclFrame; // rectangle in device units + Rectangle rclFrame; // rectangle in device units *pWMF >> nLeft >> nTop >> nRight >> nBottom; rclFrame.Left() = nLeft; rclFrame.Top() = nTop; rclFrame.Right() = nRight; rclFrame.Bottom() = nBottom; - *pWMF >> nUINT32; // signature + *pWMF >> nUINT32; // signature if ( nUINT32 != 0x464d4520 ) return FALSE; - *pWMF >> nUINT32; // nVersion - *pWMF >> nEndPos; // size of metafile + *pWMF >> nUINT32; // nVersion + *pWMF >> nEndPos; // size of metafile nEndPos += nStartPos; - sal_uInt32 nStrmPos = pWMF->Tell(); // checking if nEndPos is valid + sal_uInt32 nStrmPos = pWMF->Tell(); // checking if nEndPos is valid pWMF->Seek( STREAM_SEEK_TO_END ); if ( pWMF->Tell() < nEndPos ) nEndPos = pWMF->Tell(); diff --git a/svtools/source/filter.vcl/wmf/winmtf.cxx b/svtools/source/filter.vcl/wmf/winmtf.cxx index 4ff2c19c7141..007a56e452fb 100644 --- a/svtools/source/filter.vcl/wmf/winmtf.cxx +++ b/svtools/source/filter.vcl/wmf/winmtf.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -256,7 +256,7 @@ WinMtfFontStyle::WinMtfFontStyle( LOGFONTW& rFont ) } else if ( aFontSize.Height() < 0 ) aFontSize.Height() *= -1; - + if ( !rFont.lfWidth ) { VirtualDevice aVDev; @@ -284,7 +284,7 @@ void WinMtfAssertHandler( const sal_Char* pAction, sal_uInt32 nFlags ) if ( nFlags & WIN_MTF_ASSERT_MIFE ) { if ( ( nAssertCount == 0 ) || ( bOnlyOnce == sal_False ) ) - { + { ByteString aText( "WMF/EMF Import: " ); if ( pAction ) { @@ -302,17 +302,17 @@ void WinMtfAssertHandler( const sal_Char* pAction, sal_uInt32 nFlags ) // ------------------------------------------------------------------------ WinMtf::WinMtf( WinMtfOutput* pWinMtfOutput, SvStream& rStreamWMF, FilterConfigItem* pConfigItem ) : - pOut ( pWinMtfOutput ), - pWMF ( &rStreamWMF ), - pFilterConfigItem ( pConfigItem ) + pOut ( pWinMtfOutput ), + pWMF ( &rStreamWMF ), + pFilterConfigItem ( pConfigItem ) { #ifdef WIN_MTF_ASSERT - // we want to assert not implemented features, but we do this + // we want to assert not implemented features, but we do this // only once, so that nobody is handicaped by getting too much assertions // I hope this will bring more testdocuments, without support of these // testdocuments the implementation of missing features won't be possible. (SJ) WinMtfAssertHandler( NULL, WIN_MTF_ASSERT_INIT | WIN_MTF_ASSERT_ONCE ); -#endif +#endif SvLockBytes *pLB = pWMF->GetLockBytes(); if ( pLB ) @@ -424,7 +424,7 @@ Point WinMtfOutput::ImplMap( const Point& rPt ) fX2 *= mnDevWidth; fY2 *= mnDevHeight; fX2 += mnDevOrgX; - fY2 += mnDevOrgY; // fX2, fY2 now in device units + fY2 += mnDevOrgY; // fX2, fY2 now in device units fX2 *= (double)mnMillX * 100.0 / (double)mnPixX; fY2 *= (double)mnMillY * 100.0 / (double)mnPixY; } @@ -549,7 +549,7 @@ void WinMtfOutput::SelectObject( INT32 nIndex ) pGDIObj = new GDIObj(); else { - nIndex &= 0xffff; // zur Sicherheit: mehr als 65535 nicht zulassen + nIndex &= 0xffff; // zur Sicherheit: mehr als 65535 nicht zulassen if ( (UINT32)nIndex < vGDIObj.size() ) pGDIObj = vGDIObj[ nIndex ]; @@ -711,7 +711,7 @@ void WinMtfOutput::ImplDrawClippedPolyPolygon( const PolyPolygon& rPolyPoly ) mpGDIMetaFile->AddAction( new MetaRectAction( rPolyPoly.GetBoundRect() ) ); else { - Polygon aPoly( rPolyPoly[ 0 ] ); + Polygon aPoly( rPolyPoly[ 0 ] ); sal_uInt16 nCount = aPoly.GetSize(); if ( nCount ) { @@ -740,7 +740,7 @@ void WinMtfOutput::CreateObject( GDIObjectType eType, void* pStyle ) { ImplMap( ((WinMtfFontStyle*)pStyle)->aFont ); if (!((WinMtfFontStyle*)pStyle)->aFont.GetHeight() ) - ((WinMtfFontStyle*)pStyle)->aFont.SetHeight( 423 ); // defaulting to 12pt + ((WinMtfFontStyle*)pStyle)->aFont.SetHeight( 423 ); // defaulting to 12pt } else if ( eType == GDI_PEN ) { @@ -774,7 +774,7 @@ void WinMtfOutput::CreateObject( INT32 nIndex, GDIObjectType eType, void* pStyle { if ( ( nIndex & ENHMETA_STOCK_OBJECT ) == 0 ) { - nIndex &= 0xffff; // zur Sicherheit: mehr als 65535 nicht zulassen + nIndex &= 0xffff; // zur Sicherheit: mehr als 65535 nicht zulassen if ( pStyle ) { if ( eType == GDI_FONT ) @@ -878,44 +878,44 @@ void WinMtfOutput::SetClipPath( const PolyPolygon& rPolyPolygon, sal_Int32 nClip WinMtfOutput::WinMtfOutput( GDIMetaFile& rGDIMetaFile ) : mnLatestTextAlign ( 0 ), - mnTextAlign ( TA_LEFT | TA_TOP | TA_NOUPDATECP ), + mnTextAlign ( TA_LEFT | TA_TOP | TA_NOUPDATECP ), maLatestBkColor ( 0x12345678 ), - maBkColor ( COL_WHITE ), + maBkColor ( COL_WHITE ), mnLatestTextLayoutMode( TEXT_LAYOUT_DEFAULT ), - mnTextLayoutMode ( TEXT_LAYOUT_DEFAULT ), + mnTextLayoutMode ( TEXT_LAYOUT_DEFAULT ), mnLatestBkMode ( 0 ), - mnBkMode ( OPAQUE ), + mnBkMode ( OPAQUE ), meLatestRasterOp ( ROP_INVERT ), - meRasterOp ( ROP_OVERPAINT ), - maActPos ( Point() ), - mbNopMode ( sal_False ), - mbFillStyleSelected ( sal_False ), + meRasterOp ( ROP_OVERPAINT ), + maActPos ( Point() ), + mbNopMode ( sal_False ), + mbFillStyleSelected ( sal_False ), mbClipNeedsUpdate ( true ), mbComplexClip ( false ), - mnGfxMode ( GM_COMPATIBLE ), + mnGfxMode ( GM_COMPATIBLE ), mnMapMode ( MM_TEXT ), - mnDevOrgX ( 0 ), - mnDevOrgY ( 0 ), - mnDevWidth ( 1 ), - mnDevHeight ( 1 ), - mnWinOrgX ( 0 ), - mnWinOrgY ( 0 ), - mnWinExtX ( 1 ), - mnWinExtY ( 1 ), - mnPixX ( 100 ), - mnPixY ( 100 ), - mnMillX ( 1 ), - mnMillY ( 1 ), + mnDevOrgX ( 0 ), + mnDevOrgY ( 0 ), + mnDevWidth ( 1 ), + mnDevHeight ( 1 ), + mnWinOrgX ( 0 ), + mnWinOrgY ( 0 ), + mnWinExtX ( 1 ), + mnWinExtY ( 1 ), + mnPixX ( 100 ), + mnPixY ( 100 ), + mnMillX ( 1 ), + mnMillY ( 1 ), mpGDIMetaFile ( &rGDIMetaFile ) { - mpGDIMetaFile->AddAction( new MetaPushAction( PUSH_CLIPREGION ) ); // The original clipregion has to be on top + mpGDIMetaFile->AddAction( new MetaPushAction( PUSH_CLIPREGION ) ); // The original clipregion has to be on top // of the stack so it can always be restored // this is necessary to be able to support // SetClipRgn( NULL ) and similar ClipRgn actions (SJ) - maFont.SetName( String( RTL_CONSTASCII_USTRINGPARAM( "Arial" )) ); // sj: #i57205#, we do have some scaling problems if using - maFont.SetCharSet( gsl_getSystemTextEncoding() ); // the default font then most times a x11 font is used, we - maFont.SetHeight( 423 ); // will prevent this defining a font + maFont.SetName( String( RTL_CONSTASCII_USTRINGPARAM( "Arial" )) ); // sj: #i57205#, we do have some scaling problems if using + maFont.SetCharSet( gsl_getSystemTextEncoding() ); // the default font then most times a x11 font is used, we + maFont.SetHeight( 423 ); // will prevent this defining a font maLatestLineStyle.aLineColor = Color( 0x12, 0x34, 0x56 ); maLatestFillStyle.aFillColor = Color( 0x12, 0x34, 0x56 ); @@ -949,7 +949,7 @@ void WinMtfOutput::UpdateClipRegion() mbComplexClip = false; mpGDIMetaFile->AddAction( new MetaPopAction() ); // taking the orignal clipregion - mpGDIMetaFile->AddAction( new MetaPushAction( PUSH_CLIPREGION ) ); // + mpGDIMetaFile->AddAction( new MetaPushAction( PUSH_CLIPREGION ) ); // // skip for 'no clipping at all' case if( !aClipPath.isEmpty() ) @@ -994,7 +994,7 @@ void WinMtfOutput::UpdateLineStyle() void WinMtfOutput::UpdateFillStyle() { - if ( !mbFillStyleSelected ) // SJ: #i57205# taking care of bkcolor if no brush is selected + if ( !mbFillStyleSelected ) // SJ: #i57205# taking care of bkcolor if no brush is selected maFillStyle = WinMtfFillStyle( maBkColor, mnBkMode == TRANSPARENT ); if (!( maLatestFillStyle == maFillStyle ) ) { @@ -1016,7 +1016,7 @@ sal_uInt32 WinMtfOutput::SetRasterOp( UINT32 nRasterOp ) static WinMtfLineStyle aNopLineStyle; if ( mbNopMode && ( nRasterOp != R2_NOP ) ) - { // beim uebergang von R2_NOP auf anderen Modus + { // beim uebergang von R2_NOP auf anderen Modus // gesetzten Pen und Brush aktivieren maFillStyle = aNopFillStyle; maLineStyle = aNopLineStyle; @@ -1215,14 +1215,14 @@ void WinMtfOutput::DrawArc( const Rectangle& rRect, const Point& rStart, const P UpdateLineStyle(); UpdateFillStyle(); - Rectangle aRect( ImplMap( rRect ) ); - Point aStart( ImplMap( rStart ) ); - Point aEnd( ImplMap( rEnd ) ); + Rectangle aRect( ImplMap( rRect ) ); + Point aStart( ImplMap( rStart ) ); + Point aEnd( ImplMap( rEnd ) ); if ( maLineStyle.aLineInfo.GetWidth() || ( maLineStyle.aLineInfo.GetStyle() == LINE_DASH ) ) { if ( aStart == aEnd ) - { // SJ: #i53768# if start & end is identical, then we have to draw a full ellipse + { // SJ: #i53768# if start & end is identical, then we have to draw a full ellipse Point aCenter( aRect.Center() ); Size aRad( aRect.GetWidth() / 2, aRect.GetHeight() / 2 ); @@ -1245,9 +1245,9 @@ void WinMtfOutput::DrawPie( const Rectangle& rRect, const Point& rStart, const P UpdateClipRegion(); UpdateFillStyle(); - Rectangle aRect( ImplMap( rRect ) ); - Point aStart( ImplMap( rStart ) ); - Point aEnd( ImplMap( rEnd ) ); + Rectangle aRect( ImplMap( rRect ) ); + Point aStart( ImplMap( rStart ) ); + Point aEnd( ImplMap( rEnd ) ); if ( maLineStyle.aLineInfo.GetWidth() || ( maLineStyle.aLineInfo.GetStyle() == LINE_DASH ) ) { @@ -1270,9 +1270,9 @@ void WinMtfOutput::DrawChord( const Rectangle& rRect, const Point& rStart, const UpdateClipRegion(); UpdateFillStyle(); - Rectangle aRect( ImplMap( rRect ) ); - Point aStart( ImplMap( rStart ) ); - Point aEnd( ImplMap( rEnd ) ); + Rectangle aRect( ImplMap( rRect ) ); + Point aStart( ImplMap( rStart ) ); + Point aEnd( ImplMap( rEnd ) ); if ( maLineStyle.aLineInfo.GetWidth() || ( maLineStyle.aLineInfo.GetStyle() == LINE_DASH ) ) { @@ -1564,7 +1564,7 @@ void WinMtfOutput::DrawText( Point& rPosition, String& rText, sal_Int32* pDXArry if( mnTextAlign & TA_UPDATECP ) rPosition = maActPos; - + if ( mnTextAlign & TA_RIGHT_CENTER ) { double fLenght = ( ( mnTextAlign & TA_RIGHT_CENTER ) == TA_RIGHT ) ? nTextWidth : nTextWidth >> 1; @@ -1574,7 +1574,7 @@ void WinMtfOutput::DrawText( Point& rPosition, String& rText, sal_Int32* pDXArry if( mnTextAlign & TA_UPDATECP ) maActPos.X() = rPosition.X() + nTextWidth; - } + } if ( bChangeFont || ( maLatestFont != aTmp ) ) { maLatestFont = aTmp; @@ -1591,7 +1591,7 @@ void WinMtfOutput::DrawText( Point& rPosition, String& rText, sal_Int32* pDXArry { /* because text without dx array is badly scaled, we will create such an array if necessary */ - sal_Int32* pDX = pDXArry; + sal_Int32* pDX = pDXArry; if ( !pDXArry ) { pDX = new sal_Int32[ rText.Len() ]; @@ -1602,8 +1602,8 @@ void WinMtfOutput::DrawText( Point& rPosition, String& rText, sal_Int32* pDXArry pVDev->GetTextArray( rText, pDX, 0, STRING_LEN ); } mpGDIMetaFile->AddAction( new MetaTextArrayAction( rPosition, rText, pDX, 0, STRING_LEN ) ); - if ( !pDXArry ) // this means we have created our own array - delete[] pDX; // which must be deleted + if ( !pDXArry ) // this means we have created our own array + delete[] pDX; // which must be deleted } SetGfxMode( nOldGfxMode ); delete pVDev; @@ -1660,16 +1660,16 @@ void WinMtfOutput::ResolveBitmapActions( List& rSaveList ) { UpdateClipRegion(); - sal_uInt32 nObjects = rSaveList.Count(); - sal_uInt32 nObjectsLeft = nObjects; + sal_uInt32 nObjects = rSaveList.Count(); + sal_uInt32 nObjectsLeft = nObjects; while ( nObjectsLeft ) { - sal_uInt32 i, nObjectsOfSameSize = 0; - sal_uInt32 nObjectStartIndex = nObjects - nObjectsLeft; + sal_uInt32 i, nObjectsOfSameSize = 0; + sal_uInt32 nObjectStartIndex = nObjects - nObjectsLeft; - BSaveStruct* pSave = (BSaveStruct*)rSaveList.GetObject( nObjectStartIndex ); - Rectangle aRect( pSave->aOutRect ); + BSaveStruct* pSave = (BSaveStruct*)rSaveList.GetObject( nObjectStartIndex ); + Rectangle aRect( pSave->aOutRect ); for ( i = nObjectStartIndex; i < nObjects; ) { @@ -1681,27 +1681,27 @@ void WinMtfOutput::ResolveBitmapActions( List& rSaveList ) break; } } - Point aPos( ImplMap( aRect.TopLeft() ) ); - Size aSize( ImplMap( aRect.GetSize() ) ); + Point aPos( ImplMap( aRect.TopLeft() ) ); + Size aSize( ImplMap( aRect.GetSize() ) ); for ( i = nObjectStartIndex; i < ( nObjectStartIndex + nObjectsOfSameSize ); i++ ) { pSave = (BSaveStruct*)rSaveList.GetObject( i ); - sal_uInt32 nWinRop = pSave->nWinRop; - sal_uInt8 nRasterOperation = (sal_uInt8)( nWinRop >> 16 ); + sal_uInt32 nWinRop = pSave->nWinRop; + sal_uInt8 nRasterOperation = (sal_uInt8)( nWinRop >> 16 ); - sal_uInt32 nUsed = 0; + sal_uInt32 nUsed = 0; if ( ( nRasterOperation & 0xf ) != ( nRasterOperation >> 4 ) ) - nUsed |= 1; // pattern is used + nUsed |= 1; // pattern is used if ( ( nRasterOperation & 0x33 ) != ( ( nRasterOperation & 0xcc ) >> 2 ) ) - nUsed |= 2; // source is used + nUsed |= 2; // source is used if ( ( nRasterOperation & 0xaa ) != ( ( nRasterOperation & 0x55 ) << 1 ) ) - nUsed |= 4; // destination is used + nUsed |= 4; // destination is used if ( (nUsed & 1) && (( nUsed & 2 ) == 0) && nWinRop != PATINVERT ) - { // patterns aren't well supported yet - sal_uInt32 nOldRop = SetRasterOp( ROP_OVERPAINT ); // in this case nRasterOperation is either 0 or 0xff + { // patterns aren't well supported yet + sal_uInt32 nOldRop = SetRasterOp( ROP_OVERPAINT ); // in this case nRasterOperation is either 0 or 0xff UpdateFillStyle(); DrawRect( aRect, FALSE ); SetRasterOp( nOldRop ); @@ -1710,11 +1710,11 @@ void WinMtfOutput::ResolveBitmapActions( List& rSaveList ) { sal_Bool bDrawn = sal_False; - if ( i == nObjectStartIndex ) // optimizing, sometimes it is possible to create just one transparent bitmap + if ( i == nObjectStartIndex ) // optimizing, sometimes it is possible to create just one transparent bitmap { if ( nObjectsOfSameSize == 2 ) { - BSaveStruct* pSave2 = (BSaveStruct*)rSaveList.GetObject( i + 1 ); + BSaveStruct* pSave2 = (BSaveStruct*)rSaveList.GetObject( i + 1 ); if ( ( pSave->aBmp.GetPrefSize() == pSave2->aBmp.GetPrefSize() ) && ( pSave->aBmp.GetPrefMapMode() == pSave2->aBmp.GetPrefMapMode() ) ) { @@ -1750,18 +1750,18 @@ void WinMtfOutput::ResolveBitmapActions( List& rSaveList ) if ( !bDrawn ) { Push(); - sal_uInt32 nOldRop = SetRasterOp( R2_COPYPEN ); - Bitmap aBitmap( pSave->aBmp ); - sal_uInt32 nOperation = ( nRasterOperation & 0xf ); + sal_uInt32 nOldRop = SetRasterOp( R2_COPYPEN ); + Bitmap aBitmap( pSave->aBmp ); + sal_uInt32 nOperation = ( nRasterOperation & 0xf ); switch( nOperation ) { case 0x1 : case 0xe : - { + { SetRasterOp( R2_XORPEN ); ImplDrawBitmap( aPos, aSize, aBitmap ); SetRasterOp( R2_COPYPEN ); - Bitmap aMask( aBitmap ); + Bitmap aMask( aBitmap ); aMask.Invert(); BitmapEx aBmpEx( aBitmap, aMask ); ImplDrawBitmap( aPos, aSize, aBmpEx ); @@ -1775,8 +1775,8 @@ void WinMtfOutput::ResolveBitmapActions( List& rSaveList ) case 0x7 : case 0x8 : { - Bitmap aMask( aBitmap ); - if ( ( nUsed & 1 ) && ( nRasterOperation & 0xb0 ) == 0xb0 ) // pattern used + Bitmap aMask( aBitmap ); + if ( ( nUsed & 1 ) && ( nRasterOperation & 0xb0 ) == 0xb0 ) // pattern used { aBitmap.Convert( BMP_CONVERSION_24BIT ); aBitmap.Erase( maFillStyle.aFillColor ); @@ -1797,7 +1797,7 @@ void WinMtfOutput::ResolveBitmapActions( List& rSaveList ) SetRasterOp( R2_NOT ); DrawRect( aRect, FALSE ); SetRasterOp( R2_COPYPEN ); - Bitmap aMask( aBitmap ); + Bitmap aMask( aBitmap ); aBitmap.Invert(); BitmapEx aBmpEx( aBitmap, aMask ); ImplDrawBitmap( aPos, aSize, aBmpEx ); @@ -1814,7 +1814,7 @@ void WinMtfOutput::ResolveBitmapActions( List& rSaveList ) case 0x2 : case 0xd : { - Bitmap aMask( aBitmap ); + Bitmap aMask( aBitmap ); aMask.Invert(); BitmapEx aBmpEx( aBitmap, aMask ); ImplDrawBitmap( aPos, aSize, aBmpEx ); @@ -1840,16 +1840,16 @@ void WinMtfOutput::ResolveBitmapActions( List& rSaveList ) } break; - case 0x0 : // WHITENESS - case 0xf : // BLACKNESS - { // in this case nRasterOperation is either 0 or 0xff + case 0x0 : // WHITENESS + case 0xf : // BLACKNESS + { // in this case nRasterOperation is either 0 or 0xff maFillStyle = WinMtfFillStyle( Color( nRasterOperation, nRasterOperation, nRasterOperation ) ); UpdateFillStyle(); DrawRect( aRect, FALSE ); } break; - case 0x3 : // only source is used + case 0x3 : // only source is used case 0xc : { if ( nRasterOperation == 0x33 ) @@ -1858,12 +1858,12 @@ void WinMtfOutput::ResolveBitmapActions( List& rSaveList ) } break; - case 0x5 : // only destination is used + case 0x5 : // only destination is used { SetRasterOp( R2_NOT ); DrawRect( aRect, FALSE ); } - case 0xa : // no operation + case 0xa : // no operation break; } SetRasterOp( nOldRop ); @@ -1905,7 +1905,7 @@ void WinMtfOutput::SetDevExt( const Size& rSize ) switch( mnMapMode ) { case MM_ISOTROPIC : - case MM_ANISOTROPIC : + case MM_ANISOTROPIC : { mnDevWidth = rSize.Width(); mnDevHeight = rSize.Height(); @@ -1948,7 +1948,7 @@ void WinMtfOutput::SetWinExt( const Size& rSize ) switch( mnMapMode ) { case MM_ISOTROPIC : - case MM_ANISOTROPIC : + case MM_ANISOTROPIC : { mnWinExtX = rSize.Width(); mnWinExtY = rSize.Height(); @@ -2039,7 +2039,7 @@ void WinMtfOutput::ModifyWorldTransform( const XForm& rXForm, UINT32 nMode ) case MWT_RIGHTMULTIPLY : case MWT_LEFTMULTIPLY : - { + { const XForm* pLeft; const XForm* pRight; @@ -2101,7 +2101,7 @@ void WinMtfOutput::ModifyWorldTransform( const XForm& rXForm, UINT32 nMode ) //----------------------------------------------------------------------------------- -void WinMtfOutput::Push() // !! to be able to access the original ClipRegion it +void WinMtfOutput::Push() // !! to be able to access the original ClipRegion it { // is not allowed to use the MetaPushAction() UpdateClipRegion(); // (the original clip region is on top of the stack) (SJ) SaveStructPtr pSave( new SaveStruct ); diff --git a/svtools/source/filter.vcl/wmf/winmtf.hxx b/svtools/source/filter.vcl/wmf/winmtf.hxx index db9d44aca0f5..9f2a1b344381 100644 --- a/svtools/source/filter.vcl/wmf/winmtf.hxx +++ b/svtools/source/filter.vcl/wmf/winmtf.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,140 +57,140 @@ #define SIMPLEREGION 2 #define COMPLEXREGION 3 -#define RGN_AND 1 -#define RGN_OR 2 -#define RGN_XOR 3 -#define RGN_DIFF 4 -#define RGN_COPY 5 +#define RGN_AND 1 +#define RGN_OR 2 +#define RGN_XOR 3 +#define RGN_DIFF 4 +#define RGN_COPY 5 -#define TRANSPARENT 1 -#define OPAQUE 2 -#define BKMODE_LAST 2 +#define TRANSPARENT 1 +#define OPAQUE 2 +#define BKMODE_LAST 2 /* xform stuff */ -#define MWT_IDENTITY 1 -#define MWT_LEFTMULTIPLY 2 -#define MWT_RIGHTMULTIPLY 3 +#define MWT_IDENTITY 1 +#define MWT_LEFTMULTIPLY 2 +#define MWT_RIGHTMULTIPLY 3 #define ENHMETA_STOCK_OBJECT 0x80000000 /* Stock Logical Objects */ -#define WHITE_BRUSH 0 -#define LTGRAY_BRUSH 1 -#define GRAY_BRUSH 2 -#define DKGRAY_BRUSH 3 -#define BLACK_BRUSH 4 -#define NULL_BRUSH 5 -#define HOLLOW_BRUSH NULL_BRUSH -#define WHITE_PEN 6 -#define BLACK_PEN 7 -#define NULL_PEN 8 -#define OEM_FIXED_FONT 10 -#define ANSI_FIXED_FONT 11 -#define ANSI_VAR_FONT 12 -#define SYSTEM_FONT 13 -#define DEVICE_DEFAULT_FONT 14 -#define DEFAULT_PALETTE 15 -#define SYSTEM_FIXED_FONT 16 - - -#define R2_BLACK 1 -#define R2_NOTMERGEPEN 2 -#define R2_MASKNOTPEN 3 -#define R2_NOTCOPYPEN 4 -#define R2_MASKPENNOT 5 -#define R2_NOT 6 -#define R2_XORPEN 7 -#define R2_NOTMASKPEN 8 -#define R2_MASKPEN 9 -#define R2_NOTXORPEN 10 -#define R2_NOP 11 -#define R2_MERGENOTPEN 12 -#define R2_COPYPEN 13 -#define R2_MERGEPENNOT 14 -#define R2_MERGEPEN 15 -#define R2_WHITE 16 +#define WHITE_BRUSH 0 +#define LTGRAY_BRUSH 1 +#define GRAY_BRUSH 2 +#define DKGRAY_BRUSH 3 +#define BLACK_BRUSH 4 +#define NULL_BRUSH 5 +#define HOLLOW_BRUSH NULL_BRUSH +#define WHITE_PEN 6 +#define BLACK_PEN 7 +#define NULL_PEN 8 +#define OEM_FIXED_FONT 10 +#define ANSI_FIXED_FONT 11 +#define ANSI_VAR_FONT 12 +#define SYSTEM_FONT 13 +#define DEVICE_DEFAULT_FONT 14 +#define DEFAULT_PALETTE 15 +#define SYSTEM_FIXED_FONT 16 + + +#define R2_BLACK 1 +#define R2_NOTMERGEPEN 2 +#define R2_MASKNOTPEN 3 +#define R2_NOTCOPYPEN 4 +#define R2_MASKPENNOT 5 +#define R2_NOT 6 +#define R2_XORPEN 7 +#define R2_NOTMASKPEN 8 +#define R2_MASKPEN 9 +#define R2_NOTXORPEN 10 +#define R2_NOP 11 +#define R2_MERGENOTPEN 12 +#define R2_COPYPEN 13 +#define R2_MERGEPENNOT 14 +#define R2_MERGEPEN 15 +#define R2_WHITE 16 /* Mapping Modes */ -#define MM_TEXT 1 -#define MM_LOMETRIC 2 -#define MM_HIMETRIC 3 -#define MM_LOENGLISH 4 -#define MM_HIENGLISH 5 -#define MM_TWIPS 6 -#define MM_ISOTROPIC 7 -#define MM_ANISOTROPIC 8 +#define MM_TEXT 1 +#define MM_LOMETRIC 2 +#define MM_HIMETRIC 3 +#define MM_LOENGLISH 4 +#define MM_HIENGLISH 5 +#define MM_TWIPS 6 +#define MM_ISOTROPIC 7 +#define MM_ANISOTROPIC 8 /* Graphics Modes */ -#define GM_COMPATIBLE 1 -#define GM_ADVANCED 2 -#define GM_LAST 2 +#define GM_COMPATIBLE 1 +#define GM_ADVANCED 2 +#define GM_LAST 2 /* StretchBlt() Modes */ -#define BLACKONWHITE 1 -#define WHITEONBLACK 2 -#define COLORONCOLOR 3 -#define HALFTONE 4 -#define MAXSTRETCHBLTMODE 4 -#define STRETCH_ANDSCANS BLACKONWHITE -#define STRETCH_ORSCANS WHITEONBLACK -#define STRETCH_DELETESCANS COLORONCOLOR -#define STRETCH_HALFTONE HALFTONE - -#define LF_FACESIZE 32 +#define BLACKONWHITE 1 +#define WHITEONBLACK 2 +#define COLORONCOLOR 3 +#define HALFTONE 4 +#define MAXSTRETCHBLTMODE 4 +#define STRETCH_ANDSCANS BLACKONWHITE +#define STRETCH_ORSCANS WHITEONBLACK +#define STRETCH_DELETESCANS COLORONCOLOR +#define STRETCH_HALFTONE HALFTONE + +#define LF_FACESIZE 32 struct LOGFONTW { - INT32 lfHeight; - INT32 lfWidth; - INT32 lfEscapement; - INT32 lfOrientation; - INT32 lfWeight; - BYTE lfItalic; - BYTE lfUnderline; - BYTE lfStrikeOut; - BYTE lfCharSet; - BYTE lfOutPrecision; - BYTE lfClipPrecision; - BYTE lfQuality; - BYTE lfPitchAndFamily; - String alfFaceName; + INT32 lfHeight; + INT32 lfWidth; + INT32 lfEscapement; + INT32 lfOrientation; + INT32 lfWeight; + BYTE lfItalic; + BYTE lfUnderline; + BYTE lfStrikeOut; + BYTE lfCharSet; + BYTE lfOutPrecision; + BYTE lfClipPrecision; + BYTE lfQuality; + BYTE lfPitchAndFamily; + String alfFaceName; }; -#define TA_NOUPDATECP 0x0000 -#define TA_UPDATECP 0x0001 -#define TA_LEFT 0x0000 -#define TA_RIGHT 0x0002 -#define TA_CENTER 0x0006 -#define TA_RIGHT_CENTER (TA_RIGHT | TA_CENTER) -#define TA_TOP 0x0000 -#define TA_BOTTOM 0x0008 -#define TA_BASELINE 0x0018 - -#define SRCCOPY 0x00CC0020L -#define SRCPAINT 0x00EE0086L -#define SRCAND 0x008800C6L -#define SRCINVERT 0x00660046L -#define SRCERASE 0x00440328L -#define NOTSRCCOPY 0x00330008L -#define NOTSRCERASE 0x001100A6L -#define MERGECOPY 0x00C000CAL -#define MERGEPAINT 0x00BB0226L -#define PATCOPY 0x00F00021L -#define PATPAINT 0x00FB0A09L -#define PATINVERT 0x005A0049L -#define DSTINVERT 0x00550009L -#define BLACKNESS 0x00000042L -#define WHITENESS 0x00FF0062L - -#define PS_SOLID 0 -#define PS_DASH 1 -#define PS_DOT 2 -#define PS_DASHDOT 3 -#define PS_DASHDOTDOT 4 -#define PS_NULL 5 -#define PS_INSIDEFRAME 6 +#define TA_NOUPDATECP 0x0000 +#define TA_UPDATECP 0x0001 +#define TA_LEFT 0x0000 +#define TA_RIGHT 0x0002 +#define TA_CENTER 0x0006 +#define TA_RIGHT_CENTER (TA_RIGHT | TA_CENTER) +#define TA_TOP 0x0000 +#define TA_BOTTOM 0x0008 +#define TA_BASELINE 0x0018 + +#define SRCCOPY 0x00CC0020L +#define SRCPAINT 0x00EE0086L +#define SRCAND 0x008800C6L +#define SRCINVERT 0x00660046L +#define SRCERASE 0x00440328L +#define NOTSRCCOPY 0x00330008L +#define NOTSRCERASE 0x001100A6L +#define MERGECOPY 0x00C000CAL +#define MERGEPAINT 0x00BB0226L +#define PATCOPY 0x00F00021L +#define PATPAINT 0x00FB0A09L +#define PATINVERT 0x005A0049L +#define DSTINVERT 0x00550009L +#define BLACKNESS 0x00000042L +#define WHITENESS 0x00FF0062L + +#define PS_SOLID 0 +#define PS_DASH 1 +#define PS_DOT 2 +#define PS_DASHDOT 3 +#define PS_DASHDOTDOT 4 +#define PS_NULL 5 +#define PS_INSIDEFRAME 6 #define PS_USERSTYLE 7 #define PS_ALTERNATE 8 #define PS_STYLE_MASK 15 @@ -209,14 +209,14 @@ struct LOGFONTW #define PS_GEOMETRIC 0x10000 #define PS_TYPE_MASK 0xF0000 -#define ANSI_CHARSET 0 -#define DEFAULT_CHARSET 1 -#define SYMBOL_CHARSET 2 -#define SHIFTJIS_CHARSET 128 -#define HANGEUL_CHARSET 129 -#define GB2312_CHARSET 134 -#define CHINESEBIG5_CHARSET 136 -#define OEM_CHARSET 255 +#define ANSI_CHARSET 0 +#define DEFAULT_CHARSET 1 +#define SYMBOL_CHARSET 2 +#define SHIFTJIS_CHARSET 128 +#define HANGEUL_CHARSET 129 +#define GB2312_CHARSET 134 +#define CHINESEBIG5_CHARSET 136 +#define OEM_CHARSET 255 /*WINVER >= 0x0400*/ #define JOHAB_CHARSET 130 #define HEBREW_CHARSET 177 @@ -230,70 +230,70 @@ struct LOGFONTW #define MAC_CHARSET 77 #define BALTIC_CHARSET 186 -#define ETO_OPAQUE 0x0002 -#define ETO_CLIPPED 0x0004 +#define ETO_OPAQUE 0x0002 +#define ETO_CLIPPED 0x0004 /*WINVER >= 0x0400*/ -#define ETO_GLYPH_INDEX 0x0010 -#define ETO_RTLREADING 0x0080 -#define ETO_NUMERICSLOCAL 0x0400 -#define ETO_NUMERICSLATIN 0x0800 -#define ETO_IGNORELANGUAGE 0x1000 +#define ETO_GLYPH_INDEX 0x0010 +#define ETO_RTLREADING 0x0080 +#define ETO_NUMERICSLOCAL 0x0400 +#define ETO_NUMERICSLATIN 0x0800 +#define ETO_IGNORELANGUAGE 0x1000 /*_WIN32_WINNT >= 0x0500*/ -#define ETO_PDY 0x2000 +#define ETO_PDY 0x2000 -#define DEFAULT_PITCH 0x00 -#define FIXED_PITCH 0x01 -#define VARIABLE_PITCH 0x02 +#define DEFAULT_PITCH 0x00 +#define FIXED_PITCH 0x01 +#define VARIABLE_PITCH 0x02 /* Font Families */ -#define FF_DONTCARE 0x00 -#define FF_ROMAN 0x10 -#define FF_SWISS 0x20 -#define FF_MODERN 0x30 -#define FF_SCRIPT 0x40 -#define FF_DECORATIVE 0x50 - -#define FW_DONTCARE 0 -#define FW_THIN 100 -#define FW_EXTRALIGHT 200 -#define FW_LIGHT 300 -#define FW_NORMAL 400 -#define FW_MEDIUM 500 -#define FW_SEMIBOLD 600 -#define FW_BOLD 700 -#define FW_EXTRABOLD 800 -#define FW_HEAVY 900 -#define FW_ULTRALIGHT 200 -#define FW_REGULAR 400 -#define FW_DEMIBOLD 600 -#define FW_ULTRABOLD 800 -#define FW_BLACK 900 - -#define BS_SOLID 0 -#define BS_NULL 1 -#define BS_HOLLOW 1 -#define BS_HATCHED 2 -#define BS_PATTERN 3 -#define BS_INDEXED 4 -#define BS_DIBPATTERN 5 -#define BS_DIBPATTERNPT 6 -#define BS_PATTERN8X8 7 -#define BS_DIBPATTERN8X8 8 -#define BS_MONOPATTERN 9 - -#define W_HS_HORIZONTAL 0 -#define W_HS_VERTICAL 1 -#define W_HS_FDIAGONAL 2 -#define W_HS_BDIAGONAL 3 -#define W_HS_CROSS 4 -#define W_HS_DIAGCROSS 5 +#define FF_DONTCARE 0x00 +#define FF_ROMAN 0x10 +#define FF_SWISS 0x20 +#define FF_MODERN 0x30 +#define FF_SCRIPT 0x40 +#define FF_DECORATIVE 0x50 + +#define FW_DONTCARE 0 +#define FW_THIN 100 +#define FW_EXTRALIGHT 200 +#define FW_LIGHT 300 +#define FW_NORMAL 400 +#define FW_MEDIUM 500 +#define FW_SEMIBOLD 600 +#define FW_BOLD 700 +#define FW_EXTRABOLD 800 +#define FW_HEAVY 900 +#define FW_ULTRALIGHT 200 +#define FW_REGULAR 400 +#define FW_DEMIBOLD 600 +#define FW_ULTRABOLD 800 +#define FW_BLACK 900 + +#define BS_SOLID 0 +#define BS_NULL 1 +#define BS_HOLLOW 1 +#define BS_HATCHED 2 +#define BS_PATTERN 3 +#define BS_INDEXED 4 +#define BS_DIBPATTERN 5 +#define BS_DIBPATTERNPT 6 +#define BS_PATTERN8X8 7 +#define BS_DIBPATTERN8X8 8 +#define BS_MONOPATTERN 9 + +#define W_HS_HORIZONTAL 0 +#define W_HS_VERTICAL 1 +#define W_HS_FDIAGONAL 2 +#define W_HS_BDIAGONAL 3 +#define W_HS_CROSS 4 +#define W_HS_DIAGCROSS 5 #define RDH_RECTANGLES 1 -#define W_MFCOMMENT 15 +#define W_MFCOMMENT 15 -#define PRIVATE_ESCAPE_UNICODE 2 +#define PRIVATE_ESCAPE_UNICODE 2 //============================ WMFReader ================================== @@ -304,7 +304,7 @@ struct LOGFONTW #define WIN_MTF_ASSERT_MIFE 0x20000000 void WinMtfAssertHandler( const sal_Char*, sal_uInt32 nFlags = WIN_MTF_ASSERT_MIFE ); -#endif +#endif class WinMtfClipPath { @@ -313,10 +313,10 @@ class WinMtfClipPath public : WinMtfClipPath(): maClip() {}; - void setClipPath( const PolyPolygon& rPolyPolygon, sal_Int32 nClippingMode ); - void intersectClipRect( const Rectangle& rRect ); - void excludeClipRect( const Rectangle& rRect ); - void moveClipRegion( const Size& rSize ); + void setClipPath( const PolyPolygon& rPolyPolygon, sal_Int32 nClippingMode ); + void intersectClipRect( const Rectangle& rRect ); + void excludeClipRect( const Rectangle& rRect ); + void moveClipRegion( const Size& rSize ); bool isEmpty() const { return maClip.isCleared(); } @@ -330,23 +330,23 @@ public : class WinMtfPathObj : public PolyPolygon { - sal_Bool bClosed; + sal_Bool bClosed; public : WinMtfPathObj() { bClosed = sal_True; } void Init() { Clear(); bClosed = sal_True; }; - void ClosePath(); + void ClosePath(); - void AddPoint( const Point& rPoint ); - void AddPolygon( const Polygon& rPoly ); - void AddPolyLine( const Polygon& rPoly ); - void AddPolyPolygon( const PolyPolygon& rPolyPolygon ); + void AddPoint( const Point& rPoint ); + void AddPolygon( const Polygon& rPoly ); + void AddPolyLine( const Polygon& rPoly ); + void AddPolyPolygon( const PolyPolygon& rPolyPolygon ); }; struct WinMtfFontStyle { - Font aFont; + Font aFont; WinMtfFontStyle( LOGFONTW& rLogFont ); }; @@ -360,19 +360,19 @@ typedef enum { struct WinMtfFillStyle { - Color aFillColor; - BOOL bTransparent; + Color aFillColor; + BOOL bTransparent; WinMtfFillStyleType aType; Bitmap aBmp; WinMtfFillStyle() : - aFillColor ( Color( COL_BLACK ) ), + aFillColor ( Color( COL_BLACK ) ), bTransparent( FALSE ) { }; WinMtfFillStyle( const Color& rColor, BOOL bTrans = FALSE ) : - aFillColor ( rColor ), + aFillColor ( rColor ), bTransparent( bTrans ), aType ( FillStyleSolid ) { @@ -396,21 +396,21 @@ struct WinMtfFillStyle struct WinMtfLineStyle { - Color aLineColor; - LineInfo aLineInfo; - BOOL bTransparent; + Color aLineColor; + LineInfo aLineInfo; + BOOL bTransparent; WinMtfLineStyle() : - aLineColor ( COL_BLACK ), + aLineColor ( COL_BLACK ), bTransparent( FALSE ) {}; WinMtfLineStyle( const Color& rColor, BOOL bTrans = FALSE ) : - aLineColor ( rColor ), + aLineColor ( rColor ), bTransparent( bTrans ) {}; WinMtfLineStyle( const Color& rColor, const LineInfo rStyle, BOOL bTrans = FALSE ) : - aLineColor ( rColor ), - aLineInfo ( rStyle ), + aLineColor ( rColor ), + aLineInfo ( rStyle ), bTransparent( bTrans ) {}; BOOL operator==( const WinMtfLineStyle& rStyle ) { return ( ( aLineColor == rStyle.aLineColor ) && ( bTransparent == rStyle.bTransparent ) && ( aLineInfo == rStyle.aLineInfo ) ); }; @@ -434,12 +434,12 @@ struct WinMtfLineStyle struct XForm { - float eM11; - float eM12; - float eM21; - float eM22; - float eDx; - float eDy; + float eM11; + float eM12; + float eM21; + float eM22; + float eDx; + float eDy; XForm() { eM11 = eM22 = 1.0f; @@ -454,25 +454,25 @@ struct XForm struct SaveStruct { sal_uInt32 nBkMode, nMapMode, nGfxMode, nTextLayoutMode; - sal_Int32 nWinOrgX, nWinOrgY, nWinExtX, nWinExtY; - sal_Int32 nDevOrgX, nDevOrgY, nDevWidth, nDevHeight; + sal_Int32 nWinOrgX, nWinOrgY, nWinExtX, nWinExtY; + sal_Int32 nDevOrgX, nDevOrgY, nDevWidth, nDevHeight; - WinMtfLineStyle aLineStyle; - WinMtfFillStyle aFillStyle; + WinMtfLineStyle aLineStyle; + WinMtfFillStyle aFillStyle; - Font aFont; - Color aBkColor; - Color aTextColor; + Font aFont; + Color aBkColor; + Color aTextColor; sal_uInt32 nTextAlign; RasterOp eRasterOp; - Point aActPos; - WinMtfPathObj aPathObj; - WinMtfClipPath aClipPath; - XForm aXForm; + Point aActPos; + WinMtfPathObj aPathObj; + WinMtfClipPath aClipPath; + XForm aXForm; - sal_Bool bRecordPath; - sal_Bool bFillStyleSelected; + sal_Bool bRecordPath; + sal_Bool bFillStyleSelected; }; typedef ::boost::shared_ptr< SaveStruct > SaveStructPtr; @@ -481,9 +481,9 @@ typedef ::boost::shared_ptr< SaveStruct > SaveStructPtr; struct BSaveStruct { - Bitmap aBmp; - Rectangle aOutRect; - UINT32 nWinRop; + Bitmap aBmp; + Rectangle aOutRect; + UINT32 nWinRop; WinMtfFillStyle aStyle; BSaveStruct( const Bitmap& rBmp, const Rectangle& rOutRect, UINT32 nRop, WinMtfFillStyle& rStyle ) : @@ -496,12 +496,12 @@ enum GDIObjectType { GDI_DUMMY = 0, GDI_PEN = 1, GDI_BRUSH = 2, GDI_FONT = 3, GD struct GDIObj { - void* pStyle; - GDIObjectType eType; + void* pStyle; + GDIObjectType eType; GDIObj() : - pStyle ( NULL ), - eType ( GDI_DUMMY ) + pStyle ( NULL ), + eType ( GDI_DUMMY ) { }; @@ -542,148 +542,148 @@ struct GDIObj class WinMtfOutput { - WinMtfPathObj aPathObj; - WinMtfClipPath aClipPath; + WinMtfPathObj aPathObj; + WinMtfClipPath aClipPath; - WinMtfLineStyle maLatestLineStyle; - WinMtfLineStyle maLineStyle; - WinMtfFillStyle maLatestFillStyle; - WinMtfFillStyle maFillStyle; + WinMtfLineStyle maLatestLineStyle; + WinMtfLineStyle maLineStyle; + WinMtfFillStyle maLatestFillStyle; + WinMtfFillStyle maFillStyle; Font maLatestFont; - Font maFont; + Font maFont; sal_uInt32 mnLatestTextAlign; sal_uInt32 mnTextAlign; Color maLatestTextColor; - Color maTextColor; + Color maTextColor; Color maLatestBkColor; - Color maBkColor; - sal_uInt32 mnLatestTextLayoutMode; - sal_uInt32 mnTextLayoutMode; + Color maBkColor; + sal_uInt32 mnLatestTextLayoutMode; + sal_uInt32 mnTextLayoutMode; sal_uInt32 mnLatestBkMode; sal_uInt32 mnBkMode; RasterOp meLatestRasterOp; - RasterOp meRasterOp; + RasterOp meRasterOp; std::vector< GDIObj* > vGDIObj; - Point maActPos; + Point maActPos; sal_uInt32 mnRop; sal_Bool mbNopMode; - sal_Bool mbFillStyleSelected; + sal_Bool mbFillStyleSelected; sal_Bool mbClipNeedsUpdate; sal_Bool mbComplexClip; std::vector< SaveStructPtr > vSaveStack; - sal_uInt32 mnGfxMode; + sal_uInt32 mnGfxMode; sal_uInt32 mnMapMode; - XForm maXForm; - sal_Int32 mnDevOrgX, mnDevOrgY; - sal_Int32 mnDevWidth, mnDevHeight; - sal_Int32 mnWinOrgX, mnWinOrgY; // aktuelles Window-Origin - sal_Int32 mnWinExtX, mnWinExtY; // aktuelles Window-Extent - - sal_Int32 mnPixX, mnPixY; // Reference Device in pixel - sal_Int32 mnMillX, mnMillY; // Reference Device in Mill - Rectangle mrclFrame; // rectangle in logical units 1/100th mm - Rectangle mrclBounds; - - GDIMetaFile* mpGDIMetaFile; - - void UpdateLineStyle(); - void UpdateFillStyle(); - - Point ImplMap( const Point& rPt ); - Size ImplMap( const Size& rSz ); - Rectangle ImplMap( const Rectangle& rRectangle ); - void ImplMap( Font& rFont ); - Polygon& ImplMap( Polygon& rPolygon ); - PolyPolygon& ImplMap( PolyPolygon& rPolyPolygon ); - void ImplResizeObjectArry( UINT32 nNewEntry ); - void ImplSetNonPersistentLineColorTransparenz(); - void ImplDrawClippedPolyPolygon( const PolyPolygon& rPolyPoly ); - void ImplDrawBitmap( const Point& rPos, const Size& rSize, const BitmapEx rBitmap ); + XForm maXForm; + sal_Int32 mnDevOrgX, mnDevOrgY; + sal_Int32 mnDevWidth, mnDevHeight; + sal_Int32 mnWinOrgX, mnWinOrgY; // aktuelles Window-Origin + sal_Int32 mnWinExtX, mnWinExtY; // aktuelles Window-Extent + + sal_Int32 mnPixX, mnPixY; // Reference Device in pixel + sal_Int32 mnMillX, mnMillY; // Reference Device in Mill + Rectangle mrclFrame; // rectangle in logical units 1/100th mm + Rectangle mrclBounds; + + GDIMetaFile* mpGDIMetaFile; + + void UpdateLineStyle(); + void UpdateFillStyle(); + + Point ImplMap( const Point& rPt ); + Size ImplMap( const Size& rSz ); + Rectangle ImplMap( const Rectangle& rRectangle ); + void ImplMap( Font& rFont ); + Polygon& ImplMap( Polygon& rPolygon ); + PolyPolygon& ImplMap( PolyPolygon& rPolyPolygon ); + void ImplResizeObjectArry( UINT32 nNewEntry ); + void ImplSetNonPersistentLineColorTransparenz(); + void ImplDrawClippedPolyPolygon( const PolyPolygon& rPolyPoly ); + void ImplDrawBitmap( const Point& rPos, const Size& rSize, const BitmapEx rBitmap ); public: - void SetDevOrg( const Point& rPoint ); - void SetDevOrgOffset( INT32 nXAdd, INT32 nYAdd ); - void SetDevExt( const Size& rSize ); - void ScaleDevExt( double fX, double fY ); + void SetDevOrg( const Point& rPoint ); + void SetDevOrgOffset( INT32 nXAdd, INT32 nYAdd ); + void SetDevExt( const Size& rSize ); + void ScaleDevExt( double fX, double fY ); - void SetWinOrg( const Point& rPoint ); - void SetWinOrgOffset( INT32 nX, INT32 nY ); - void SetWinExt( const Size& rSize ); - void ScaleWinExt( double fX, double fY ); + void SetWinOrg( const Point& rPoint ); + void SetWinOrgOffset( INT32 nX, INT32 nY ); + void SetWinExt( const Size& rSize ); + void ScaleWinExt( double fX, double fY ); - void SetrclBounds( const Rectangle& rRect ); - void SetrclFrame( const Rectangle& rRect ); - void SetRefPix( const Size& rSize ); - void SetRefMill( const Size& rSize ); + void SetrclBounds( const Rectangle& rRect ); + void SetrclFrame( const Rectangle& rRect ); + void SetRefPix( const Size& rSize ); + void SetRefMill( const Size& rSize ); - sal_uInt32 GetMapMode() const { return mnMapMode; }; + sal_uInt32 GetMapMode() const { return mnMapMode; }; void SetMapMode( sal_uInt32 mnMapMode ); - void SetWorldTransform( const XForm& rXForm ); - void ModifyWorldTransform( const XForm& rXForm, UINT32 nMode ); - - void Push(); - void Pop(); - - UINT32 SetRasterOp( UINT32 nRasterOp ); - void StrokeAndFillPath( sal_Bool bStroke, sal_Bool bFill ); - - void SetGfxMode( sal_Int32 nGfxMode ){ mnGfxMode = nGfxMode; }; - sal_Int32 GetGfxMode() const { return mnGfxMode; }; - void SetBkMode( UINT32 nMode ); - void SetBkColor( const Color& rColor ); - void SetTextColor( const Color& rColor ); - void SetTextAlign( UINT32 nAlign ); - void CreateObject( GDIObjectType, void* pStyle = NULL ); - void CreateObject( INT32 nIndex, GDIObjectType, void* pStyle = NULL ); - void DeleteObject( INT32 nIndex ); - void SelectObject( INT32 nIndex ); - CharSet GetCharSet(){ return maFont.GetCharSet(); }; + void SetWorldTransform( const XForm& rXForm ); + void ModifyWorldTransform( const XForm& rXForm, UINT32 nMode ); + + void Push(); + void Pop(); + + UINT32 SetRasterOp( UINT32 nRasterOp ); + void StrokeAndFillPath( sal_Bool bStroke, sal_Bool bFill ); + + void SetGfxMode( sal_Int32 nGfxMode ){ mnGfxMode = nGfxMode; }; + sal_Int32 GetGfxMode() const { return mnGfxMode; }; + void SetBkMode( UINT32 nMode ); + void SetBkColor( const Color& rColor ); + void SetTextColor( const Color& rColor ); + void SetTextAlign( UINT32 nAlign ); + void CreateObject( GDIObjectType, void* pStyle = NULL ); + void CreateObject( INT32 nIndex, GDIObjectType, void* pStyle = NULL ); + void DeleteObject( INT32 nIndex ); + void SelectObject( INT32 nIndex ); + CharSet GetCharSet(){ return maFont.GetCharSet(); }; WinMtfFillStyle& GetFillStyle () { return maFillStyle; } - void SetFont( const Font& rFont ); - const Font& GetFont() const; - void SetTextLayoutMode( const sal_uInt32 nLayoutMode ); - sal_uInt32 GetTextLayoutMode() const; - - void ClearPath(){ aPathObj.Init(); }; - void ClosePath(){ aPathObj.ClosePath(); }; - const PolyPolygon& GetPathObj(){ return aPathObj; }; - - void MoveTo( const Point& rPoint, sal_Bool bRecordPath = sal_False ); - void LineTo( const Point& rPoint, sal_Bool bRecordPath = sal_False ); - void DrawPixel( const Point& rSource, const Color& rColor ); - void DrawLine( const Point& rSource, const Point& rDest ); - void DrawRect( const Rectangle& rRect, BOOL bEdge = TRUE ); - void DrawRoundRect( const Rectangle& rRect, const Size& rSize ); - void DrawEllipse( const Rectangle& rRect ); - void DrawArc( const Rectangle& rRect, const Point& rStartAngle, const Point& rEndAngle, BOOL bDrawTo = FALSE ); - void DrawPie( const Rectangle& rRect, const Point& rStartAngle, const Point& rEndAngle ); - void DrawChord( const Rectangle& rRect, const Point& rStartAngle, const Point& rEndAngle ); - void DrawPolygon( Polygon& rPolygon, sal_Bool bRecordPath = sal_False ); - void DrawPolyPolygon( PolyPolygon& rPolyPolygon, sal_Bool bRecordPath = sal_False ); - void DrawPolyLine( Polygon& rPolygon, sal_Bool bDrawTo = sal_False, sal_Bool bRecordPath = sal_False ); - void DrawPolyBezier( Polygon& rPolygin, sal_Bool bDrawTo = sal_False, sal_Bool bRecordPath = sal_False ); - void DrawText( Point& rPosition, String& rString, sal_Int32* pDXArry = NULL, sal_Bool bRecordPath = sal_False, + void SetFont( const Font& rFont ); + const Font& GetFont() const; + void SetTextLayoutMode( const sal_uInt32 nLayoutMode ); + sal_uInt32 GetTextLayoutMode() const; + + void ClearPath(){ aPathObj.Init(); }; + void ClosePath(){ aPathObj.ClosePath(); }; + const PolyPolygon& GetPathObj(){ return aPathObj; }; + + void MoveTo( const Point& rPoint, sal_Bool bRecordPath = sal_False ); + void LineTo( const Point& rPoint, sal_Bool bRecordPath = sal_False ); + void DrawPixel( const Point& rSource, const Color& rColor ); + void DrawLine( const Point& rSource, const Point& rDest ); + void DrawRect( const Rectangle& rRect, BOOL bEdge = TRUE ); + void DrawRoundRect( const Rectangle& rRect, const Size& rSize ); + void DrawEllipse( const Rectangle& rRect ); + void DrawArc( const Rectangle& rRect, const Point& rStartAngle, const Point& rEndAngle, BOOL bDrawTo = FALSE ); + void DrawPie( const Rectangle& rRect, const Point& rStartAngle, const Point& rEndAngle ); + void DrawChord( const Rectangle& rRect, const Point& rStartAngle, const Point& rEndAngle ); + void DrawPolygon( Polygon& rPolygon, sal_Bool bRecordPath = sal_False ); + void DrawPolyPolygon( PolyPolygon& rPolyPolygon, sal_Bool bRecordPath = sal_False ); + void DrawPolyLine( Polygon& rPolygon, sal_Bool bDrawTo = sal_False, sal_Bool bRecordPath = sal_False ); + void DrawPolyBezier( Polygon& rPolygin, sal_Bool bDrawTo = sal_False, sal_Bool bRecordPath = sal_False ); + void DrawText( Point& rPosition, String& rString, sal_Int32* pDXArry = NULL, sal_Bool bRecordPath = sal_False, sal_Int32 nGraphicsMode = GM_COMPATIBLE ); - void ResolveBitmapActions( List& rSaveList ); + void ResolveBitmapActions( List& rSaveList ); - void IntersectClipRect( const Rectangle& rRect ); - void ExcludeClipRect( const Rectangle& rRect ); - void MoveClipRegion( const Size& rSize ); - void SetClipPath( const PolyPolygon& rPolyPoly, sal_Int32 nClippingMode, sal_Bool bIsMapped ); - void UpdateClipRegion(); - void AddFromGDIMetaFile( GDIMetaFile& rGDIMetaFile ); + void IntersectClipRect( const Rectangle& rRect ); + void ExcludeClipRect( const Rectangle& rRect ); + void MoveClipRegion( const Size& rSize ); + void SetClipPath( const PolyPolygon& rPolyPoly, sal_Int32 nClippingMode, sal_Bool bIsMapped ); + void UpdateClipRegion(); + void AddFromGDIMetaFile( GDIMetaFile& rGDIMetaFile ); void PassEMFPlus( void* pBuffer, UINT32 nLength ); void PassEMFPlusHeaderInfo(); WinMtfOutput( GDIMetaFile& rGDIMetaFile ); - virtual ~WinMtfOutput(); + virtual ~WinMtfOutput(); }; // ----------------------------------------------------------------------------- @@ -692,20 +692,20 @@ class WinMtf { protected: - WinMtfOutput* pOut; // - SvStream* pWMF; // Die einzulesende WMF/EMF-Datei + WinMtfOutput* pOut; // + SvStream* pWMF; // Die einzulesende WMF/EMF-Datei - UINT32 nStartPos, nEndPos; - List aBmpSaveList; + UINT32 nStartPos, nEndPos; + List aBmpSaveList; - FilterConfigItem* pFilterConfigItem; + FilterConfigItem* pFilterConfigItem; com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator; // Sorgt dafuer, das aSampledBrush der aktuelle Brush des GDIMetaFiles ist. - Color ReadColor(); - void Callback( USHORT nPercent ); + Color ReadColor(); + void Callback( USHORT nPercent ); WinMtf( WinMtfOutput* pOut, SvStream& rStreamWMF, FilterConfigItem* pConfigItem = NULL ); ~WinMtf(); @@ -718,21 +718,21 @@ class WinMtf class EnhWMFReader : public WinMtf { - sal_Bool bRecordPath; - sal_Int32 nRecordCount; + sal_Bool bRecordPath; + sal_Int32 nRecordCount; BOOL bEMFPlus; - BOOL ReadHeader(); - Rectangle ReadRectangle( INT32, INT32, INT32, INT32 ); // Liesst und konvertiert ein Rechteck - void ImplExtTextOut( BOOL bWideCharakter ); + BOOL ReadHeader(); + Rectangle ReadRectangle( INT32, INT32, INT32, INT32 ); // Liesst und konvertiert ein Rechteck + void ImplExtTextOut( BOOL bWideCharakter ); public: EnhWMFReader( SvStream& rStreamWMF, GDIMetaFile& rGDIMetaFile, FilterConfigItem* pConfigItem = NULL ) : WinMtf( new WinMtfOutput( rGDIMetaFile ), rStreamWMF, pConfigItem ), bRecordPath( sal_False ), bEMFPlus (FALSE) {}; ~EnhWMFReader(); - BOOL ReadEnhWMF(); + BOOL ReadEnhWMF(); void ReadEMFPlusComment(sal_uInt32 length, sal_Bool& bHaveDC); void ReadGDIComment(); }; @@ -743,47 +743,47 @@ class WMFReader : public WinMtf { private: - VirtualDevice aVDev; // just for the purpose of "IsFontAvailable" - UINT16 nUnitsPerInch; - sal_uInt32 nRecSize; + VirtualDevice aVDev; // just for the purpose of "IsFontAvailable" + UINT16 nUnitsPerInch; + sal_uInt32 nRecSize; // embedded EMF data - SvMemoryStream* pEMFStream; + SvMemoryStream* pEMFStream; // total number of comment records containing EMF data sal_uInt32 nEMFRecCount; - + // number of EMF records read sal_uInt32 nEMFRec; // total size of embedded EMF data sal_uInt32 nEMFSize; - sal_uInt32 nSkipActions; - sal_uInt32 nCurrentAction; - sal_uInt32 nUnicodeEscapeAction; + sal_uInt32 nSkipActions; + sal_uInt32 nCurrentAction; + sal_uInt32 nUnicodeEscapeAction; // Liesst den Kopf der WMF-Datei - BOOL ReadHeader(); + BOOL ReadHeader(); // Liesst die Parameter des Rocords mit der Funktionsnummer nFunction. - void ReadRecordParams( USHORT nFunction ); + void ReadRecordParams( USHORT nFunction ); - Point ReadPoint(); // Liesst und konvertiert einen Punkt (erst X dann Y) - Point ReadYX(); // Liesst und konvertiert einen Punkt (erst Y dann X) - Rectangle ReadRectangle(); // Liesst und konvertiert ein Rechteck - Size ReadYXExt(); + Point ReadPoint(); // Liesst und konvertiert einen Punkt (erst X dann Y) + Point ReadYX(); // Liesst und konvertiert einen Punkt (erst Y dann X) + Rectangle ReadRectangle(); // Liesst und konvertiert ein Rechteck + Size ReadYXExt(); sal_Bool GetPlaceableBound( Rectangle& rSize, SvStream* pStrm ); public: WMFReader( SvStream& rStreamWMF, GDIMetaFile& rGDIMetaFile, FilterConfigItem* pConfigItem = NULL ) : WinMtf( new WinMtfOutput( rGDIMetaFile ), rStreamWMF, pConfigItem ) {}; - + ~WMFReader(); // Liesst aus dem Stream eine WMF-Datei und fuellt das GDIMetaFile - void ReadWMF(); + void ReadWMF(); }; #endif diff --git a/svtools/source/filter.vcl/wmf/winwmf.cxx b/svtools/source/filter.vcl/wmf/winwmf.cxx index 1a67a97f17c2..fdb8cf5b620c 100644 --- a/svtools/source/filter.vcl/wmf/winwmf.cxx +++ b/svtools/source/filter.vcl/wmf/winwmf.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -334,9 +334,9 @@ void WMFReader::ReadRecordParams( USHORT nFunc ) case W_META_POLYPOLYGON: { - USHORT i, nPoly, nPoints; - USHORT* pnPoints; - Point* pPtAry; + USHORT i, nPoly, nPoints; + USHORT* pnPoints; + Point* pPtAry; // Anzahl der Polygone: *pWMF >> nPoly; // Anzahl der Punkte eines jeden Polygons holen, Gesammtzahl der Punkte ermitteln: @@ -401,7 +401,7 @@ void WMFReader::ReadRecordParams( USHORT nFunc ) *pWMF >> nLength; if ( nLength ) { - char* pChar = new char[ ( nLength + 1 ) &~ 1 ]; + char* pChar = new char[ ( nLength + 1 ) &~ 1 ]; pWMF->Read( pChar, ( nLength + 1 ) &~ 1 ); String aText( pChar, nLength, pOut->GetCharSet() ); delete[] pChar; @@ -413,12 +413,12 @@ void WMFReader::ReadRecordParams( USHORT nFunc ) case W_META_EXTTEXTOUT: { - sal_Int16 nDx, nDxTmp; - sal_uInt16 i, nLen, nOptions; - sal_Int32 nRecordPos, nRecordSize, nOriginalTextLen, nNewTextLen; - Point aPosition; - Rectangle aRect; - sal_Int32* pDXAry = NULL; + sal_Int16 nDx, nDxTmp; + sal_uInt16 i, nLen, nOptions; + sal_Int32 nRecordPos, nRecordSize, nOriginalTextLen, nNewTextLen; + Point aPosition; + Rectangle aRect; + sal_Int32* pDXAry = NULL; pWMF->SeekRel(-6); nRecordPos = pWMF->Tell(); @@ -446,15 +446,15 @@ void WMFReader::ReadRecordParams( USHORT nFunc ) char* pChar = new char[ ( nOriginalTextLen + 1 ) &~ 1 ]; pWMF->Read( pChar, ( nOriginalTextLen + 1 ) &~ 1 ); String aText( pChar, (sal_uInt16)nOriginalTextLen, pOut->GetCharSet() );// after this conversion the text may contain - nNewTextLen = aText.Len(); // less character (japanese version), so the - delete[] pChar; // dxAry will not fit + nNewTextLen = aText.Len(); // less character (japanese version), so the + delete[] pChar; // dxAry will not fit if ( nNewTextLen ) { - sal_uInt32 nMaxStreamPos = nRecordPos + ( nRecordSize << 1 ); - sal_Int32 nDxArySize = nMaxStreamPos - pWMF->Tell(); - sal_Int32 nDxAryEntries = nDxArySize >> 1; - sal_Bool bUseDXAry = FALSE; + sal_uInt32 nMaxStreamPos = nRecordPos + ( nRecordSize << 1 ); + sal_Int32 nDxArySize = nMaxStreamPos - pWMF->Tell(); + sal_Int32 nDxAryEntries = nDxArySize >> 1; + sal_Bool bUseDXAry = FALSE; if ( ( ( nDxAryEntries % nOriginalTextLen ) == 0 ) && ( nNewTextLen <= nOriginalTextLen ) ) { @@ -477,7 +477,7 @@ void WMFReader::ReadRecordParams( USHORT nFunc ) *pWMF >> nDxTmp; nDx = nDx + nDxTmp; } - } + } } pDXAry[ i ] = nDx; } @@ -497,7 +497,7 @@ void WMFReader::ReadRecordParams( USHORT nFunc ) case W_META_SELECTOBJECT: { - INT16 nObjIndex; + INT16 nObjIndex; *pWMF >> nObjIndex; pOut->SelectObject( nObjIndex ); } @@ -505,7 +505,7 @@ void WMFReader::ReadRecordParams( USHORT nFunc ) case W_META_SETTEXTALIGN: { - UINT16 nAlign; + UINT16 nAlign; *pWMF >> nAlign; pOut->SetTextAlign( nAlign ); } @@ -513,7 +513,7 @@ void WMFReader::ReadRecordParams( USHORT nFunc ) case W_META_BITBLT: { - // 0-3 : nWinROP #93454# + // 0-3 : nWinROP #93454# // 4-5 : y offset of source bitmap // 6-7 : x offset of source bitmap // 8-9 : used height of source bitmap @@ -525,11 +525,11 @@ void WMFReader::ReadRecordParams( USHORT nFunc ) // 20-21 : Height Bitmap in Pixel // 22-23 : bytes per scanline // 24 : planes - // 25 : bitcount + // 25 : bitcount - sal_Int32 nWinROP; - sal_uInt16 nSx, nSy, nSxe, nSye, nDontKnow, nWidth, nHeight, nBytesPerScan; - sal_uInt8 nPlanes, nBitCount; + sal_Int32 nWinROP; + sal_uInt16 nSx, nSy, nSxe, nSye, nDontKnow, nWidth, nHeight, nBytesPerScan; + sal_uInt8 nPlanes, nBitCount; *pWMF >> nWinROP >> nSy >> nSx >> nSye >> nSxe; @@ -562,7 +562,7 @@ void WMFReader::ReadRecordParams( USHORT nFunc ) } } aBmp.ReleaseAccess( pAcc ); - if ( nSye && nSxe && + if ( nSye && nSxe && ( ( nSx + nSxe ) <= aBmp.GetSizePixel().Width() ) && ( ( nSy + nSye <= aBmp.GetSizePixel().Height() ) ) ) { @@ -573,7 +573,7 @@ void WMFReader::ReadRecordParams( USHORT nFunc ) aBmpSaveList.Insert( new BSaveStruct( aBmp, aDestRect, nWinROP, pOut->GetFillStyle () ), LIST_APPEND ); } } - } + } break; case W_META_STRETCHBLT: @@ -583,13 +583,13 @@ void WMFReader::ReadRecordParams( USHORT nFunc ) { sal_Int32 nWinROP; sal_uInt16 nSx, nSy, nSxe, nSye, nUsage; - Bitmap aBmp; + Bitmap aBmp; *pWMF >> nWinROP; if( nFunc == W_META_STRETCHDIB ) *pWMF >> nUsage; - + // nSye and nSxe is the number of pixels that has to been used if( nFunc == W_META_STRETCHDIB || nFunc == W_META_STRETCHBLT || nFunc == W_META_DIBSTRETCHBLT ) *pWMF >> nSye >> nSxe; @@ -602,18 +602,18 @@ void WMFReader::ReadRecordParams( USHORT nFunc ) if( nFunc == W_META_STRETCHDIB || nFunc == W_META_DIBBITBLT || nFunc == W_META_DIBSTRETCHBLT ) { if ( nWinROP == PATCOPY ) - *pWMF >> nUsage; // i don't know anything of this parameter, so its called nUsage + *pWMF >> nUsage; // i don't know anything of this parameter, so its called nUsage // pOut->DrawRect( Rectangle( ReadYX(), aDestSize ), FALSE ); Size aDestSize( ReadYXExt() ); - if ( aDestSize.Width() && aDestSize.Height() ) // #92623# do not try to read buggy bitmaps + if ( aDestSize.Width() && aDestSize.Height() ) // #92623# do not try to read buggy bitmaps { Rectangle aDestRect( ReadYX(), aDestSize ); if ( nWinROP != PATCOPY ) aBmp.Read( *pWMF, FALSE ); // test if it is sensible to crop - if ( nSye && nSxe && + if ( nSye && nSxe && ( ( nSx + nSxe ) <= aBmp.GetSizePixel().Width() ) && ( ( nSy + nSye <= aBmp.GetSizePixel().Height() ) ) ) { @@ -628,10 +628,10 @@ void WMFReader::ReadRecordParams( USHORT nFunc ) case W_META_DIBCREATEPATTERNBRUSH: { - Bitmap aBmp; + Bitmap aBmp; BitmapReadAccess* pBmp; - UINT32 nRed = 0, nGreen = 0, nBlue = 0, nCount = 1; - UINT16 nFunction; + UINT32 nRed = 0, nGreen = 0, nBlue = 0, nCount = 1; + UINT16 nFunction; *pWMF >> nFunction >> nFunction; @@ -643,8 +643,8 @@ void WMFReader::ReadRecordParams( USHORT nFunc ) { for ( INT32 x = 0; x < pBmp->Width(); x++ ) { - const BitmapColor aColor( pBmp->GetColor( y, x ) ); - + const BitmapColor aColor( pBmp->GetColor( y, x ) ); + nRed += aColor.GetRed(); nGreen += aColor.GetGreen(); nBlue += aColor.GetBlue(); @@ -688,8 +688,8 @@ void WMFReader::ReadRecordParams( USHORT nFunc ) case W_META_CREATEPENINDIRECT: { - LineInfo aLineInfo; - USHORT nStyle, nWidth, nHeight; + LineInfo aLineInfo; + USHORT nStyle, nWidth, nHeight; *pWMF >> nStyle >> nWidth >> nHeight; @@ -732,7 +732,7 @@ void WMFReader::ReadRecordParams( USHORT nFunc ) case W_META_CREATEBRUSHINDIRECT: { - USHORT nStyle; + USHORT nStyle; *pWMF >> nStyle; pOut->CreateObject( GDI_BRUSH, new WinMtfFillStyle( ReadColor(), ( nStyle == BS_HOLLOW ) ? TRUE : FALSE ) ); } @@ -740,9 +740,9 @@ void WMFReader::ReadRecordParams( USHORT nFunc ) case W_META_CREATEFONTINDIRECT: { - Size aFontSize; - char lfFaceName[ LF_FACESIZE ]; - INT16 lfEscapement, lfOrientation, lfWeight; // ( ehemals USHORT ) + Size aFontSize; + char lfFaceName[ LF_FACESIZE ]; + INT16 lfEscapement, lfOrientation, lfWeight; // ( ehemals USHORT ) LOGFONTW aLogFont; aFontSize = ReadYXExt(); @@ -830,22 +830,22 @@ void WMFReader::ReadRecordParams( USHORT nFunc ) pWMF->SetError( SVSTREAM_FILEFORMAT_ERROR ); break; } - if ( nRecSize >= 4 ) // minimal escape lenght + if ( nRecSize >= 4 ) // minimal escape lenght { - sal_uInt16 nMode, nLen; + sal_uInt16 nMode, nLen; *pWMF >> nMode >> nLen; if ( ( nMode == W_MFCOMMENT ) && ( nLen >= 4 ) ) { - sal_uInt32 nNewMagic; // we have to read int32 for + sal_uInt32 nNewMagic; // we have to read int32 for *pWMF >> nNewMagic; // META_ESCAPE_ENHANCED_METAFILE CommentIdentifier - + if( nNewMagic == 0x2c2a4f4f && nLen >= 14 ) { sal_uInt16 nMagic2; *pWMF >> nMagic2; if( nMagic2 == 0x0a ) // 2nd half of magic - { // continue with private escape + { // continue with private escape sal_uInt32 nCheck, nEsc; *pWMF >> nCheck >> nEsc; @@ -877,12 +877,12 @@ void WMFReader::ReadRecordParams( USHORT nFunc ) switch( nEsc ) { case PRIVATE_ESCAPE_UNICODE : - { // we will use text instead of polygons only if we have the correct font + { // we will use text instead of polygons only if we have the correct font if ( aVDev.IsFontAvailable( pOut->GetFont().GetName() ) ) { Point aPt; String aString; - sal_uInt32 i, nStringLen, nDXCount; + sal_uInt32 i, nStringLen, nDXCount; sal_Int32* pDXAry = NULL; SvMemoryStream aMemoryStream( nEscLen ); aMemoryStream.Write( pData, nEscLen ); @@ -918,12 +918,12 @@ void WMFReader::ReadRecordParams( USHORT nFunc ) } else if ( (nNewMagic == static_cast< sal_uInt32 >(0x43464D57)) && (nLen >= 34) && ( (sal_Int32)(nLen + 10) <= (sal_Int32)(nRecSize * 2) )) { - sal_uInt32 nComType, nVersion, nFlags, nComRecCount, + sal_uInt32 nComType, nVersion, nFlags, nComRecCount, nCurRecSize, nRemainingSize, nEMFTotalSize; sal_uInt16 nCheck; - + *pWMF >> nComType >> nVersion >> nCheck >> nFlags - >> nComRecCount >> nCurRecSize + >> nComRecCount >> nCurRecSize >> nRemainingSize >> nEMFTotalSize; // the nRemainingSize is not mentioned in MSDN documentation // but it seems to be required to read in data produced by OLE @@ -950,7 +950,7 @@ void WMFReader::ReadRecordParams( USHORT nFunc ) delete pEMFStream; pEMFStream = NULL; } - + if( pEMFStream ) { sal_Int8* pBuf = new sal_Int8[ nCurRecSize ]; @@ -999,7 +999,7 @@ void WMFReader::ReadRecordParams( USHORT nFunc ) BOOL WMFReader::ReadHeader() { - Rectangle aPlaceableBound; + Rectangle aPlaceableBound; sal_uInt32 nl, nStrmPos = pWMF->Tell(); // Einlesen des METAFILEHEADER, falls vorhanden @@ -1030,7 +1030,7 @@ BOOL WMFReader::ReadHeader() } else { - nUnitsPerInch = 96; + nUnitsPerInch = 96; pWMF->Seek( nStrmPos + 18 ); // set the streampos to the start of the the metaactions GetPlaceableBound( aPlaceableBound, pWMF ); pWMF->Seek( nStrmPos ); @@ -1043,9 +1043,9 @@ BOOL WMFReader::ReadHeader() Size aDevExt( 10000, 10000 ); if( ( labs( aWMFSize.Width() ) > 1 ) && ( labs( aWMFSize.Height() ) > 1 ) ) { - const Fraction aFrac( 1, nUnitsPerInch ); - MapMode aWMFMap( MAP_INCH, Point(), aFrac, aFrac ); - Size aSize100( OutputDevice::LogicToLogic( aWMFSize, aWMFMap, MAP_100TH_MM ) ); + const Fraction aFrac( 1, nUnitsPerInch ); + MapMode aWMFMap( MAP_INCH, Point(), aFrac, aFrac ); + Size aSize100( OutputDevice::LogicToLogic( aWMFSize, aWMFMap, MAP_100TH_MM ) ); aDevExt = Size( labs( aSize100.Width() ), labs( aSize100.Height() ) ); } pOut->SetDevExt( aDevExt ); @@ -1070,9 +1070,9 @@ BOOL WMFReader::ReadHeader() void WMFReader::ReadWMF() { - USHORT nFunction; - ULONG nPos, nPercent, nLastPercent; - + USHORT nFunction; + ULONG nPos, nPercent, nLastPercent; + nSkipActions = 0; nCurrentAction = 0; nUnicodeEscapeAction = 0; @@ -1081,7 +1081,7 @@ void WMFReader::ReadWMF() nEMFRecCount = 0; nEMFRec = 0; nEMFSize = 0; - + sal_Bool bEMFAvailable = sal_False; pOut->SetMapMode( MM_ANISOTROPIC ); @@ -1133,7 +1133,7 @@ void WMFReader::ReadWMF() ReadRecordParams( nFunction ); else nSkipActions--; - + if( pEMFStream && nEMFRecCount == nEMFRec ) { GDIMetaFile aMeta; @@ -1142,7 +1142,7 @@ void WMFReader::ReadWMF() bEMFAvailable = pEMFReader->ReadEnhWMF(); delete pEMFReader; // destroy first!!! - if( bEMFAvailable ) + if( bEMFAvailable ) { pOut->AddFromGDIMetaFile( aMeta ); pOut->SetrclFrame( Rectangle(0, 0, aMeta.GetPrefSize().Width(), aMeta.GetPrefSize().Height() )); @@ -1210,14 +1210,14 @@ sal_Bool WMFReader::GetPlaceableBound( Rectangle& rPlaceableBound, SvStream* pSt rPlaceableBound.Top() = (sal_Int32)0x7fffffff; rPlaceableBound.Right() = (sal_Int32)0x80000000; rPlaceableBound.Bottom() = (sal_Int32)0x80000000; - + sal_Int16 nMapMode = MM_ANISOTROPIC; sal_uInt16 nFunction; sal_uInt32 nRSize; sal_uInt32 nPos = pStm->Tell(); sal_uInt32 nEnd = pStm->Seek( STREAM_SEEK_TO_END ); - + pStm->Seek( nPos ); if( nEnd - nPos ) @@ -1252,7 +1252,7 @@ sal_Bool WMFReader::GetPlaceableBound( Rectangle& rPlaceableBound, SvStream* pSt *pStm >> nHeight >> nWidth; rPlaceableBound.SetSize( Size( nWidth, nHeight ) ); } - break; + break; case W_META_SETMAPMODE : *pStm >> nMapMode; @@ -1298,7 +1298,7 @@ sal_Bool WMFReader::GetPlaceableBound( Rectangle& rPlaceableBound, SvStream* pSt case W_META_POLYPOLYGON: { - USHORT i, nPoly, nPoints = 0; + USHORT i, nPoly, nPoints = 0; *pStm >> nPoly; for( i = 0; i < nPoly; i++ ) { @@ -1342,10 +1342,10 @@ sal_Bool WMFReader::GetPlaceableBound( Rectangle& rPlaceableBound, SvStream* pSt case W_META_EXTTEXTOUT: { - sal_uInt16 nLen, nOptions; - sal_Int32 nRecordPos, nRecordSize; - Point aPosition; - Rectangle aRect; + sal_uInt16 nLen, nOptions; + sal_Int32 nRecordPos, nRecordSize; + Point aPosition; + Rectangle aRect; pStm->SeekRel(-6); nRecordPos = pStm->Tell(); @@ -1370,7 +1370,7 @@ sal_Bool WMFReader::GetPlaceableBound( Rectangle& rPlaceableBound, SvStream* pSt if( nFunction == W_META_STRETCHDIB ) *pStm >> nUsage; - + // nSye and nSxe is the number of pixels that has to been used if( nFunction == W_META_STRETCHDIB || nFunction == W_META_STRETCHBLT || nFunction == W_META_DIBSTRETCHBLT ) *pStm >> nSye >> nSxe; @@ -1383,11 +1383,11 @@ sal_Bool WMFReader::GetPlaceableBound( Rectangle& rPlaceableBound, SvStream* pSt if( nFunction == W_META_STRETCHDIB || nFunction == W_META_DIBBITBLT || nFunction == W_META_DIBSTRETCHBLT ) { if ( nWinROP == PATCOPY ) - *pStm >> nUsage; // i don't know anything of this parameter, so its called nUsage + *pStm >> nUsage; // i don't know anything of this parameter, so its called nUsage // pOut->DrawRect( Rectangle( ReadYX(), aDestSize ), FALSE ); Size aDestSize( ReadYXExt() ); - if ( aDestSize.Width() && aDestSize.Height() ) // #92623# do not try to read buggy bitmaps + if ( aDestSize.Width() && aDestSize.Height() ) // #92623# do not try to read buggy bitmaps { Rectangle aDestRect( ReadYX(), aDestSize ); GetWinExtMax( aDestRect, rPlaceableBound, nMapMode ); diff --git a/svtools/source/filter.vcl/wmf/wmf.cxx b/svtools/source/filter.vcl/wmf/wmf.cxx index 035eaf9e5225..095cbfd8ec08 100644 --- a/svtools/source/filter.vcl/wmf/wmf.cxx +++ b/svtools/source/filter.vcl/wmf/wmf.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/svtools/source/filter.vcl/wmf/wmfwr.cxx b/svtools/source/filter.vcl/wmf/wmfwr.cxx index b1d08c091be8..fd8fefdda821 100644 --- a/svtools/source/filter.vcl/wmf/wmfwr.cxx +++ b/svtools/source/filter.vcl/wmf/wmfwr.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ #include <rtl/tencinfo.h> #include <tools/tenccvt.hxx> #include <osl/endian.h> -#include <i18nutil/unicode.hxx> //unicode::getUnicodeScriptType +#include <i18nutil/unicode.hxx> //unicode::getUnicodeScriptType #include <vcl/metric.hxx> #include <basegfx/polygon/b2dpolygon.hxx> @@ -189,17 +189,17 @@ #define W_CHINESEBIG5_CHARSET 136 #define W_OEM_CHARSET 255 /*WINVER >= 0x0400*/ -#define W_JOHAB_CHARSET 130 -#define W_HEBREW_CHARSET 177 -#define W_ARABIC_CHARSET 178 -#define W_GREEK_CHARSET 161 -#define W_TURKISH_CHARSET 162 +#define W_JOHAB_CHARSET 130 +#define W_HEBREW_CHARSET 177 +#define W_ARABIC_CHARSET 178 +#define W_GREEK_CHARSET 161 +#define W_TURKISH_CHARSET 162 #define W_VIETNAMESE_CHARSET 163 -#define W_THAI_CHARSET 222 +#define W_THAI_CHARSET 222 #define W_EASTEUROPE_CHARSET 238 #define W_RUSSIAN_CHARSET 204 #define W_MAC_CHARSET 77 -#define W_BALTIC_CHARSET 186 +#define W_BALTIC_CHARSET 186 #define W_DEFAULT_PITCH 0x00 #define W_FIXED_PITCH 0x01 @@ -242,9 +242,9 @@ #define W_HS_CROSS 4 #define W_HS_DIAGCROSS 5 -#define W_MFCOMMENT 15 +#define W_MFCOMMENT 15 -#define PRIVATE_ESCAPE_UNICODE 2 +#define PRIVATE_ESCAPE_UNICODE 2 /// copied from writerwordglue.cxx @@ -458,8 +458,8 @@ void WMFWriter::WMFRecord_CreateFontIndirect(const Font & rFont) if (rFont.GetUnderline()==UNDERLINE_NONE) *pWMF << (BYTE)0; else *pWMF << (BYTE)1; if (rFont.GetStrikeout()==STRIKEOUT_NONE) *pWMF << (BYTE)0; else *pWMF << (BYTE)1; - CharSet eFontNameEncoding = rFont.GetCharSet(); - sal_uInt8 nCharSet = rtl_getBestWindowsCharsetFromTextEncoding( eFontNameEncoding ); + CharSet eFontNameEncoding = rFont.GetCharSet(); + sal_uInt8 nCharSet = rtl_getBestWindowsCharsetFromTextEncoding( eFontNameEncoding ); if ( eFontNameEncoding == RTL_TEXTENCODING_SYMBOL ) eFontNameEncoding = RTL_TEXTENCODING_MS_1252; if ( nCharSet == 1 ) @@ -560,14 +560,14 @@ void WMFWriter::WMFRecord_Escape( sal_uInt32 nEsc, sal_uInt32 nLen, const sal_In WriteRecordHeader( 3 + 9 + ( ( nLen + 1 ) >> 1 ), W_META_ESCAPE ); *pWMF << (sal_uInt16)W_MFCOMMENT - << (sal_uInt16)( nLen + 14 ) // we will always have a fourteen byte escape header: - << (sal_uInt16)0x4f4f // OO - << (sal_uInt32)0xa2c2a // evil magic number - << (sal_uInt32)nCheckSum // crc32 checksum about nEsc & pData - << (sal_uInt32)nEsc; // escape number + << (sal_uInt16)( nLen + 14 ) // we will always have a fourteen byte escape header: + << (sal_uInt16)0x4f4f // OO + << (sal_uInt32)0xa2c2a // evil magic number + << (sal_uInt32)nCheckSum // crc32 checksum about nEsc & pData + << (sal_uInt32)nEsc; // escape number pWMF->Write( pData, nLen ); if ( nLen & 1 ) - *pWMF << (sal_uInt8)0; // pad byte + *pWMF << (sal_uInt8)0; // pad byte } /* if return value is true, then a complete unicode string and also a polygon replacement has been written, @@ -581,49 +581,49 @@ sal_Bool WMFWriter::WMFRecord_Escape_Unicode( const Point& rPoint, const String& if ( nStringLen ) { // first we will check if a comment is necessary - if ( aSrcFont.GetCharSet() != RTL_TEXTENCODING_SYMBOL ) // symbol is always byte character, so there is no unicode loss + if ( aSrcFont.GetCharSet() != RTL_TEXTENCODING_SYMBOL ) // symbol is always byte character, so there is no unicode loss { const sal_Unicode* pBuf = rUniStr.GetBuffer(); const rtl_TextEncoding aTextEncodingOrg = aSrcFont.GetCharSet(); ByteString aByteStr( rUniStr, aTextEncodingOrg ); - String aUniStr2( aByteStr, aTextEncodingOrg ); - const sal_Unicode* pConversion = aUniStr2.GetBuffer(); // this is the unicode array after bytestring <-> unistring conversion + String aUniStr2( aByteStr, aTextEncodingOrg ); + const sal_Unicode* pConversion = aUniStr2.GetBuffer(); // this is the unicode array after bytestring <-> unistring conversion for ( i = 0; i < nStringLen; i++ ) { if ( *pBuf++ != *pConversion++ ) break; } - if ( i != nStringLen ) // after conversion the characters are not original, - { // try again, with determining a better charset from unicode char + if ( i != nStringLen ) // after conversion the characters are not original, + { // try again, with determining a better charset from unicode char pBuf = rUniStr.GetBuffer(); const sal_Unicode* pCheckChar = pBuf; - rtl_TextEncoding aTextEncoding = getScriptClass (*pCheckChar); // try the first character + rtl_TextEncoding aTextEncoding = getScriptClass (*pCheckChar); // try the first character for ( i = 1; i < nStringLen; i++) { if (aTextEncoding != aTextEncodingOrg) // found something break; pCheckChar++; - aTextEncoding = getScriptClass (*pCheckChar); // try the next character + aTextEncoding = getScriptClass (*pCheckChar); // try the next character } aByteStr = ByteString ( rUniStr, aTextEncoding ); aUniStr2 = String ( aByteStr, aTextEncoding ); - pConversion = aUniStr2.GetBuffer(); // this is the unicode array after bytestring <-> unistring conversion + pConversion = aUniStr2.GetBuffer(); // this is the unicode array after bytestring <-> unistring conversion for ( i = 0; i < nStringLen; i++ ) { if ( *pBuf++ != *pConversion++ ) break; } - if (i == nStringLen) + if (i == nStringLen) { aSrcFont.SetCharSet (aTextEncoding); SetAllAttr(); } } - if ( ( i != nStringLen ) || IsStarSymbol( aSrcFont.GetName() ) ) // after conversion the characters are not original, so we - { // will store the unicode string and a polypoly replacement + if ( ( i != nStringLen ) || IsStarSymbol( aSrcFont.GetName() ) ) // after conversion the characters are not original, so we + { // will store the unicode string and a polypoly replacement Color aOldFillColor( aSrcFillColor ); Color aOldLineColor( aSrcLineColor ); aSrcLineInfo = LineInfo(); @@ -686,7 +686,7 @@ void WMFWriter::WMFRecord_ExtTextOut( const Point & rPoint, TrueExtTextOut(rPoint,rString,aByteString,pDXAry); } -void WMFWriter::TrueExtTextOut( const Point & rPoint, const String & rString, +void WMFWriter::TrueExtTextOut( const Point & rPoint, const String & rString, const ByteString & rByteString, const sal_Int32 * pDXAry ) { WriteRecordHeader( 0, W_META_EXTTEXTOUT ); @@ -1179,8 +1179,8 @@ void WMFWriter::HandleLineInfoPolyPolygons(const LineInfo& rInfo, const basegfx: void WMFWriter::WriteRecords( const GDIMetaFile & rMTF ) { - ULONG nA, nACount; - MetaAction* pMA; + ULONG nA, nACount; + MetaAction* pMA; if( bStatus ) { @@ -1205,8 +1205,8 @@ void WMFWriter::WriteRecords( const GDIMetaFile & rMTF ) case META_POINT_ACTION: { - const MetaPointAction* pA = (const MetaPointAction*) pMA; - const Point& rPt = pA->GetPoint(); + const MetaPointAction* pA = (const MetaPointAction*) pMA; + const Point& rPt = pA->GetPoint(); aSrcLineInfo = LineInfo(); SetLineAndFillAttr(); WMFRecord_MoveTo( rPt); @@ -1293,7 +1293,7 @@ void WMFWriter::WriteRecords( const GDIMetaFile & rMTF ) case META_POLYLINE_ACTION: { const MetaPolyLineAction* pA = (const MetaPolyLineAction*) pMA; - const Polygon& rPoly = pA->GetPolygon(); + const Polygon& rPoly = pA->GetPolygon(); if( rPoly.GetSize() ) { @@ -1357,7 +1357,7 @@ void WMFWriter::WriteRecords( const GDIMetaFile & rMTF ) case META_TEXTARRAY_ACTION: { const MetaTextArrayAction* pA = (const MetaTextArrayAction*) pMA; - + String aTemp( pA->GetText(), pA->GetIndex(), pA->GetLen() ); aSrcLineInfo = LineInfo(); SetAllAttr(); @@ -1406,8 +1406,8 @@ void WMFWriter::WriteRecords( const GDIMetaFile & rMTF ) case META_BMPSCALEPART_ACTION: { - const MetaBmpScalePartAction* pA = (const MetaBmpScalePartAction*) pMA; - Bitmap aTmp( pA->GetBitmap() ); + const MetaBmpScalePartAction* pA = (const MetaBmpScalePartAction*) pMA; + Bitmap aTmp( pA->GetBitmap() ); if( aTmp.Crop( Rectangle( pA->GetSrcPoint(), pA->GetSrcSize() ) ) ) WMFRecord_StretchDIB( pA->GetDestPoint(), pA->GetDestSize(), aTmp ); @@ -1416,9 +1416,9 @@ void WMFWriter::WriteRecords( const GDIMetaFile & rMTF ) case META_BMPEX_ACTION: { - const MetaBmpExAction* pA = (const MetaBmpExAction *) pMA; - Bitmap aBmp( pA->GetBitmapEx().GetBitmap() ); - Bitmap aMsk( pA->GetBitmapEx().GetMask() ); + const MetaBmpExAction* pA = (const MetaBmpExAction *) pMA; + Bitmap aBmp( pA->GetBitmapEx().GetBitmap() ); + Bitmap aMsk( pA->GetBitmapEx().GetMask() ); if( !!aMsk ) { @@ -1434,9 +1434,9 @@ void WMFWriter::WriteRecords( const GDIMetaFile & rMTF ) case META_BMPEXSCALE_ACTION: { - const MetaBmpExScaleAction* pA = (const MetaBmpExScaleAction*) pMA; - Bitmap aBmp( pA->GetBitmapEx().GetBitmap() ); - Bitmap aMsk( pA->GetBitmapEx().GetMask() ); + const MetaBmpExScaleAction* pA = (const MetaBmpExScaleAction*) pMA; + Bitmap aBmp( pA->GetBitmapEx().GetBitmap() ); + Bitmap aMsk( pA->GetBitmapEx().GetMask() ); if( !!aMsk ) { @@ -1452,11 +1452,11 @@ void WMFWriter::WriteRecords( const GDIMetaFile & rMTF ) case META_BMPEXSCALEPART_ACTION: { - const MetaBmpExScalePartAction* pA = (const MetaBmpExScalePartAction*) pMA; - BitmapEx aBmpEx( pA->GetBitmapEx() ); + const MetaBmpExScalePartAction* pA = (const MetaBmpExScalePartAction*) pMA; + BitmapEx aBmpEx( pA->GetBitmapEx() ); aBmpEx.Crop( Rectangle( pA->GetSrcPoint(), pA->GetSrcSize() ) ); - Bitmap aBmp( aBmpEx.GetBitmap() ); - Bitmap aMsk( aBmpEx.GetMask() ); + Bitmap aBmp( aBmpEx.GetBitmap() ); + Bitmap aMsk( aBmpEx.GetMask() ); if( !!aMsk ) { @@ -1472,8 +1472,8 @@ void WMFWriter::WriteRecords( const GDIMetaFile & rMTF ) case META_GRADIENT_ACTION: { - const MetaGradientAction* pA = (const MetaGradientAction*) pMA; - GDIMetaFile aTmpMtf; + const MetaGradientAction* pA = (const MetaGradientAction*) pMA; + GDIMetaFile aTmpMtf; pVirDev->AddGradientActions( pA->GetRect(), pA->GetGradient(), aTmpMtf ); WriteRecords( aTmpMtf ); @@ -1482,8 +1482,8 @@ void WMFWriter::WriteRecords( const GDIMetaFile & rMTF ) case META_HATCH_ACTION: { - const MetaHatchAction* pA = (const MetaHatchAction*) pMA; - GDIMetaFile aTmpMtf; + const MetaHatchAction* pA = (const MetaHatchAction*) pMA; + GDIMetaFile aTmpMtf; pVirDev->AddHatchActions( pA->GetPolyPolygon(), pA->GetHatch(), aTmpMtf ); WriteRecords( aTmpMtf ); @@ -1492,10 +1492,10 @@ void WMFWriter::WriteRecords( const GDIMetaFile & rMTF ) case META_WALLPAPER_ACTION: { - const MetaWallpaperAction* pA = (const MetaWallpaperAction*) pMA; - const Color& rColor = pA->GetWallpaper().GetColor(); - const Color aOldLineColor( aSrcLineColor ); - const Color aOldFillColor( aSrcFillColor ); + const MetaWallpaperAction* pA = (const MetaWallpaperAction*) pMA; + const Color& rColor = pA->GetWallpaper().GetColor(); + const Color aOldLineColor( aSrcLineColor ); + const Color aOldFillColor( aSrcFillColor ); aSrcLineColor = rColor; aSrcFillColor = rColor; @@ -1729,15 +1729,15 @@ void WMFWriter::WriteRecords( const GDIMetaFile & rMTF ) case META_FLOATTRANSPARENT_ACTION: { const MetaFloatTransparentAction* pA = (const MetaFloatTransparentAction*) pMA; - - GDIMetaFile aTmpMtf( pA->GetGDIMetaFile() ); - Point aSrcPt( aTmpMtf.GetPrefMapMode().GetOrigin() ); - const Size aSrcSize( aTmpMtf.GetPrefSize() ); - const Point aDestPt( pA->GetPoint() ); - const Size aDestSize( pA->GetSize() ); - const double fScaleX = aSrcSize.Width() ? (double) aDestSize.Width() / aSrcSize.Width() : 1.0; - const double fScaleY = aSrcSize.Height() ? (double) aDestSize.Height() / aSrcSize.Height() : 1.0; - long nMoveX, nMoveY; + + GDIMetaFile aTmpMtf( pA->GetGDIMetaFile() ); + Point aSrcPt( aTmpMtf.GetPrefMapMode().GetOrigin() ); + const Size aSrcSize( aTmpMtf.GetPrefSize() ); + const Point aDestPt( pA->GetPoint() ); + const Size aDestSize( pA->GetSize() ); + const double fScaleX = aSrcSize.Width() ? (double) aDestSize.Width() / aSrcSize.Width() : 1.0; + const double fScaleY = aSrcSize.Height() ? (double) aDestSize.Height() / aSrcSize.Height() : 1.0; + long nMoveX, nMoveY; aSrcLineInfo = LineInfo(); SetAllAttr(); @@ -1815,9 +1815,9 @@ void WMFWriter::WriteHeader( const GDIMetaFile &, BOOL bPlaceable ) { if( bPlaceable ) { - USHORT nCheckSum, nValue; - Size aSize( pVirDev->LogicToLogic(Size(1,1),MapMode(MAP_INCH), aTargetMapMode) ); - USHORT nUnitsPerInch = (USHORT) ( ( aSize.Width() + aSize.Height() ) >> 1 ); + USHORT nCheckSum, nValue; + Size aSize( pVirDev->LogicToLogic(Size(1,1),MapMode(MAP_INCH), aTargetMapMode) ); + USHORT nUnitsPerInch = (USHORT) ( ( aSize.Width() + aSize.Height() ) >> 1 ); nCheckSum=0; nValue=0xcdd7; nCheckSum^=nValue; *pWMF << nValue; @@ -1825,8 +1825,8 @@ void WMFWriter::WriteHeader( const GDIMetaFile &, BOOL bPlaceable ) nValue=0x0000; nCheckSum^=nValue; *pWMF << nValue; nValue=0x0000; nCheckSum^=nValue; *pWMF << nValue; nValue=0x0000; nCheckSum^=nValue; *pWMF << nValue; - nValue=(USHORT) aTargetSize.Width(); nCheckSum^=nValue; *pWMF << nValue; - nValue=(USHORT) aTargetSize.Height(); nCheckSum^=nValue; *pWMF << nValue; + nValue=(USHORT) aTargetSize.Width(); nCheckSum^=nValue; *pWMF << nValue; + nValue=(USHORT) aTargetSize.Height(); nCheckSum^=nValue; *pWMF << nValue; nValue=nUnitsPerInch; nCheckSum^=nValue; *pWMF << nValue; nValue=0x0000; nCheckSum^=nValue; *pWMF << nValue; nValue=0x0000; nCheckSum^=nValue; *pWMF << nValue; @@ -1837,9 +1837,9 @@ void WMFWriter::WriteHeader( const GDIMetaFile &, BOOL bPlaceable ) *pWMF << (sal_uInt16)0x0001 // Typ: Datei << (sal_uInt16)0x0009 // Headerlaenge in Worten << (sal_uInt16)0x0300 // Version als BCD-Zahl - << (sal_uInt32) 0x00000000 // Dateilaenge (ohne 1. Header), wird spaeter durch UpdateHeader() berichtigt + << (sal_uInt32) 0x00000000 // Dateilaenge (ohne 1. Header), wird spaeter durch UpdateHeader() berichtigt << (sal_uInt16)MAXOBJECTHANDLES // Maximalezahl der gleichzeitigen Objekte - << (sal_uInt32) 0x00000000 // Maximale Record-laenge, wird spaeter durch UpdateHeader() berichtigt + << (sal_uInt32) 0x00000000 // Maximale Record-laenge, wird spaeter durch UpdateHeader() berichtigt << (sal_uInt16)0x0000; // Reserved } @@ -1908,8 +1908,8 @@ BOOL WMFWriter::WriteWMF( const GDIMetaFile& rMTF, SvStream& rTargetStream, { aTargetMapMode = MapMode( MAP_INCH ); - const long nUnit = pVirDev->LogicToPixel( Size( 1, 1 ), aTargetMapMode ).Width(); - const Fraction aFrac( 1, nUnit ); + const long nUnit = pVirDev->LogicToPixel( Size( 1, 1 ), aTargetMapMode ).Width(); + const Fraction aFrac( 1, nUnit ); aTargetMapMode.SetScaleX( aFrac ); aTargetMapMode.SetScaleY( aFrac ); @@ -1987,7 +1987,7 @@ BOOL WMFWriter::WriteWMF( const GDIMetaFile& rMTF, SvStream& rTargetStream, if ( xStatusIndicator.is() ) xStatusIndicator->end(); - + return bStatus; } @@ -1996,8 +1996,8 @@ BOOL WMFWriter::WriteWMF( const GDIMetaFile& rMTF, SvStream& rTargetStream, USHORT WMFWriter::CalcSaveTargetMapMode(MapMode& rMapMode, const Size& rPrefSize) { - Fraction aDivFrac(2, 1); - USHORT nDivisor = 1; + Fraction aDivFrac(2, 1); + USHORT nDivisor = 1; Size aSize = pVirDev->LogicToLogic( rPrefSize, aSrcMapMode, rMapMode ); @@ -2023,7 +2023,7 @@ void WMFWriter::WriteEmbeddedEMF( const GDIMetaFile& rMTF ) { EMFWriter aEMFWriter; SvMemoryStream aStream; - + if( aEMFWriter.WriteEMF( rMTF, aStream ) ) { sal_Size nTotalSize = aStream.Tell(); @@ -2059,8 +2059,8 @@ void WMFWriter::WriteEmbeddedEMF( const GDIMetaFile& rMTF ) nCurSize = nRemainingSize; nRemainingSize = 0; } - WriteEMFRecord( aStream, - nCurSize, + WriteEMFRecord( aStream, + nCurSize, nRemainingSize, nTotalSize, nRecCounts, @@ -2069,18 +2069,18 @@ void WMFWriter::WriteEmbeddedEMF( const GDIMetaFile& rMTF ) } } } - + // ------------------------------------------------------------------------ void WMFWriter::WriteEMFRecord( SvMemoryStream& rStream, sal_uInt32 nCurSize, sal_uInt32 nRemainingSize, sal_uInt32 nTotalSize, sal_uInt32 nRecCounts, sal_uInt16 nCheckSum ) { // according to http://msdn.microsoft.com/en-us/library/dd366152%28PROT.13%29.aspx - WriteRecordHeader( 0, W_META_ESCAPE ); - *pWMF << (sal_uInt16)W_MFCOMMENT // same as META_ESCAPE_ENHANCED_METAFILE - << (sal_uInt16)( nCurSize + 34 ) // we will always have a 34 byte escape header: - << (sal_uInt32) 0x43464D57 // WMFC - << (sal_uInt32) 0x00000001 // Comment type + WriteRecordHeader( 0, W_META_ESCAPE ); + *pWMF << (sal_uInt16)W_MFCOMMENT // same as META_ESCAPE_ENHANCED_METAFILE + << (sal_uInt16)( nCurSize + 34 ) // we will always have a 34 byte escape header: + << (sal_uInt32) 0x43464D57 // WMFC + << (sal_uInt32) 0x00000001 // Comment type << (sal_uInt32) 0x00010000 // version << nCheckSum // check sum << (sal_uInt32) 0 // flags = 0 diff --git a/svtools/source/filter.vcl/wmf/wmfwr.hxx b/svtools/source/filter.vcl/wmf/wmfwr.hxx index 222550317784..9b001f687f70 100644 --- a/svtools/source/filter.vcl/wmf/wmfwr.hxx +++ b/svtools/source/filter.vcl/wmf/wmfwr.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,27 +70,27 @@ class WMFWriter { private: - BOOL bStatus; + BOOL bStatus; - ULONG nLastPercent; // Mit welcher Zahl pCallback zuletzt aufgerufen wurde. - FilterConfigItem* pFilterConfigItem; + ULONG nLastPercent; // Mit welcher Zahl pCallback zuletzt aufgerufen wurde. + FilterConfigItem* pFilterConfigItem; com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator; - SvStream* pWMF; - VirtualDevice* pVirDev; + SvStream* pWMF; + VirtualDevice* pVirDev; StarSymbolToMSMultiFont *pConvert; - MapMode aTargetMapMode; - Size aTargetSize; - USHORT nTargetDivisor; + MapMode aTargetMapMode; + Size aTargetSize; + USHORT nTargetDivisor; ULONG nMetafileHeaderPos; sal_uInt32 nMaxRecordSize; // in Worten ULONG nActRecordPos; // Aktuelle Attribute im Quell-Metafile: - Color aSrcLineColor; - Color aSrcFillColor; + Color aSrcLineColor; + Color aSrcFillColor; Color aSrcTextColor; LineInfo aSrcLineInfo; RasterOp eSrcRasterOp; @@ -101,18 +101,18 @@ private: Region aSrcClipRegion; WMFWriterAttrStackMember * pAttrStack; - UINT32 eSrcHorTextAlign; + UINT32 eSrcHorTextAlign; // Aktuelle Attribute im Ziel-Metafile: - Color aDstLineColor; - Color aDstFillColor; + Color aDstLineColor; + Color aDstFillColor; Color aDstTextColor; LineInfo aDstLineInfo; RasterOp eDstROP2; FontAlign eDstTextAlign; Font aDstFont; - UINT32 eDstHorTextAlign; + UINT32 eDstHorTextAlign; BOOL bDstIsClipping; // ???: derzeit unberuecksichtigt Region aDstClipRegion; // ???: derzeit unberuecksichtigt @@ -168,7 +168,7 @@ private: sal_Bool WMFRecord_Escape_Unicode( const Point& rPoint, const String& rStr, const sal_Int32 * pDXAry ); void WMFRecord_ExtTextOut(const Point & rPoint, const String & rString, const sal_Int32 * pDXAry); - void TrueExtTextOut(const Point & rPoint, const String & rString, + void TrueExtTextOut(const Point & rPoint, const String & rString, const ByteString & rByteString, const sal_Int32 * pDXAry); void TrueTextOut(const Point & rPoint, const ByteString& rString); void WMFRecord_LineTo(const Point & rPoint); @@ -212,7 +212,7 @@ private: void UpdateHeader(); void WriteEmbeddedEMF( const GDIMetaFile& rMTF ); - void WriteEMFRecord( SvMemoryStream& rStream, sal_uInt32 nCurSize, + void WriteEMFRecord( SvMemoryStream& rStream, sal_uInt32 nCurSize, sal_uInt32 nRemainingSize, sal_uInt32 nTotalSize, sal_uInt32 nRecCounts, diff --git a/svtools/source/graphic/descriptor.cxx b/svtools/source/graphic/descriptor.cxx index 3c477f045fc3..7665f7f1e1cf 100644 --- a/svtools/source/graphic/descriptor.cxx +++ b/svtools/source/graphic/descriptor.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ #include "vcl/graph.hxx" #include "vcl/svapp.hxx" -#define UNOGRAPHIC_GRAPHICTYPE 1 -#define UNOGRAPHIC_MIMETYPE 2 -#define UNOGRAPHIC_SIZEPIXEL 3 -#define UNOGRAPHIC_SIZE100THMM 4 -#define UNOGRAPHIC_BITSPERPIXEL 5 -#define UNOGRAPHIC_TRANSPARENT 6 -#define UNOGRAPHIC_ALPHA 7 -#define UNOGRAPHIC_ANIMATED 8 +#define UNOGRAPHIC_GRAPHICTYPE 1 +#define UNOGRAPHIC_MIMETYPE 2 +#define UNOGRAPHIC_SIZEPIXEL 3 +#define UNOGRAPHIC_SIZE100THMM 4 +#define UNOGRAPHIC_BITSPERPIXEL 5 +#define UNOGRAPHIC_TRANSPARENT 6 +#define UNOGRAPHIC_ALPHA 7 +#define UNOGRAPHIC_ANIMATED 8 using namespace ::com::sun::star; @@ -61,7 +61,7 @@ namespace unographic { // --------------------- // - GraphicDescriptor - // --------------------- - + GraphicDescriptor::GraphicDescriptor() : ::comphelper::PropertySetHelper( createPropertySetInfo(), SAL_NO_ACQUIRE ), mpGraphic( NULL ), @@ -82,7 +82,7 @@ GraphicDescriptor::~GraphicDescriptor() // ------------------------------------------------------------------------------ -void GraphicDescriptor::init( const ::Graphic& rGraphic ) +void GraphicDescriptor::init( const ::Graphic& rGraphic ) throw() { mpGraphic = &rGraphic; @@ -90,11 +90,11 @@ void GraphicDescriptor::init( const ::Graphic& rGraphic ) // ------------------------------------------------------------------------------ -void GraphicDescriptor::init( const ::rtl::OUString& rURL ) +void GraphicDescriptor::init( const ::rtl::OUString& rURL ) throw() { SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( rURL, STREAM_READ ); - + if( pIStm ) { implCreate( *pIStm, &rURL ); @@ -104,11 +104,11 @@ void GraphicDescriptor::init( const ::rtl::OUString& rURL ) // ------------------------------------------------------------------------------ -void GraphicDescriptor::init( const uno::Reference< io::XInputStream >& rxIStm, const ::rtl::OUString& rURL ) +void GraphicDescriptor::init( const uno::Reference< io::XInputStream >& rxIStm, const ::rtl::OUString& rURL ) throw() { SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( rxIStm ); - + if( pIStm ) { implCreate( *pIStm, &rURL ); @@ -137,12 +137,12 @@ void GraphicDescriptor::implCreate( SvStream& rIStm, const ::rtl::OUString* pURL meType = GRAPHIC_NONE; mnBitsPerPixel = 0; mbTransparent = false; - + if( aDescriptor.Detect( true ) && aDescriptor.GetFileFormat() != GFF_NOT ) { - const char* pMimeType = NULL; - sal_uInt8 cType = graphic::GraphicType::EMPTY; - + const char* pMimeType = NULL; + sal_uInt8 cType = graphic::GraphicType::EMPTY; + switch( aDescriptor.GetFileFormat() ) { case( GFF_BMP ): pMimeType = MIMETYPE_BMP; cType = graphic::GraphicType::PIXEL; break; @@ -160,7 +160,7 @@ void GraphicDescriptor::implCreate( SvStream& rIStm, const ::rtl::OUString* pURL case( GFF_RAS ): pMimeType = MIMETYPE_RAS; cType = graphic::GraphicType::PIXEL; break; case( GFF_TGA ): pMimeType = MIMETYPE_TGA; cType = graphic::GraphicType::PIXEL; break; case( GFF_PSD ): pMimeType = MIMETYPE_PSD; cType = graphic::GraphicType::PIXEL; break; - + case( GFF_EPS ): pMimeType = MIMETYPE_EPS; cType = graphic::GraphicType::VECTOR; break; case( GFF_DXF ): pMimeType = MIMETYPE_DXF; cType = graphic::GraphicType::VECTOR; break; case( GFF_MET ): pMimeType = MIMETYPE_MET; cType = graphic::GraphicType::VECTOR; break; @@ -170,11 +170,11 @@ void GraphicDescriptor::implCreate( SvStream& rIStm, const ::rtl::OUString* pURL case( GFF_WMF ): pMimeType = MIMETYPE_WMF; cType = graphic::GraphicType::VECTOR; break; case( GFF_SGV ): pMimeType = MIMETYPE_SGV; cType = graphic::GraphicType::VECTOR; break; case( GFF_EMF ): pMimeType = MIMETYPE_EMF; cType = graphic::GraphicType::VECTOR; break; - + default: break; } - + if( graphic::GraphicType::EMPTY != cType ) { meType = ( ( graphic::GraphicType::PIXEL == cType ) ? GRAPHIC_BITMAP : GRAPHIC_GDIMETAFILE ); @@ -190,7 +190,7 @@ void GraphicDescriptor::implCreate( SvStream& rIStm, const ::rtl::OUString* pURL // ------------------------------------------------------------------------------ -::rtl::OUString GraphicDescriptor::getImplementationName_Static() +::rtl::OUString GraphicDescriptor::getImplementationName_Static() throw() { return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.graphic.GraphicDescriptor" ) ); @@ -198,19 +198,19 @@ void GraphicDescriptor::implCreate( SvStream& rIStm, const ::rtl::OUString* pURL // ------------------------------------------------------------------------------ -uno::Sequence< ::rtl::OUString > GraphicDescriptor::getSupportedServiceNames_Static() - throw( ) +uno::Sequence< ::rtl::OUString > GraphicDescriptor::getSupportedServiceNames_Static() + throw( ) { uno::Sequence< ::rtl::OUString > aSeq( 1 ); - + aSeq.getArray()[ 0 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.graphic.GraphicDescriptor" ) ); - + return aSeq; } // ------------------------------------------------------------------------------ -uno::Any SAL_CALL GraphicDescriptor::queryAggregation( const uno::Type & rType ) +uno::Any SAL_CALL GraphicDescriptor::queryAggregation( const uno::Type & rType ) throw( uno::RuntimeException ) { uno::Any aAny; @@ -233,7 +233,7 @@ uno::Any SAL_CALL GraphicDescriptor::queryAggregation( const uno::Type & rType ) // ------------------------------------------------------------------------------ -uno::Any SAL_CALL GraphicDescriptor::queryInterface( const uno::Type & rType ) +uno::Any SAL_CALL GraphicDescriptor::queryInterface( const uno::Type & rType ) throw( uno::RuntimeException ) { return OWeakAggObject::queryInterface( rType ); @@ -241,7 +241,7 @@ uno::Any SAL_CALL GraphicDescriptor::queryInterface( const uno::Type & rType ) // ------------------------------------------------------------------------------ -void SAL_CALL GraphicDescriptor::acquire() +void SAL_CALL GraphicDescriptor::acquire() throw() { OWeakAggObject::acquire(); @@ -257,7 +257,7 @@ void SAL_CALL GraphicDescriptor::release() // ------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL GraphicDescriptor::getImplementationName() +::rtl::OUString SAL_CALL GraphicDescriptor::getImplementationName() throw( uno::RuntimeException ) { return getImplementationName_Static(); @@ -268,8 +268,8 @@ void SAL_CALL GraphicDescriptor::release() sal_Bool SAL_CALL GraphicDescriptor::supportsService( const rtl::OUString& ServiceName ) throw( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aSNL( getSupportedServiceNames() ); - const ::rtl::OUString* pArray = aSNL.getConstArray(); + uno::Sequence< ::rtl::OUString > aSNL( getSupportedServiceNames() ); + const ::rtl::OUString* pArray = aSNL.getConstArray(); for( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) if( pArray[i] == ServiceName ) @@ -291,8 +291,8 @@ uno::Sequence< rtl::OUString > SAL_CALL GraphicDescriptor::getSupportedServiceNa uno::Sequence< uno::Type > SAL_CALL GraphicDescriptor::getTypes() throw( uno::RuntimeException ) { - uno::Sequence< uno::Type > aTypes( 6 ); - uno::Type* pTypes = aTypes.getArray(); + uno::Sequence< uno::Type > aTypes( 6 ); + uno::Type* pTypes = aTypes.getArray(); *pTypes++ = ::getCppuType((const uno::Reference< uno::XAggregation>*)0); *pTypes++ = ::getCppuType((const uno::Reference< lang::XServiceInfo>*)0); @@ -303,21 +303,21 @@ uno::Sequence< uno::Type > SAL_CALL GraphicDescriptor::getTypes() return aTypes; } - + // ------------------------------------------------------------------------------ uno::Sequence< sal_Int8 > SAL_CALL GraphicDescriptor::getImplementationId() throw( uno::RuntimeException ) { SolarMutexGuard aGuard; - static uno::Sequence< sal_Int8 > aId; - + static uno::Sequence< sal_Int8 > aId; + if( aId.getLength() == 0 ) { aId.realloc( 16 ); rtl_createUuid( reinterpret_cast< sal_uInt8* >( aId.getArray() ), 0, sal_True ); } - + return aId; } @@ -326,19 +326,19 @@ uno::Sequence< sal_Int8 > SAL_CALL GraphicDescriptor::getImplementationId() ::comphelper::PropertySetInfo* GraphicDescriptor::createPropertySetInfo() { SolarMutexGuard aGuard; - ::comphelper::PropertySetInfo* pRet = new ::comphelper::PropertySetInfo(); + ::comphelper::PropertySetInfo* pRet = new ::comphelper::PropertySetInfo(); static ::comphelper::PropertyMapEntry aEntries[] = { { MAP_CHAR_LEN( "GraphicType" ), UNOGRAPHIC_GRAPHICTYPE, &::getCppuType( (const sal_Int8*)(0)), beans::PropertyAttribute::READONLY, 0 }, { MAP_CHAR_LEN( "MimeType" ), UNOGRAPHIC_MIMETYPE, &::getCppuType( (const ::rtl::OUString*)(0)), beans::PropertyAttribute::READONLY, 0 }, { MAP_CHAR_LEN( "SizePixel" ), UNOGRAPHIC_SIZEPIXEL, &::getCppuType( (const awt::Size*)(0)), beans::PropertyAttribute::READONLY, 0 }, - { MAP_CHAR_LEN( "Size100thMM" ), UNOGRAPHIC_SIZE100THMM, &::getCppuType( (const awt::Size*)(0)), beans::PropertyAttribute::READONLY, 0 }, + { MAP_CHAR_LEN( "Size100thMM" ), UNOGRAPHIC_SIZE100THMM, &::getCppuType( (const awt::Size*)(0)), beans::PropertyAttribute::READONLY, 0 }, { MAP_CHAR_LEN( "BitsPerPixel" ), UNOGRAPHIC_BITSPERPIXEL, &::getCppuType( (const sal_uInt8*)(0)), beans::PropertyAttribute::READONLY, 0 }, { MAP_CHAR_LEN( "Transparent" ), UNOGRAPHIC_TRANSPARENT, &::getCppuType( (const sal_Bool*)(0)), beans::PropertyAttribute::READONLY, 0 }, { MAP_CHAR_LEN( "Alpha" ), UNOGRAPHIC_ALPHA, &::getCppuType( (const sal_Bool*)(0)), beans::PropertyAttribute::READONLY, 0 }, { MAP_CHAR_LEN( "Animated" ), UNOGRAPHIC_ANIMATED, &::getCppuType( (const sal_Bool*)(0)), beans::PropertyAttribute::READONLY, 0 }, - + { 0,0,0,0,0,0 } }; @@ -351,14 +351,14 @@ uno::Sequence< sal_Int8 > SAL_CALL GraphicDescriptor::getImplementationId() // ------------------------------------------------------------------------------ void GraphicDescriptor::_setPropertyValues( const comphelper::PropertyMapEntry** /*ppEntries*/, const uno::Any* /*pValues*/ ) - throw( beans::UnknownPropertyException, - beans::PropertyVetoException, + throw( beans::UnknownPropertyException, + beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException ) { // we only have readonly attributes } - + // ------------------------------------------------------------------------------ void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, uno::Any* pValues ) @@ -373,9 +373,9 @@ void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry** case( UNOGRAPHIC_GRAPHICTYPE ): { const GraphicType eType( mpGraphic ? mpGraphic->GetType() : meType ); - - *pValues <<= ( ( eType == GRAPHIC_BITMAP ? graphic::GraphicType::PIXEL : - ( eType == GRAPHIC_GDIMETAFILE ? graphic::GraphicType::VECTOR : + + *pValues <<= ( ( eType == GRAPHIC_BITMAP ? graphic::GraphicType::PIXEL : + ( eType == GRAPHIC_GDIMETAFILE ? graphic::GraphicType::VECTOR : graphic::GraphicType::EMPTY ) ) ); } break; @@ -383,13 +383,13 @@ void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry** case( UNOGRAPHIC_MIMETYPE ): { ::rtl::OUString aMimeType; - + if( mpGraphic ) { if( mpGraphic->IsLink() ) { const char* pMimeType; - + switch( const_cast< Graphic* >( mpGraphic )->GetLink().GetType() ) { case( GFX_LINK_TYPE_NATIVE_GIF ): pMimeType = MIMETYPE_GIF; break; @@ -398,30 +398,30 @@ void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry** case( GFX_LINK_TYPE_NATIVE_WMF ): pMimeType = MIMETYPE_WMF; break; case( GFX_LINK_TYPE_NATIVE_MET ): pMimeType = MIMETYPE_MET; break; case( GFX_LINK_TYPE_NATIVE_PCT ): pMimeType = MIMETYPE_PCT ; break; - + default: pMimeType = NULL; break; } - + if( pMimeType ) aMimeType = ::rtl::OUString::createFromAscii( pMimeType ); } - + if( !aMimeType.getLength() && ( mpGraphic->GetType() != GRAPHIC_NONE ) ) aMimeType = ::rtl::OUString::createFromAscii( MIMETYPE_VCLGRAPHIC ); } else aMimeType = maMimeType; - + *pValues <<= aMimeType; } break; - + case( UNOGRAPHIC_SIZEPIXEL ): { awt::Size aAWTSize( 0, 0 ); - + if( mpGraphic ) { if( mpGraphic->GetType() == GRAPHIC_BITMAP ) @@ -436,11 +436,11 @@ void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry** *pValues <<= aAWTSize; } break; - + case( UNOGRAPHIC_SIZE100THMM ): { awt::Size aAWTSize( 0, 0 ); - + if( mpGraphic ) { if( mpGraphic->GetPrefMapMode().GetMapUnit() != MAP_PIXEL ) @@ -451,15 +451,15 @@ void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry** } else aAWTSize = awt::Size( maSize100thMM.Width(), maSize100thMM.Height() ); - + *pValues <<= aAWTSize; } break; - + case( UNOGRAPHIC_BITSPERPIXEL ): { USHORT nBitsPerPixel = 0; - + if( mpGraphic ) { if( mpGraphic->GetType() == GRAPHIC_BITMAP ) @@ -467,11 +467,11 @@ void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry** } else nBitsPerPixel = mnBitsPerPixel; - + *pValues <<= sal::static_int_cast< sal_Int8 >(nBitsPerPixel); } break; - + case( UNOGRAPHIC_TRANSPARENT ): { *pValues <<= static_cast< sal_Bool >( mpGraphic ? mpGraphic->IsTransparent() : mbTransparent ); @@ -483,14 +483,14 @@ void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry** *pValues <<= static_cast< sal_Bool >( mpGraphic ? mpGraphic->IsAlpha() : mbAlpha ); } break; - + case( UNOGRAPHIC_ANIMATED ): { *pValues <<= static_cast< sal_Bool >( mpGraphic ? mpGraphic->IsAnimated() : mbAnimated ); } break; } - + ++ppEntries; ++pValues; } diff --git a/svtools/source/graphic/descriptor.hxx b/svtools/source/graphic/descriptor.hxx index 38d0241dcd0d..c81a1c84b341 100644 --- a/svtools/source/graphic/descriptor.hxx +++ b/svtools/source/graphic/descriptor.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,8 +26,8 @@ * ************************************************************************/ -#ifndef _GOODIES_DESCRIPTOR_HXX -#define _GOODIES_DESCRIPTOR_HXX +#ifndef _GOODIES_DESCRIPTOR_HXX +#define _GOODIES_DESCRIPTOR_HXX #include <comphelper/propertysethelper.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -35,37 +35,37 @@ #include <comphelper/propertysetinfo.hxx> #include <vcl/graph.hxx> -#define MIMETYPE_BMP "image/x-MS-bmp" -#define MIMETYPE_GIF "image/gif" -#define MIMETYPE_JPG "image/jpeg" -#define MIMETYPE_PCD "image/x-photo-cd" -#define MIMETYPE_PCX "image/x-pcx" -#define MIMETYPE_PNG "image/png" -#define MIMETYPE_TIF "image/tiff" -#define MIMETYPE_XBM "image/x-xbitmap" -#define MIMETYPE_XPM "image/x-xpixmap" -#define MIMETYPE_PBM "image/x-portable-bitmap" -#define MIMETYPE_PGM "image/x-portable-graymap" -#define MIMETYPE_PPM "image/x-portable-pixmap" -#define MIMETYPE_RAS "image/x-cmu-raster" -#define MIMETYPE_TGA "image/x-targa" -#define MIMETYPE_PSD "image/vnd.adobe.photoshop" -#define MIMETYPE_EPS "image/x-eps" -#define MIMETYPE_DXF "image/vnd.dxf" -#define MIMETYPE_MET "image/x-met" -#define MIMETYPE_PCT "image/x-pict" -#define MIMETYPE_SGF "image/x-sgf" -#define MIMETYPE_SVM "image/x-svm" -#define MIMETYPE_WMF "image/x-wmf" -#define MIMETYPE_SGV "image/x-sgv" -#define MIMETYPE_EMF "image/x-emf" -#define MIMETYPE_SVG "image/svg+xml" -#define MIMETYPE_VCLGRAPHIC "image/x-vclgraphic" +#define MIMETYPE_BMP "image/x-MS-bmp" +#define MIMETYPE_GIF "image/gif" +#define MIMETYPE_JPG "image/jpeg" +#define MIMETYPE_PCD "image/x-photo-cd" +#define MIMETYPE_PCX "image/x-pcx" +#define MIMETYPE_PNG "image/png" +#define MIMETYPE_TIF "image/tiff" +#define MIMETYPE_XBM "image/x-xbitmap" +#define MIMETYPE_XPM "image/x-xpixmap" +#define MIMETYPE_PBM "image/x-portable-bitmap" +#define MIMETYPE_PGM "image/x-portable-graymap" +#define MIMETYPE_PPM "image/x-portable-pixmap" +#define MIMETYPE_RAS "image/x-cmu-raster" +#define MIMETYPE_TGA "image/x-targa" +#define MIMETYPE_PSD "image/vnd.adobe.photoshop" +#define MIMETYPE_EPS "image/x-eps" +#define MIMETYPE_DXF "image/vnd.dxf" +#define MIMETYPE_MET "image/x-met" +#define MIMETYPE_PCT "image/x-pict" +#define MIMETYPE_SGF "image/x-sgf" +#define MIMETYPE_SVM "image/x-svm" +#define MIMETYPE_WMF "image/x-wmf" +#define MIMETYPE_SGV "image/x-sgv" +#define MIMETYPE_EMF "image/x-emf" +#define MIMETYPE_SVG "image/svg+xml" +#define MIMETYPE_VCLGRAPHIC "image/x-vclgraphic" using namespace com::sun::star; namespace comphelper { class PropertySetInfo; } -namespace com { namespace sun { namespace star { namespace io { class XInputStream; } } } } +namespace com { namespace sun { namespace star { namespace io { class XInputStream; } } } } class Graphic; @@ -81,19 +81,19 @@ class GraphicDescriptor : public ::cppu::OWeakAggObject, public ::comphelper::PropertySetHelper { public: - + GraphicDescriptor(); ~GraphicDescriptor() throw(); - + void init( const ::Graphic& rGraphic ) throw(); void init( const ::rtl::OUString& rURL ) throw(); void init( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxIStm, const ::rtl::OUString& rURL ) throw(); - + bool isValid() const; static ::rtl::OUString getImplementationName_Static() throw(); static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static() throw(); - + protected: static ::comphelper::PropertySetInfo* createPropertySetInfo(); @@ -103,7 +103,7 @@ protected: virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL release() throw(); - + // XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); @@ -119,25 +119,25 @@ protected: private: - const ::Graphic* mpGraphic; - GraphicType meType; - ::rtl::OUString maMimeType; - Size maSizePixel; - Size maSize100thMM; - USHORT mnBitsPerPixel; - bool mbTransparent; - bool mbAlpha; - bool mbAnimated; - + const ::Graphic* mpGraphic; + GraphicType meType; + ::rtl::OUString maMimeType; + Size maSizePixel; + Size maSize100thMM; + USHORT mnBitsPerPixel; + bool mbTransparent; + bool mbAlpha; + bool mbAnimated; + GraphicDescriptor( const GraphicDescriptor& rDescriptor ); - - GraphicDescriptor& operator=( const GraphicDescriptor& ); + + GraphicDescriptor& operator=( const GraphicDescriptor& ); void implCreate( SvStream& rIStm, const ::rtl::OUString* pPath ); }; } -#endif +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/graphic/graphic.cxx b/svtools/source/graphic/graphic.cxx index 19c8d904b3d9..0c73949d0263 100644 --- a/svtools/source/graphic/graphic.cxx +++ b/svtools/source/graphic/graphic.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ Graphic::~Graphic() void Graphic::init( const ::Graphic& rGraphic ) throw() -{ +{ delete mpGraphic; mpGraphic = new ::Graphic( rGraphic ); ::unographic::GraphicDescriptor::init( *mpGraphic ); @@ -82,7 +82,7 @@ uno::Any SAL_CALL Graphic::queryAggregation( const uno::Type& rType ) aAny <<= uno::Reference< lang::XUnoTunnel >(this); else aAny <<= ::unographic::GraphicDescriptor::queryAggregation( rType ); - + return aAny ; } @@ -99,7 +99,7 @@ uno::Any SAL_CALL Graphic::queryInterface( const uno::Type & rType ) // ------------------------------------------------------------------------------ -void SAL_CALL Graphic::acquire() +void SAL_CALL Graphic::acquire() throw() { ::unographic::GraphicDescriptor::acquire(); @@ -113,24 +113,24 @@ void SAL_CALL Graphic::release() throw() } // ------------------------------------------------------------------------------ - -uno::Sequence< sal_Int8 > SAL_CALL Graphic::getImplementationId_Static() + +uno::Sequence< sal_Int8 > SAL_CALL Graphic::getImplementationId_Static() throw(uno::RuntimeException) { SolarMutexGuard aGuard; - static uno::Sequence< sal_Int8 > aId; - + static uno::Sequence< sal_Int8 > aId; + if( aId.getLength() == 0 ) { aId.realloc( 16 ); rtl_createUuid( reinterpret_cast< sal_uInt8* >( aId.getArray() ), 0, sal_True ); } - + return aId; } // ------------------------------------------------------------------------------ - + ::rtl::OUString Graphic::getImplementationName_Static() throw() { @@ -143,14 +143,14 @@ uno::Sequence< ::rtl::OUString > Graphic::getSupportedServiceNames_Static() throw() { uno::Sequence< ::rtl::OUString > aSeq( 1 ); - + aSeq.getArray()[ 0 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.graphic.Graphic" ) ); - + return aSeq; } // ------------------------------------------------------------------------------ - + ::rtl::OUString SAL_CALL Graphic::getImplementationName() throw( uno::RuntimeException ) { @@ -159,35 +159,35 @@ uno::Sequence< ::rtl::OUString > Graphic::getSupportedServiceNames_Static() // ------------------------------------------------------------------------------ -sal_Bool SAL_CALL Graphic::supportsService( const ::rtl::OUString& rServiceName ) +sal_Bool SAL_CALL Graphic::supportsService( const ::rtl::OUString& rServiceName ) throw( uno::RuntimeException ) { if( ::unographic::GraphicDescriptor::supportsService( rServiceName ) ) return true; else { - uno::Sequence< ::rtl::OUString > aSNL( getSupportedServiceNames() ); - const ::rtl::OUString* pArray = aSNL.getConstArray(); - + uno::Sequence< ::rtl::OUString > aSNL( getSupportedServiceNames() ); + const ::rtl::OUString* pArray = aSNL.getConstArray(); + for( int i = 0; i < aSNL.getLength(); i++ ) if( pArray[i] == rServiceName ) return true; - + return false; } } // ------------------------------------------------------------------------------ -uno::Sequence< ::rtl::OUString > SAL_CALL Graphic::getSupportedServiceNames() +uno::Sequence< ::rtl::OUString > SAL_CALL Graphic::getSupportedServiceNames() throw( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aRet( ::unographic::GraphicDescriptor::getSupportedServiceNames() ); - uno::Sequence< ::rtl::OUString > aNew( getSupportedServiceNames_Static() ); - sal_Int32 nOldCount = aRet.getLength(); - + uno::Sequence< ::rtl::OUString > aRet( ::unographic::GraphicDescriptor::getSupportedServiceNames() ); + uno::Sequence< ::rtl::OUString > aNew( getSupportedServiceNames_Static() ); + sal_Int32 nOldCount = aRet.getLength(); + aRet.realloc( nOldCount + aNew.getLength() ); - + for( sal_Int32 i = 0; i < aNew.getLength(); ++i ) aRet[ nOldCount++ ] = aNew[ i ]; @@ -196,22 +196,22 @@ uno::Sequence< ::rtl::OUString > SAL_CALL Graphic::getSupportedServiceNames() // ------------------------------------------------------------------------------ -uno::Sequence< uno::Type > SAL_CALL Graphic::getTypes() +uno::Sequence< uno::Type > SAL_CALL Graphic::getTypes() throw(uno::RuntimeException) { - uno::Sequence< uno::Type > aRet( ::unographic::GraphicDescriptor::getTypes() ); - sal_Int32 nOldCount = aRet.getLength(); + uno::Sequence< uno::Type > aRet( ::unographic::GraphicDescriptor::getTypes() ); + sal_Int32 nOldCount = aRet.getLength(); aRet.realloc( nOldCount + 2 ); aRet[ nOldCount ] = ::getCppuType((const uno::Reference< graphic::XGraphic>*)0); aRet[ nOldCount+1 ] = ::getCppuType((const uno::Reference< awt::XBitmap>*)0); - + return aRet; } // ------------------------------------------------------------------------------ -uno::Sequence< sal_Int8 > SAL_CALL Graphic::getImplementationId() +uno::Sequence< sal_Int8 > SAL_CALL Graphic::getImplementationId() throw(uno::RuntimeException) { return getImplementationId_Static(); @@ -226,7 +226,7 @@ uno::Sequence< sal_Int8 > SAL_CALL Graphic::getImplementationId() if( mpGraphic && ( mpGraphic->GetType() != GRAPHIC_NONE ) ) cRet = ( ( mpGraphic->GetType() == GRAPHIC_BITMAP ) ? graphic::GraphicType::PIXEL : graphic::GraphicType::VECTOR ); - + return cRet; } @@ -294,7 +294,7 @@ sal_Int64 SAL_CALL Graphic::getSomething( const uno::Sequence< sal_Int8 >& rId ) throw( uno::RuntimeException ) { return( ( rId.getLength() == 16 && 0 == rtl_compareMemory( getImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) ? - reinterpret_cast< sal_Int64 >( mpGraphic ) : + reinterpret_cast< sal_Int64 >( mpGraphic ) : 0 ); } diff --git a/svtools/source/graphic/graphic.hxx b/svtools/source/graphic/graphic.hxx index a82c9cca7ced..e4b968d1f343 100644 --- a/svtools/source/graphic/graphic.hxx +++ b/svtools/source/graphic/graphic.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,8 +26,8 @@ * ************************************************************************/ -#ifndef _GOODIES_GRAPHIC_HXX -#define _GOODIES_GRAPHIC_HXX +#ifndef _GOODIES_GRAPHIC_HXX +#define _GOODIES_GRAPHIC_HXX #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/graphic/XGraphic.hpp> @@ -49,23 +49,23 @@ namespace unographic { class Graphic : public ::com::sun::star::graphic::XGraphic, public ::com::sun::star::awt::XBitmap, - public ::com::sun::star::lang::XUnoTunnel, + public ::com::sun::star::lang::XUnoTunnel, public ::unographic::GraphicDescriptor, public ::unographic::GraphicTransformer { public: - + Graphic(); ~Graphic() throw(); using unographic::GraphicDescriptor::init; void init( const ::Graphic& rGraphic ) throw(); - + static const ::Graphic* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw(); static ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId_Static( ) throw(::com::sun::star::uno::RuntimeException); static ::rtl::OUString getImplementationName_Static() throw(); static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static() throw(); - + protected: // XInterface @@ -73,7 +73,7 @@ protected: virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL release() throw(); - + // XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); @@ -82,7 +82,7 @@ protected: // XTypeProvider 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( ) throw(::com::sun::star::uno::RuntimeException); - + // XGraphic virtual ::sal_Int8 SAL_CALL getType( ) throw (::com::sun::star::uno::RuntimeException); @@ -101,6 +101,6 @@ private: } -#endif +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/graphic/graphicunofactory.cxx b/svtools/source/graphic/graphicunofactory.cxx index c1e2f13068de..a0b27992ac86 100644 --- a/svtools/source/graphic/graphicunofactory.cxx +++ b/svtools/source/graphic/graphicunofactory.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,11 +63,11 @@ GObjectImpl::GObjectImpl( uno::Sequence< uno::Any > const & args, uno::Reference rtl::OUString sId; if ( !( args[ 0 ] >>= sId ) || sId.getLength() == 0 ) throw lang::IllegalArgumentException(); - ByteString bsId( sId.getStr(), RTL_TEXTENCODING_UTF8 ); - mpGObject.reset( new GraphicObject( bsId ) ); + ByteString bsId( sId.getStr(), RTL_TEXTENCODING_UTF8 ); + mpGObject.reset( new GraphicObject( bsId ) ); } else - mpGObject.reset( new GraphicObject() ); + mpGObject.reset( new GraphicObject() ); } uno::Reference< graphic::XGraphic > SAL_CALL GObjectImpl::getGraphic() throw (uno::RuntimeException) diff --git a/svtools/source/graphic/grfattr.cxx b/svtools/source/graphic/grfattr.cxx index 3515ed276529..0ee3685425e3 100644 --- a/svtools/source/graphic/grfattr.cxx +++ b/svtools/source/graphic/grfattr.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,21 +37,21 @@ // --------------- GraphicAttr::GraphicAttr() : - mfGamma ( 1.0 ), - mnMirrFlags ( 0 ), - mnLeftCrop ( 0 ), - mnTopCrop ( 0 ), - mnRightCrop ( 0 ), - mnBottomCrop ( 0 ), - mnRotate10 ( 0 ), - mnContPercent ( 0 ), - mnLumPercent ( 0 ), - mnRPercent ( 0 ), - mnGPercent ( 0 ), - mnBPercent ( 0 ), - mbInvert ( FALSE ), - mcTransparency ( 0 ), - meDrawMode ( GRAPHICDRAWMODE_STANDARD ) + mfGamma ( 1.0 ), + mnMirrFlags ( 0 ), + mnLeftCrop ( 0 ), + mnTopCrop ( 0 ), + mnRightCrop ( 0 ), + mnBottomCrop ( 0 ), + mnRotate10 ( 0 ), + mnContPercent ( 0 ), + mnLumPercent ( 0 ), + mnRPercent ( 0 ), + mnGPercent ( 0 ), + mnBPercent ( 0 ), + mbInvert ( FALSE ), + mcTransparency ( 0 ), + meDrawMode ( GRAPHICDRAWMODE_STANDARD ) { } @@ -86,13 +86,13 @@ BOOL GraphicAttr::operator==( const GraphicAttr& rAttr ) const SvStream& operator>>( SvStream& rIStm, GraphicAttr& rAttr ) { - VersionCompat aCompat( rIStm, STREAM_READ ); - sal_uInt32 nTmp32; - UINT16 nTmp16; + VersionCompat aCompat( rIStm, STREAM_READ ); + sal_uInt32 nTmp32; + UINT16 nTmp16; rIStm >> nTmp32 >> nTmp32 >> rAttr.mfGamma >> rAttr.mnMirrFlags >> rAttr.mnRotate10; rIStm >> rAttr.mnContPercent >> rAttr.mnLumPercent >> rAttr.mnRPercent >> rAttr.mnGPercent >> rAttr.mnBPercent; - rIStm >> rAttr.mbInvert >> rAttr.mcTransparency >> nTmp16; + rIStm >> rAttr.mbInvert >> rAttr.mcTransparency >> nTmp16; rAttr.meDrawMode = (GraphicDrawMode) nTmp16; if( aCompat.GetVersion() >= 2 ) @@ -107,8 +107,8 @@ SvStream& operator>>( SvStream& rIStm, GraphicAttr& rAttr ) SvStream& operator<<( SvStream& rOStm, const GraphicAttr& rAttr ) { - VersionCompat aCompat( rOStm, STREAM_WRITE, 2 ); - const sal_uInt32 nTmp32 = 0; + VersionCompat aCompat( rOStm, STREAM_WRITE, 2 ); + const sal_uInt32 nTmp32 = 0; rOStm << nTmp32 << nTmp32 << rAttr.mfGamma << rAttr.mnMirrFlags << rAttr.mnRotate10; rOStm << rAttr.mnContPercent << rAttr.mnLumPercent << rAttr.mnRPercent << rAttr.mnGPercent << rAttr.mnBPercent; diff --git a/svtools/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx index 6f3c02907144..fb52096118ac 100644 --- a/svtools/source/graphic/grfcache.cxx +++ b/svtools/source/graphic/grfcache.cxx @@ -42,7 +42,7 @@ // ----------- #define RELEASE_TIMEOUT 10000 -#define MAX_BMP_EXTENT 4096 +#define MAX_BMP_EXTENT 4096 // ----------- // - statics - @@ -58,10 +58,10 @@ class GraphicID { private: - sal_uInt32 mnID1; - sal_uInt32 mnID2; - sal_uInt32 mnID3; - sal_uInt32 mnID4; + sal_uInt32 mnID1; + sal_uInt32 mnID2; + sal_uInt32 mnID3; + sal_uInt32 mnID4; GraphicID(); @@ -71,13 +71,13 @@ public: GraphicID( const GraphicObject& rObj ); ~GraphicID() {} - BOOL operator==( const GraphicID& rID ) const + BOOL operator==( const GraphicID& rID ) const { return( rID.mnID1 == mnID1 && rID.mnID2 == mnID2 && rID.mnID3 == mnID3 && rID.mnID4 == mnID4 ); } - ByteString GetIDString() const; + ByteString GetIDString() const; BOOL IsEmpty() const { return( 0 == mnID4 ); } }; @@ -135,9 +135,9 @@ GraphicID::GraphicID( const GraphicObject& rObj ) ByteString GraphicID::GetIDString() const { - ByteString aHexStr; - sal_Char* pStr = aHexStr.AllocBuffer( 32 ); - sal_Int32 nShift; + ByteString aHexStr; + sal_Char* pStr = aHexStr.AllocBuffer( 32 ); + sal_Int32 nShift; for( nShift = 28; nShift >= 0; nShift -= 4 ) *pStr++ = aHexData[ ( mnID1 >> (sal_uInt32) nShift ) & 0xf ]; @@ -162,43 +162,43 @@ class GraphicCacheEntry { private: - List maGraphicObjectList; - GraphicID maID; - GfxLink maGfxLink; - BitmapEx* mpBmpEx; - GDIMetaFile* mpMtf; - Animation* mpAnimation; - BOOL mbSwappedAll; + List maGraphicObjectList; + GraphicID maID; + GfxLink maGfxLink; + BitmapEx* mpBmpEx; + GDIMetaFile* mpMtf; + Animation* mpAnimation; + BOOL mbSwappedAll; - BOOL ImplInit( const GraphicObject& rObj ); - BOOL ImplMatches( const GraphicObject& rObj ) const { return( GraphicID( rObj ) == maID ); } - void ImplFillSubstitute( Graphic& rSubstitute ); + BOOL ImplInit( const GraphicObject& rObj ); + BOOL ImplMatches( const GraphicObject& rObj ) const { return( GraphicID( rObj ) == maID ); } + void ImplFillSubstitute( Graphic& rSubstitute ); public: GraphicCacheEntry( const GraphicObject& rObj ); ~GraphicCacheEntry(); - const GraphicID& GetID() const { return maID; } + const GraphicID& GetID() const { return maID; } - void AddGraphicObjectReference( const GraphicObject& rObj, Graphic& rSubstitute ); - BOOL ReleaseGraphicObjectReference( const GraphicObject& rObj ); - ULONG GetGraphicObjectReferenceCount() { return maGraphicObjectList.Count(); } - BOOL HasGraphicObjectReference( const GraphicObject& rObj ); + void AddGraphicObjectReference( const GraphicObject& rObj, Graphic& rSubstitute ); + BOOL ReleaseGraphicObjectReference( const GraphicObject& rObj ); + ULONG GetGraphicObjectReferenceCount() { return maGraphicObjectList.Count(); } + BOOL HasGraphicObjectReference( const GraphicObject& rObj ); - void TryToSwapIn(); - void GraphicObjectWasSwappedOut( const GraphicObject& rObj ); - BOOL FillSwappedGraphicObject( const GraphicObject& rObj, Graphic& rSubstitute ); - void GraphicObjectWasSwappedIn( const GraphicObject& rObj ); + void TryToSwapIn(); + void GraphicObjectWasSwappedOut( const GraphicObject& rObj ); + BOOL FillSwappedGraphicObject( const GraphicObject& rObj, Graphic& rSubstitute ); + void GraphicObjectWasSwappedIn( const GraphicObject& rObj ); }; // ----------------------------------------------------------------------------- GraphicCacheEntry::GraphicCacheEntry( const GraphicObject& rObj ) : - maID ( rObj ), - mpBmpEx ( NULL ), - mpMtf ( NULL ), - mpAnimation ( NULL ), + maID ( rObj ), + mpBmpEx ( NULL ), + mpMtf ( NULL ), + mpAnimation ( NULL ), mbSwappedAll ( !ImplInit( rObj ) ) { maGraphicObjectList.Insert( (void*) &rObj, LIST_APPEND ); @@ -274,13 +274,13 @@ BOOL GraphicCacheEntry::ImplInit( const GraphicObject& rObj ) void GraphicCacheEntry::ImplFillSubstitute( Graphic& rSubstitute ) { // create substitute for graphic; - const Size aPrefSize( rSubstitute.GetPrefSize() ); - const MapMode aPrefMapMode( rSubstitute.GetPrefMapMode() ); - const Link aAnimationNotifyHdl( rSubstitute.GetAnimationNotifyHdl() ); - const String aDocFileName( rSubstitute.GetDocFileName() ); - const ULONG nDocFilePos = rSubstitute.GetDocFilePos(); - const GraphicType eOldType = rSubstitute.GetType(); - const BOOL bDefaultType = ( rSubstitute.GetType() == GRAPHIC_DEFAULT ); + const Size aPrefSize( rSubstitute.GetPrefSize() ); + const MapMode aPrefMapMode( rSubstitute.GetPrefMapMode() ); + const Link aAnimationNotifyHdl( rSubstitute.GetAnimationNotifyHdl() ); + const String aDocFileName( rSubstitute.GetDocFileName() ); + const ULONG nDocFilePos = rSubstitute.GetDocFilePos(); + const GraphicType eOldType = rSubstitute.GetType(); + const BOOL bDefaultType = ( rSubstitute.GetType() == GRAPHIC_DEFAULT ); if( rSubstitute.IsLink() && ( GFX_LINK_TYPE_NONE == maGfxLink.GetType() ) ) maGfxLink = rSubstitute.GetLink(); @@ -411,18 +411,18 @@ class GraphicDisplayCacheEntry private: ::salhelper::TTimeValue maReleaseTime; - const GraphicCacheEntry* mpRefCacheEntry; - GDIMetaFile* mpMtf; - BitmapEx* mpBmpEx; - GraphicAttr maAttr; - Size maOutSizePix; - ULONG mnCacheSize; - ULONG mnOutDevDrawMode; - USHORT mnOutDevBitCount; + const GraphicCacheEntry* mpRefCacheEntry; + GDIMetaFile* mpMtf; + BitmapEx* mpBmpEx; + GraphicAttr maAttr; + Size maOutSizePix; + ULONG mnCacheSize; + ULONG mnOutDevDrawMode; + USHORT mnOutDevBitCount; public: - static ULONG GetNeededSize( OutputDevice* pOut, const Point& rPt, const Size& rSz, + static ULONG GetNeededSize( OutputDevice* pOut, const Point& rPt, const Size& rSz, const GraphicObject& rObj, const GraphicAttr& rAttr ); public: @@ -456,17 +456,17 @@ public: ~GraphicDisplayCacheEntry(); - const GraphicAttr& GetAttr() const { return maAttr; } - const Size& GetOutputSizePixel() const { return maOutSizePix; } - ULONG GetCacheSize() const { return mnCacheSize; } - const GraphicCacheEntry* GetReferencedCacheEntry() const { return mpRefCacheEntry; } - ULONG GetOutDevDrawMode() const { return mnOutDevDrawMode; } - USHORT GetOutDevBitCount() const { return mnOutDevBitCount; } + const GraphicAttr& GetAttr() const { return maAttr; } + const Size& GetOutputSizePixel() const { return maOutSizePix; } + ULONG GetCacheSize() const { return mnCacheSize; } + const GraphicCacheEntry* GetReferencedCacheEntry() const { return mpRefCacheEntry; } + ULONG GetOutDevDrawMode() const { return mnOutDevDrawMode; } + USHORT GetOutDevBitCount() const { return mnOutDevBitCount; } void SetReleaseTime( const ::salhelper::TTimeValue& rReleaseTime ) { maReleaseTime = rReleaseTime; } const ::salhelper::TTimeValue& GetReleaseTime() const { return maReleaseTime; } - BOOL Matches( OutputDevice* pOut, const Point& /*rPtPixel*/, const Size& rSzPixel, + BOOL Matches( OutputDevice* pOut, const Point& /*rPtPixel*/, const Size& rSzPixel, const GraphicCacheEntry* pCacheEntry, const GraphicAttr& rAttr ) const { // #i46805# Additional match @@ -482,7 +482,7 @@ public: ( pOut->GetDrawMode() == mnOutDevDrawMode ) ); } - void Draw( OutputDevice* pOut, const Point& rPt, const Size& rSz ) const; + void Draw( OutputDevice* pOut, const Point& rPt, const Size& rSz ) const; }; // ----------------------------------------------------------------------------- @@ -491,8 +491,8 @@ ULONG GraphicDisplayCacheEntry::GetNeededSize( OutputDevice* pOut, const Point& const GraphicObject& rObj, const GraphicAttr& rAttr ) { const Graphic& rGraphic = rObj.GetGraphic(); - const GraphicType eType = rGraphic.GetType(); - ULONG nNeededSize; + const GraphicType eType = rGraphic.GetType(); + ULONG nNeededSize; if( GRAPHIC_BITMAP == eType ) { @@ -562,11 +562,11 @@ void GraphicDisplayCacheEntry::Draw( OutputDevice* pOut, const Point& rPt, const // ----------------------- GraphicCache::GraphicCache( GraphicManager& rMgr, ULONG nDisplayCacheSize, ULONG nMaxObjDisplayCacheSize ) : - mrMgr ( rMgr ), + mrMgr ( rMgr ), mnReleaseTimeoutSeconds ( 0UL ), - mnMaxDisplaySize ( nDisplayCacheSize ), - mnMaxObjDisplaySize ( nMaxObjDisplayCacheSize ), - mnUsedDisplaySize ( 0UL ) + mnMaxDisplaySize ( nDisplayCacheSize ), + mnMaxObjDisplaySize ( nMaxObjDisplayCacheSize ), + mnUsedDisplaySize ( 0UL ) { maReleaseTimer.SetTimeoutHdl( LINK( this, GraphicCache, ReleaseTimeoutHdl ) ); maReleaseTimer.SetTimeout( RELEASE_TIMEOUT ); @@ -676,8 +676,8 @@ void GraphicCache::AddGraphicObject( const GraphicObject& rObj, Graphic& rSubsti void GraphicCache::ReleaseGraphicObject( const GraphicObject& rObj ) { // Release cached object - GraphicCacheEntry* pEntry = (GraphicCacheEntry*) maGraphicCache.First(); - BOOL bRemoved = FALSE; + GraphicCacheEntry* pEntry = (GraphicCacheEntry*) maGraphicCache.First(); + BOOL bRemoved = FALSE; while( !bRemoved && pEntry ) { @@ -843,11 +843,11 @@ BOOL GraphicCache::IsDisplayCacheable( OutputDevice* pOut, const Point& rPt, con BOOL GraphicCache::IsInDisplayCache( OutputDevice* pOut, const Point& rPt, const Size& rSz, const GraphicObject& rObj, const GraphicAttr& rAttr ) const { - const Point aPtPixel( pOut->LogicToPixel( rPt ) ); - const Size aSzPixel( pOut->LogicToPixel( rSz ) ); - const GraphicCacheEntry* pCacheEntry = ( (GraphicCache*) this )->ImplGetCacheEntry( rObj ); - //GraphicDisplayCacheEntry* pDisplayEntry = (GraphicDisplayCacheEntry*) ( (GraphicCache*) this )->maDisplayCache.First(); // -Wall removed .... - BOOL bFound = FALSE; + const Point aPtPixel( pOut->LogicToPixel( rPt ) ); + const Size aSzPixel( pOut->LogicToPixel( rSz ) ); + const GraphicCacheEntry* pCacheEntry = ( (GraphicCache*) this )->ImplGetCacheEntry( rObj ); + //GraphicDisplayCacheEntry* pDisplayEntry = (GraphicDisplayCacheEntry*) ( (GraphicCache*) this )->maDisplayCache.First(); // -Wall removed .... + BOOL bFound = FALSE; if( pCacheEntry ) { @@ -863,8 +863,8 @@ BOOL GraphicCache::IsInDisplayCache( OutputDevice* pOut, const Point& rPt, const ByteString GraphicCache::GetUniqueID( const GraphicObject& rObj ) const { - ByteString aRet; - GraphicCacheEntry* pEntry = ( (GraphicCache*) this )->ImplGetCacheEntry( rObj ); + ByteString aRet; + GraphicCacheEntry* pEntry = ( (GraphicCache*) this )->ImplGetCacheEntry( rObj ); // ensure that the entry is correctly initialized (it has to be read at least once) if( pEntry && pEntry->GetID().IsEmpty() ) @@ -886,7 +886,7 @@ BOOL GraphicCache::CreateDisplayCacheObj( OutputDevice* pOut, const Point& rPt, const BitmapEx& rBmpEx ) { const ULONG nNeededSize = GraphicDisplayCacheEntry::GetNeededSize( pOut, rPt, rSz, rObj, rAttr ); - BOOL bRet = FALSE; + BOOL bRet = FALSE; if( nNeededSize <= GetMaxObjDisplayCacheSize() ) { @@ -920,7 +920,7 @@ BOOL GraphicCache::CreateDisplayCacheObj( OutputDevice* pOut, const Point& rPt, const GDIMetaFile& rMtf ) { const ULONG nNeededSize = GraphicDisplayCacheEntry::GetNeededSize( pOut, rPt, rSz, rObj, rAttr ); - BOOL bRet = FALSE; + BOOL bRet = FALSE; if( nNeededSize <= GetMaxObjDisplayCacheSize() ) { @@ -952,11 +952,11 @@ BOOL GraphicCache::CreateDisplayCacheObj( OutputDevice* pOut, const Point& rPt, BOOL GraphicCache::DrawDisplayCacheObj( OutputDevice* pOut, const Point& rPt, const Size& rSz, const GraphicObject& rObj, const GraphicAttr& rAttr ) { - const Point aPtPixel( pOut->LogicToPixel( rPt ) ); - const Size aSzPixel( pOut->LogicToPixel( rSz ) ); - const GraphicCacheEntry* pCacheEntry = ImplGetCacheEntry( rObj ); - GraphicDisplayCacheEntry* pDisplayCacheEntry = (GraphicDisplayCacheEntry*) maDisplayCache.First(); - BOOL bRet = FALSE; + const Point aPtPixel( pOut->LogicToPixel( rPt ) ); + const Size aSzPixel( pOut->LogicToPixel( rSz ) ); + const GraphicCacheEntry* pCacheEntry = ImplGetCacheEntry( rObj ); + GraphicDisplayCacheEntry* pDisplayCacheEntry = (GraphicDisplayCacheEntry*) maDisplayCache.First(); + BOOL bRet = FALSE; while( !bRet && pDisplayCacheEntry ) { diff --git a/svtools/source/graphic/grfcache.hxx b/svtools/source/graphic/grfcache.hxx index a91ad1e833f3..ecf2cf16d210 100644 --- a/svtools/source/graphic/grfcache.hxx +++ b/svtools/source/graphic/grfcache.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,66 +44,66 @@ class GraphicCache { private: - GraphicManager& mrMgr; + GraphicManager& mrMgr; Timer maReleaseTimer; - List maGraphicCache; - List maDisplayCache; + List maGraphicCache; + List maDisplayCache; ULONG mnReleaseTimeoutSeconds; - ULONG mnMaxDisplaySize; - ULONG mnMaxObjDisplaySize; - ULONG mnUsedDisplaySize; + ULONG mnMaxDisplaySize; + ULONG mnMaxObjDisplaySize; + ULONG mnUsedDisplaySize; - BOOL ImplFreeDisplayCacheSpace( ULONG nSizeToFree ); - GraphicCacheEntry* ImplGetCacheEntry( const GraphicObject& rObj ); + BOOL ImplFreeDisplayCacheSpace( ULONG nSizeToFree ); + GraphicCacheEntry* ImplGetCacheEntry( const GraphicObject& rObj ); DECL_LINK( ReleaseTimeoutHdl, Timer* pTimer ); - -public: - + +public: + GraphicCache( GraphicManager& rMgr, - ULONG nDisplayCacheSize = 10000000UL, + ULONG nDisplayCacheSize = 10000000UL, ULONG nMaxObjDisplayCacheSize = 2400000UL ); ~GraphicCache(); - -public: - - void AddGraphicObject( const GraphicObject& rObj, Graphic& rSubstitute, + +public: + + void AddGraphicObject( const GraphicObject& rObj, Graphic& rSubstitute, const ByteString* pID, const GraphicObject* pCopyObj ); - void ReleaseGraphicObject( const GraphicObject& rObj ); - - void GraphicObjectWasSwappedOut( const GraphicObject& rObj ); - BOOL FillSwappedGraphicObject( const GraphicObject& rObj, Graphic& rSubstitute ); - void GraphicObjectWasSwappedIn( const GraphicObject& rObj ); - - ByteString GetUniqueID( const GraphicObject& rObj ) const; - -public: - - void SetMaxDisplayCacheSize( ULONG nNewCacheSize ); - ULONG GetMaxDisplayCacheSize() const { return mnMaxDisplaySize; }; - - void SetMaxObjDisplayCacheSize( ULONG nNewMaxObjSize, BOOL bDestroyGreaterCached = FALSE ); - ULONG GetMaxObjDisplayCacheSize() const { return mnMaxObjDisplaySize; } - - ULONG GetUsedDisplayCacheSize() const { return mnUsedDisplaySize; } - ULONG GetFreeDisplayCacheSize() const { return( mnMaxDisplaySize - mnUsedDisplaySize ); } + void ReleaseGraphicObject( const GraphicObject& rObj ); + + void GraphicObjectWasSwappedOut( const GraphicObject& rObj ); + BOOL FillSwappedGraphicObject( const GraphicObject& rObj, Graphic& rSubstitute ); + void GraphicObjectWasSwappedIn( const GraphicObject& rObj ); + + ByteString GetUniqueID( const GraphicObject& rObj ) const; + +public: + + void SetMaxDisplayCacheSize( ULONG nNewCacheSize ); + ULONG GetMaxDisplayCacheSize() const { return mnMaxDisplaySize; }; + + void SetMaxObjDisplayCacheSize( ULONG nNewMaxObjSize, BOOL bDestroyGreaterCached = FALSE ); + ULONG GetMaxObjDisplayCacheSize() const { return mnMaxObjDisplaySize; } + + ULONG GetUsedDisplayCacheSize() const { return mnUsedDisplaySize; } + ULONG GetFreeDisplayCacheSize() const { return( mnMaxDisplaySize - mnUsedDisplaySize ); } void SetCacheTimeout( ULONG nTimeoutSeconds ); ULONG GetCacheTimeout() const { return mnReleaseTimeoutSeconds; } - - void ClearDisplayCache(); - BOOL IsDisplayCacheable( OutputDevice* pOut, const Point& rPt, const Size& rSz, + + void ClearDisplayCache(); + BOOL IsDisplayCacheable( OutputDevice* pOut, const Point& rPt, const Size& rSz, const GraphicObject& rObj, const GraphicAttr& rAttr ) const; - BOOL IsInDisplayCache( OutputDevice* pOut, const Point& rPt, const Size& rSz, + BOOL IsInDisplayCache( OutputDevice* pOut, const Point& rPt, const Size& rSz, const GraphicObject& rObj, const GraphicAttr& rAttr ) const; - BOOL CreateDisplayCacheObj( OutputDevice* pOut, const Point& rPt, const Size& rSz, + BOOL CreateDisplayCacheObj( OutputDevice* pOut, const Point& rPt, const Size& rSz, const GraphicObject& rObj, const GraphicAttr& rAttr, const BitmapEx& rBmpEx ); - BOOL CreateDisplayCacheObj( OutputDevice* pOut, const Point& rPt, const Size& rSz, + BOOL CreateDisplayCacheObj( OutputDevice* pOut, const Point& rPt, const Size& rSz, const GraphicObject& rObj, const GraphicAttr& rAttr, const GDIMetaFile& rMtf ); - BOOL DrawDisplayCacheObj( OutputDevice* pOut, const Point& rPt, const Size& rSz, + BOOL DrawDisplayCacheObj( OutputDevice* pOut, const Point& rPt, const Size& rSz, const GraphicObject& rObj, const GraphicAttr& rAttr ); }; diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx index 22e790a5db55..a624092dda61 100644 --- a/svtools/source/graphic/grfmgr.cxx +++ b/svtools/source/graphic/grfmgr.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,15 +47,15 @@ #include <vcl/pdfextoutdevdata.hxx> -#define WATERMARK_LUM_OFFSET 50 -#define WATERMARK_CON_OFFSET -70 +#define WATERMARK_LUM_OFFSET 50 +#define WATERMARK_CON_OFFSET -70 GraphicManager* GraphicObject::mpGlobalMgr = NULL; struct GrfSimpleCacheObj { - Graphic maGraphic; - GraphicAttr maAttr; + Graphic maGraphic; + GraphicAttr maAttr; GrfSimpleCacheObj( const Graphic& rGraphic, const GraphicAttr& rAttr ) : maGraphic( rGraphic ), maAttr( rAttr ) {} @@ -64,8 +64,8 @@ struct GrfSimpleCacheObj TYPEINIT1_AUTOFACTORY( GraphicObject, SvDataCopyStream ); GraphicObject::GraphicObject( const GraphicManager* pMgr ) : - mpLink ( NULL ), - mpUserData ( NULL ) + mpLink ( NULL ), + mpUserData ( NULL ) { ImplConstruct(); ImplAssignGraphicData(); @@ -73,9 +73,9 @@ GraphicObject::GraphicObject( const GraphicManager* pMgr ) : } GraphicObject::GraphicObject( const Graphic& rGraphic, const GraphicManager* pMgr ) : - maGraphic ( rGraphic ), - mpLink ( NULL ), - mpUserData ( NULL ) + maGraphic ( rGraphic ), + mpLink ( NULL ), + mpUserData ( NULL ) { ImplConstruct(); ImplAssignGraphicData(); @@ -83,9 +83,9 @@ GraphicObject::GraphicObject( const Graphic& rGraphic, const GraphicManager* pMg } GraphicObject::GraphicObject( const Graphic& rGraphic, const String& rLink, const GraphicManager* pMgr ) : - maGraphic ( rGraphic ), - mpLink ( rLink.Len() ? ( new String( rLink ) ) : NULL ), - mpUserData ( NULL ) + maGraphic ( rGraphic ), + mpLink ( rLink.Len() ? ( new String( rLink ) ) : NULL ), + mpUserData ( NULL ) { ImplConstruct(); ImplAssignGraphicData(); @@ -94,10 +94,10 @@ GraphicObject::GraphicObject( const Graphic& rGraphic, const String& rLink, cons GraphicObject::GraphicObject( const GraphicObject& rGraphicObj, const GraphicManager* pMgr ) : SvDataCopyStream(), - maGraphic ( rGraphicObj.GetGraphic() ), - maAttr ( rGraphicObj.maAttr ), - mpLink ( rGraphicObj.mpLink ? ( new String( *rGraphicObj.mpLink ) ) : NULL ), - mpUserData ( rGraphicObj.mpUserData ? ( new String( *rGraphicObj.mpUserData ) ) : NULL ) + maGraphic ( rGraphicObj.GetGraphic() ), + maAttr ( rGraphicObj.maAttr ), + mpLink ( rGraphicObj.mpLink ? ( new String( *rGraphicObj.mpLink ) ) : NULL ), + mpUserData ( rGraphicObj.mpUserData ? ( new String( *rGraphicObj.mpUserData ) ) : NULL ) { ImplConstruct(); ImplAssignGraphicData(); @@ -105,8 +105,8 @@ GraphicObject::GraphicObject( const GraphicObject& rGraphicObj, const GraphicMan } GraphicObject::GraphicObject( const ByteString& rUniqueID, const GraphicManager* pMgr ) : - mpLink ( NULL ), - mpUserData ( NULL ) + mpLink ( NULL ), + mpUserData ( NULL ) { ImplConstruct(); @@ -274,14 +274,14 @@ BOOL GraphicObject::ImplGetCropParams( OutputDevice* pOut, Point& rPt, Size& rSz if( GetType() != GRAPHIC_NONE ) { - Polygon aClipPoly( Rectangle( rPt, rSz ) ); - const USHORT nRot10 = pAttr->GetRotation() % 3600; - const Point aOldOrigin( rPt ); - const MapMode aMap100( MAP_100TH_MM ); - Size aSize100; - long nTotalWidth, nTotalHeight; - long nNewLeft, nNewTop, nNewRight, nNewBottom; - double fScale; + Polygon aClipPoly( Rectangle( rPt, rSz ) ); + const USHORT nRot10 = pAttr->GetRotation() % 3600; + const Point aOldOrigin( rPt ); + const MapMode aMap100( MAP_100TH_MM ); + Size aSize100; + long nTotalWidth, nTotalHeight; + long nNewLeft, nNewTop, nNewRight, nNewBottom; + double fScale; if( nRot10 ) { @@ -366,7 +366,7 @@ GraphicObject& GraphicObject::operator=( const GraphicObject& rGraphicObj ) BOOL GraphicObject::operator==( const GraphicObject& rGraphicObj ) const { - return( ( rGraphicObj.maGraphic == maGraphic ) && + return( ( rGraphicObj.maGraphic == maGraphic ) && ( rGraphicObj.maAttr == maAttr ) && ( rGraphicObj.GetLink() == GetLink() ) ); } @@ -472,7 +472,7 @@ void GraphicObject::SetSwapStreamHdl() void GraphicObject::SetSwapStreamHdl( const Link& rHdl, const ULONG nSwapOutTimeout ) { - delete mpSwapStreamHdl, mpSwapStreamHdl = new Link( rHdl ); + delete mpSwapStreamHdl, mpSwapStreamHdl = new Link( rHdl ); if( nSwapOutTimeout ) { @@ -561,16 +561,16 @@ List* GraphicObject::GetAnimationInfoList() const BOOL GraphicObject::Draw( OutputDevice* pOut, const Point& rPt, const Size& rSz, const GraphicAttr* pAttr, ULONG nFlags ) { - GraphicAttr aAttr( pAttr ? *pAttr : GetAttr() ); - Point aPt( rPt ); - Size aSz( rSz ); + GraphicAttr aAttr( pAttr ? *pAttr : GetAttr() ); + Point aPt( rPt ); + Size aSz( rSz ); const sal_uInt32 nOldDrawMode = pOut->GetDrawMode(); - BOOL bCropped = aAttr.IsCropped(); - BOOL bCached = FALSE; - BOOL bRet; + BOOL bCropped = aAttr.IsCropped(); + BOOL bCached = FALSE; + BOOL bRet; // #i29534# Provide output rects for PDF writer - Rectangle aCropRect; + Rectangle aCropRect; if( !( GRFMGR_DRAW_USE_DRAWMODE_SETTINGS & nFlags ) ) pOut->SetDrawMode( nOldDrawMode & ( ~( DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT ) ) ); @@ -594,8 +594,8 @@ BOOL GraphicObject::Draw( OutputDevice* pOut, const Point& rPt, const Size& rSz, if( bCropped ) { PolyPolygon aClipPolyPoly; - BOOL bRectClip; - const BOOL bCrop = ImplGetCropParams( pOut, aPt, aSz, &aAttr, aClipPolyPoly, bRectClip ); + BOOL bRectClip; + const BOOL bCrop = ImplGetCropParams( pOut, aPt, aSz, &aAttr, aClipPolyPoly, bRectClip ); pOut->Push( PUSH_CLIPREGION ); @@ -702,11 +702,11 @@ BOOL GraphicObject::DrawTiled( OutputDevice* pOut, const Rectangle& rArea, const if( pOut == NULL || rSize.Width() == 0 || rSize.Height() == 0 ) return FALSE; - const MapMode aOutMapMode( pOut->GetMapMode() ); - const MapMode aMapMode( aOutMapMode.GetMapUnit(), Point(), aOutMapMode.GetScaleX(), aOutMapMode.GetScaleY() ); + const MapMode aOutMapMode( pOut->GetMapMode() ); + const MapMode aMapMode( aOutMapMode.GetMapUnit(), Point(), aOutMapMode.GetScaleX(), aOutMapMode.GetScaleY() ); // #106258# Clamp size to 1 for zero values. This is okay, since // logical size of zero is handled above already - const Size aOutTileSize( ::std::max( 1L, pOut->LogicToPixel( rSize, aOutMapMode ).Width() ), + const Size aOutTileSize( ::std::max( 1L, pOut->LogicToPixel( rSize, aOutMapMode ).Width() ), ::std::max( 1L, pOut->LogicToPixel( rSize, aOutMapMode ).Height() ) ); //#i69780 clip final tile size to a sane max size @@ -733,14 +733,14 @@ BOOL GraphicObject::StartAnimation( OutputDevice* pOut, const Point& rPt, const if( mbAnimated ) { Point aPt( rPt ); - Size aSz( rSz ); - BOOL bCropped = aAttr.IsCropped(); + Size aSz( rSz ); + BOOL bCropped = aAttr.IsCropped(); if( bCropped ) { PolyPolygon aClipPolyPoly; - BOOL bRectClip; - const BOOL bCrop = ImplGetCropParams( pOut, aPt, aSz, &aAttr, aClipPolyPoly, bRectClip ); + BOOL bRectClip; + const BOOL bCrop = ImplGetCropParams( pOut, aPt, aSz, &aAttr, aClipPolyPoly, bRectClip ); pOut->Push( PUSH_CLIPREGION ); @@ -804,7 +804,7 @@ void GraphicObject::SetGraphic( const Graphic& rGraphic, const GraphicObject* pC delete mpSimpleCache, mpSimpleCache = NULL; mpMgr->ImplRegisterObj( *this, maGraphic, 0, pCopyObj); - + if( mpSwapOutTimer ) mpSwapOutTimer->Start(); } @@ -818,9 +818,9 @@ void GraphicObject::SetGraphic( const Graphic& rGraphic, const String& rLink ) Graphic GraphicObject::GetTransformedGraphic( const Size& rDestSize, const MapMode& rDestMap, const GraphicAttr& rAttr ) const { // #104550# Extracted from svx/source/svdraw/svdograf.cxx - Graphic aTransGraphic( maGraphic ); - const GraphicType eType = GetType(); - const Size aSrcSize( aTransGraphic.GetPrefSize() ); + Graphic aTransGraphic( maGraphic ); + const GraphicType eType = GetType(); + const Size aSrcSize( aTransGraphic.GetPrefSize() ); // #104115# Convert the crop margins to graphic object mapmode const MapMode aMapGraph( aTransGraphic.GetPrefMapMode() ); @@ -1176,11 +1176,11 @@ IMPL_LINK( GraphicObject, ImplAutoSwapOutHdl, void*, EMPTYARG ) SvStream& operator>>( SvStream& rIStm, GraphicObject& rGraphicObj ) { - VersionCompat aCompat( rIStm, STREAM_READ ); - Graphic aGraphic; - GraphicAttr aAttr; - ByteString aLink; - BOOL bLink; + VersionCompat aCompat( rIStm, STREAM_READ ); + Graphic aGraphic; + GraphicAttr aAttr; + ByteString aLink; + BOOL bLink; rIStm >> aGraphic >> aAttr >> bLink; @@ -1202,8 +1202,8 @@ SvStream& operator>>( SvStream& rIStm, GraphicObject& rGraphicObj ) SvStream& operator<<( SvStream& rOStm, const GraphicObject& rGraphicObj ) { - VersionCompat aCompat( rOStm, STREAM_WRITE, 1 ); - const BOOL bLink = rGraphicObj.HasLink(); + VersionCompat aCompat( rOStm, STREAM_WRITE, 1 ); + const BOOL bLink = rGraphicObj.HasLink(); rOStm << rGraphicObj.GetGraphic() << rGraphicObj.GetAttr() << bLink; @@ -1226,10 +1226,10 @@ GraphicObject GraphicObject::CreateGraphicObjectFromURL( const ::rtl::OUString & } else { - Graphic aGraphic; + Graphic aGraphic; if ( aURL.Len() ) { - SvStream* pStream = utl::UcbStreamHelper::CreateStream( aURL, STREAM_READ ); + SvStream* pStream = utl::UcbStreamHelper::CreateStream( aURL, STREAM_READ ); if( pStream ) GraphicConverter::Import( *pStream, aGraphic ); } diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx index 8fe7739cf8cf..70b81c85b403 100644 --- a/svtools/source/graphic/grfmgr2.cxx +++ b/svtools/source/graphic/grfmgr2.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ // - defines - // ----------- -#define MAX_PRINTER_EXT 1024 -#define MAP( cVal0, cVal1, nFrac ) ((BYTE)((((long)(cVal0)<<20L)+nFrac*((long)(cVal1)-(cVal0)))>>20L)) -#define WATERMARK_LUM_OFFSET 50 -#define WATERMARK_CON_OFFSET -70 +#define MAX_PRINTER_EXT 1024 +#define MAP( cVal0, cVal1, nFrac ) ((BYTE)((((long)(cVal0)<<20L)+nFrac*((long)(cVal1)-(cVal0)))>>20L)) +#define WATERMARK_LUM_OFFSET 50 +#define WATERMARK_CON_OFFSET -70 // ----------- // - helpers - @@ -158,9 +158,9 @@ ULONG GraphicManager::GetMaxObjCacheSize() const // ----------------------------------------------------------------------------- -ULONG GraphicManager::GetUsedCacheSize() const -{ - return mpCache->GetUsedDisplayCacheSize(); +ULONG GraphicManager::GetUsedCacheSize() const +{ + return mpCache->GetUsedDisplayCacheSize(); } // ----------------------------------------------------------------------------- @@ -201,7 +201,7 @@ void GraphicManager::ReleaseFromCache( const GraphicObject& /*rObj*/ ) // ----------------------------------------------------------------------------- BOOL GraphicManager::IsInCache( OutputDevice* pOut, const Point& rPt, - const Size& rSz, const GraphicObject& rObj, + const Size& rSz, const GraphicObject& rObj, const GraphicAttr& rAttr ) const { return mpCache->IsInDisplayCache( pOut, rPt, rSz, rObj, rAttr ); @@ -214,8 +214,8 @@ BOOL GraphicManager::DrawObj( OutputDevice* pOut, const Point& rPt, const Size& const ULONG nFlags, BOOL& rCached ) { Point aPt( rPt ); - Size aSz( rSz ); - BOOL bRet = FALSE; + Size aSz( rSz ); + BOOL bRet = FALSE; rCached = FALSE; @@ -225,9 +225,9 @@ BOOL GraphicManager::DrawObj( OutputDevice* pOut, const Point& rPt, const Size& const Size aOutSize( pOut->GetOutputSizePixel() ); if( rObj.IsAnimated() || ( pOut->GetOutDevType() == OUTDEV_PRINTER ) || - ( !( nFlags & GRFMGR_DRAW_NO_SUBSTITUTE ) && - ( ( nFlags & GRFMGR_DRAW_SUBSTITUTE ) || - !( nFlags & GRFMGR_DRAW_CACHED ) || + ( !( nFlags & GRFMGR_DRAW_NO_SUBSTITUTE ) && + ( ( nFlags & GRFMGR_DRAW_SUBSTITUTE ) || + !( nFlags & GRFMGR_DRAW_CACHED ) || ( pOut->GetConnectMetaFile() && !pOut->IsOutputEnabled() ) ) ) ) { // simple output of transformed graphic @@ -236,7 +236,7 @@ BOOL GraphicManager::DrawObj( OutputDevice* pOut, const Point& rPt, const Size& if( aGraphic.IsSupportedGraphic() ) { const USHORT nRot10 = rAttr.GetRotation() % 3600; - + if( nRot10 ) { Polygon aPoly( Rectangle( aPt, aSz ) ); @@ -268,7 +268,7 @@ BOOL GraphicManager::DrawObj( OutputDevice* pOut, const Point& rPt, const Size& // ----------------------------------------------------------------------------- -void GraphicManager::ImplRegisterObj( const GraphicObject& rObj, Graphic& rSubstitute, +void GraphicManager::ImplRegisterObj( const GraphicObject& rObj, Graphic& rSubstitute, const ByteString* pID, const GraphicObject* pCopyObj ) { maObjList.Insert( (void*) &rObj, LIST_APPEND ); @@ -278,7 +278,7 @@ void GraphicManager::ImplRegisterObj( const GraphicObject& rObj, Graphic& rSubst // ----------------------------------------------------------------------------- void GraphicManager::ImplUnregisterObj( const GraphicObject& rObj ) -{ +{ mpCache->ReleaseGraphicObject( rObj ); maObjList.Remove( (void*) &rObj ); } @@ -315,11 +315,11 @@ void GraphicManager::ImplGraphicObjectWasSwappedIn( const GraphicObject& rObj ) BOOL GraphicManager::ImplDraw( OutputDevice* pOut, const Point& rPt, const Size& rSz, GraphicObject& rObj, - const GraphicAttr& rAttr, + const GraphicAttr& rAttr, const ULONG nFlags, BOOL& rCached ) { - const Graphic& rGraphic = rObj.GetGraphic(); - BOOL bRet = FALSE; + const Graphic& rGraphic = rObj.GetGraphic(); + BOOL bRet = FALSE; if( rGraphic.IsSupportedGraphic() && !rGraphic.IsSwapOut() ) { @@ -333,7 +333,7 @@ BOOL GraphicManager::ImplDraw( OutputDevice* pOut, const Point& rPt, mpCache->IsDisplayCacheable( pOut, rPt, rSz, rObj, rAttr ) ) { BitmapEx aDstBmpEx; - + if( ImplCreateOutput( pOut, rPt, rSz, aSrcBmpEx, rAttr, nFlags, &aDstBmpEx ) ) { rCached = mpCache->CreateDisplayCacheObj( pOut, rPt, rSz, rObj, rAttr, aDstBmpEx ); @@ -361,7 +361,7 @@ BOOL GraphicManager::ImplDraw( OutputDevice* pOut, const Point& rPt, // metafile basically contains only a single // bitmap BitmapEx aDstBmpEx; - + if( ImplCreateOutput( pOut, rPt, rSz, aContainedBmpEx, rAttr, nFlags, &aDstBmpEx ) ) { rCached = mpCache->CreateDisplayCacheObj( pOut, rPt, rSz, rObj, rAttr, aDstBmpEx ); @@ -379,7 +379,7 @@ BOOL GraphicManager::ImplDraw( OutputDevice* pOut, const Point& rPt, if( !bRet ) { const Graphic aGraphic( rObj.GetTransformedGraphic( &rAttr ) ); - + if( aGraphic.IsSupportedGraphic() ) { aGraphic.Draw( pOut, rPt, rSz ); @@ -394,16 +394,16 @@ BOOL GraphicManager::ImplDraw( OutputDevice* pOut, const Point& rPt, // ----------------------------------------------------------------------------- -BOOL GraphicManager::ImplCreateOutput( OutputDevice* pOut, +BOOL GraphicManager::ImplCreateOutput( OutputDevice* pOut, const Point& rPt, const Size& rSz, const BitmapEx& rBmpEx, const GraphicAttr& rAttr, const ULONG nFlags, BitmapEx* pBmpEx ) { - USHORT nRot10 = rAttr.GetRotation() % 3600; - Point aOutPtPix; - Size aOutSzPix; - Size aUnrotatedSzPix( pOut->LogicToPixel( rSz ) ); - BOOL bRet = FALSE; + USHORT nRot10 = rAttr.GetRotation() % 3600; + Point aOutPtPix; + Size aOutSzPix; + Size aUnrotatedSzPix( pOut->LogicToPixel( rSz ) ); + BOOL bRet = FALSE; if( nRot10 ) { @@ -422,29 +422,29 @@ BOOL GraphicManager::ImplCreateOutput( OutputDevice* pOut, if( aUnrotatedSzPix.Width() && aUnrotatedSzPix.Height() ) { - BitmapEx aBmpEx( rBmpEx ); - BitmapEx aOutBmpEx; - Point aOutPt; - Size aOutSz; - const Size& rBmpSzPix = rBmpEx.GetSizePixel(); - const long nW = rBmpSzPix.Width(); - const long nH = rBmpSzPix.Height(); - const long nNewW = aUnrotatedSzPix.Width(); - const long nNewH = aUnrotatedSzPix.Height(); - double fTmp; - long* pMapIX = new long[ nNewW ]; - long* pMapFX = new long[ nNewW ]; - long* pMapIY = new long[ nNewH ]; - long* pMapFY = new long[ nNewH ]; - long nStartX = -1, nStartY = -1, nEndX = -1, nEndY = -1; - long nX, nY, nTmp, nTmpX, nTmpY; - BOOL bHMirr = ( rAttr.GetMirrorFlags() & BMP_MIRROR_HORZ ) != 0; - BOOL bVMirr = ( rAttr.GetMirrorFlags() & BMP_MIRROR_VERT ) != 0; + BitmapEx aBmpEx( rBmpEx ); + BitmapEx aOutBmpEx; + Point aOutPt; + Size aOutSz; + const Size& rBmpSzPix = rBmpEx.GetSizePixel(); + const long nW = rBmpSzPix.Width(); + const long nH = rBmpSzPix.Height(); + const long nNewW = aUnrotatedSzPix.Width(); + const long nNewH = aUnrotatedSzPix.Height(); + double fTmp; + long* pMapIX = new long[ nNewW ]; + long* pMapFX = new long[ nNewW ]; + long* pMapIY = new long[ nNewH ]; + long* pMapFY = new long[ nNewH ]; + long nStartX = -1, nStartY = -1, nEndX = -1, nEndY = -1; + long nX, nY, nTmp, nTmpX, nTmpY; + BOOL bHMirr = ( rAttr.GetMirrorFlags() & BMP_MIRROR_HORZ ) != 0; + BOOL bVMirr = ( rAttr.GetMirrorFlags() & BMP_MIRROR_VERT ) != 0; if( nFlags & GRFMGR_DRAW_BILINEAR ) { - const double fRevScaleX = ( nNewW > 1L ) ? ( (double) ( nW - 1L ) / ( nNewW - 1L ) ) : 0.0; - const double fRevScaleY = ( nNewH > 1L ) ? ( (double) ( nH - 1L ) / ( nNewH - 1L ) ) : 0.0; + const double fRevScaleX = ( nNewW > 1L ) ? ( (double) ( nW - 1L ) / ( nNewW - 1L ) ) : 0.0; + const double fRevScaleY = ( nNewH > 1L ) ? ( (double) ( nH - 1L ) / ( nNewH - 1L ) ) : 0.0; // create horizontal mapping table for( nX = 0L, nTmpX = nW - 1L, nTmp = nW - 2L; nX < nNewW; nX++ ) @@ -471,8 +471,8 @@ BOOL GraphicManager::ImplCreateOutput( OutputDevice* pOut, else { // #98290# Use a different mapping for non-interpolating mode, to avoid missing rows/columns - const double fRevScaleX = ( nNewW > 1L ) ? ( (double) nW / nNewW ) : 0.0; - const double fRevScaleY = ( nNewH > 1L ) ? ( (double) nH / nNewH ) : 0.0; + const double fRevScaleX = ( nNewW > 1L ) ? ( (double) nW / nNewW ) : 0.0; + const double fRevScaleY = ( nNewH > 1L ) ? ( (double) nH / nNewH ) : 0.0; // create horizontal mapping table for( nX = 0L, nTmpX = nW - 1L, nTmp = nW - 2L; nX < nNewW; nX++ ) @@ -504,9 +504,9 @@ BOOL GraphicManager::ImplCreateOutput( OutputDevice* pOut, // calculate output sizes if( !pBmpEx ) { - Point aPt; - Rectangle aOutRect( aPt, pOut->GetOutputSizePixel() ); - Rectangle aBmpRect( aOutPtPix, aOutSzPix ); + Point aPt; + Rectangle aOutRect( aPt, pOut->GetOutputSizePixel() ); + Rectangle aBmpRect( aOutPtPix, aOutSzPix ); if( pOut->GetOutDevType() == OUTDEV_WINDOW ) { @@ -646,7 +646,7 @@ BOOL GraphicManager::ImplCreateOutput( OutputDevice* pOut, const double fScaleY = 1.0; const MapMode& rPrefMapMode( rMtf.GetPrefMapMode() ); - const Size& rSizePix( pOut->LogicToPixel( aNewSize, + const Size& rSizePix( pOut->LogicToPixel( aNewSize, rPrefMapMode ) ); // taking care of font width default if scaling metafile. @@ -929,17 +929,17 @@ BOOL GraphicManager::ImplCreateScaled( const BitmapEx& rBmpEx, long nStartX, long nEndX, long nStartY, long nEndY, BitmapEx& rOutBmpEx ) { - Bitmap aBmp( rBmpEx.GetBitmap() ); - Bitmap aOutBmp; - BitmapReadAccess* pAcc = aBmp.AcquireReadAccess(); - BitmapWriteAccess* pWAcc; - BitmapColor aCol0, aCol1, aColRes; - const long nDstW = nEndX - nStartX + 1L; - const long nDstH = nEndY - nStartY + 1L; - long nX, nY, nTmpX, nTmpY, nTmpFX, nTmpFY; - long nXDst, nYDst; - BYTE cR0, cG0, cB0, cR1, cG1, cB1; - BOOL bRet = FALSE; + Bitmap aBmp( rBmpEx.GetBitmap() ); + Bitmap aOutBmp; + BitmapReadAccess* pAcc = aBmp.AcquireReadAccess(); + BitmapWriteAccess* pWAcc; + BitmapColor aCol0, aCol1, aColRes; + const long nDstW = nEndX - nStartX + 1L; + const long nDstH = nEndY - nStartY + 1L; + long nX, nY, nTmpX, nTmpY, nTmpFX, nTmpFY; + long nXDst, nYDst; + BYTE cR0, cG0, cB0, cR1, cG1, cB1; + BOOL bRet = FALSE; DBG_ASSERT( aBmp.GetSizePixel() == rBmpEx.GetSizePixel(), "GraphicManager::ImplCreateScaled(): bmp size inconsistent" ); @@ -1021,8 +1021,8 @@ BOOL GraphicManager::ImplCreateScaled( const BitmapEx& rBmpEx, { if( pAcc->GetScanlineFormat() == BMP_FORMAT_24BIT_TC_BGR ) { - Scanline pLine0, pLine1, pTmp0, pTmp1; - long nOff; + Scanline pLine0, pLine1, pTmp0, pTmp1; + long nOff; for( nY = nStartY, nYDst = 0L; nY <= nEndY; nY++, nYDst++ ) { @@ -1054,8 +1054,8 @@ BOOL GraphicManager::ImplCreateScaled( const BitmapEx& rBmpEx, } else if( pAcc->GetScanlineFormat() == BMP_FORMAT_24BIT_TC_RGB ) { - Scanline pLine0, pLine1, pTmp0, pTmp1; - long nOff; + Scanline pLine0, pLine1, pTmp0, pTmp1; + long nOff; for( nY = nStartY, nYDst = 0L; nY <= nEndY; nY++, nYDst++ ) { @@ -1132,8 +1132,8 @@ BOOL GraphicManager::ImplCreateScaled( const BitmapEx& rBmpEx, DBG_ASSERT( rBmpEx.GetAlpha().GetSizePixel() == rBmpEx.GetSizePixel(), "GraphicManager::ImplCreateScaled(): alpha mask size inconsistent" ); - AlphaMask aAlpha( rBmpEx.GetAlpha() ); - AlphaMask aOutAlpha; + AlphaMask aAlpha( rBmpEx.GetAlpha() ); + AlphaMask aOutAlpha; pAcc = aAlpha.AcquireReadAccess(); @@ -1160,12 +1160,12 @@ BOOL GraphicManager::ImplCreateScaled( const BitmapEx& rBmpEx, { nTmpX = pMapIX[ nX ]; nTmpFX = pMapFX[ nX ]; - const long nAlpha0 = pLine0[ nTmpX ]; - const long nAlpha2 = pLine1[ nTmpX ]; - const long nAlpha1 = pLine0[ ++nTmpX ]; - const long nAlpha3 = pLine1[ nTmpX ]; - const long n0 = MAP( nAlpha0, nAlpha1, nTmpFX ); - const long n1 = MAP( nAlpha2, nAlpha3, nTmpFX ); + const long nAlpha0 = pLine0[ nTmpX ]; + const long nAlpha2 = pLine1[ nTmpX ]; + const long nAlpha1 = pLine0[ ++nTmpX ]; + const long nAlpha3 = pLine1[ nTmpX ]; + const long n0 = MAP( nAlpha0, nAlpha1, nTmpFX ); + const long n1 = MAP( nAlpha2, nAlpha3, nTmpFX ); *pLineW++ = MAP( n0, n1, nTmpFY ); } @@ -1183,13 +1183,13 @@ BOOL GraphicManager::ImplCreateScaled( const BitmapEx& rBmpEx, { nTmpX = pMapIX[ nX ]; nTmpFX = pMapFX[ nX ]; - long nAlpha0 = pAcc->GetPixel( nTmpY, nTmpX ).GetIndex(); - long nAlpha1 = pAcc->GetPixel( nTmpY, ++nTmpX ).GetIndex(); - const long n0 = MAP( nAlpha0, nAlpha1, nTmpFX ); + long nAlpha0 = pAcc->GetPixel( nTmpY, nTmpX ).GetIndex(); + long nAlpha1 = pAcc->GetPixel( nTmpY, ++nTmpX ).GetIndex(); + const long n0 = MAP( nAlpha0, nAlpha1, nTmpFX ); nAlpha1 = pAcc->GetPixel( ++nTmpY, nTmpX ).GetIndex(); nAlpha0 = pAcc->GetPixel( nTmpY--, --nTmpX ).GetIndex(); - const long n1 = MAP( nAlpha0, nAlpha1, nTmpFX ); + const long n1 = MAP( nAlpha0, nAlpha1, nTmpFX ); aAlphaValue.SetIndex( MAP( n0, n1, nTmpFY ) ); pWAcc->SetPixel( nYDst, nXDst++, aAlphaValue ); @@ -1212,8 +1212,8 @@ BOOL GraphicManager::ImplCreateScaled( const BitmapEx& rBmpEx, DBG_ASSERT( rBmpEx.GetMask().GetSizePixel() == rBmpEx.GetSizePixel(), "GraphicManager::ImplCreateScaled(): mask size inconsistent" ); - Bitmap aMsk( rBmpEx.GetMask() ); - Bitmap aOutMsk; + Bitmap aMsk( rBmpEx.GetMask() ); + Bitmap aOutMsk; pAcc = aMsk.AcquireReadAccess(); @@ -1223,7 +1223,7 @@ BOOL GraphicManager::ImplCreateScaled( const BitmapEx& rBmpEx, // bitmap. Otherwise, we'd have to color-map even the // case below, when both masks are one bit deep. if( pAcc->HasPalette() ) - aOutMsk = Bitmap( Size( nDstW, nDstH ), + aOutMsk = Bitmap( Size( nDstW, nDstH ), 1, &pAcc->GetPalette() ); else @@ -1329,26 +1329,26 @@ BOOL GraphicManager::ImplCreateRotatedScaled( const BitmapEx& rBmpEx, long nStartX, long nEndX, long nStartY, long nEndY, BitmapEx& rOutBmpEx ) { - Point aPt; - Bitmap aBmp( rBmpEx.GetBitmap() ); - Bitmap aOutBmp; - BitmapReadAccess* pAcc = aBmp.AcquireReadAccess(); - BitmapWriteAccess* pWAcc; - Polygon aPoly( Rectangle( aPt, rUnrotatedSzPix ) ); aPoly.Rotate( Point(), nRot10 ); - Rectangle aNewBound( aPoly.GetBoundRect() ); - const double fCosAngle = cos( nRot10 * F_PI1800 ), fSinAngle = sin( nRot10 * F_PI1800 ); - double fTmp; - const long nDstW = nEndX - nStartX + 1L; - const long nDstH = nEndY - nStartY + 1L; - const long nUnRotW = rUnrotatedSzPix.Width(); - const long nUnRotH = rUnrotatedSzPix.Height(); - long* pCosX = new long[ nDstW ]; - long* pSinX = new long[ nDstW ]; - long* pCosY = new long[ nDstH ]; - long* pSinY = new long[ nDstH ]; - long nX, nY, nTmpX, nTmpY, nTmpFX, nTmpFY, nUnRotX, nUnRotY, nSinY, nCosY; - BYTE cR0, cG0, cB0, cR1, cG1, cB1; - BOOL bRet = FALSE; + Point aPt; + Bitmap aBmp( rBmpEx.GetBitmap() ); + Bitmap aOutBmp; + BitmapReadAccess* pAcc = aBmp.AcquireReadAccess(); + BitmapWriteAccess* pWAcc; + Polygon aPoly( Rectangle( aPt, rUnrotatedSzPix ) ); aPoly.Rotate( Point(), nRot10 ); + Rectangle aNewBound( aPoly.GetBoundRect() ); + const double fCosAngle = cos( nRot10 * F_PI1800 ), fSinAngle = sin( nRot10 * F_PI1800 ); + double fTmp; + const long nDstW = nEndX - nStartX + 1L; + const long nDstH = nEndY - nStartY + 1L; + const long nUnRotW = rUnrotatedSzPix.Width(); + const long nUnRotH = rUnrotatedSzPix.Height(); + long* pCosX = new long[ nDstW ]; + long* pSinX = new long[ nDstW ]; + long* pCosY = new long[ nDstH ]; + long* pSinY = new long[ nDstH ]; + long nX, nY, nTmpX, nTmpY, nTmpFX, nTmpFY, nUnRotX, nUnRotY, nSinY, nCosY; + BYTE cR0, cG0, cB0, cR1, cG1, cB1; + BOOL bRet = FALSE; // create horizontal mapping table for( nX = 0L, nTmpX = aNewBound.Left() + nStartX; nX < nDstW; nX++ ) @@ -1413,7 +1413,7 @@ BOOL GraphicManager::ImplCreateRotatedScaled( const BitmapEx& rBmpEx, } else { - BitmapColor aCol0, aCol1; + BitmapColor aCol0, aCol1; for( nY = 0; nY < nDstH; nY++ ) { @@ -1466,8 +1466,8 @@ BOOL GraphicManager::ImplCreateRotatedScaled( const BitmapEx& rBmpEx, if( rBmpEx.IsAlpha() ) { - AlphaMask aAlpha( rBmpEx.GetAlpha() ); - AlphaMask aOutAlpha; + AlphaMask aAlpha( rBmpEx.GetAlpha() ); + AlphaMask aOutAlpha; pAcc = aAlpha.AcquireReadAccess(); @@ -1502,12 +1502,12 @@ BOOL GraphicManager::ImplCreateRotatedScaled( const BitmapEx& rBmpEx, pLine0 = pAcc->GetScanline( nTmpY++ ); pLine1 = pAcc->GetScanline( nTmpY ); - const long nAlpha0 = pLine0[ nTmpX ]; - const long nAlpha2 = pLine1[ nTmpX++ ]; - const long nAlpha1 = pLine0[ nTmpX ]; - const long nAlpha3 = pLine1[ nTmpX ]; - const long n0 = MAP( nAlpha0, nAlpha1, nTmpFX ); - const long n1 = MAP( nAlpha2, nAlpha3, nTmpFX ); + const long nAlpha0 = pLine0[ nTmpX ]; + const long nAlpha2 = pLine1[ nTmpX++ ]; + const long nAlpha1 = pLine0[ nTmpX ]; + const long nAlpha3 = pLine1[ nTmpX ]; + const long n0 = MAP( nAlpha0, nAlpha1, nTmpFX ); + const long n1 = MAP( nAlpha2, nAlpha3, nTmpFX ); *pLineW++ = MAP( n0, n1, nTmpFY ); } @@ -1518,8 +1518,8 @@ BOOL GraphicManager::ImplCreateRotatedScaled( const BitmapEx& rBmpEx, } else { - const BitmapColor aTrans( pWAcc->GetBestMatchingColor( Color( COL_WHITE ) ) ); - BitmapColor aAlphaVal( 0 ); + const BitmapColor aTrans( pWAcc->GetBestMatchingColor( Color( COL_WHITE ) ) ); + BitmapColor aAlphaVal( 0 ); for( nY = 0; nY < nDstH; nY++ ) { @@ -1536,12 +1536,12 @@ BOOL GraphicManager::ImplCreateRotatedScaled( const BitmapEx& rBmpEx, nTmpX = pMapIX[ nUnRotX ]; nTmpFX = pMapFX[ nUnRotX ]; nTmpY = pMapIY[ nUnRotY ], nTmpFY = pMapFY[ nUnRotY ]; - const long nAlpha0 = pAcc->GetPixel( nTmpY, nTmpX ).GetIndex(); - const long nAlpha1 = pAcc->GetPixel( nTmpY, ++nTmpX ).GetIndex(); - const long nAlpha3 = pAcc->GetPixel( ++nTmpY, nTmpX ).GetIndex(); - const long nAlpha2 = pAcc->GetPixel( nTmpY, --nTmpX ).GetIndex(); - const long n0 = MAP( nAlpha0, nAlpha1, nTmpFX ); - const long n1 = MAP( nAlpha2, nAlpha3, nTmpFX ); + const long nAlpha0 = pAcc->GetPixel( nTmpY, nTmpX ).GetIndex(); + const long nAlpha1 = pAcc->GetPixel( nTmpY, ++nTmpX ).GetIndex(); + const long nAlpha3 = pAcc->GetPixel( ++nTmpY, nTmpX ).GetIndex(); + const long nAlpha2 = pAcc->GetPixel( nTmpY, --nTmpX ).GetIndex(); + const long n0 = MAP( nAlpha0, nAlpha1, nTmpFX ); + const long n1 = MAP( nAlpha2, nAlpha3, nTmpFX ); aAlphaVal.SetIndex( MAP( n0, n1, nTmpFY ) ); pWAcc->SetPixel( nY, nX, aAlphaVal ); @@ -1569,16 +1569,16 @@ BOOL GraphicManager::ImplCreateRotatedScaled( const BitmapEx& rBmpEx, if( pWAcc ) { - Bitmap aMsk( rBmpEx.GetMask() ); - const BitmapColor aB( pWAcc->GetBestMatchingColor( Color( COL_BLACK ) ) ); - const BitmapColor aW( pWAcc->GetBestMatchingColor( Color( COL_WHITE ) ) ); - BitmapReadAccess* pMAcc = NULL; + Bitmap aMsk( rBmpEx.GetMask() ); + const BitmapColor aB( pWAcc->GetBestMatchingColor( Color( COL_BLACK ) ) ); + const BitmapColor aW( pWAcc->GetBestMatchingColor( Color( COL_WHITE ) ) ); + BitmapReadAccess* pMAcc = NULL; if( !aMsk || ( ( pMAcc = aMsk.AcquireReadAccess() ) != NULL ) ) { - long* pMapLX = new long[ nUnRotW ]; - long* pMapLY = new long[ nUnRotH ]; - BitmapColor aTestB; + long* pMapLX = new long[ nUnRotW ]; + long* pMapLY = new long[ nUnRotH ]; + BitmapColor aTestB; if( pMAcc ) aTestB = pMAcc->GetBestMatchingColor( Color( COL_BLACK ) ); @@ -1699,8 +1699,8 @@ void GraphicManager::ImplAdjust( BitmapEx& rBmpEx, const GraphicAttr& rAttr, ULO if( ( nAdjustmentFlags & ADJUSTMENT_TRANSPARENCY ) && aAttr.IsTransparent() ) { - AlphaMask aAlpha; - BYTE cTrans = aAttr.GetTransparency(); + AlphaMask aAlpha; + BYTE cTrans = aAttr.GetTransparency(); if( !rBmpEx.IsTransparent() ) aAlpha = AlphaMask( rBmpEx.GetSizePixel(), &cTrans ); @@ -1716,8 +1716,8 @@ void GraphicManager::ImplAdjust( BitmapEx& rBmpEx, const GraphicAttr& rAttr, ULO if( pA ) { - ULONG nTrans = cTrans, nNewTrans; - const long nWidth = pA->Width(), nHeight = pA->Height(); + ULONG nTrans = cTrans, nNewTrans; + const long nWidth = pA->Width(), nHeight = pA->Height(); if( pA->GetScanlineFormat() == BMP_FORMAT_8BIT_PAL ) { @@ -1866,9 +1866,9 @@ void GraphicManager::ImplAdjust( Animation& rAnimation, const GraphicAttr& rAttr void GraphicManager::ImplDraw( OutputDevice* pOut, const Point& rPt, const Size& rSz, const GDIMetaFile& rMtf, const GraphicAttr& rAttr ) { - USHORT nRot10 = rAttr.GetRotation() % 3600; - Point aOutPt( rPt ); - Size aOutSz( rSz ); + USHORT nRot10 = rAttr.GetRotation() % 3600; + Point aOutPt( rPt ); + Size aOutSz( rSz ); if( nRot10 ) { @@ -1896,7 +1896,7 @@ struct ImplTileInfo { ImplTileInfo() : aTileTopLeft(), aNextTileTopLeft(), aTileSizePixel(), nTilesEmptyX(0), nTilesEmptyY(0) {} - Point aTileTopLeft; // top, left position of the rendered tile + Point aTileTopLeft; // top, left position of the rendered tile Point aNextTileTopLeft; // top, left position for next recursion // level's tile Size aTileSizePixel; // size of the generated tile (might @@ -1909,7 +1909,7 @@ struct ImplTileInfo // required area coverage is often // less. The extraneous area covered is // later overwritten by the next stage) - int nTilesEmptyX; // number of original tiles empty right of + int nTilesEmptyX; // number of original tiles empty right of // this tile. This counts from // aNextTileTopLeft, i.e. the additional // area covered by aTileSizePixel is not @@ -1917,13 +1917,13 @@ struct ImplTileInfo // unification purposes, as the iterative // calculation of the next level's empty // tiles has to be based on this value. - int nTilesEmptyY; // as above, for Y + int nTilesEmptyY; // as above, for Y }; -bool GraphicObject::ImplRenderTempTile( VirtualDevice& rVDev, int nExponent, - int nNumTilesX, int nNumTilesY, - const Size& rTileSizePixel, +bool GraphicObject::ImplRenderTempTile( VirtualDevice& rVDev, int nExponent, + int nNumTilesX, int nNumTilesY, + const Size& rTileSizePixel, const GraphicAttr* pAttr, ULONG nFlags ) { if( nExponent <= 1 ) @@ -1932,7 +1932,7 @@ bool GraphicObject::ImplRenderTempTile( VirtualDevice& rVDev, int nExponent, // determine MSB factor int nMSBFactor( 1 ); while( nNumTilesX / nMSBFactor != 0 || - nNumTilesY / nMSBFactor != 0 ) + nNumTilesY / nMSBFactor != 0 ) { nMSBFactor *= nExponent; } @@ -1947,7 +1947,7 @@ bool GraphicObject::ImplRenderTempTile( VirtualDevice& rVDev, int nExponent, BOOL bOldMap( rVDev.IsMapModeEnabled() ); rVDev.EnableMapMode( FALSE ); - bool bRet( ImplRenderTileRecursive( rVDev, nExponent, nMSBFactor, nNumTilesX, nNumTilesY, + bool bRet( ImplRenderTileRecursive( rVDev, nExponent, nMSBFactor, nNumTilesX, nNumTilesY, nNumTilesX, nNumTilesY, rTileSizePixel, pAttr, nFlags, aTileInfo ) ); rVDev.EnableMapMode( bOldMap ); @@ -1965,9 +1965,9 @@ bool GraphicObject::ImplRenderTempTile( VirtualDevice& rVDev, int nExponent, // size is given by the decimal place of the corresponding decimal // representation. bool GraphicObject::ImplRenderTileRecursive( VirtualDevice& rVDev, int nExponent, int nMSBFactor, - int nNumOrigTilesX, int nNumOrigTilesY, - int nRemainderTilesX, int nRemainderTilesY, - const Size& rTileSizePixel, const GraphicAttr* pAttr, + int nNumOrigTilesX, int nNumOrigTilesY, + int nRemainderTilesX, int nRemainderTilesY, + const Size& rTileSizePixel, const GraphicAttr* pAttr, ULONG nFlags, ImplTileInfo& rTileInfo ) { // gets loaded with our tile bitmap @@ -1989,7 +1989,7 @@ bool GraphicObject::ImplRenderTileRecursive( VirtualDevice& rVDev, int nExponent ImplTileInfo aTileInfo; // current output position while drawing - Point aCurrPos; + Point aCurrPos; int nX, nY; // check for recursion's end condition: LSB place reached? @@ -2002,23 +2002,23 @@ bool GraphicObject::ImplRenderTileRecursive( VirtualDevice& rVDev, int nExponent aTileInfo.nTilesEmptyX = nNumOrigTilesX; aTileInfo.nTilesEmptyY = nNumOrigTilesY; } - else if( ImplRenderTileRecursive( rVDev, nExponent, nMSBFactor/nExponent, - nNumOrigTilesX, nNumOrigTilesY, - nNewRemainderX, nNewRemainderY, + else if( ImplRenderTileRecursive( rVDev, nExponent, nMSBFactor/nExponent, + nNumOrigTilesX, nNumOrigTilesY, + nNewRemainderX, nNewRemainderY, rTileSizePixel, pAttr, nFlags, aTileInfo ) ) { // extract generated tile -> see comment on the first loop below BitmapEx aTileBitmap( rVDev.GetBitmap( aTileInfo.aTileTopLeft, aTileInfo.aTileSizePixel ) ); - + aTmpGraphic = GraphicObject( aTileBitmap ); // fill stripes left over from upstream levels: - // + // // x0000 // 0 // 0 // 0 - // 0 + // 0 // // where x denotes the place filled by our recursive predecessors @@ -2039,12 +2039,12 @@ bool GraphicObject::ImplRenderTileRecursive( VirtualDevice& rVDev, int nExponent { if( !aTmpGraphic.Draw( &rVDev, aCurrPos, aTileInfo.aTileSizePixel, pAttr, nFlags ) ) return false; - + aCurrPos.X() += aTileInfo.aTileSizePixel.Width(); } #ifdef DBG_TEST -// rVDev.SetFillColor( COL_WHITE ); +// rVDev.SetFillColor( COL_WHITE ); rVDev.SetFillColor(); rVDev.SetLineColor( Color( 255 * nExponent / nMSBFactor, 255 - 255 * nExponent / nMSBFactor, 128 - 255 * nExponent / nMSBFactor ) ); rVDev.DrawEllipse( Rectangle(aTileInfo.aNextTileTopLeft.X(), aTileInfo.aTileTopLeft.Y(), @@ -2094,13 +2094,13 @@ bool GraphicObject::ImplRenderTileRecursive( VirtualDevice& rVDev, int nExponent nRemainderTilesY -= nNewRemainderY; // fill tile info for calling method - rTileInfo.aTileTopLeft = aTileInfo.aNextTileTopLeft; + rTileInfo.aTileTopLeft = aTileInfo.aNextTileTopLeft; rTileInfo.aNextTileTopLeft = Point( rTileInfo.aTileTopLeft.X() + rTileSizePixel.Width()*nRemainderTilesX, rTileInfo.aTileTopLeft.Y() + rTileSizePixel.Height()*nRemainderTilesY ); rTileInfo.aTileSizePixel = Size( rTileSizePixel.Width()*nMSBFactor*nExponent, rTileSizePixel.Height()*nMSBFactor*nExponent ); - rTileInfo.nTilesEmptyX = aTileInfo.nTilesEmptyX - nRemainderTilesX; - rTileInfo.nTilesEmptyY = aTileInfo.nTilesEmptyY - nRemainderTilesY; + rTileInfo.nTilesEmptyX = aTileInfo.nTilesEmptyX - nRemainderTilesX; + rTileInfo.nTilesEmptyY = aTileInfo.nTilesEmptyY - nRemainderTilesY; // init output position aCurrPos = aTileInfo.aNextTileTopLeft; @@ -2131,8 +2131,8 @@ bool GraphicObject::ImplRenderTileRecursive( VirtualDevice& rVDev, int nExponent // rVDev.SetFillColor( COL_WHITE ); rVDev.SetFillColor(); rVDev.SetLineColor( Color( 255 * nExponent / nMSBFactor, 255 - 255 * nExponent / nMSBFactor, 128 - 255 * nExponent / nMSBFactor ) ); - rVDev.DrawRect( Rectangle((rTileInfo.aTileTopLeft.X())*rTileSizePixel.Width(), - (rTileInfo.aTileTopLeft.Y())*rTileSizePixel.Height(), + rVDev.DrawRect( Rectangle((rTileInfo.aTileTopLeft.X())*rTileSizePixel.Width(), + (rTileInfo.aTileTopLeft.Y())*rTileSizePixel.Height(), (rTileInfo.aNextTileTopLeft.X())*rTileSizePixel.Width()-1, (rTileInfo.aNextTileTopLeft.Y())*rTileSizePixel.Height()-1) ); #endif @@ -2148,68 +2148,68 @@ bool GraphicObject::ImplDrawTiled( OutputDevice* pOut, const Rectangle& rArea, c // how many tiles to generate per recursion step enum{ SubdivisionExponent=2 }; - const MapMode aOutMapMode( pOut->GetMapMode() ); - const MapMode aMapMode( aOutMapMode.GetMapUnit(), Point(), aOutMapMode.GetScaleX(), aOutMapMode.GetScaleY() ); - bool bRet( false ); + const MapMode aOutMapMode( pOut->GetMapMode() ); + const MapMode aMapMode( aOutMapMode.GetMapUnit(), Point(), aOutMapMode.GetScaleX(), aOutMapMode.GetScaleY() ); + bool bRet( false ); // #i42643# Casting to Int64, to avoid integer overflow for // huge-DPI output devices if( GetGraphic().GetType() == GRAPHIC_BITMAP && - static_cast<sal_Int64>(rSizePixel.Width()) * rSizePixel.Height() < + static_cast<sal_Int64>(rSizePixel.Width()) * rSizePixel.Height() < static_cast<sal_Int64>(nTileCacheSize1D)*nTileCacheSize1D ) { // First combine very small bitmaps into a larger tile // =================================================== - VirtualDevice aVDev; - const int nNumTilesInCacheX( (nTileCacheSize1D + rSizePixel.Width()-1) / rSizePixel.Width() ); - const int nNumTilesInCacheY( (nTileCacheSize1D + rSizePixel.Height()-1) / rSizePixel.Height() ); + VirtualDevice aVDev; + const int nNumTilesInCacheX( (nTileCacheSize1D + rSizePixel.Width()-1) / rSizePixel.Width() ); + const int nNumTilesInCacheY( (nTileCacheSize1D + rSizePixel.Height()-1) / rSizePixel.Height() ); - aVDev.SetOutputSizePixel( Size( nNumTilesInCacheX*rSizePixel.Width(), + aVDev.SetOutputSizePixel( Size( nNumTilesInCacheX*rSizePixel.Width(), nNumTilesInCacheY*rSizePixel.Height() ) ); aVDev.SetMapMode( aMapMode ); // draw bitmap content - if( ImplRenderTempTile( aVDev, SubdivisionExponent, nNumTilesInCacheX, + if( ImplRenderTempTile( aVDev, SubdivisionExponent, nNumTilesInCacheX, nNumTilesInCacheY, rSizePixel, pAttr, nFlags ) ) { BitmapEx aTileBitmap( aVDev.GetBitmap( Point(0,0), aVDev.GetOutputSize() ) ); - + // draw alpha content, if any if( IsTransparent() ) { GraphicObject aAlphaGraphic; - + if( GetGraphic().IsAlpha() ) aAlphaGraphic.SetGraphic( GetGraphic().GetBitmapEx().GetAlpha().GetBitmap() ); else - aAlphaGraphic.SetGraphic( GetGraphic().GetBitmapEx().GetMask() ); - - if( aAlphaGraphic.ImplRenderTempTile( aVDev, SubdivisionExponent, nNumTilesInCacheX, + aAlphaGraphic.SetGraphic( GetGraphic().GetBitmapEx().GetMask() ); + + if( aAlphaGraphic.ImplRenderTempTile( aVDev, SubdivisionExponent, nNumTilesInCacheX, nNumTilesInCacheY, rSizePixel, pAttr, nFlags ) ) - { + { // Combine bitmap and alpha/mask if( GetGraphic().IsAlpha() ) - aTileBitmap = BitmapEx( aTileBitmap.GetBitmap(), + aTileBitmap = BitmapEx( aTileBitmap.GetBitmap(), AlphaMask( aVDev.GetBitmap( Point(0,0), aVDev.GetOutputSize() ) ) ); else - aTileBitmap = BitmapEx( aTileBitmap.GetBitmap(), + aTileBitmap = BitmapEx( aTileBitmap.GetBitmap(), aVDev.GetBitmap( Point(0,0), aVDev.GetOutputSize() ).CreateMask( Color(COL_WHITE) ) ); } } - + // paint generated tile GraphicObject aTmpGraphic( aTileBitmap ); - bRet = aTmpGraphic.ImplDrawTiled( pOut, rArea, - aTileBitmap.GetSizePixel(), + bRet = aTmpGraphic.ImplDrawTiled( pOut, rArea, + aTileBitmap.GetSizePixel(), rOffset, pAttr, nFlags, nTileCacheSize1D ); } } else { - const Size aOutOffset( pOut->LogicToPixel( rOffset, aOutMapMode ) ); - const Rectangle aOutArea( pOut->LogicToPixel( rArea, aOutMapMode ) ); - + const Size aOutOffset( pOut->LogicToPixel( rOffset, aOutMapMode ) ); + const Rectangle aOutArea( pOut->LogicToPixel( rArea, aOutMapMode ) ); + // number of invisible (because out-of-area) tiles int nInvisibleTilesX; int nInvisibleTilesY; @@ -2252,17 +2252,17 @@ bool GraphicObject::ImplDrawTiled( OutputDevice* pOut, const Rectangle& rArea, c // ----------------------------------------------------------------------------- -bool GraphicObject::ImplDrawTiled( OutputDevice& rOut, const Point& rPosPixel, - int nNumTilesX, int nNumTilesY, +bool GraphicObject::ImplDrawTiled( OutputDevice& rOut, const Point& rPosPixel, + int nNumTilesX, int nNumTilesY, const Size& rTileSizePixel, const GraphicAttr* pAttr, ULONG nFlags ) { - Point aCurrPos( rPosPixel ); - Size aTileSizeLogic( rOut.PixelToLogic( rTileSizePixel ) ); - int nX, nY; + Point aCurrPos( rPosPixel ); + Size aTileSizeLogic( rOut.PixelToLogic( rTileSizePixel ) ); + int nX, nY; // #107607# Use logical coordinates for metafile playing, too - bool bDrawInPixel( rOut.GetConnectMetaFile() == NULL && GRAPHIC_BITMAP == GetType() ); - BOOL bRet( FALSE ); + bool bDrawInPixel( rOut.GetConnectMetaFile() == NULL && GRAPHIC_BITMAP == GetType() ); + BOOL bRet( FALSE ); // #105229# Switch off mapping (converting to logic and back to // pixel might cause roundoff errors) @@ -2283,9 +2283,9 @@ bool GraphicObject::ImplDrawTiled( OutputDevice& rOut, const Point& rPosPixel, // update return value. This method should return true, if // at least one of the looped Draws succeeded. - bRet |= Draw( &rOut, - bDrawInPixel ? aCurrPos : rOut.PixelToLogic( aCurrPos ), - bDrawInPixel ? rTileSizePixel : aTileSizeLogic, + bRet |= Draw( &rOut, + bDrawInPixel ? aCurrPos : rOut.PixelToLogic( aCurrPos ), + bDrawInPixel ? rTileSizePixel : aTileSizeLogic, pAttr, nFlags ); aCurrPos.X() += rTileSizePixel.Width(); @@ -2302,13 +2302,13 @@ bool GraphicObject::ImplDrawTiled( OutputDevice& rOut, const Point& rPosPixel, // ----------------------------------------------------------------------------- -void GraphicObject::ImplTransformBitmap( BitmapEx& rBmpEx, +void GraphicObject::ImplTransformBitmap( BitmapEx& rBmpEx, const GraphicAttr& rAttr, - const Size& rCropLeftTop, - const Size& rCropRightBottom, - const Rectangle& rCropRect, - const Size& rDstSize, - BOOL bEnlarge ) const + const Size& rCropLeftTop, + const Size& rCropRightBottom, + const Rectangle& rCropRect, + const Size& rDstSize, + BOOL bEnlarge ) const { // #107947# Extracted from svdograf.cxx @@ -2331,7 +2331,7 @@ void GraphicObject::ImplTransformBitmap( BitmapEx& rBmpEx, sal_Int32 nPadTotalHeight( aBmpSize.Height() + nPadTop + (rCropRightBottom.Height() < 0 ? -rCropRightBottom.Height() : 0) ); BitmapEx aBmpEx2; - + if( rBmpEx.IsTransparent() ) { if( rBmpEx.IsAlpha() ) @@ -2359,8 +2359,8 @@ void GraphicObject::ImplTransformBitmap( BitmapEx& rBmpEx, } } - const Size aSizePixel( rBmpEx.GetSizePixel() ); - + const Size aSizePixel( rBmpEx.GetSizePixel() ); + if( rAttr.GetRotation() != 0 && !IsAnimated() ) { if( aSizePixel.Width() && aSizePixel.Height() && rDstSize.Width() && rDstSize.Height() ) diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx index 045dca6fe5d9..789b864f47b2 100644 --- a/svtools/source/graphic/provider.cxx +++ b/svtools/source/graphic/provider.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,7 +78,7 @@ GraphicProvider::~GraphicProvider() } // ------------------------------------------------------------------------------ - + ::rtl::OUString GraphicProvider::getImplementationName_Static() throw() { @@ -91,15 +91,15 @@ uno::Sequence< ::rtl::OUString > GraphicProvider::getSupportedServiceNames_Stati throw() { uno::Sequence< ::rtl::OUString > aSeq( 1 ); - + aSeq.getArray()[ 0 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.graphic.GraphicProvider" ) ); - + return aSeq; } // ------------------------------------------------------------------------------ - -::rtl::OUString SAL_CALL GraphicProvider::getImplementationName() + +::rtl::OUString SAL_CALL GraphicProvider::getImplementationName() throw( uno::RuntimeException ) { return getImplementationName_Static(); @@ -107,11 +107,11 @@ uno::Sequence< ::rtl::OUString > GraphicProvider::getSupportedServiceNames_Stati // ------------------------------------------------------------------------------ -sal_Bool SAL_CALL GraphicProvider::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL GraphicProvider::supportsService( const ::rtl::OUString& ServiceName ) throw( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aSNL( getSupportedServiceNames() ); - const ::rtl::OUString* pArray = aSNL.getConstArray(); + uno::Sequence< ::rtl::OUString > aSNL( getSupportedServiceNames() ); + const ::rtl::OUString* pArray = aSNL.getConstArray(); for( int i = 0; i < aSNL.getLength(); i++ ) if( pArray[i] == ServiceName ) @@ -122,7 +122,7 @@ sal_Bool SAL_CALL GraphicProvider::supportsService( const ::rtl::OUString& Servi // ------------------------------------------------------------------------------ -uno::Sequence< ::rtl::OUString > SAL_CALL GraphicProvider::getSupportedServiceNames() +uno::Sequence< ::rtl::OUString > SAL_CALL GraphicProvider::getSupportedServiceNames() throw( uno::RuntimeException ) { return getSupportedServiceNames_Static(); @@ -130,11 +130,11 @@ uno::Sequence< ::rtl::OUString > SAL_CALL GraphicProvider::getSupportedServiceNa // ------------------------------------------------------------------------------ -uno::Sequence< uno::Type > SAL_CALL GraphicProvider::getTypes() +uno::Sequence< uno::Type > SAL_CALL GraphicProvider::getTypes() throw(uno::RuntimeException) { - uno::Sequence< uno::Type > aTypes( 3 ); - uno::Type* pTypes = aTypes.getArray(); + uno::Sequence< uno::Type > aTypes( 3 ); + uno::Type* pTypes = aTypes.getArray(); *pTypes++ = ::getCppuType((const uno::Reference< lang::XServiceInfo>*)0); *pTypes++ = ::getCppuType((const uno::Reference< lang::XTypeProvider>*)0); @@ -145,18 +145,18 @@ uno::Sequence< uno::Type > SAL_CALL GraphicProvider::getTypes() // ------------------------------------------------------------------------------ -uno::Sequence< sal_Int8 > SAL_CALL GraphicProvider::getImplementationId() +uno::Sequence< sal_Int8 > SAL_CALL GraphicProvider::getImplementationId() throw(uno::RuntimeException) { SolarMutexGuard aGuard; - static uno::Sequence< sal_Int8 > aId; - + static uno::Sequence< sal_Int8 > aId; + if( aId.getLength() == 0 ) { aId.realloc( 16 ); rtl_createUuid( reinterpret_cast< sal_uInt8* >( aId.getArray() ), 0, sal_True ); } - + return aId; } @@ -164,14 +164,14 @@ uno::Sequence< sal_Int8 > SAL_CALL GraphicProvider::getImplementationId() uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadGraphicObject( const ::rtl::OUString& rResourceURL ) const { - uno::Reference< ::graphic::XGraphic > xRet; - if( rResourceURL.compareToAscii( UNO_NAME_GRAPHOBJ_URLPREFIX, RTL_CONSTASCII_LENGTH( UNO_NAME_GRAPHOBJ_URLPREFIX ) ) == 0 ) + uno::Reference< ::graphic::XGraphic > xRet; + if( rResourceURL.compareToAscii( UNO_NAME_GRAPHOBJ_URLPREFIX, RTL_CONSTASCII_LENGTH( UNO_NAME_GRAPHOBJ_URLPREFIX ) ) == 0 ) { // graphic manager url String aTmpStr( rResourceURL.copy( sizeof( UNO_NAME_GRAPHOBJ_URLPREFIX ) - 1 ) ); ByteString aUniqueID( aTmpStr, RTL_TEXTENCODING_UTF8 ); - GraphicObject aGrafObj( aUniqueID ); - // I don't call aGrafObj.GetXGraphic because it will call us back + GraphicObject aGrafObj( aUniqueID ); + // I don't call aGrafObj.GetXGraphic because it will call us back // into implLoadMemory ( with "private:memorygraphic" test ) ::unographic::Graphic* pUnoGraphic = new ::unographic::Graphic; pUnoGraphic->init( aGrafObj.GetGraphic() ); @@ -182,22 +182,22 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadGraphicObject( co uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadMemory( const ::rtl::OUString& rResourceURL ) const { - uno::Reference< ::graphic::XGraphic > xRet; - sal_Int32 nIndex = 0; - + uno::Reference< ::graphic::XGraphic > xRet; + sal_Int32 nIndex = 0; + if( ( 0 == rResourceURL.getToken( 0, '/', nIndex ).compareToAscii( "private:memorygraphic" ) ) ) { sal_Int64 nGraphicAddress = rResourceURL.getToken( 0, '/', nIndex ).toInt64(); - + if( nGraphicAddress ) { ::unographic::Graphic* pUnoGraphic = new ::unographic::Graphic; - + pUnoGraphic->init( *reinterpret_cast< ::Graphic* >( nGraphicAddress ) ); xRet = pUnoGraphic; } } - + return xRet; } @@ -205,8 +205,8 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadMemory( const ::r uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadRepositoryImage( const ::rtl::OUString& rResourceURL ) const { - uno::Reference< ::graphic::XGraphic > xRet; - sal_Int32 nIndex = 0; + uno::Reference< ::graphic::XGraphic > xRet; + sal_Int32 nIndex = 0; if( ( 0 == rResourceURL.getToken( 0, '/', nIndex ).compareToAscii( "private:graphicrepository" ) ) ) { @@ -226,8 +226,8 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadRepositoryImage( uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadStandardImage( const ::rtl::OUString& rResourceURL ) const { - uno::Reference< ::graphic::XGraphic > xRet; - sal_Int32 nIndex = 0; + uno::Reference< ::graphic::XGraphic > xRet; + sal_Int32 nIndex = 0; if( ( 0 == rResourceURL.getToken( 0, '/', nIndex ).compareToAscii( "private:standardimage" ) ) ) { @@ -262,9 +262,9 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadBitmap( const uno SvMemoryStream aBmpStream( aBmpSeq.getArray(), aBmpSeq.getLength(), STREAM_READ ); Bitmap aBmp; aBmpStream >> aBmp; - + BitmapEx aBmpEx; - + if( aMaskSeq.getLength() ) { SvMemoryStream aMaskStream( aMaskSeq.getArray(), aMaskSeq.getLength(), STREAM_READ ); @@ -278,7 +278,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadBitmap( const uno if( !aBmpEx.IsEmpty() ) { ::unographic::Graphic* pUnoGraphic = new ::unographic::Graphic; - + pUnoGraphic->init( aBmpEx ); xRet = pUnoGraphic; } @@ -289,29 +289,29 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadBitmap( const uno uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadResource( const ::rtl::OUString& rResourceURL ) const { - uno::Reference< ::graphic::XGraphic > xRet; - sal_Int32 nIndex = 0; - + uno::Reference< ::graphic::XGraphic > xRet; + sal_Int32 nIndex = 0; + if( ( 0 == rResourceURL.getToken( 0, '/', nIndex ).compareToAscii( "private:resource" ) ) ) { ByteString aResMgrName( String( rResourceURL.getToken( 0, '/', nIndex ) ), RTL_TEXTENCODING_ASCII_US ); - + ResMgr* pResMgr = ResMgr::CreateResMgr( aResMgrName.GetBuffer(), Application::GetSettings().GetUILocale() ); - + if( pResMgr ) { - const ::rtl::OUString aResourceType( rResourceURL.getToken( 0, '/', nIndex ) ); - const ResId aResId( rResourceURL.getToken( 0, '/', nIndex ).toInt32(), *pResMgr ); - + const ::rtl::OUString aResourceType( rResourceURL.getToken( 0, '/', nIndex ) ); + const ResId aResId( rResourceURL.getToken( 0, '/', nIndex ).toInt32(), *pResMgr ); + if( aResourceType.getLength() ) { BitmapEx aBmpEx; - + if( ( 0 == aResourceType.compareToAscii( "bitmap" ) ) || ( 0 == aResourceType.compareToAscii( "bitmapex" ) ) ) { aResId.SetRT( RSC_BITMAP ); - + if( pResMgr->IsAvailable( aResId ) ) { aBmpEx = BitmapEx( aResId ); @@ -320,7 +320,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadResource( const : else if( 0 == aResourceType.compareToAscii( "image" ) ) { aResId.SetRT( RSC_IMAGE ); - + if( pResMgr->IsAvailable( aResId ) ) { const Image aImage( aResId ); @@ -330,12 +330,12 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadResource( const : else if( 0 == aResourceType.compareToAscii( "imagelist" ) ) { aResId.SetRT( RSC_IMAGELIST ); - + if( pResMgr->IsAvailable( aResId ) ) { const ImageList aImageList( aResId ); - sal_Int32 nImageId = ( nIndex > -1 ) ? rResourceURL.getToken( 0, '/', nIndex ).toInt32() : 0; - + sal_Int32 nImageId = ( nIndex > -1 ) ? rResourceURL.getToken( 0, '/', nIndex ).toInt32() : 0; + if( 0 < nImageId ) { const Image aImage( aImageList.GetImage( sal::static_int_cast< USHORT >(nImageId) ) ); @@ -347,20 +347,20 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadResource( const : } } } - + if( !aBmpEx.IsEmpty() ) { ::unographic::Graphic* pUnoGraphic = new ::unographic::Graphic; - + pUnoGraphic->init( aBmpEx ); xRet = pUnoGraphic; } } - + delete pResMgr; } } - + return xRet; } @@ -377,9 +377,9 @@ uno::Reference< beans::XPropertySet > SAL_CALL GraphicProvider::queryGraphicDesc for( sal_Int32 i = 0; ( i < rMediaProperties.getLength() ) && !xRet.is(); ++i ) { - const ::rtl::OUString aName( rMediaProperties[ i ].Name ); - const uno::Any aValue( rMediaProperties[ i ].Value ); - + const ::rtl::OUString aName( rMediaProperties[ i ].Name ); + const uno::Any aValue( rMediaProperties[ i ].Value ); + if( COMPARE_EQUAL == aName.compareToAscii( "URL" ) ) { aValue >>= aURL; @@ -413,7 +413,7 @@ uno::Reference< beans::XPropertySet > SAL_CALL GraphicProvider::queryGraphicDesc if ( !xGraphic.is() ) xGraphic = implLoadStandardImage( aURL ); - + if( xGraphic.is() ) { xRet = uno::Reference< beans::XPropertySet >( xGraphic, uno::UNO_QUERY ); @@ -436,24 +436,24 @@ uno::Reference< beans::XPropertySet > SAL_CALL GraphicProvider::queryGraphicDesc } // ------------------------------------------------------------------------------ - + uno::Reference< ::graphic::XGraphic > SAL_CALL GraphicProvider::queryGraphic( const uno::Sequence< ::beans::PropertyValue >& rMediaProperties ) throw ( io::IOException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - uno::Reference< ::graphic::XGraphic > xRet; - String aPath; - SvStream* pIStm = NULL; + uno::Reference< ::graphic::XGraphic > xRet; + String aPath; + SvStream* pIStm = NULL; uno::Reference< io::XInputStream > xIStm; uno::Reference< awt::XBitmap >xBtm; for( sal_Int32 i = 0; ( i < rMediaProperties.getLength() ) && !pIStm && !xRet.is(); ++i ) { - const ::rtl::OUString aName( rMediaProperties[ i ].Name ); - const uno::Any aValue( rMediaProperties[ i ].Value ); - + const ::rtl::OUString aName( rMediaProperties[ i ].Name ); + const uno::Any aValue( rMediaProperties[ i ].Value ); + if( COMPARE_EQUAL == aName.compareToAscii( "URL" ) ) - { + { ::rtl::OUString aURL; aValue >>= aURL; aPath = aURL; @@ -478,10 +478,10 @@ uno::Reference< ::graphic::XGraphic > SAL_CALL GraphicProvider::queryGraphic( co if( !xRet.is() ) xRet = implLoadGraphicObject( aPath ); - + if( !xRet.is() ) xRet = implLoadResource( aPath ); - + if ( !xRet.is() ) xRet = implLoadRepositoryImage( aPath ); @@ -499,24 +499,24 @@ uno::Reference< ::graphic::XGraphic > SAL_CALL GraphicProvider::queryGraphic( co if( pIStm ) { ::GraphicFilter* pFilter = ::GraphicFilter::GetGraphicFilter(); - + if( pFilter ) { ::Graphic aVCLGraphic; - - if( ( pFilter->ImportGraphic( aVCLGraphic, aPath, *pIStm ) == GRFILTER_OK ) && + + if( ( pFilter->ImportGraphic( aVCLGraphic, aPath, *pIStm ) == GRFILTER_OK ) && ( aVCLGraphic.GetType() != GRAPHIC_NONE ) ) { ::unographic::Graphic* pUnoGraphic = new ::unographic::Graphic; - + pUnoGraphic->init( aVCLGraphic ); xRet = pUnoGraphic; } } - + delete pIStm; } - + return xRet; } @@ -558,7 +558,7 @@ void ImplApplyBitmapScaling( ::Graphic& rGraphic, sal_Int32 nPixelWidth, sal_Int { BitmapEx aBmpEx( rGraphic.GetBitmapEx() ); MapMode aPrefMapMode( aBmpEx.GetPrefMapMode() ); - Size aPrefSize( aBmpEx.GetPrefSize() ); + Size aPrefSize( aBmpEx.GetPrefSize() ); aBmpEx.Scale( Size( nPixelWidth, nPixelHeight ) ); aBmpEx.SetPrefMapMode( aPrefMapMode ); aBmpEx.SetPrefSize( aPrefSize ); @@ -582,7 +582,7 @@ void ImplApplyBitmapResolution( ::Graphic& rGraphic, sal_Int32 nImageResolution, sal_Int32 nDestPixelHeight = nSourcePixelHeight; // check, if the bitmap DPI exceeds the maximum DPI - if( fSourceDPIX > fImageResolution ) + if( fSourceDPIX > fImageResolution ) { nDestPixelWidth = static_cast<sal_Int32>(( fSourcePixelWidth * fImageResolution ) / fSourceDPIX); if ( !nDestPixelWidth || ( nDestPixelWidth > nSourcePixelWidth ) ) @@ -615,8 +615,8 @@ void ImplApplyFilterData( ::Graphic& rGraphic, uno::Sequence< beans::PropertyVal for( sal_Int32 i = 0; i < rFilterData.getLength(); ++i ) { - const ::rtl::OUString aName( rFilterData[ i ].Name ); - const uno::Any aValue( rFilterData[ i ].Value ); + const ::rtl::OUString aName( rFilterData[ i ].Name ); + const uno::Any aValue( rFilterData[ i ].Value ); if( COMPARE_EQUAL == aName.compareToAscii( "PixelWidth" ) ) aValue >>= nPixelWidth; @@ -733,23 +733,23 @@ void ImplApplyFilterData( ::Graphic& rGraphic, uno::Sequence< beans::PropertyVal } // ------------------------------------------------------------------------------ - -void SAL_CALL GraphicProvider::storeGraphic( const uno::Reference< ::graphic::XGraphic >& rxGraphic, const uno::Sequence< beans::PropertyValue >& rMediaProperties ) + +void SAL_CALL GraphicProvider::storeGraphic( const uno::Reference< ::graphic::XGraphic >& rxGraphic, const uno::Sequence< beans::PropertyValue >& rMediaProperties ) throw ( io::IOException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - SvStream* pOStm = NULL; - String aPath; - sal_Int32 i; - + SvStream* pOStm = NULL; + String aPath; + sal_Int32 i; + for( i = 0; ( i < rMediaProperties.getLength() ) && !pOStm; ++i ) { - const ::rtl::OUString aName( rMediaProperties[ i ].Name ); - const uno::Any aValue( rMediaProperties[ i ].Value ); - + const ::rtl::OUString aName( rMediaProperties[ i ].Name ); + const uno::Any aValue( rMediaProperties[ i ].Value ); + if( COMPARE_EQUAL == aName.compareToAscii( "URL" ) ) { ::rtl::OUString aURL; - + aValue >>= aURL; pOStm = ::utl::UcbStreamHelper::CreateStream( aURL, STREAM_WRITE | STREAM_TRUNC ); aPath = aURL; @@ -757,9 +757,9 @@ void SAL_CALL GraphicProvider::storeGraphic( const uno::Reference< ::graphic::XG else if( COMPARE_EQUAL == aName.compareToAscii( "OutputStream" ) ) { uno::Reference< io::XStream > xOStm; - + aValue >>= xOStm; - + if( xOStm.is() ) pOStm = ::utl::UcbStreamHelper::CreateStream( xOStm ); } @@ -767,24 +767,24 @@ void SAL_CALL GraphicProvider::storeGraphic( const uno::Reference< ::graphic::XG if( pOStm ) { - uno::Sequence< beans::PropertyValue > aFilterDataSeq; - const char* pFilterShortName = NULL; - + uno::Sequence< beans::PropertyValue > aFilterDataSeq; + const char* pFilterShortName = NULL; + for( i = 0; i < rMediaProperties.getLength(); ++i ) { - const ::rtl::OUString aName( rMediaProperties[ i ].Name ); - const uno::Any aValue( rMediaProperties[ i ].Value ); - + const ::rtl::OUString aName( rMediaProperties[ i ].Name ); + const uno::Any aValue( rMediaProperties[ i ].Value ); + if( COMPARE_EQUAL == aName.compareToAscii( "FilterData" ) ) { aValue >>= aFilterDataSeq; } else if( COMPARE_EQUAL == aName.compareToAscii( "MimeType" ) ) { - ::rtl::OUString aMimeType; - + ::rtl::OUString aMimeType; + aValue >>= aMimeType; - + if( COMPARE_EQUAL == aMimeType.compareToAscii( MIMETYPE_BMP ) ) pFilterShortName = "bmp"; else if( COMPARE_EQUAL == aMimeType.compareToAscii( MIMETYPE_EPS ) ) @@ -823,16 +823,16 @@ void SAL_CALL GraphicProvider::storeGraphic( const uno::Reference< ::graphic::XG pFilterShortName = MIMETYPE_VCLGRAPHIC; } } - + if( pFilterShortName ) { ::GraphicFilter* pFilter = ::GraphicFilter::GetGraphicFilter(); - + if( pFilter ) { - const uno::Reference< XInterface > xIFace( rxGraphic, uno::UNO_QUERY ); - const ::Graphic* pGraphic = ::unographic::Graphic::getImplementation( xIFace ); - + const uno::Reference< XInterface > xIFace( rxGraphic, uno::UNO_QUERY ); + const ::Graphic* pGraphic = ::unographic::Graphic::getImplementation( xIFace ); + if( pGraphic && ( pGraphic->GetType() != GRAPHIC_NONE ) ) { ::Graphic aGraphic( *pGraphic ); @@ -846,7 +846,7 @@ void SAL_CALL GraphicProvider::storeGraphic( const uno::Reference< ::graphic::XG aMemStrm << aGraphic; else { - pFilter->ExportGraphic( aGraphic, aPath, aMemStrm, + pFilter->ExportGraphic( aGraphic, aPath, aMemStrm, pFilter->GetExportFormatNumberForShortName( ::rtl::OUString::createFromAscii( pFilterShortName ) ), ( aFilterDataSeq.getLength() ? &aFilterDataSeq : NULL ) ); } diff --git a/svtools/source/graphic/renderer.cxx b/svtools/source/graphic/renderer.cxx index d955fca30cac..3ac324892d8a 100644 --- a/svtools/source/graphic/renderer.cxx +++ b/svtools/source/graphic/renderer.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 "graphic.hxx" #include "renderer.hxx" -#define UNOGRAPHIC_DEVICE 1 -#define UNOGRAPHIC_DESTINATIONRECT 2 -#define UNOGRAPHIC_RENDERDATA 3 +#define UNOGRAPHIC_DEVICE 1 +#define UNOGRAPHIC_DESTINATIONRECT 2 +#define UNOGRAPHIC_RENDERDATA 3 using namespace ::com::sun::star; @@ -59,7 +59,7 @@ uno::Reference< uno::XInterface > SAL_CALL GraphicRendererVCL_CreateInstance( co return SAL_STATIC_CAST( ::cppu::OWeakObject*, new GraphicRendererVCL ); } - + GraphicRendererVCL::GraphicRendererVCL() : ::comphelper::PropertySetHelper( createPropertySetInfo() ), mpOutDev( NULL ) @@ -75,7 +75,7 @@ GraphicRendererVCL::~GraphicRendererVCL() // ------------------------------------------------------------------------------ -::rtl::OUString GraphicRendererVCL::getImplementationName_Static() +::rtl::OUString GraphicRendererVCL::getImplementationName_Static() throw() { return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.graphic.GraphicRendererVCL" ) ); @@ -83,19 +83,19 @@ GraphicRendererVCL::~GraphicRendererVCL() // ------------------------------------------------------------------------------ -uno::Sequence< ::rtl::OUString > GraphicRendererVCL::getSupportedServiceNames_Static() - throw( ) +uno::Sequence< ::rtl::OUString > GraphicRendererVCL::getSupportedServiceNames_Static() + throw( ) { uno::Sequence< ::rtl::OUString > aSeq( 1 ); - + aSeq.getArray()[ 0 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.graphic.GraphicRendererVCL" ) ); - + return aSeq; } // ------------------------------------------------------------------------------ -uno::Any SAL_CALL GraphicRendererVCL::queryAggregation( const uno::Type & rType ) +uno::Any SAL_CALL GraphicRendererVCL::queryAggregation( const uno::Type & rType ) throw( uno::RuntimeException ) { uno::Any aAny; @@ -120,7 +120,7 @@ uno::Any SAL_CALL GraphicRendererVCL::queryAggregation( const uno::Type & rType // ------------------------------------------------------------------------------ -uno::Any SAL_CALL GraphicRendererVCL::queryInterface( const uno::Type & rType ) +uno::Any SAL_CALL GraphicRendererVCL::queryInterface( const uno::Type & rType ) throw( uno::RuntimeException ) { return OWeakAggObject::queryInterface( rType ); @@ -128,7 +128,7 @@ uno::Any SAL_CALL GraphicRendererVCL::queryInterface( const uno::Type & rType ) // ------------------------------------------------------------------------------ -void SAL_CALL GraphicRendererVCL::acquire() +void SAL_CALL GraphicRendererVCL::acquire() throw() { OWeakAggObject::acquire(); @@ -144,7 +144,7 @@ void SAL_CALL GraphicRendererVCL::release() // ------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL GraphicRendererVCL::getImplementationName() +::rtl::OUString SAL_CALL GraphicRendererVCL::getImplementationName() throw( uno::RuntimeException ) { return getImplementationName_Static(); @@ -155,8 +155,8 @@ void SAL_CALL GraphicRendererVCL::release() sal_Bool SAL_CALL GraphicRendererVCL::supportsService( const rtl::OUString& ServiceName ) throw( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aSNL( getSupportedServiceNames() ); - const ::rtl::OUString* pArray = aSNL.getConstArray(); + uno::Sequence< ::rtl::OUString > aSNL( getSupportedServiceNames() ); + const ::rtl::OUString* pArray = aSNL.getConstArray(); for( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) if( pArray[i] == ServiceName ) @@ -178,8 +178,8 @@ uno::Sequence< rtl::OUString > SAL_CALL GraphicRendererVCL::getSupportedServiceN uno::Sequence< uno::Type > SAL_CALL GraphicRendererVCL::getTypes() throw( uno::RuntimeException ) { - uno::Sequence< uno::Type > aTypes( 7 ); - uno::Type* pTypes = aTypes.getArray(); + uno::Sequence< uno::Type > aTypes( 7 ); + uno::Type* pTypes = aTypes.getArray(); *pTypes++ = ::getCppuType((const uno::Reference< uno::XAggregation>*)0); *pTypes++ = ::getCppuType((const uno::Reference< lang::XServiceInfo>*)0); @@ -191,21 +191,21 @@ uno::Sequence< uno::Type > SAL_CALL GraphicRendererVCL::getTypes() return aTypes; } - + // ------------------------------------------------------------------------------ uno::Sequence< sal_Int8 > SAL_CALL GraphicRendererVCL::getImplementationId() throw( uno::RuntimeException ) { SolarMutexGuard aGuard; - static uno::Sequence< sal_Int8 > aId; - + static uno::Sequence< sal_Int8 > aId; + if( aId.getLength() == 0 ) { aId.realloc( 16 ); rtl_createUuid( reinterpret_cast< sal_uInt8* >( aId.getArray() ), 0, sal_True ); } - + return aId; } @@ -214,14 +214,14 @@ uno::Sequence< sal_Int8 > SAL_CALL GraphicRendererVCL::getImplementationId() ::comphelper::PropertySetInfo* GraphicRendererVCL::createPropertySetInfo() { SolarMutexGuard aGuard; - ::comphelper::PropertySetInfo* pRet = new ::comphelper::PropertySetInfo(); + ::comphelper::PropertySetInfo* pRet = new ::comphelper::PropertySetInfo(); static ::comphelper::PropertyMapEntry aEntries[] = { { MAP_CHAR_LEN( "Device" ), UNOGRAPHIC_DEVICE, &::getCppuType( (const uno::Any*)(0)), 0, 0 }, { MAP_CHAR_LEN( "DestinationRect" ), UNOGRAPHIC_DESTINATIONRECT, &::getCppuType( (const awt::Rectangle*)(0)), 0, 0 }, - { MAP_CHAR_LEN( "RenderData" ), UNOGRAPHIC_RENDERDATA, &::getCppuType( (const uno::Any*)(0)), 0, 0 }, - + { MAP_CHAR_LEN( "RenderData" ), UNOGRAPHIC_RENDERDATA, &::getCppuType( (const uno::Any*)(0)), 0, 0 }, + { 0,0,0,0,0,0 } }; @@ -234,8 +234,8 @@ uno::Sequence< sal_Int8 > SAL_CALL GraphicRendererVCL::getImplementationId() // ------------------------------------------------------------------------------ void GraphicRendererVCL::_setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const uno::Any* pValues ) - throw( beans::UnknownPropertyException, - beans::PropertyVetoException, + throw( beans::UnknownPropertyException, + beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException ) { @@ -247,8 +247,8 @@ void GraphicRendererVCL::_setPropertyValues( const comphelper::PropertyMapEntry* { case( UNOGRAPHIC_DEVICE ): { - uno::Reference< awt::XDevice > xDevice; - + uno::Reference< awt::XDevice > xDevice; + if( ( *pValues >>= xDevice ) && xDevice.is() ) { mxDevice = xDevice; @@ -265,27 +265,27 @@ void GraphicRendererVCL::_setPropertyValues( const comphelper::PropertyMapEntry* case( UNOGRAPHIC_DESTINATIONRECT ): { awt::Rectangle aAWTRect; - + if( *pValues >>= aAWTRect ) { - maDestRect = Rectangle( Point( aAWTRect.X, aAWTRect.Y ), + maDestRect = Rectangle( Point( aAWTRect.X, aAWTRect.Y ), Size( aAWTRect.Width, aAWTRect.Height ) ); } } break; - + case( UNOGRAPHIC_RENDERDATA ): { *pValues >>= maRenderData; } break; } - + ++ppEntries; ++pValues; } } - + // ------------------------------------------------------------------------------ void GraphicRendererVCL::_getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, uno::Any* pValues ) @@ -306,35 +306,35 @@ void GraphicRendererVCL::_getPropertyValues( const comphelper::PropertyMapEntry* case( UNOGRAPHIC_DESTINATIONRECT ): { - const awt::Rectangle aAWTRect( maDestRect.Left(), maDestRect.Top(), + const awt::Rectangle aAWTRect( maDestRect.Left(), maDestRect.Top(), maDestRect.GetWidth(), maDestRect.GetHeight() ); - + *pValues <<= aAWTRect; } break; - + case( UNOGRAPHIC_RENDERDATA ): { *pValues <<= maRenderData; } break; } - + ++ppEntries; ++pValues; } } // ------------------------------------------------------------------------------ - + void SAL_CALL GraphicRendererVCL::render( const uno::Reference< graphic::XGraphic >& rxGraphic ) throw (uno::RuntimeException) { if( mpOutDev && mxDevice.is() && rxGraphic.is() ) { - const uno::Reference< XInterface > xIFace( rxGraphic, uno::UNO_QUERY ); - const ::Graphic* pGraphic = ::unographic::Graphic::getImplementation( xIFace ); - + const uno::Reference< XInterface > xIFace( rxGraphic, uno::UNO_QUERY ); + const ::Graphic* pGraphic = ::unographic::Graphic::getImplementation( xIFace ); + if( pGraphic ) { GraphicObject aGraphicObject( *pGraphic ); diff --git a/svtools/source/graphic/transformer.cxx b/svtools/source/graphic/transformer.cxx index 3a0d3c8e2fd4..226fd3afcc2d 100644 --- a/svtools/source/graphic/transformer.cxx +++ b/svtools/source/graphic/transformer.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 setAlpha( Bitmap& rBitmap, AlphaMask& rAlpha, sal_Int32 nColorFrom, sal_Int } // XGraphicTransformer -uno::Reference< graphic::XGraphic > SAL_CALL GraphicTransformer::colorChange( +uno::Reference< graphic::XGraphic > SAL_CALL GraphicTransformer::colorChange( const uno::Reference< graphic::XGraphic >& rxGraphic, sal_Int32 nColorFrom, sal_Int8 nTolerance, sal_Int32 nColorTo, sal_Int8 nAlphaTo ) throw ( lang::IllegalArgumentException, uno::RuntimeException) { @@ -103,8 +103,8 @@ uno::Reference< graphic::XGraphic > SAL_CALL GraphicTransformer::colorChange( if ( aGraphic.GetType() == GRAPHIC_BITMAP ) { - BitmapEx aBitmapEx( aGraphic.GetBitmapEx() ); - Bitmap aBitmap( aBitmapEx.GetBitmap() ); + BitmapEx aBitmapEx( aGraphic.GetBitmapEx() ); + Bitmap aBitmap( aBitmapEx.GetBitmap() ); if ( aBitmapEx.IsAlpha() ) { diff --git a/svtools/source/graphic/transformer.hxx b/svtools/source/graphic/transformer.hxx index 0ee340c40631..d109be98b5e8 100644 --- a/svtools/source/graphic/transformer.hxx +++ b/svtools/source/graphic/transformer.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,10 +26,10 @@ * ************************************************************************/ -#ifndef _GOODIES_GRAPHICTRANSFORMER_HXX -#define _GOODIES_GRAPHICTRANSFORMER_HXX +#ifndef _GOODIES_GRAPHICTRANSFORMER_HXX +#define _GOODIES_GRAPHICTRANSFORMER_HXX -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase1.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/graphic/XGraphicTransformer.hpp> @@ -50,17 +50,17 @@ class GraphicTransformer : public GraphicTransformer_UnoImplHelper1 GraphicTransformer(); ~GraphicTransformer(); - + // XGraphicTransformer - virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL colorChange( + virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL colorChange( const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& rGraphic, sal_Int32 nColorFrom, sal_Int8 nTolerance, sal_Int32 nColorTo, sal_Int8 nAlphaTo ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - + }; } -#endif +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/hatchwindow/documentcloser.cxx b/svtools/source/hatchwindow/documentcloser.cxx index de44feea6f18..1586041ac08e 100644 --- a/svtools/source/hatchwindow/documentcloser.cxx +++ b/svtools/source/hatchwindow/documentcloser.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -212,7 +212,7 @@ void SAL_CALL ODocumentCloser::initialize( const uno::Sequence< uno::Any >& aArg if ( m_bDisposed ) throw lang::DisposedException(); // TODO - + if ( !m_refCount ) throw uno::RuntimeException(); // the object must be refcounted already! diff --git a/svtools/source/hatchwindow/documentcloser.hxx b/svtools/source/hatchwindow/documentcloser.hxx index 3b278e2e91ee..9cf7751d2f80 100644 --- a/svtools/source/hatchwindow/documentcloser.hxx +++ b/svtools/source/hatchwindow/documentcloser.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 ODocumentCloser : public ::cppu::WeakImplHelper3< ::com::sun::star::lang:: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; ::cppu::OInterfaceContainerHelper* m_pListenersContainer; // list of listeners - + sal_Bool m_bDisposed; sal_Bool m_bInitialized; @@ -68,7 +68,7 @@ public: static ::rtl::OUString SAL_CALL impl_staticGetImplementationName(); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - impl_staticCreateSelfInstance( + impl_staticCreateSelfInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ); // XComponent diff --git a/svtools/source/hatchwindow/hatchwindow.cxx b/svtools/source/hatchwindow/hatchwindow.cxx index 1651eb2b16c3..bd938c4b32f3 100644 --- a/svtools/source/hatchwindow/hatchwindow.cxx +++ b/svtools/source/hatchwindow/hatchwindow.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ uno::Any SAL_CALL VCLXHatchWindow::queryInterface( const uno::Type & rType ) throw( uno::RuntimeException ) { // Attention: - // Don't use mutex or guard in this method!!! Is a method of XInterface. + // Don't use mutex or guard in this method!!! Is a method of XInterface. uno::Any aReturn( ::cppu::queryInterface( rType, static_cast< embed::XHatchWindow* >( this ) ) ); diff --git a/svtools/source/hatchwindow/hatchwindow.hxx b/svtools/source/hatchwindow/hatchwindow.hxx index 0ece4e6acb64..d4eca24f926f 100644 --- a/svtools/source/hatchwindow/hatchwindow.hxx +++ b/svtools/source/hatchwindow/hatchwindow.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/svtools/source/hatchwindow/hatchwindowfactory.cxx b/svtools/source/hatchwindow/hatchwindowfactory.cxx index c5076e8984c3..2441fda96bf3 100644 --- a/svtools/source/hatchwindow/hatchwindowfactory.cxx +++ b/svtools/source/hatchwindow/hatchwindowfactory.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -125,7 +125,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo ( // OHatchWindowFactory registration xNewKey = xRegistryKey->createKey ( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + OHatchWindowFactory::impl_staticGetImplementationName() + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) ); @@ -138,7 +138,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo ( // ODocumentCloser registration xNewKey = xRegistryKey->createKey ( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + ODocumentCloser::impl_staticGetImplementationName() + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) ); diff --git a/svtools/source/hatchwindow/hatchwindowfactory.hxx b/svtools/source/hatchwindow/hatchwindowfactory.hxx index b7848503d2dc..cd83c89c1353 100644 --- a/svtools/source/hatchwindow/hatchwindowfactory.hxx +++ b/svtools/source/hatchwindow/hatchwindowfactory.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,7 +55,7 @@ public: static ::rtl::OUString SAL_CALL impl_staticGetImplementationName(); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - impl_staticCreateSelfInstance( + impl_staticCreateSelfInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ); diff --git a/svtools/source/hatchwindow/ipwin.cxx b/svtools/source/hatchwindow/ipwin.cxx index 4cf4f9dcf741..d94b21b38d7a 100644 --- a/svtools/source/hatchwindow/ipwin.cxx +++ b/svtools/source/hatchwindow/ipwin.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/svtools/source/hatchwindow/ipwin.hxx b/svtools/source/hatchwindow/ipwin.hxx index cbe91e7ed4d9..255195a03fdb 100644 --- a/svtools/source/hatchwindow/ipwin.hxx +++ b/svtools/source/hatchwindow/ipwin.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 SvResizeHelper Rectangle aOuter; short nGrab; // -1 kein Grab, 0 - 7, 8 = Move, siehe FillHandle... Point aSelPos; - BOOL bResizeable; + BOOL bResizeable; public: SvResizeHelper(); - void SetResizeable( BOOL b ) { bResizeable = b; } + void SetResizeable( BOOL b ) { bResizeable = b; } short GetGrab() const { return nGrab; } void SetBorderPixel( const Size & rBorderP ) { aBorder = rBorderP; } @@ -71,7 +71,7 @@ public: BOOL SelectBegin( Window *, const Point & rPos ); short SelectMove( Window * pWin, const Point & rPos ); Point GetTrackPosPixel( const Rectangle & rRect ) const; - Rectangle GetTrackRectPixel( const Point & rTrackPos ) const; + Rectangle GetTrackRectPixel( const Point & rTrackPos ) const; void ValidateRect( Rectangle & rValidate ) const; BOOL SelectRelease( Window *, const Point & rPos, Rectangle & rOutPosSize ); void Release( Window * pWin ); @@ -103,7 +103,7 @@ public: virtual long Notify( NotifyEvent& rNEvt ); virtual long PreNotify( NotifyEvent& rNEvt ); - void QueryObjAreaPixel( Rectangle & ); + void QueryObjAreaPixel( Rectangle & ); void RequestObjAreaPixel( const Rectangle & ); }; diff --git a/svtools/source/inc/accessibletableimp.hxx b/svtools/source/inc/accessibletableimp.hxx index ffeba9b1deef..45e3ac6faa37 100644 --- a/svtools/source/inc/accessibletableimp.hxx +++ b/svtools/source/inc/accessibletableimp.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER 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 @@ namespace svt { namespace table AccessibleTableControl_Impl() : m_pAccessible(NULL) { } - + /// @see AccessibleTableControl::getTableRowHeader ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > diff --git a/svtools/source/inc/configitems/accessibilityoptions_const.hxx b/svtools/source/inc/configitems/accessibilityoptions_const.hxx index 184e5a9850f0..b52ee6e9106a 100644 --- a/svtools/source/inc/configitems/accessibilityoptions_const.hxx +++ b/svtools/source/inc/configitems/accessibilityoptions_const.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/svtools/source/inc/filectrl.hrc b/svtools/source/inc/filectrl.hrc index 1707e306e1b0..acaf450a2126 100644 --- a/svtools/source/inc/filectrl.hrc +++ b/svtools/source/inc/filectrl.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 @@ #ifndef _SV_FILECTRL_HRC #define _SV_FILECTRL_HRC -#define STR_FILECTRL_BUTTONTEXT 333 // ID-Range?! +#define STR_FILECTRL_BUTTONTEXT 333 // ID-Range?! #endif diff --git a/svtools/source/inc/gifread.hxx b/svtools/source/inc/gifread.hxx index ee42c86b23de..64231b56211c 100644 --- a/svtools/source/inc/gifread.hxx +++ b/svtools/source/inc/gifread.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,65 +69,65 @@ class SvStream; class GIFReader : public GraphicReader { - Graphic aImGraphic; - Animation aAnimation; - Bitmap aBmp8; - Bitmap aBmp1; - BitmapPalette aGPalette; - BitmapPalette aLPalette; - SvStream& rIStm; - void* pCallerData; - HPBYTE pSrcBuf; - GIFLZWDecompressor* pDecomp; - BitmapWriteAccess* pAcc8; - BitmapWriteAccess* pAcc1; - long nYAcc; - long nLastPos; - sal_uInt32 nLogWidth100; - sal_uInt32 nLogHeight100; - USHORT nTimer; - USHORT nGlobalWidth; // maximale Bildbreite aus Header - USHORT nGlobalHeight; // maximale Bildhoehe aus Header - USHORT nImageWidth; // maximale Bildbreite aus Header - USHORT nImageHeight; // maximale Bildhoehe aus Header - USHORT nImagePosX; - USHORT nImagePosY; - USHORT nImageX; // maximale Bildbreite aus Header - USHORT nImageY; // maximale Bildhoehe aus Header - USHORT nLastImageY; - USHORT nLastInterCount; - USHORT nLoops; - GIFAction eActAction; - BOOL bStatus; - BOOL bGCTransparent; // Ob das Bild Transparent ist, wenn ja: - BOOL bInterlaced; - BOOL bOverreadBlock; - BOOL bImGraphicReady; - BOOL bGlobalPalette; - BYTE nBackgroundColor; // Hintergrundfarbe - BYTE nGCTransparentIndex; // Pixel von diesem Index sind durchsichtig - BYTE nGCDisposalMethod; // 'Disposal Method' (siehe GIF-Doku) - BYTE cTransIndex1; - BYTE cNonTransIndex1; - - void ReadPaletteEntries( BitmapPalette* pPal, ULONG nCount ); - void ClearImageExtensions(); - BOOL CreateBitmaps( long nWidth, long nHeight, BitmapPalette* pPal, BOOL bWatchForBackgroundColor ); - BOOL ReadGlobalHeader(); - BOOL ReadExtension(); - BOOL ReadLocalHeader(); - ULONG ReadNextBlock(); - void FillImages( HPBYTE pBytes, ULONG nCount ); - void CreateNewBitmaps(); - BOOL ProcessGIF(); + Graphic aImGraphic; + Animation aAnimation; + Bitmap aBmp8; + Bitmap aBmp1; + BitmapPalette aGPalette; + BitmapPalette aLPalette; + SvStream& rIStm; + void* pCallerData; + HPBYTE pSrcBuf; + GIFLZWDecompressor* pDecomp; + BitmapWriteAccess* pAcc8; + BitmapWriteAccess* pAcc1; + long nYAcc; + long nLastPos; + sal_uInt32 nLogWidth100; + sal_uInt32 nLogHeight100; + USHORT nTimer; + USHORT nGlobalWidth; // maximale Bildbreite aus Header + USHORT nGlobalHeight; // maximale Bildhoehe aus Header + USHORT nImageWidth; // maximale Bildbreite aus Header + USHORT nImageHeight; // maximale Bildhoehe aus Header + USHORT nImagePosX; + USHORT nImagePosY; + USHORT nImageX; // maximale Bildbreite aus Header + USHORT nImageY; // maximale Bildhoehe aus Header + USHORT nLastImageY; + USHORT nLastInterCount; + USHORT nLoops; + GIFAction eActAction; + BOOL bStatus; + BOOL bGCTransparent; // Ob das Bild Transparent ist, wenn ja: + BOOL bInterlaced; + BOOL bOverreadBlock; + BOOL bImGraphicReady; + BOOL bGlobalPalette; + BYTE nBackgroundColor; // Hintergrundfarbe + BYTE nGCTransparentIndex; // Pixel von diesem Index sind durchsichtig + BYTE nGCDisposalMethod; // 'Disposal Method' (siehe GIF-Doku) + BYTE cTransIndex1; + BYTE cNonTransIndex1; + + void ReadPaletteEntries( BitmapPalette* pPal, ULONG nCount ); + void ClearImageExtensions(); + BOOL CreateBitmaps( long nWidth, long nHeight, BitmapPalette* pPal, BOOL bWatchForBackgroundColor ); + BOOL ReadGlobalHeader(); + BOOL ReadExtension(); + BOOL ReadLocalHeader(); + ULONG ReadNextBlock(); + void FillImages( HPBYTE pBytes, ULONG nCount ); + void CreateNewBitmaps(); + BOOL ProcessGIF(); public: - ReadState ReadGIF( Graphic& rGraphic ); - const Graphic& GetIntermediateGraphic(); + ReadState ReadGIF( Graphic& rGraphic ); + const Graphic& GetIntermediateGraphic(); GIFReader( SvStream& rStm ); - virtual ~GIFReader(); + virtual ~GIFReader(); }; #endif // _GIFPRIVATE diff --git a/svtools/source/inc/gradwrap.hxx b/svtools/source/inc/gradwrap.hxx index 35b04e833475..b21b9b8c78e8 100644 --- a/svtools/source/inc/gradwrap.hxx +++ b/svtools/source/inc/gradwrap.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,30 +32,30 @@ /****************************************************************************** |* -|* class GradientWrapper +|* class GradientWrapper |* -|* Ersterstellung: KA 24.11.95 -|* letzte Aenderung: KA 24.11.95 +|* Ersterstellung: KA 24.11.95 +|* letzte Aenderung: KA 24.11.95 |* -|* Zeck: dient beim MetaFile-Export dazu, die eigentliche Berechungs- -|* funktionalitaet zu kapseln. Das Schreiben der Records fuer -|* die unterschiedlichen File-Formate geschieht ueber LinkHandler. +|* Zeck: dient beim MetaFile-Export dazu, die eigentliche Berechungs- +|* funktionalitaet zu kapseln. Das Schreiben der Records fuer +|* die unterschiedlichen File-Formate geschieht ueber LinkHandler. |* -|* Klassen, die diesen Wrapper benutzen, muessen drei Linkhandler -|* zur Verfuegung stellen, die im Ctor uebergeben werden: +|* Klassen, die diesen Wrapper benutzen, muessen drei Linkhandler +|* zur Verfuegung stellen, die im Ctor uebergeben werden: |* -|* 1. Linkhandler zum Schreiben eines Records fuer Polygonausgabe -|* 2. Linkhandler zum Schreiben eines Records fuer PolyPolygonausgabe -|* 3. Linkhandler zum Schreiben eines Records fuer Setzen der Brush +|* 1. Linkhandler zum Schreiben eines Records fuer Polygonausgabe +|* 2. Linkhandler zum Schreiben eines Records fuer PolyPolygonausgabe +|* 3. Linkhandler zum Schreiben eines Records fuer Setzen der Brush |* \******************************************************************************/ class GradientWrapper { - Link aDrawPolyRecordHdl; - Link aDrawPolyPolyRecordHdl; - Link aSetFillInBrushRecordHdl; + Link aDrawPolyRecordHdl; + Link aDrawPolyPolyRecordHdl; + Link aSetFillInBrushRecordHdl; GradientWrapper() {}; @@ -67,11 +67,11 @@ public: ~GradientWrapper(); - void WriteLinearGradient(const Rectangle& rRect, + void WriteLinearGradient(const Rectangle& rRect, const Gradient& rGradient); - void WriteRadialGradient(const Rectangle& rRect, + void WriteRadialGradient(const Rectangle& rRect, const Gradient& rGradient); - void WriteRectGradient(const Rectangle& rRect, + void WriteRectGradient(const Rectangle& rRect, const Gradient& rGradient); }; diff --git a/svtools/source/inc/iodlg.hrc b/svtools/source/inc/iodlg.hrc index e78e3fb687fe..2627a9ae1e26 100644 --- a/svtools/source/inc/iodlg.hrc +++ b/svtools/source/inc/iodlg.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,43 +34,43 @@ // ModalDialog DLG_SVT_EXPLORERFILE -#define FT_EXPLORERFILE_CURRENTPATH 10 -#define BTN_EXPLORERFILE_NEWFOLDER 11 -#define BTN_EXPLORERFILE_LISTVIEW 12 -#define BTN_EXPLORERFILE_DETAILSVIEW 13 -#define BTN_EXPLORERFILE_UP 14 -#define BTN_EXPLORERFILE_STANDARD 15 -#define BTN_EXPLORERFILE_OPEN 16 -#define BTN_EXPLORERFILE_CANCEL 17 -#define BTN_EXPLORERFILE_HELP 18 - -#define IMG_FILEDLG_BTN_UP 10 -#define IMG_FILEDLG_BTN_STD 11 +#define FT_EXPLORERFILE_CURRENTPATH 10 +#define BTN_EXPLORERFILE_NEWFOLDER 11 +#define BTN_EXPLORERFILE_LISTVIEW 12 +#define BTN_EXPLORERFILE_DETAILSVIEW 13 +#define BTN_EXPLORERFILE_UP 14 +#define BTN_EXPLORERFILE_STANDARD 15 +#define BTN_EXPLORERFILE_OPEN 16 +#define BTN_EXPLORERFILE_CANCEL 17 +#define BTN_EXPLORERFILE_HELP 18 + +#define IMG_FILEDLG_BTN_UP 10 +#define IMG_FILEDLG_BTN_STD 11 #define IMG_FILEDLG_CREATEFOLDER 15 -#define CTL_EXPLORERFILE_FILELIST 20 +#define CTL_EXPLORERFILE_FILELIST 20 -#define FT_EXPLORERFILE_FILENAME 30 -#define ED_EXPLORERFILE_FILENAME 31 -#define FT_EXPLORERFILE_SHARED_LISTBOX 32 -#define LB_EXPLORERFILE_SHARED_LISTBOX 33 -#define FT_EXPLORERFILE_FILETYPE 34 -#define LB_EXPLORERFILE_FILETYPE 35 +#define FT_EXPLORERFILE_FILENAME 30 +#define ED_EXPLORERFILE_FILENAME 31 +#define FT_EXPLORERFILE_SHARED_LISTBOX 32 +#define LB_EXPLORERFILE_SHARED_LISTBOX 33 +#define FT_EXPLORERFILE_FILETYPE 34 +#define LB_EXPLORERFILE_FILETYPE 35 -#define CB_EXPLORERFILE_READONLY 40 -#define CB_EXPLORERFILE_PASSWORD 41 -#define CB_AUTO_EXTENSION 42 -#define CB_OPTIONS 43 +#define CB_EXPLORERFILE_READONLY 40 +#define CB_EXPLORERFILE_PASSWORD 41 +#define CB_AUTO_EXTENSION 42 +#define CB_OPTIONS 43 // ----------------------------------------------- #define STR_EXPLORERFILE_OPEN 1 #define STR_EXPLORERFILE_SAVE 2 -#define STR_EXPLORERFILE_BUTTONSAVE 3 -#define STR_PATHNAME 4 -#define STR_PATHSELECT 5 -#define STR_BUTTONSELECT 6 -#define STR_ACTUALVERSION 7 +#define STR_EXPLORERFILE_BUTTONSAVE 3 +#define STR_PATHNAME 4 +#define STR_PATHSELECT 5 +#define STR_BUTTONSELECT 6 +#define STR_ACTUALVERSION 7 // DLG_SVT_QUERYFOLDERNAME ----------------------- @@ -92,16 +92,16 @@ #define HID_FILEDLG_USE_PASSWD (HID_SFX_START + 31) #define HID_FILEDLG_READ_ONLY (HID_SFX_START + 32) -#define HID_FILEDLG_AUTOCOMPLETEBOX (HID_SFX_START + 218) -#define HID_FILEDLG_SAVE_BTN (HID_SFX_START + 219) -#define HID_FILEDLG_SAVE_FILENAME (HID_SFX_START + 220) -#define HID_FILEDLG_SAVE_FILETYPE (HID_SFX_START + 221) -#define HID_FILEDLG_INSERT_BTN (HID_SFX_START + 222) -#define HID_FILEDLG_PATH_BTN (HID_SFX_START + 223) -#define HID_FILEDLG_PATH_FILENAME (HID_SFX_START + 224) -#define HID_FILEDLG_FOLDER_BTN (HID_SFX_START + 225) -#define HID_FILEDLG_FOLDER_FILENAME (HID_SFX_START + 226) -#define HID_FILEDLG_SRCHFOLDER_BTN (HID_SFX_START + 227) +#define HID_FILEDLG_AUTOCOMPLETEBOX (HID_SFX_START + 218) +#define HID_FILEDLG_SAVE_BTN (HID_SFX_START + 219) +#define HID_FILEDLG_SAVE_FILENAME (HID_SFX_START + 220) +#define HID_FILEDLG_SAVE_FILETYPE (HID_SFX_START + 221) +#define HID_FILEDLG_INSERT_BTN (HID_SFX_START + 222) +#define HID_FILEDLG_PATH_BTN (HID_SFX_START + 223) +#define HID_FILEDLG_PATH_FILENAME (HID_SFX_START + 224) +#define HID_FILEDLG_FOLDER_BTN (HID_SFX_START + 225) +#define HID_FILEDLG_FOLDER_FILENAME (HID_SFX_START + 226) +#define HID_FILEDLG_SRCHFOLDER_BTN (HID_SFX_START + 227) #endif diff --git a/svtools/source/inc/jpeg.hxx b/svtools/source/inc/jpeg.hxx index 4163354d1416..7560cecaaa95 100644 --- a/svtools/source/inc/jpeg.hxx +++ b/svtools/source/inc/jpeg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,68 +49,68 @@ enum ReadState }; // -------------- -// - JPEGReader - +// - JPEGReader - // -------------- class JPEGReader : public GraphicReader { - SvStream& rIStm; - Bitmap aBmp; - Bitmap aBmp1; - BitmapWriteAccess* pAcc; - BitmapWriteAccess* pAcc1; - void* pBuffer; - long nLastPos; - long nFormerPos; - long nLastLines; + SvStream& rIStm; + Bitmap aBmp; + Bitmap aBmp1; + BitmapWriteAccess* pAcc; + BitmapWriteAccess* pAcc1; + void* pBuffer; + long nLastPos; + long nFormerPos; + long nLastLines; sal_Bool bSetLogSize; - Graphic CreateIntermediateGraphic( const Bitmap& rBitmap, long nLines ); - void FillBitmap(); + Graphic CreateIntermediateGraphic( const Bitmap& rBitmap, long nLines ); + void FillBitmap(); public: - void* CreateBitmap( void* JPEGCreateBitmapParam ); + void* CreateBitmap( void* JPEGCreateBitmapParam ); public: JPEGReader( SvStream& rStm, void* pCallData, sal_Bool bSetLogSize ); - virtual ~JPEGReader(); + virtual ~JPEGReader(); - ReadState Read( Graphic& rGraphic ); + ReadState Read( Graphic& rGraphic ); }; // -------------- -// - JPEGWriter - +// - JPEGWriter - // -------------- class JPEGWriter { - SvStream& rOStm; - Bitmap aBmp; - BitmapReadAccess* pAcc; - BYTE* pBuffer; - BOOL bNative; - - sal_Bool bGreys; - sal_Int32 nQuality; - + SvStream& rOStm; + Bitmap aBmp; + BitmapReadAccess* pAcc; + BYTE* pBuffer; + BOOL bNative; + + sal_Bool bGreys; + sal_Int32 nQuality; + bool* pExpWasGrey; com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator; public: - void* GetScanline( long nY ); + void* GetScanline( long nY ); - JPEGWriter( SvStream& rOStm, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >* pFilterData, + JPEGWriter( SvStream& rOStm, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >* pFilterData, bool* pExportWasGrey = NULL ); ~JPEGWriter() {}; - BOOL Write( const Graphic& rGraphic ); + BOOL Write( const Graphic& rGraphic ); }; #endif // _JPEGPRIVATE diff --git a/svtools/source/inc/msgrd.hxx b/svtools/source/inc/msgrd.hxx index 6b1bc8cb5775..38cff1743dec 100644 --- a/svtools/source/inc/msgrd.hxx +++ b/svtools/source/inc/msgrd.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/svtools/source/inc/msgwr.hxx b/svtools/source/inc/msgwr.hxx index 77eeda2b26b9..81536f359d77 100644 --- a/svtools/source/inc/msgwr.hxx +++ b/svtools/source/inc/msgwr.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/svtools/source/inc/property.hxx b/svtools/source/inc/property.hxx index e77cbb4ed5e6..7fd8ab4f9adc 100644 --- a/svtools/source/inc/property.hxx +++ b/svtools/source/inc/property.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ #include <vcl/scrbar.hxx> #include <svl/svarray.hxx> -#ifndef _SVSTDARR_STRINGS +#ifndef _SVSTDARR_STRINGS #define _SVSTDARR_STRINGS #include <svl/svstdarr.hxx> #endif @@ -67,34 +67,34 @@ public: SvXPropertyControl( Window* pParent, WinBits nWinStyle = 0 ); SvXPropertyControl( Window* pParent, const ResId& rResId ); - virtual void SetSvXPropertyCtrListener(SvXPropertyCtrListener*)=0; + virtual void SetSvXPropertyCtrListener(SvXPropertyCtrListener*)=0; - virtual SvXPropertyCtrListener* GetSvXPropertyCtrListener()=0; - virtual void SetProperty(const String &rString)=0; - virtual String GetProperty()const=0; - virtual BOOL HasList()=0; - virtual void ClearList()=0; - virtual void InsertEntry( const String& rString, + virtual SvXPropertyCtrListener* GetSvXPropertyCtrListener()=0; + virtual void SetProperty(const String &rString)=0; + virtual String GetProperty()const=0; + virtual BOOL HasList()=0; + virtual void ClearList()=0; + virtual void InsertEntry( const String& rString, USHORT nPos = LISTBOX_APPEND )=0; - virtual void SetCtrSize(const Size& rSize)=0; - virtual void SetLocked(BOOL bLocked=TRUE)=0; + virtual void SetCtrSize(const Size& rSize)=0; + virtual void SetLocked(BOOL bLocked=TRUE)=0; - virtual void SetMyName(const String &rString)=0; - virtual String GetMyName()const=0; + virtual void SetMyName(const String &rString)=0; + virtual String GetMyName()const=0; - virtual void SetMyData(void*)=0; - virtual void* GetMyData()=0; + virtual void SetMyData(void*)=0; + virtual void* GetMyData()=0; }; class SvXPropertyCtrListener { public: - virtual void Modified (SvXPropertyControl *pSvXPCtr)=0; - virtual void GetFocus (SvXPropertyControl *pSvXPCtr)=0; - virtual void LoseFocus(SvXPropertyControl *pSvXPCtr)=0; - virtual void KeyInput (SvXPropertyControl *pSvXPCtr ,const KeyCode&)=0; + virtual void Modified (SvXPropertyControl *pSvXPCtr)=0; + virtual void GetFocus (SvXPropertyControl *pSvXPCtr)=0; + virtual void LoseFocus(SvXPropertyControl *pSvXPCtr)=0; + virtual void KeyInput (SvXPropertyControl *pSvXPCtr ,const KeyCode&)=0; }; @@ -102,10 +102,10 @@ class SvXPropertyEdit : public SvXPropertyControl { private: - String aName; - SvXPropertyCtrListener* pListener; - Edit aEdit; - void* pData; + String aName; + SvXPropertyCtrListener* pListener; + Edit aEdit; + void* pData; DECL_LINK(ModifiedHdl,Edit*); DECL_LINK(GetFocusHdl,Edit*); @@ -115,26 +115,26 @@ public: SvXPropertyEdit( Window* pParent, WinBits nWinStyle = 0 ); SvXPropertyEdit( Window* pParent, const ResId& rResId ); - virtual void SetSvXPropertyCtrListener(SvXPropertyCtrListener*); + virtual void SetSvXPropertyCtrListener(SvXPropertyCtrListener*); - virtual SvXPropertyCtrListener* GetSvXPropertyCtrListener(); + virtual SvXPropertyCtrListener* GetSvXPropertyCtrListener(); - virtual void SetProperty(const String &rString); - virtual String GetProperty()const; + virtual void SetProperty(const String &rString); + virtual String GetProperty()const; - virtual BOOL HasList(); - virtual void ClearList(); - virtual void InsertEntry( const String& rString, + virtual BOOL HasList(); + virtual void ClearList(); + virtual void InsertEntry( const String& rString, USHORT nPos = LISTBOX_APPEND ); - virtual void SetCtrSize(const Size& rSize); - virtual void SetLocked(BOOL bLocked=TRUE); + virtual void SetCtrSize(const Size& rSize); + virtual void SetLocked(BOOL bLocked=TRUE); - virtual void SetMyName(const String &rString); - virtual String GetMyName()const; + virtual void SetMyName(const String &rString); + virtual String GetMyName()const; - virtual void SetMyData(void*); - virtual void* GetMyData(); + virtual void SetMyData(void*); + virtual void* GetMyData(); }; @@ -142,10 +142,10 @@ class SvXPropertyListBox : public SvXPropertyControl { private: - String aName; - SvXPropertyCtrListener* pListener; - ListBox aListBox; - void* pData; + String aName; + SvXPropertyCtrListener* pListener; + ListBox aListBox; + void* pData; DECL_LINK(ModifiedHdl,ListBox*); DECL_LINK(GetFocusHdl,ListBox*); @@ -156,38 +156,38 @@ public: SvXPropertyListBox( Window* pParent, WinBits nWinStyle = 0 ); SvXPropertyListBox( Window* pParent, const ResId& rResId ); - virtual void SetSvXPropertyCtrListener(SvXPropertyCtrListener*); + virtual void SetSvXPropertyCtrListener(SvXPropertyCtrListener*); - virtual SvXPropertyCtrListener* GetSvXPropertyCtrListener(); + virtual SvXPropertyCtrListener* GetSvXPropertyCtrListener(); - ListBox* GetListBox(); + ListBox* GetListBox(); - virtual void SetProperty(const String &rString); - virtual String GetProperty()const; + virtual void SetProperty(const String &rString); + virtual String GetProperty()const; - virtual BOOL HasList(); - virtual void ClearList(); - virtual void InsertEntry( const String& rString, + virtual BOOL HasList(); + virtual void ClearList(); + virtual void InsertEntry( const String& rString, USHORT nPos = LISTBOX_APPEND ); - virtual void SetCtrSize(const Size& rSize); - virtual void SetLocked(BOOL bLocked=TRUE); + virtual void SetCtrSize(const Size& rSize); + virtual void SetLocked(BOOL bLocked=TRUE); - virtual void SetMyName(const String &rString); - virtual String GetMyName()const; + virtual void SetMyName(const String &rString); + virtual String GetMyName()const; - virtual void SetMyData(void*); - virtual void* GetMyData(); + virtual void SetMyData(void*); + virtual void* GetMyData(); }; class SvXPropertyComboBox : public SvXPropertyControl { private: - String aName; - SvXPropertyCtrListener* pListener; - ComboBox aComboBox; - void* pData; + String aName; + SvXPropertyCtrListener* pListener; + ComboBox aComboBox; + void* pData; DECL_LINK(ModifiedHdl,ComboBox*); DECL_LINK(GetFocusHdl,ComboBox*); @@ -198,28 +198,28 @@ public: SvXPropertyComboBox( Window* pParent, WinBits nWinStyle = 0 ); SvXPropertyComboBox( Window* pParent, const ResId& rResId ); - virtual void SetSvXPropertyCtrListener(SvXPropertyCtrListener*); + virtual void SetSvXPropertyCtrListener(SvXPropertyCtrListener*); - virtual SvXPropertyCtrListener* GetSvXPropertyCtrListener(); + virtual SvXPropertyCtrListener* GetSvXPropertyCtrListener(); - ComboBox* GetComboBox(); + ComboBox* GetComboBox(); - virtual void SetProperty(const String &rString); - virtual String GetProperty()const; + virtual void SetProperty(const String &rString); + virtual String GetProperty()const; - virtual BOOL HasList(); - virtual void ClearList(); - virtual void InsertEntry( const String& rString, + virtual BOOL HasList(); + virtual void ClearList(); + virtual void InsertEntry( const String& rString, USHORT nPos = LISTBOX_APPEND ); - virtual void SetCtrSize(const Size& rSize); - virtual void SetLocked(BOOL bLocked=TRUE); + virtual void SetCtrSize(const Size& rSize); + virtual void SetLocked(BOOL bLocked=TRUE); - virtual void SetMyName(const String &rString); - virtual String GetMyName()const; + virtual void SetMyName(const String &rString); + virtual String GetMyName()const; - virtual void SetMyData(void*); - virtual void* GetMyData(); + virtual void SetMyData(void*); + virtual void* GetMyData(); }; @@ -227,19 +227,19 @@ public: class SvPropertyLine : public Control { private: - FixedText aName; - USHORT nNameWidth; - BOOL bNeedsRepaint; - SvXPropertyControl* pSvXPropertyControl; + FixedText aName; + USHORT nNameWidth; + BOOL bNeedsRepaint; + SvXPropertyControl* pSvXPropertyControl; - PushButton aXButton; - BOOL bIsLocked; - BOOL bHasXButton; - BOOL bIsHyperlink; - eKindOfControl eKindOfCtr; + PushButton aXButton; + BOOL bIsLocked; + BOOL bHasXButton; + BOOL bIsHyperlink; + eKindOfControl eKindOfCtr; protected: - virtual void Resize(); + virtual void Resize(); public: SvPropertyLine( Window* pParent, @@ -247,28 +247,28 @@ public: SvPropertyLine( Window* pParent, const ResId& rResId ); - BOOL NeedsRepaint(); - void SetNeedsRepaint(BOOL bFlag); - void SetSvXPropertyControl(SvXPropertyControl*); - SvXPropertyControl* GetSvXPropertyControl(); + BOOL NeedsRepaint(); + void SetNeedsRepaint(BOOL bFlag); + void SetSvXPropertyControl(SvXPropertyControl*); + SvXPropertyControl* GetSvXPropertyControl(); - void SetKindOfControl(eKindOfControl); - eKindOfControl GetKindOfControl(); + void SetKindOfControl(eKindOfControl); + eKindOfControl GetKindOfControl(); - void SetName(const String& rString ); - String GetName() const; - void SetNameWidth(USHORT); + void SetName(const String& rString ); + String GetName() const; + void SetNameWidth(USHORT); - void ShowXButton(); - void HideXButton(); - BOOL IsVisibleXButton(); - void ShowAsHyperLink(BOOL nFlag=TRUE); - BOOL IsShownAsHyperlink(); + void ShowXButton(); + void HideXButton(); + BOOL IsVisibleXButton(); + void ShowAsHyperLink(BOOL nFlag=TRUE); + BOOL IsShownAsHyperlink(); - void Locked(BOOL nFlag=TRUE); - BOOL IsLineLocked(); + void Locked(BOOL nFlag=TRUE); + BOOL IsLineLocked(); - void SetClickHdl(const Link&); + void SetClickHdl(const Link&); }; @@ -276,16 +276,16 @@ public: class SvPropertyData { public: - eKindOfControl eKind; - String aName; - String aValue; - SvStrings theValues; // ??? - - BOOL bHasVisibleXButton; - BOOL bIsHyperLink; - BOOL bIsLocked; - void* pDataPtr; - SvXPropertyControl* pControl; + eKindOfControl eKind; + String aName; + String aValue; + SvStrings theValues; // ??? + + BOOL bHasVisibleXButton; + BOOL bIsHyperLink; + BOOL bIsLocked; + void* pDataPtr; + SvXPropertyControl* pControl; }; class SvPropertyDataObjectControl @@ -295,59 +295,59 @@ class SvPropertyDataObjectControl class SvPropertyDataControl { public: - virtual void Modified( const String& aName, + virtual void Modified( const String& aName, const String& aVal, void* pData)=0; - virtual void Clicked( const String& aName, + virtual void Clicked( const String& aName, const String& aVal, void* pData)=0; - virtual void Commit( const String& aName, + virtual void Commit( const String& aName, const String& aVal, void* pData)=0; - virtual void Select( const String& aName, + virtual void Select( const String& aName, void* pData)=0; - virtual void LinkClicked(const String& aName, + virtual void LinkClicked(const String& aName, void* pData)=0; }; class SvXPropEvListener: public SvXPropertyCtrListener { - Link aModifyLink; - Link aGetFocusLink; - Link aLoseFocusLink; - Link aKeyInputLink; - String aModifiedResult; + Link aModifyLink; + Link aGetFocusLink; + Link aLoseFocusLink; + Link aKeyInputLink; + String aModifiedResult; - SvXPropertyControl * pTheActiveControl; - KeyCode aKeyCode; + SvXPropertyControl * pTheActiveControl; + KeyCode aKeyCode; public: SvXPropEvListener(); virtual ~SvXPropEvListener(); + + virtual void Modified (SvXPropertyControl *pSvXPCtr); + virtual void GetFocus (SvXPropertyControl *pSvXPCtr); + virtual void LoseFocus(SvXPropertyControl *pSvXPCtr); + virtual void KeyInput(SvXPropertyControl *pSvXPCtr ,const KeyCode&); - virtual void Modified (SvXPropertyControl *pSvXPCtr); - virtual void GetFocus (SvXPropertyControl *pSvXPCtr); - virtual void LoseFocus(SvXPropertyControl *pSvXPCtr); - virtual void KeyInput(SvXPropertyControl *pSvXPCtr ,const KeyCode&); - - SvXPropertyControl * GetPropertyControl(); - KeyCode GetKeyCode() const; + SvXPropertyControl * GetPropertyControl(); + KeyCode GetKeyCode() const; - void SetModifyHdl( const Link& rLink ) { aModifyLink = rLink; } - const Link& GetModifyHdl() const { return aModifyLink; } + void SetModifyHdl( const Link& rLink ) { aModifyLink = rLink; } + const Link& GetModifyHdl() const { return aModifyLink; } - void SetGetFocusHdl( const Link& rLink ) { aGetFocusLink = rLink; } - const Link& GetGetFocusHdl() const { return aGetFocusLink; } + void SetGetFocusHdl( const Link& rLink ) { aGetFocusLink = rLink; } + const Link& GetGetFocusHdl() const { return aGetFocusLink; } - void SetLoseFocusHdl( const Link& rLink ) { aLoseFocusLink = rLink; } - const Link& GetLoseFocusHdl() const { return aLoseFocusLink; } + void SetLoseFocusHdl( const Link& rLink ) { aLoseFocusLink = rLink; } + const Link& GetLoseFocusHdl() const { return aLoseFocusLink; } - void SetKeyInputHdl( const Link& rLink ) { aKeyInputLink = rLink; } - const Link& GetKeyInputHdl() const { return aKeyInputLink; } + void SetKeyInputHdl( const Link& rLink ) { aKeyInputLink = rLink; } + const Link& GetKeyInputHdl() const { return aKeyInputLink; } }; @@ -360,18 +360,18 @@ class SvListBoxForProperties: public Control { private: - SvXPropEvListener aListener; - Window aPlayGround; - ScrollBar aVScroll; - SvPropLineArray PLineArray; - SvPropertyDataControl* pPropDataControl; - USHORT nRowHeight; - BOOL bUpdate; - USHORT nTheNameSize; - long nYOffset; + SvXPropEvListener aListener; + Window aPlayGround; + ScrollBar aVScroll; + SvPropLineArray PLineArray; + SvPropertyDataControl* pPropDataControl; + USHORT nRowHeight; + BOOL bUpdate; + USHORT nTheNameSize; + long nYOffset; DECL_LINK( ScrollHdl,ScrollBar*); - DECL_LINK( ClickHdl ,PushButton*); + DECL_LINK( ClickHdl ,PushButton*); DECL_LINK( ModifyHdl,SvXPropEvListener*); DECL_LINK( GetFocusHdl,SvXPropEvListener*); @@ -379,12 +379,12 @@ private: DECL_LINK( KeyInputHdl,SvXPropEvListener*); protected: - void UpdateAll(); - void UpdatePosNSize(); - void UpdatePlayGround(); - void UpdateVScroll(); + void UpdateAll(); + void UpdatePosNSize(); + void UpdatePlayGround(); + void UpdateVScroll(); - void Resize(); + void Resize(); public: SvListBoxForProperties( Window* pParent, WinBits nWinStyle = 0 ); @@ -392,27 +392,27 @@ public: ~SvListBoxForProperties(); - virtual USHORT CalcVisibleLines(); - virtual void EnableUpdate(); - virtual void DisableUpdate(); + virtual USHORT CalcVisibleLines(); + virtual void EnableUpdate(); + virtual void DisableUpdate(); - virtual void SetController(SvPropertyDataControl *); + virtual void SetController(SvPropertyDataControl *); - virtual void Clear(); + virtual void Clear(); - virtual USHORT InsertEntry( const SvPropertyData&, USHORT nPos = LISTBOX_APPEND ); + virtual USHORT InsertEntry( const SvPropertyData&, USHORT nPos = LISTBOX_APPEND ); - virtual void ChangeEntry( const SvPropertyData&, USHORT nPos); + virtual void ChangeEntry( const SvPropertyData&, USHORT nPos); - virtual USHORT AppendEntry( const SvPropertyData&); + virtual USHORT AppendEntry( const SvPropertyData&); - virtual void SetPropertyValue( const String & rEntryName, const String & rValue ); + virtual void SetPropertyValue( const String & rEntryName, const String & rValue ); - virtual void SetFirstVisibleEntry(USHORT nPos); - virtual USHORT GetFirstVisibleEntry(); + virtual void SetFirstVisibleEntry(USHORT nPos); + virtual USHORT GetFirstVisibleEntry(); - virtual void SetSelectedEntry(USHORT nPos); - virtual USHORT GetSelectedEntry(); + virtual void SetSelectedEntry(USHORT nPos); + virtual USHORT GetSelectedEntry(); }; class SvTabPageForProperties: public TabPage @@ -420,11 +420,11 @@ class SvTabPageForProperties: public TabPage private: - SvListBoxForProperties aLbProp; + SvListBoxForProperties aLbProp; protected: - virtual void Resize(); + virtual void Resize(); public: SvTabPageForProperties(Window* pParent,WinBits nWinStyle = 0 ); @@ -437,58 +437,58 @@ class SvBasicPropertyDataControl: public SvPropertyDataControl { private: - BOOL bCorrectness; - String aEntryName; - String aEntryProperty; - String aCorrectProperty; - void* pTheData; - Link aModifyLink; - Link aClickedLink; - Link aCommitLink; - Link aSelectLink; + BOOL bCorrectness; + String aEntryName; + String aEntryProperty; + String aCorrectProperty; + void* pTheData; + Link aModifyLink; + Link aClickedLink; + Link aCommitLink; + Link aSelectLink; public: virtual ~SvBasicPropertyDataControl(); - virtual void Modified( const String& aName, + virtual void Modified( const String& aName, const String& aVal, - void* pData); //User has modified Property + void* pData); //User has modified Property - virtual void Clicked( const String& aName, + virtual void Clicked( const String& aName, const String& aVal, - void* pData); //Xtension-Button pressed + void* pData); //Xtension-Button pressed - virtual void Commit( const String& aName, + virtual void Commit( const String& aName, const String& aVal, - void* pData); //User accept changes + void* pData); //User accept changes - virtual void Select( const String& aName, - void* pData); //User select new Row + virtual void Select( const String& aName, + void* pData); //User select new Row - virtual void LinkClicked(const String& aName, + virtual void LinkClicked(const String& aName, void* pData); - virtual void SetIsCorrect(BOOL nFlag); + virtual void SetIsCorrect(BOOL nFlag); - //virtual String GetTheCorrectProperty()const; - virtual void SetTheCorrectProperty(const String& aName); + //virtual String GetTheCorrectProperty()const; + virtual void SetTheCorrectProperty(const String& aName); - String GetName() const; //Tell's the name of the Property - String GetProperty() const; //Tell's the content of the Property - void* GetData(); //Tell's the storage + String GetName() const; //Tell's the name of the Property + String GetProperty() const; //Tell's the content of the Property + void* GetData(); //Tell's the storage - void SetModifyHdl( const Link& rLink ) { aModifyLink = rLink; } - const Link& GetModifyHdl() const { return aModifyLink; } + void SetModifyHdl( const Link& rLink ) { aModifyLink = rLink; } + const Link& GetModifyHdl() const { return aModifyLink; } - void SetClickedHdl( const Link& rLink ) { aClickedLink = rLink; } - const Link& GetClickedHdl() const { return aClickedLink; } + void SetClickedHdl( const Link& rLink ) { aClickedLink = rLink; } + const Link& GetClickedHdl() const { return aClickedLink; } - void SetCommitHdl( const Link& rLink ) { aCommitLink = rLink; } - const Link& GetCommitHdl() const { return aCommitLink; } + void SetCommitHdl( const Link& rLink ) { aCommitLink = rLink; } + const Link& GetCommitHdl() const { return aCommitLink; } - void SetSelectHdl( const Link& rLink ) { aSelectLink = rLink; } - const Link& GetSelectHdl() const { return aSelectLink; } + void SetSelectHdl( const Link& rLink ) { aSelectLink = rLink; } + const Link& GetSelectHdl() const { return aSelectLink; } }; @@ -496,42 +496,42 @@ public: class SvPropertyBox: public Control { private: - SvPropertyDataControl* pThePropDataCtr; - TabControl aTabControl; + SvPropertyDataControl* pThePropDataCtr; + TabControl aTabControl; protected: - virtual void Resize(); + virtual void Resize(); public: - SvPropertyBox ( Window* pParent, WinBits nWinStyle = 0 ); - SvPropertyBox ( Window* pParent, const ResId& rResId ); + SvPropertyBox ( Window* pParent, WinBits nWinStyle = 0 ); + SvPropertyBox ( Window* pParent, const ResId& rResId ); ~SvPropertyBox(); - virtual USHORT CalcVisibleLines(); - virtual void EnableUpdate(); // auch IDL? - virtual void DisableUpdate(); // auch IDL? + virtual USHORT CalcVisibleLines(); + virtual void EnableUpdate(); // auch IDL? + virtual void DisableUpdate(); // auch IDL? // AB: Hier beginnt das 'offizielle' Interface, das in IDL uebernommen werden soll - virtual void SetController(SvPropertyDataControl *); + virtual void SetController(SvPropertyDataControl *); - virtual USHORT AppendPage( const String & r ); - virtual void SetPage( USHORT ); - virtual USHORT GetCurPage(); - virtual void ClearAll(); - virtual void ClearTable(); + virtual USHORT AppendPage( const String & r ); + virtual void SetPage( USHORT ); + virtual USHORT GetCurPage(); + virtual void ClearAll(); + virtual void ClearTable(); - virtual void SetPropertyValue( const String & rEntryName, const String & rValue ); + virtual void SetPropertyValue( const String & rEntryName, const String & rValue ); - virtual USHORT InsertEntry( const SvPropertyData&, USHORT nPos = LISTBOX_APPEND ); - virtual void ChangeEntry( const SvPropertyData&, USHORT nPos); - virtual USHORT AppendEntry( const SvPropertyData&); + virtual USHORT InsertEntry( const SvPropertyData&, USHORT nPos = LISTBOX_APPEND ); + virtual void ChangeEntry( const SvPropertyData&, USHORT nPos); + virtual USHORT AppendEntry( const SvPropertyData&); - virtual void SetFirstVisibleEntry(USHORT nPos); - virtual USHORT GetFirstVisibleEntry(); + virtual void SetFirstVisibleEntry(USHORT nPos); + virtual USHORT GetFirstVisibleEntry(); - virtual void SetSelectedEntry(USHORT nPos); - virtual USHORT GetSelectedEntry(); + virtual void SetSelectedEntry(USHORT nPos); + virtual USHORT GetSelectedEntry(); }; @@ -540,30 +540,30 @@ public: class ScPropertyDlg : public ModalDialog { private: - SvBasicPropertyDataControl aBaProDatCtr; - OKButton anOk; - CancelButton aCancel; - USHORT nCount; - USHORT nClickCount; + SvBasicPropertyDataControl aBaProDatCtr; + OKButton anOk; + CancelButton aCancel; + USHORT nCount; + USHORT nClickCount; - SvPropertyData aProperty; - SvPropertyBox aPropListBox; + SvPropertyData aProperty; + SvPropertyBox aPropListBox; - ListBox aKindOfListBox; - FixedText aModAnswer; - FixedText aClickAnswer; - FixedText aCommitAnswer; - FixedText aSelectAnswer; + ListBox aKindOfListBox; + FixedText aModAnswer; + FixedText aClickAnswer; + FixedText aCommitAnswer; + FixedText aSelectAnswer; DECL_LINK( ModifiedHdl, ListBox*); DECL_LINK( RowModifiedHdl, SvBasicPropertyDataControl*); - DECL_LINK( ClickHdl , SvBasicPropertyDataControl*); - DECL_LINK( SelectHdl , SvBasicPropertyDataControl*); - DECL_LINK( CommitHdl , SvBasicPropertyDataControl*); + DECL_LINK( ClickHdl , SvBasicPropertyDataControl*); + DECL_LINK( SelectHdl , SvBasicPropertyDataControl*); + DECL_LINK( CommitHdl , SvBasicPropertyDataControl*); public: - ScPropertyDlg( Window* pParent); + ScPropertyDlg( Window* pParent); ~ScPropertyDlg(); }; */ diff --git a/svtools/source/inc/provider.hxx b/svtools/source/inc/provider.hxx index 0674d8d8ea6c..9dcd6da31690 100644 --- a/svtools/source/inc/provider.hxx +++ b/svtools/source/inc/provider.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,10 +26,10 @@ * ************************************************************************/ -#ifndef _GOODIES_PROVIDER_HXX -#define _GOODIES_PROVIDER_HXX +#ifndef _GOODIES_PROVIDER_HXX +#define _GOODIES_PROVIDER_HXX -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase1.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/graphic/XGraphicProvider.hpp> #include <com/sun/star/awt/XBitmap.hpp> @@ -45,13 +45,13 @@ namespace unographic { class GraphicProvider : public ::cppu::WeakImplHelper1< ::com::sun::star::graphic::XGraphicProvider > { public: - + GraphicProvider(); ~GraphicProvider(); - + static ::rtl::OUString getImplementationName_Static() throw(); static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static() throw(); - + protected: // XServiceInfo @@ -62,12 +62,12 @@ protected: // XTypeProvider 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( ) throw(::com::sun::star::uno::RuntimeException); - + // XGraphicProvider virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL queryGraphicDescriptor( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& MediaProperties ) throw (::com::sun::star::io::IOException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL queryGraphic( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& MediaProperties ) throw (::com::sun::star::io::IOException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL storeGraphic( const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& Graphic, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& MediaProperties ) throw (::com::sun::star::io::IOException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - + private: ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadMemory( const ::rtl::OUString& rResourceURL ) const; @@ -80,6 +80,6 @@ private: } -#endif +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/inc/renderer.hxx b/svtools/source/inc/renderer.hxx index 741d052bf9de..ced679e5a5d3 100644 --- a/svtools/source/inc/renderer.hxx +++ b/svtools/source/inc/renderer.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,8 +26,8 @@ * ************************************************************************/ -#ifndef _GOODIES_RENDERER_HXX -#define _GOODIES_RENDERER_HXX +#ifndef _GOODIES_RENDERER_HXX +#define _GOODIES_RENDERER_HXX #include <tools/gen.hxx> #include <comphelper/propertysethelper.hxx> @@ -54,13 +54,13 @@ class GraphicRendererVCL : public ::cppu::OWeakAggObject, public ::com::sun::star::graphic::XGraphicRenderer { public: - + GraphicRendererVCL(); ~GraphicRendererVCL() throw(); static ::rtl::OUString getImplementationName_Static() throw(); static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static() throw(); - + protected: static ::comphelper::PropertySetInfo* createPropertySetInfo(); @@ -70,7 +70,7 @@ protected: virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL release() throw(); - + // XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); @@ -83,21 +83,21 @@ protected: // PropertySetHelper virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const ::com::sun::star::uno::Any* pValues ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ); virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, ::com::sun::star::uno::Any* pValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ); - + // XGraphicRenderer virtual void SAL_CALL render( const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& Graphic ) throw (::com::sun::star::uno::RuntimeException); private: ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > mxDevice; - - OutputDevice* mpOutDev; - Rectangle maDestRect; - ::com::sun::star::uno::Any maRenderData; + + OutputDevice* mpOutDev; + Rectangle maDestRect; + ::com::sun::star::uno::Any maRenderData; }; } -#endif +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/inc/sgfbram.hxx b/svtools/source/inc/sgfbram.hxx index d3003e5ba565..d58facdf8565 100644 --- a/svtools/source/inc/sgfbram.hxx +++ b/svtools/source/inc/sgfbram.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/svtools/source/inc/sgffilt.hxx b/svtools/source/inc/sgffilt.hxx index e21810c6109e..835cddb90c7d 100644 --- a/svtools/source/inc/sgffilt.hxx +++ b/svtools/source/inc/sgffilt.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/svtools/source/inc/sgvmain.hxx b/svtools/source/inc/sgvmain.hxx index 25a4785c9b15..a5175b3fe586 100644 --- a/svtools/source/inc/sgvmain.hxx +++ b/svtools/source/inc/sgvmain.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/svtools/source/inc/sgvspln.hxx b/svtools/source/inc/sgvspln.hxx index eda6ac628a0d..3e5737c9f0ae 100644 --- a/svtools/source/inc/sgvspln.hxx +++ b/svtools/source/inc/sgvspln.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/svtools/source/inc/svimpbox.hxx b/svtools/source/inc/svimpbox.hxx index 7361893532d6..160f84698f48 100644 --- a/svtools/source/inc/svimpbox.hxx +++ b/svtools/source/inc/svimpbox.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 TabBar; class ImpLBSelEng : public FunctionSet { - SvImpLBox* pImp; - SelectionEngine* pSelEng; - SvTreeListBox* pView; + SvImpLBox* pImp; + SelectionEngine* pSelEng; + SvTreeListBox* pView; public: ImpLBSelEng( SvImpLBox* pImp, SelectionEngine* pSelEng, SvTreeListBox* pView ); virtual ~ImpLBSelEng(); - void BeginDrag(); - void CreateAnchor(); - void DestroyAnchor(); - BOOL SetCursorAtPoint( const Point& rPoint, + void BeginDrag(); + void CreateAnchor(); + void DestroyAnchor(); + BOOL SetCursorAtPoint( const Point& rPoint, BOOL bDontSelectAtCursor=FALSE ); - BOOL IsSelectionAtPoint( const Point& rPoint ); - void DeselectAtPoint( const Point& rPoint ); - void DeselectAll(); + BOOL IsSelectionAtPoint( const Point& rPoint ); + void DeselectAtPoint( const Point& rPoint ); + void DeselectAll(); }; // Flags fuer nFlag -#define F_VER_SBARSIZE_WITH_HBAR 0x0001 -#define F_HOR_SBARSIZE_WITH_VBAR 0x0002 -#define F_IGNORE_NEXT_MOUSEMOVE 0x0004 // OS/2 only -#define F_IN_SCROLLING 0x0008 -#define F_DESEL_ALL 0x0010 -#define F_START_EDITTIMER 0x0020 // MAC only -#define F_IGNORE_SELECT 0x0040 -#define F_IN_RESIZE 0x0080 -#define F_REMOVED_ENTRY_INVISIBLE 0x0100 -#define F_REMOVED_RECALC_MOST_RIGHT 0x0200 -#define F_IGNORE_CHANGED_TABS 0x0400 -#define F_PAINTED 0x0800 -#define F_IN_PAINT 0x1000 -#define F_ENDSCROLL_SET_VIS_SIZE 0x2000 -#define F_FILLING 0x4000 +#define F_VER_SBARSIZE_WITH_HBAR 0x0001 +#define F_HOR_SBARSIZE_WITH_VBAR 0x0002 +#define F_IGNORE_NEXT_MOUSEMOVE 0x0004 // OS/2 only +#define F_IN_SCROLLING 0x0008 +#define F_DESEL_ALL 0x0010 +#define F_START_EDITTIMER 0x0020 // MAC only +#define F_IGNORE_SELECT 0x0040 +#define F_IN_RESIZE 0x0080 +#define F_REMOVED_ENTRY_INVISIBLE 0x0100 +#define F_REMOVED_RECALC_MOST_RIGHT 0x0200 +#define F_IGNORE_CHANGED_TABS 0x0400 +#define F_PAINTED 0x0800 +#define F_IN_PAINT 0x1000 +#define F_ENDSCROLL_SET_VIS_SIZE 0x2000 +#define F_FILLING 0x4000 class SvImpLBox @@ -91,83 +91,83 @@ class SvImpLBox friend class ImpLBSelEng; friend class SvTreeListBox; private: - SvTreeListBox* pView; - SvLBoxTreeList* pTree; - SvLBoxEntry* pCursor; - SvLBoxEntry* pStartEntry; - SvLBoxEntry* pAnchor; - SvLBoxEntry* pMostRightEntry; - SvLBoxButton* pActiveButton; - SvLBoxEntry* pActiveEntry; - SvLBoxTab* pActiveTab; - TabBar* pTabBar; - - ScrollBar aVerSBar; - ScrollBar aHorSBar; - ScrollBarBox aScrBarBox; + SvTreeListBox* pView; + SvLBoxTreeList* pTree; + SvLBoxEntry* pCursor; + SvLBoxEntry* pStartEntry; + SvLBoxEntry* pAnchor; + SvLBoxEntry* pMostRightEntry; + SvLBoxButton* pActiveButton; + SvLBoxEntry* pActiveEntry; + SvLBoxTab* pActiveTab; + TabBar* pTabBar; + + ScrollBar aVerSBar; + ScrollBar aHorSBar; + ScrollBarBox aScrBarBox; ::svt::AccessibleFactoryAccess m_aFactoryAccess; - static Image* s_pDefCollapsed; - static Image* s_pDefExpanded; - static Image* s_pDefCollapsedHC; - static Image* s_pDefExpandedHC; - static oslInterlockedCount s_nImageRefCount; /// When 0 all static images will be destroyed + static Image* s_pDefCollapsed; + static Image* s_pDefExpanded; + static Image* s_pDefCollapsedHC; + static Image* s_pDefExpandedHC; + static oslInterlockedCount s_nImageRefCount; /// When 0 all static images will be destroyed // Node Bitmaps enum ImageType { - itNodeExpanded = 0, // node is expanded ( usually a bitmap showing a minus ) - itNodeCollapsed, // node is collapsed ( usually a bitmap showing a plus ) - itNodeDontKnow, // don't know the node state - itEntryDefExpanded, // default for expanded entries - itEntryDefCollapsed, // default for collapsed entries + itNodeExpanded = 0, // node is expanded ( usually a bitmap showing a minus ) + itNodeCollapsed, // node is collapsed ( usually a bitmap showing a plus ) + itNodeDontKnow, // don't know the node state + itEntryDefExpanded, // default for expanded entries + itEntryDefCollapsed, // default for collapsed entries IT_IMAGE_COUNT }; // all our images - Image m_aNodeAndEntryImages[ IT_IMAGE_COUNT ]; + Image m_aNodeAndEntryImages[ IT_IMAGE_COUNT ]; // plus the high contrast versions - Image m_aNodeAndEntryImages_HC[ IT_IMAGE_COUNT ]; + Image m_aNodeAndEntryImages_HC[ IT_IMAGE_COUNT ]; // wg. kompat. hier - Size aOutputSize; - SelectionEngine aSelEng; - ImpLBSelEng aFctSet; - Timer aAsyncBeginDragTimer; - Point aAsyncBeginDragPos; - - long nYoffsNodeBmp; - long nNodeBmpTabDistance; // typisch kleiner 0 - long nNodeBmpWidth; - long nNextVerVisSize; - long nMostRight; - ULONG nVisibleCount; // Anzahl Zeilen im Control - ULONG nCurUserEvent; //-1 == kein Userevent amn Laufen - short nHorSBarHeight, nVerSBarWidth; - USHORT nFlags; - USHORT nCurTabPos; - - WinBits nWinBits; + Size aOutputSize; + SelectionEngine aSelEng; + ImpLBSelEng aFctSet; + Timer aAsyncBeginDragTimer; + Point aAsyncBeginDragPos; + + long nYoffsNodeBmp; + long nNodeBmpTabDistance; // typisch kleiner 0 + long nNodeBmpWidth; + long nNextVerVisSize; + long nMostRight; + ULONG nVisibleCount; // Anzahl Zeilen im Control + ULONG nCurUserEvent; //-1 == kein Userevent amn Laufen + short nHorSBarHeight, nVerSBarWidth; + USHORT nFlags; + USHORT nCurTabPos; + + WinBits nWinBits; ExtendedWinBits nExtendedWinBits; - BOOL bSimpleTravel : 1; // ist TRUE bei SINGLE_SELECTION - BOOL bUpdateMode : 1; - BOOL bInVScrollHdl : 1; - BOOL bAsyncBeginDrag : 1; - BOOL bSubLstOpRet : 1; // open/close sublist with return/enter, defaulted with FALSE - BOOL bSubLstOpLR : 1; // open/close sublist with cursor left/right, defaulted with FALSE - BOOL bContextMenuHandling : 1; - BOOL bIsCellFocusEnabled : 1; + BOOL bSimpleTravel : 1; // ist TRUE bei SINGLE_SELECTION + BOOL bUpdateMode : 1; + BOOL bInVScrollHdl : 1; + BOOL bAsyncBeginDrag : 1; + BOOL bSubLstOpRet : 1; // open/close sublist with return/enter, defaulted with FALSE + BOOL bSubLstOpLR : 1; // open/close sublist with cursor left/right, defaulted with FALSE + BOOL bContextMenuHandling : 1; + BOOL bIsCellFocusEnabled : 1; sal_Bool bAreChildrenTransient; - Point aEditClickPos; - Timer aEditTimer; + Point aEditClickPos; + Timer aEditTimer; // #102891# ------------------- - IntlWrapper * pIntlWrapper; + IntlWrapper * pIntlWrapper; // #97680# -------------------- std::vector< short > aContextBmpWidthVector; @@ -176,82 +176,82 @@ private: DECL_LINK( BeginDragHdl, void* ); DECL_LINK( MyUserEvent,void*); - void StopUserEvent(); + void StopUserEvent(); - void InvalidateEntriesFrom( long nY ) const; - void InvalidateEntry( long nY ) const; - void ShowVerSBar(); + void InvalidateEntriesFrom( long nY ) const; + void InvalidateEntry( long nY ) const; + void ShowVerSBar(); // setzt Thumb auf FirstEntryToDraw - void SyncVerThumb(); - BOOL IsLineVisible( long nY ) const; - long GetEntryLine( SvLBoxEntry* pEntry ) const; - void FillView(); - void CursorDown(); - void CursorUp(); - void KeyLeftRight( long nDiff ); - void PageDown( USHORT nDelta ); - void PageUp( USHORT nDelta ); + void SyncVerThumb(); + BOOL IsLineVisible( long nY ) const; + long GetEntryLine( SvLBoxEntry* pEntry ) const; + void FillView(); + void CursorDown(); + void CursorUp(); + void KeyLeftRight( long nDiff ); + void PageDown( USHORT nDelta ); + void PageUp( USHORT nDelta ); - void SetCursor( SvLBoxEntry* pEntry, BOOL bForceNoSelect = FALSE ); + void SetCursor( SvLBoxEntry* pEntry, BOOL bForceNoSelect = FALSE ); - void DrawNet(); + void DrawNet(); // ScrollBar-Handler DECL_LINK( ScrollUpDownHdl, ScrollBar * ); DECL_LINK( ScrollLeftRightHdl, ScrollBar * ); DECL_LINK( EndScrollHdl, ScrollBar * ); - void SetNodeBmpYOffset( const Image& ); - void SetNodeBmpTabDistance(); + void SetNodeBmpYOffset( const Image& ); + void SetNodeBmpTabDistance(); // Selection-Engine - SvLBoxEntry* MakePointVisible( const Point& rPoint, + SvLBoxEntry* MakePointVisible( const Point& rPoint, BOOL bNotifyScroll=TRUE ); - void SetAnchorSelection( SvLBoxEntry* pOld, + void SetAnchorSelection( SvLBoxEntry* pOld, SvLBoxEntry* pNewCursor ); - void BeginDrag(); - BOOL ButtonDownCheckCtrl( const MouseEvent& rMEvt, - SvLBoxEntry* pEntry, long nY ); - BOOL MouseMoveCheckCtrl( const MouseEvent& rMEvt, + void BeginDrag(); + BOOL ButtonDownCheckCtrl( const MouseEvent& rMEvt, + SvLBoxEntry* pEntry, long nY ); + BOOL MouseMoveCheckCtrl( const MouseEvent& rMEvt, SvLBoxEntry* pEntry ); - BOOL ButtonUpCheckCtrl( const MouseEvent& rMEvt ); - BOOL ButtonDownCheckExpand( const MouseEvent&, + BOOL ButtonUpCheckCtrl( const MouseEvent& rMEvt ); + BOOL ButtonDownCheckExpand( const MouseEvent&, SvLBoxEntry*,long nY ); - void PositionScrollBars( Size& rOSize, USHORT nMask ); - USHORT AdjustScrollBars( Size& rSize ); + void PositionScrollBars( Size& rOSize, USHORT nMask ); + USHORT AdjustScrollBars( Size& rSize ); - void BeginScroll(); - void EndScroll(); - BOOL InScroll() const { return (BOOL)(nFlags & F_IN_SCROLLING)!=0;} - Rectangle GetVisibleArea() const; - BOOL EntryReallyHit(SvLBoxEntry* pEntry,const Point& rPos,long nLine); - void InitScrollBarBox(); - SvLBoxTab* NextTab( SvLBoxTab* ); + void BeginScroll(); + void EndScroll(); + BOOL InScroll() const { return (BOOL)(nFlags & F_IN_SCROLLING)!=0;} + Rectangle GetVisibleArea() const; + BOOL EntryReallyHit(SvLBoxEntry* pEntry,const Point& rPos,long nLine); + void InitScrollBarBox(); + SvLBoxTab* NextTab( SvLBoxTab* ); - BOOL SetMostRight( SvLBoxEntry* pEntry ); - void FindMostRight( SvLBoxEntry* EntryToIgnore ); - void FindMostRight( SvLBoxEntry* pParent, SvLBoxEntry* EntryToIgnore ); - void FindMostRight_Impl( SvLBoxEntry* pParent,SvLBoxEntry* EntryToIgnore ); - void NotifyTabsChanged(); + BOOL SetMostRight( SvLBoxEntry* pEntry ); + void FindMostRight( SvLBoxEntry* EntryToIgnore ); + void FindMostRight( SvLBoxEntry* pParent, SvLBoxEntry* EntryToIgnore ); + void FindMostRight_Impl( SvLBoxEntry* pParent,SvLBoxEntry* EntryToIgnore ); + void NotifyTabsChanged(); - inline BOOL IsExpandable() const // if element at cursor can be expanded in general + inline BOOL IsExpandable() const // if element at cursor can be expanded in general { return pCursor->HasChilds() || pCursor->HasChildsOnDemand(); } - inline BOOL IsNowExpandable() const // if element at cursor can be expanded at this moment + inline BOOL IsNowExpandable() const // if element at cursor can be expanded at this moment { return IsExpandable() && !pView->IsExpanded( pCursor ); } - static void implInitDefaultNodeImages(); + static void implInitDefaultNodeImages(); // #102891# ------------------- - void UpdateIntlWrapper(); + void UpdateIntlWrapper(); // #97680# -------------------- - short UpdateContextBmpWidthVector( SvLBoxEntry* pEntry, short nWidth ); - void UpdateContextBmpWidthMax( SvLBoxEntry* pEntry ); - void UpdateContextBmpWidthVectorFromMovedEntry( SvLBoxEntry* pEntry ); + short UpdateContextBmpWidthVector( SvLBoxEntry* pEntry, short nWidth ); + void UpdateContextBmpWidthMax( SvLBoxEntry* pEntry ); + void UpdateContextBmpWidthVectorFromMovedEntry( SvLBoxEntry* pEntry ); - void CalcCellFocusRect( SvLBoxEntry* pEntry, Rectangle& rRect ); + void CalcCellFocusRect( SvLBoxEntry* pEntry, Rectangle& rRect ); inline sal_Bool AreChildrenTransient() const { return bAreChildrenTransient; } inline void SetChildrenNotTransient() { bAreChildrenTransient = sal_False; } @@ -260,115 +260,115 @@ public: SvImpLBox( SvTreeListBox* pView, SvLBoxTreeList*, WinBits nWinStyle ); ~SvImpLBox(); - void Clear(); - void SetWindowBits( WinBits nWinStyle ); - void SetExtendedWindowBits( ExtendedWinBits _nBits ); + void Clear(); + void SetWindowBits( WinBits nWinStyle ); + void SetExtendedWindowBits( ExtendedWinBits _nBits ); ExtendedWinBits GetExtendedWindowBits() const { return nExtendedWinBits; } - void SetModel( SvLBoxTreeList* pModel ) { pTree = pModel;} - - void EntryInserted( SvLBoxEntry*); - void RemovingEntry( SvLBoxEntry* pEntry ); - void EntryRemoved(); - void MovingEntry( SvLBoxEntry* pEntry ); - void EntryMoved( SvLBoxEntry* pEntry ); - void TreeInserted( SvLBoxEntry* pEntry ); - - void IndentChanged( short nIndentPixel ); - void EntryExpanded( SvLBoxEntry* pEntry ); - void EntryCollapsed( SvLBoxEntry* pEntry ); - void CollapsingEntry( SvLBoxEntry* pEntry ); - void EntrySelected( SvLBoxEntry*, BOOL bSelect ); - - void Paint( const Rectangle& rRect ); - void RepaintSelectionItems(); - void MouseButtonDown( const MouseEvent& ); - void MouseButtonUp( const MouseEvent& ); - void MouseMove( const MouseEvent&); - BOOL KeyInput( const KeyEvent& ); - void Resize(); - void GetFocus(); - void LoseFocus(); - void UpdateAll( + void SetModel( SvLBoxTreeList* pModel ) { pTree = pModel;} + + void EntryInserted( SvLBoxEntry*); + void RemovingEntry( SvLBoxEntry* pEntry ); + void EntryRemoved(); + void MovingEntry( SvLBoxEntry* pEntry ); + void EntryMoved( SvLBoxEntry* pEntry ); + void TreeInserted( SvLBoxEntry* pEntry ); + + void IndentChanged( short nIndentPixel ); + void EntryExpanded( SvLBoxEntry* pEntry ); + void EntryCollapsed( SvLBoxEntry* pEntry ); + void CollapsingEntry( SvLBoxEntry* pEntry ); + void EntrySelected( SvLBoxEntry*, BOOL bSelect ); + + void Paint( const Rectangle& rRect ); + void RepaintSelectionItems(); + void MouseButtonDown( const MouseEvent& ); + void MouseButtonUp( const MouseEvent& ); + void MouseMove( const MouseEvent&); + BOOL KeyInput( const KeyEvent& ); + void Resize(); + void GetFocus(); + void LoseFocus(); + void UpdateAll( BOOL bInvalidateCompleteView= TRUE, BOOL bUpdateVerSBar = TRUE ); - void SetEntryHeight( short nHeight ); - void PaintEntry( SvLBoxEntry* pEntry ); - void InvalidateEntry( SvLBoxEntry* ); - void RecalcFocusRect(); - - inline void SelectEntry( SvLBoxEntry* pEntry, BOOL bSelect ); - void SetDragDropMode( DragDropMode eDDMode ); - void SetSelectionMode( SelectionMode eSelMode ); - void SetAddMode( BOOL ) { aSelEng.AddAlways(FALSE); } - BOOL IsAddMode() const { return aSelEng.IsAlwaysAdding(); } - - SvLBoxEntry* GetCurrentEntry() const { return pCursor; } - BOOL IsEntryInView( SvLBoxEntry* ) const; - SvLBoxEntry* GetEntry( const Point& rPos ) const; + void SetEntryHeight( short nHeight ); + void PaintEntry( SvLBoxEntry* pEntry ); + void InvalidateEntry( SvLBoxEntry* ); + void RecalcFocusRect(); + + inline void SelectEntry( SvLBoxEntry* pEntry, BOOL bSelect ); + void SetDragDropMode( DragDropMode eDDMode ); + void SetSelectionMode( SelectionMode eSelMode ); + void SetAddMode( BOOL ) { aSelEng.AddAlways(FALSE); } + BOOL IsAddMode() const { return aSelEng.IsAlwaysAdding(); } + + SvLBoxEntry* GetCurrentEntry() const { return pCursor; } + BOOL IsEntryInView( SvLBoxEntry* ) const; + SvLBoxEntry* GetEntry( const Point& rPos ) const; // gibt letzten Eintrag zurueck, falls Pos unter letztem Eintrag - SvLBoxEntry* GetClickedEntry( const Point& ) const; - SvLBoxEntry* GetCurEntry() const { return pCursor; } - void SetCurEntry( SvLBoxEntry* ); - Point GetEntryPosition( SvLBoxEntry* ) const; - void MakeVisible( SvLBoxEntry* pEntry, BOOL bMoveToTop=FALSE ); + SvLBoxEntry* GetClickedEntry( const Point& ) const; + SvLBoxEntry* GetCurEntry() const { return pCursor; } + void SetCurEntry( SvLBoxEntry* ); + Point GetEntryPosition( SvLBoxEntry* ) const; + void MakeVisible( SvLBoxEntry* pEntry, BOOL bMoveToTop=FALSE ); - void PaintDDCursor( SvLBoxEntry* ); + void PaintDDCursor( SvLBoxEntry* ); // Images - inline Image& implGetImageLocation( const ImageType _eType, BmpColorMode _eMode ); - inline Image& implGetImageLocationWithFallback( const ImageType _eType, BmpColorMode _eMode ) const; + inline Image& implGetImageLocation( const ImageType _eType, BmpColorMode _eMode ); + inline Image& implGetImageLocationWithFallback( const ImageType _eType, BmpColorMode _eMode ) const; - inline void SetExpandedNodeBmp( const Image& _rImg, BmpColorMode _eMode = BMP_COLOR_NORMAL ); - inline void SetCollapsedNodeBmp( const Image& _rImg, BmpColorMode _eMode = BMP_COLOR_NORMAL ); - inline void SetDontKnowNodeBmp( const Image& rImg, BmpColorMode _eMode = BMP_COLOR_NORMAL ); + inline void SetExpandedNodeBmp( const Image& _rImg, BmpColorMode _eMode = BMP_COLOR_NORMAL ); + inline void SetCollapsedNodeBmp( const Image& _rImg, BmpColorMode _eMode = BMP_COLOR_NORMAL ); + inline void SetDontKnowNodeBmp( const Image& rImg, BmpColorMode _eMode = BMP_COLOR_NORMAL ); inline const Image& GetExpandedNodeBmp( BmpColorMode _eMode = BMP_COLOR_NORMAL ) const; inline const Image& GetCollapsedNodeBmp( BmpColorMode _eMode = BMP_COLOR_NORMAL ) const; - inline const Image& GetDontKnowNodeBmp( BmpColorMode _eMode = BMP_COLOR_NORMAL ) const; + inline const Image& GetDontKnowNodeBmp( BmpColorMode _eMode = BMP_COLOR_NORMAL ) const; - inline void SetDefaultEntryExpBmp( const Image& _rImg, BmpColorMode _eMode = BMP_COLOR_NORMAL ); - inline void SetDefaultEntryColBmp( const Image& _rImg, BmpColorMode _eMode = BMP_COLOR_NORMAL ); - inline const Image& GetDefaultEntryExpBmp( BmpColorMode _eMode = BMP_COLOR_NORMAL ); - inline const Image& GetDefaultEntryColBmp( BmpColorMode _eMode = BMP_COLOR_NORMAL ); + inline void SetDefaultEntryExpBmp( const Image& _rImg, BmpColorMode _eMode = BMP_COLOR_NORMAL ); + inline void SetDefaultEntryColBmp( const Image& _rImg, BmpColorMode _eMode = BMP_COLOR_NORMAL ); + inline const Image& GetDefaultEntryExpBmp( BmpColorMode _eMode = BMP_COLOR_NORMAL ); + inline const Image& GetDefaultEntryColBmp( BmpColorMode _eMode = BMP_COLOR_NORMAL ); - static const Image& GetDefaultExpandedNodeImage( BmpColorMode _eMode = BMP_COLOR_NORMAL ); - static const Image& GetDefaultCollapsedNodeImage( BmpColorMode _eMode = BMP_COLOR_NORMAL ); + static const Image& GetDefaultExpandedNodeImage( BmpColorMode _eMode = BMP_COLOR_NORMAL ); + static const Image& GetDefaultCollapsedNodeImage( BmpColorMode _eMode = BMP_COLOR_NORMAL ); - const Size& GetOutputSize() const { return aOutputSize;} - void KeyUp( BOOL bPageUp, BOOL bNotifyScroll = TRUE ); - void KeyDown( BOOL bPageDown, BOOL bNotifyScroll = TRUE ); + const Size& GetOutputSize() const { return aOutputSize;} + void KeyUp( BOOL bPageUp, BOOL bNotifyScroll = TRUE ); + void KeyDown( BOOL bPageDown, BOOL bNotifyScroll = TRUE ); bool Command( const CommandEvent& rCEvt ); - void Invalidate(); - void DestroyAnchor() { pAnchor=0; aSelEng.Reset(); } - void SelAllDestrAnch( BOOL bSelect, + void Invalidate(); + void DestroyAnchor() { pAnchor=0; aSelEng.Reset(); } + void SelAllDestrAnch( BOOL bSelect, BOOL bDestroyAnchor = TRUE, BOOL bSingleSelToo = FALSE ); - void ShowCursor( BOOL bShow ); - - BOOL RequestHelp( const HelpEvent& rHEvt ); - void EndSelection(); - BOOL IsNodeButton( const Point& rPosPixel, SvLBoxEntry* pEntry ) const; - void RepaintScrollBars(); - void EnableAsyncDrag( BOOL b) { bAsyncBeginDrag = b; } - void SetUpdateMode( BOOL ); - void SetUpdateModeFast( BOOL ); - BOOL GetUpdateMode() const { return bUpdateMode; } - Rectangle GetClipRegionRect() const; - BOOL HasHorScrollBar() const { return aHorSBar.IsVisible(); } - void ShowFocusRect( const SvLBoxEntry* pEntry ); - void SetTabBar( TabBar* pTabBar ); - void CancelPendingEdit(); - - void CallEventListeners( ULONG nEvent, void* pData = NULL ); + void ShowCursor( BOOL bShow ); + + BOOL RequestHelp( const HelpEvent& rHEvt ); + void EndSelection(); + BOOL IsNodeButton( const Point& rPosPixel, SvLBoxEntry* pEntry ) const; + void RepaintScrollBars(); + void EnableAsyncDrag( BOOL b) { bAsyncBeginDrag = b; } + void SetUpdateMode( BOOL ); + void SetUpdateModeFast( BOOL ); + BOOL GetUpdateMode() const { return bUpdateMode; } + Rectangle GetClipRegionRect() const; + BOOL HasHorScrollBar() const { return aHorSBar.IsVisible(); } + void ShowFocusRect( const SvLBoxEntry* pEntry ); + void SetTabBar( TabBar* pTabBar ); + void CancelPendingEdit(); + + void CallEventListeners( ULONG nEvent, void* pData = NULL ); /** Enables, that one cell of a tablistbox entry can be focused */ - inline BOOL IsCellFocusEnabled() const { return bIsCellFocusEnabled; } - inline void EnableCellFocus() { bIsCellFocusEnabled = TRUE; } - bool SetCurrentTabPos( USHORT _nNewPos ); - inline USHORT GetCurrentTabPos() const { return nCurTabPos; } + inline BOOL IsCellFocusEnabled() const { return bIsCellFocusEnabled; } + inline void EnableCellFocus() { bIsCellFocusEnabled = TRUE; } + bool SetCurrentTabPos( USHORT _nNewPos ); + inline USHORT GetCurrentTabPos() const { return nCurTabPos; } - bool IsSelectable( const SvLBoxEntry* pEntry ); + bool IsSelectable( const SvLBoxEntry* pEntry ); }; inline Image& SvImpLBox::implGetImageLocation( const ImageType _eType, BmpColorMode _eMode ) @@ -408,7 +408,7 @@ inline void SvImpLBox::SetCollapsedNodeBmp( const Image& rImg, BmpColorMode _eMo SetNodeBmpYOffset( rImg ); } -inline const Image& SvImpLBox::GetDontKnowNodeBmp( BmpColorMode _eMode ) const +inline const Image& SvImpLBox::GetDontKnowNodeBmp( BmpColorMode _eMode ) const { return implGetImageLocationWithFallback( itNodeDontKnow, _eMode ); } @@ -433,12 +433,12 @@ inline void SvImpLBox::SetDefaultEntryColBmp( const Image& _rImg, BmpColorMode _ implGetImageLocation( itEntryDefCollapsed, _eMode ) = _rImg; } -inline const Image& SvImpLBox::GetDefaultEntryExpBmp( BmpColorMode _eMode ) +inline const Image& SvImpLBox::GetDefaultEntryExpBmp( BmpColorMode _eMode ) { return implGetImageLocationWithFallback( itEntryDefExpanded, _eMode ); } -inline const Image& SvImpLBox::GetDefaultEntryColBmp( BmpColorMode _eMode ) +inline const Image& SvImpLBox::GetDefaultEntryColBmp( BmpColorMode _eMode ) { return implGetImageLocationWithFallback( itEntryDefCollapsed, _eMode ); } diff --git a/svtools/source/inc/svimpicn.hxx b/svtools/source/inc/svimpicn.hxx index 8d297e3476db..09427410d5c7 100644 --- a/svtools/source/inc/svimpicn.hxx +++ b/svtools/source/inc/svimpicn.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,272 +39,272 @@ class SvImpIconView; class ImpIcnCursor; class SvPtrarr; -#define PAINTFLAG_HOR_CENTERED 0x0001 -#define PAINTFLAG_VER_CENTERED 0x0002 +#define PAINTFLAG_HOR_CENTERED 0x0001 +#define PAINTFLAG_VER_CENTERED 0x0002 -#define SELRECT_BORDER_OFFS -7 +#define SELRECT_BORDER_OFFS -7 // Flags -#define F_VER_SBARSIZE_WITH_HBAR 0x00000001 -#define F_HOR_SBARSIZE_WITH_VBAR 0x00000002 -#define F_IGNORE_NEXT_MOUSEMOVE 0x00000004 // OS/2 only -#define F_ENTRY_REMOVED 0x00000008 +#define F_VER_SBARSIZE_WITH_HBAR 0x00000001 +#define F_HOR_SBARSIZE_WITH_VBAR 0x00000002 +#define F_IGNORE_NEXT_MOUSEMOVE 0x00000004 // OS/2 only +#define F_ENTRY_REMOVED 0x00000008 // ist gesetzt, wenn nach Clear oder Ctor mind. einmal gepaintet wurde -#define F_PAINTED 0x00000010 -#define F_ADD_MODE 0x00000020 -#define F_MOVING_SIBLING 0x00000040 -#define F_SELRECT_VISIBLE 0x00000080 -#define F_CMD_ARRIVED 0x00000100 -#define F_DRAG_SOURCE 0x00000200 -#define F_GRIDMODE 0x00000400 +#define F_PAINTED 0x00000010 +#define F_ADD_MODE 0x00000020 +#define F_MOVING_SIBLING 0x00000040 +#define F_SELRECT_VISIBLE 0x00000080 +#define F_CMD_ARRIVED 0x00000100 +#define F_DRAG_SOURCE 0x00000200 +#define F_GRIDMODE 0x00000400 // beim Einfuegen eines Eintrags ergibt sich dessen Position // durch simples Addieren auf die Position des zuletzt eingefuegten Eintrags -#define F_GRID_INSERT 0x00000800 -#define F_DOWN_CTRL 0x00001000 -#define F_DOWN_DESELECT 0x00002000 +#define F_GRID_INSERT 0x00000800 +#define F_DOWN_CTRL 0x00001000 +#define F_DOWN_DESELECT 0x00002000 // Hack fuer D&D: Hintergrund des Entries nicht painten -#define F_NO_EMPHASIS 0x00004000 +#define F_NO_EMPHASIS 0x00004000 // Selektion per Gummiband -#define F_RUBBERING 0x00008000 -#define F_START_EDITTIMER_IN_MOUSEUP 0x00010000 +#define F_RUBBERING 0x00008000 +#define F_START_EDITTIMER_IN_MOUSEUP 0x00010000 class SvImpIconView { friend class ImpIcnCursor; - ScrollBar aVerSBar; - ScrollBar aHorSBar; - Rectangle aCurSelectionRect; - SvPtrarr aSelectedRectList; - MouseEvent aMouseMoveEvent; - Timer aEditTimer; // fuer Inplace-Editieren - Timer aMouseMoveTimer; // generiert MouseMoves bei Gummibandselektion + ScrollBar aVerSBar; + ScrollBar aHorSBar; + Rectangle aCurSelectionRect; + SvPtrarr aSelectedRectList; + MouseEvent aMouseMoveEvent; + Timer aEditTimer; // fuer Inplace-Editieren + Timer aMouseMoveTimer; // generiert MouseMoves bei Gummibandselektion // Boundrect des zuletzt eingefuegten Entries - Rectangle aPrevBoundRect; - Size aOutputSize; // Pixel - Size aVirtOutputSize; // expandiert automatisch - Point aDDLastEntryPos; - Point aDDLastRectPos; + Rectangle aPrevBoundRect; + Size aOutputSize; // Pixel + Size aVirtOutputSize; // expandiert automatisch + Point aDDLastEntryPos; + Point aDDLastRectPos; SvLBoxTreeList* pModel; - SvIconView* pView; - ImpIcnCursor* pImpCursor; - long nMaxVirtWidth; // max.breite aVirtOutputSize - SvPtrarr* pZOrderList; - long nGridDX, + SvIconView* pView; + ImpIcnCursor* pImpCursor; + long nMaxVirtWidth; // max.breite aVirtOutputSize + SvPtrarr* pZOrderList; + long nGridDX, nGridDY; - long nHorSBarHeight, + long nHorSBarHeight, nVerSBarWidth; - WinBits nWinBits; - int nViewMode; - long nHorDist; - long nVerDist; - long nMaxBmpWidth; - long nMaxBmpHeight; - long nMaxTextWidth; - long nMaxBoundHeight; // Hoehe des hoechsten BoundRects - ULONG nFlags; - ULONG nCurUserEvent; - SvLBoxEntry* pCurParent; - SvLBoxEntry* pCursor; - SvLBoxEntry* pNextCursor; // wird in MovingEntry gesetzt und ist + WinBits nWinBits; + int nViewMode; + long nHorDist; + long nVerDist; + long nMaxBmpWidth; + long nMaxBmpHeight; + long nMaxTextWidth; + long nMaxBoundHeight; // Hoehe des hoechsten BoundRects + ULONG nFlags; + ULONG nCurUserEvent; + SvLBoxEntry* pCurParent; + SvLBoxEntry* pCursor; + SvLBoxEntry* pNextCursor; // wird in MovingEntry gesetzt und ist // nur in EntryMoved gueltig! - SvLBoxEntry* pDDRefEntry; - VirtualDevice* pDDDev; - VirtualDevice* pDDBufDev; + SvLBoxEntry* pDDRefEntry; + VirtualDevice* pDDDev; + VirtualDevice* pDDBufDev; VirtualDevice* pDDTempDev; SvIconViewTextMode eTextMode; - BOOL bMustRecalcBoundingRects; + BOOL bMustRecalcBoundingRects; - void CheckAllSizes(); - void CheckSizes( SvLBoxEntry* pEntry, + void CheckAllSizes(); + void CheckSizes( SvLBoxEntry* pEntry, const SvIcnVwDataEntry* pViewData = 0 ); - void ShowCursor( BOOL bShow ); + void ShowCursor( BOOL bShow ); - void SetNextEntryPos(const Point& rPos); - Point FindNextEntryPos( const Size& rBoundSize ); - void ImpArrange(); - void AdjustVirtSize( const Rectangle& ); - void ResetVirtSize(); - void CheckScrollBars(); + void SetNextEntryPos(const Point& rPos); + Point FindNextEntryPos( const Size& rBoundSize ); + void ImpArrange(); + void AdjustVirtSize( const Rectangle& ); + void ResetVirtSize(); + void CheckScrollBars(); DECL_LINK( ScrollUpDownHdl, ScrollBar * ); DECL_LINK( ScrollLeftRightHdl, ScrollBar * ); DECL_LINK( MouseMoveTimeoutHdl, Timer* ); DECL_LINK( EditTimeoutHdl, Timer* ); DECL_LINK( UserEventHdl, void* ); - void AdjustScrollBars(); - void PositionScrollBars( long nRealWidth, long nRealHeight ); - void CalcDocPos( Point& aMousePos ); - BOOL GetResizeRect( Rectangle& ); - void PaintResizeRect( const Rectangle& ); - SvLBoxEntry* GetNewCursor(); - void ToggleSelection( SvLBoxEntry* ); - void DeselectAllBut( SvLBoxEntry* ); - void Center( SvLBoxEntry* pEntry, SvIcnVwDataEntry* ) const; - void StopEditTimer() { aEditTimer.Stop(); } - void StartEditTimer() { aEditTimer.Start(); } - void ImpHideDDIcon(); - void ImpDrawXORRect( const Rectangle& rRect ); - void AddSelectedRect( const Rectangle&, short nOffset = SELRECT_BORDER_OFFS ); - void ClearSelectedRectList(); - Rectangle CalcMaxTextRect( const SvLBoxEntry* pEntry, + void AdjustScrollBars(); + void PositionScrollBars( long nRealWidth, long nRealHeight ); + void CalcDocPos( Point& aMousePos ); + BOOL GetResizeRect( Rectangle& ); + void PaintResizeRect( const Rectangle& ); + SvLBoxEntry* GetNewCursor(); + void ToggleSelection( SvLBoxEntry* ); + void DeselectAllBut( SvLBoxEntry* ); + void Center( SvLBoxEntry* pEntry, SvIcnVwDataEntry* ) const; + void StopEditTimer() { aEditTimer.Stop(); } + void StartEditTimer() { aEditTimer.Start(); } + void ImpHideDDIcon(); + void ImpDrawXORRect( const Rectangle& rRect ); + void AddSelectedRect( const Rectangle&, short nOffset = SELRECT_BORDER_OFFS ); + void ClearSelectedRectList(); + Rectangle CalcMaxTextRect( const SvLBoxEntry* pEntry, const SvIcnVwDataEntry* pViewData ) const; - void ClipAtVirtOutRect( Rectangle& rRect ) const; - void AdjustAtGrid( const SvPtrarr& rRow, SvLBoxEntry* pStart=0 ); - Point AdjustAtGrid( + void ClipAtVirtOutRect( Rectangle& rRect ) const; + void AdjustAtGrid( const SvPtrarr& rRow, SvLBoxEntry* pStart=0 ); + Point AdjustAtGrid( const Rectangle& rCenterRect, // "Schwerpunkt" des Objekts (typ. Bmp-Rect) const Rectangle& rBoundRect ) const; SvIconViewTextMode GetEntryTextModeSmart( const SvLBoxEntry* pEntry, const SvIcnVwDataEntry* pViewData ) const; - BOOL CheckVerScrollBar(); - BOOL CheckHorScrollBar(); - void CancelUserEvent(); + BOOL CheckVerScrollBar(); + BOOL CheckHorScrollBar(); + void CancelUserEvent(); public: SvImpIconView( SvIconView* pView, SvLBoxTreeList*, WinBits nWinStyle ); ~SvImpIconView(); - void Clear( BOOL bInCtor = FALSE ); - void SetWindowBits( WinBits nWinStyle ); - void SetModel( SvLBoxTreeList* pTree, SvLBoxEntry* pParent ) + void Clear( BOOL bInCtor = FALSE ); + void SetWindowBits( WinBits nWinStyle ); + void SetModel( SvLBoxTreeList* pTree, SvLBoxEntry* pParent ) { pModel = pTree; SetCurParent(pParent); } - void EntryInserted( SvLBoxEntry*); - void RemovingEntry( SvLBoxEntry* pEntry ); - void EntryRemoved(); - void MovingEntry( SvLBoxEntry* pEntry ); - void EntryMoved( SvLBoxEntry* pEntry ); - void TreeInserted( SvLBoxEntry* pEntry ); - void ChangedFont(); - void ModelHasEntryInvalidated( SvListEntry* ); - void EntryExpanded( SvLBoxEntry* pEntry ); - void EntryCollapsed( SvLBoxEntry* pEntry ); - void CollapsingEntry( SvLBoxEntry* pEntry ); - void EntrySelected( SvLBoxEntry*, BOOL bSelect ); - - void Paint( const Rectangle& rRect ); - void RepaintSelectionItems(); - void MouseButtonDown( const MouseEvent& ); - void MouseButtonUp( const MouseEvent& ); - void MouseMove( const MouseEvent&); - BOOL KeyInput( const KeyEvent& ); - void Resize(); - void GetFocus(); - void LoseFocus(); - void UpdateAll(); - void PaintEntry( SvLBoxEntry* pEntry, + void EntryInserted( SvLBoxEntry*); + void RemovingEntry( SvLBoxEntry* pEntry ); + void EntryRemoved(); + void MovingEntry( SvLBoxEntry* pEntry ); + void EntryMoved( SvLBoxEntry* pEntry ); + void TreeInserted( SvLBoxEntry* pEntry ); + void ChangedFont(); + void ModelHasEntryInvalidated( SvListEntry* ); + void EntryExpanded( SvLBoxEntry* pEntry ); + void EntryCollapsed( SvLBoxEntry* pEntry ); + void CollapsingEntry( SvLBoxEntry* pEntry ); + void EntrySelected( SvLBoxEntry*, BOOL bSelect ); + + void Paint( const Rectangle& rRect ); + void RepaintSelectionItems(); + void MouseButtonDown( const MouseEvent& ); + void MouseButtonUp( const MouseEvent& ); + void MouseMove( const MouseEvent&); + BOOL KeyInput( const KeyEvent& ); + void Resize(); + void GetFocus(); + void LoseFocus(); + void UpdateAll(); + void PaintEntry( SvLBoxEntry* pEntry, SvIcnVwDataEntry* pViewData = 0 ); - void PaintEntry( SvLBoxEntry*, const Point&, + void PaintEntry( SvLBoxEntry*, const Point&, SvIcnVwDataEntry* pViewData = 0, OutputDevice* pOut = 0); - void SetEntryPosition( SvLBoxEntry* pEntry, const Point& rPos, + void SetEntryPosition( SvLBoxEntry* pEntry, const Point& rPos, BOOL bAdjustRow = FALSE, BOOL bCheckScrollBars = FALSE ); - void InvalidateEntry( SvLBoxEntry* ); - void ViewDataInitialized( SvLBoxEntry* pEntry ); - SvLBoxItem* GetItem( SvLBoxEntry*, const Point& rAbsPos ); + void InvalidateEntry( SvLBoxEntry* ); + void ViewDataInitialized( SvLBoxEntry* pEntry ); + SvLBoxItem* GetItem( SvLBoxEntry*, const Point& rAbsPos ); - void SetNoSelection(); - void SetDragDropMode( DragDropMode eDDMode ); - void SetSelectionMode( SelectionMode eSelMode ); + void SetNoSelection(); + void SetDragDropMode( DragDropMode eDDMode ); + void SetSelectionMode( SelectionMode eSelMode ); - void SttDrag( const Point& rPos ); - void EndDrag(); + void SttDrag( const Point& rPos ); + void EndDrag(); - SvLBoxEntry* GetCurEntry() const { return pCursor; } - void SetCursor( SvLBoxEntry* ); + SvLBoxEntry* GetCurEntry() const { return pCursor; } + void SetCursor( SvLBoxEntry* ); - BOOL IsEntryInView( SvLBoxEntry* ); - SvLBoxEntry* GetEntry( const Point& rDocPos ); - SvLBoxEntry* GetNextEntry( const Point& rDocPos, SvLBoxEntry* pCurEntry ); - SvLBoxEntry* GetPrevEntry( const Point& rDocPos, SvLBoxEntry* pCurEntry ); + BOOL IsEntryInView( SvLBoxEntry* ); + SvLBoxEntry* GetEntry( const Point& rDocPos ); + SvLBoxEntry* GetNextEntry( const Point& rDocPos, SvLBoxEntry* pCurEntry ); + SvLBoxEntry* GetPrevEntry( const Point& rDocPos, SvLBoxEntry* pCurEntry ); - Point GetEntryPosition( SvLBoxEntry* ); - void MakeVisible( SvLBoxEntry* pEntry ); + Point GetEntryPosition( SvLBoxEntry* ); + void MakeVisible( SvLBoxEntry* pEntry ); - void Arrange(); + void Arrange(); - void SetSpaceBetweenEntries( long nHor, long Ver ); - long GetHorSpaceBetweenEntries() const { return nHorDist; } - long GetVerSpaceBetweenEntries() const { return nVerDist; } + void SetSpaceBetweenEntries( long nHor, long Ver ); + long GetHorSpaceBetweenEntries() const { return nHorDist; } + long GetVerSpaceBetweenEntries() const { return nVerDist; } - Rectangle CalcFocusRect( SvLBoxEntry* ); + Rectangle CalcFocusRect( SvLBoxEntry* ); - Rectangle CalcBmpRect( SvLBoxEntry*, const Point* pPos = 0, + Rectangle CalcBmpRect( SvLBoxEntry*, const Point* pPos = 0, SvIcnVwDataEntry* pViewData=0 ); - Rectangle CalcTextRect( SvLBoxEntry*, SvLBoxString* pItem = 0, + Rectangle CalcTextRect( SvLBoxEntry*, SvLBoxString* pItem = 0, const Point* pPos = 0, BOOL bForInplaceEdit = FALSE, SvIcnVwDataEntry* pViewData = 0 ); - long CalcBoundingWidth( SvLBoxEntry*, const SvIcnVwDataEntry* pViewData = 0) const; - long CalcBoundingHeight( SvLBoxEntry*, const SvIcnVwDataEntry* pViewData= 0 ) const; - Size CalcBoundingSize( SvLBoxEntry*, + long CalcBoundingWidth( SvLBoxEntry*, const SvIcnVwDataEntry* pViewData = 0) const; + long CalcBoundingHeight( SvLBoxEntry*, const SvIcnVwDataEntry* pViewData= 0 ) const; + Size CalcBoundingSize( SvLBoxEntry*, SvIcnVwDataEntry* pViewData = 0 ) const; - void FindBoundingRect( SvLBoxEntry* pEntry, + void FindBoundingRect( SvLBoxEntry* pEntry, SvIcnVwDataEntry* pViewData = 0 ); // berechnet alle BoundRects neu - void RecalcAllBoundingRects(); + void RecalcAllBoundingRects(); // berechnet alle ungueltigen BoundRects neu - void RecalcAllBoundingRectsSmart(); + void RecalcAllBoundingRectsSmart(); const Rectangle& GetBoundingRect( SvLBoxEntry*, SvIcnVwDataEntry* pViewData=0); - void InvalidateBoundingRect( SvLBoxEntry* ); - void InvalidateBoundingRect( Rectangle& rRect ) { rRect.Right() = LONG_MAX; } - BOOL IsBoundingRectValid( const Rectangle& rRect ) const { return (BOOL)( rRect.Right() != LONG_MAX ); } + void InvalidateBoundingRect( SvLBoxEntry* ); + void InvalidateBoundingRect( Rectangle& rRect ) { rRect.Right() = LONG_MAX; } + BOOL IsBoundingRectValid( const Rectangle& rRect ) const { return (BOOL)( rRect.Right() != LONG_MAX ); } - void PaintEmphasis( const Rectangle&, BOOL bSelected, + void PaintEmphasis( const Rectangle&, BOOL bSelected, BOOL bCursored, OutputDevice* pOut = 0 ); - void PaintItem( const Rectangle& rRect, SvLBoxItem* pItem, + void PaintItem( const Rectangle& rRect, SvLBoxItem* pItem, SvLBoxEntry* pEntry, USHORT nPaintFlags, OutputDevice* pOut = 0 ); // berechnet alle BoundingRects neu, wenn bMustRecalcBoundingRects == TRUE - void CheckBoundingRects() { if (bMustRecalcBoundingRects) RecalcAllBoundingRects(); } + void CheckBoundingRects() { if (bMustRecalcBoundingRects) RecalcAllBoundingRects(); } // berechnet alle invalidierten BoundingRects neu - void UpdateBoundingRects(); - void ShowTargetEmphasis( SvLBoxEntry* pEntry, BOOL bShow ); - SvLBoxEntry* GetDropTarget( const Point& rPosPixel ); - BOOL NotifyMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, + void UpdateBoundingRects(); + void ShowTargetEmphasis( SvLBoxEntry* pEntry, BOOL bShow ); + SvLBoxEntry* GetDropTarget( const Point& rPosPixel ); + BOOL NotifyMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, SvLBoxEntry*& rpNewParent, ULONG& rNewChildPos ); - BOOL NotifyCopying( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, + BOOL NotifyCopying( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, SvLBoxEntry*& rpNewParent, ULONG& rNewChildPos ); - void WriteDragServerInfo( const Point&, SvLBoxDDInfo* ); - void ReadDragServerInfo( const Point&, SvLBoxDDInfo* ); - void ToTop( SvLBoxEntry* ); + void WriteDragServerInfo( const Point&, SvLBoxDDInfo* ); + void ReadDragServerInfo( const Point&, SvLBoxDDInfo* ); + void ToTop( SvLBoxEntry* ); - void SetCurParent( SvLBoxEntry* pNewParent ); - SvLBoxEntry* GetCurParent() const { return pCurParent; } - USHORT GetSelectionCount() const; - void SetGrid( long nDX, long nDY ); - void Scroll( long nDeltaX, long nDeltaY, BOOL bScrollBar = FALSE ); - const Size& GetItemSize( SvIconView* pView, SvLBoxEntry*, SvLBoxItem*, + void SetCurParent( SvLBoxEntry* pNewParent ); + SvLBoxEntry* GetCurParent() const { return pCurParent; } + USHORT GetSelectionCount() const; + void SetGrid( long nDX, long nDY ); + void Scroll( long nDeltaX, long nDeltaY, BOOL bScrollBar = FALSE ); + const Size& GetItemSize( SvIconView* pView, SvLBoxEntry*, SvLBoxItem*, const SvIcnVwDataEntry* pViewData = 0 ) const; - void PrepareCommandEvent( const Point& rPt ); + void PrepareCommandEvent( const Point& rPt ); - void HideDDIcon(); - void ShowDDIcon( SvLBoxEntry* pRefEntry, const Point& rPos ); - void HideShowDDIcon( SvLBoxEntry* pRefEntry, const Point& rPos ); + void HideDDIcon(); + void ShowDDIcon( SvLBoxEntry* pRefEntry, const Point& rPos ); + void HideShowDDIcon( SvLBoxEntry* pRefEntry, const Point& rPos ); - SvLBoxEntry* mpViewData; + SvLBoxEntry* mpViewData; - BOOL IsOver( SvPtrarr* pSelectedRectList, const Rectangle& rEntryBoundRect ) const; - void SelectRect( const Rectangle&, BOOL bAdd = TRUE, + BOOL IsOver( SvPtrarr* pSelectedRectList, const Rectangle& rEntryBoundRect ) const; + void SelectRect( const Rectangle&, BOOL bAdd = TRUE, SvPtrarr* pOtherRects = 0, short nOffs = SELRECT_BORDER_OFFS ); - void DrawSelectionRect( const Rectangle& ); - void HideSelectionRect(); - void CalcScrollOffsets( const Point& rRefPosPixel, + void DrawSelectionRect( const Rectangle& ); + void HideSelectionRect(); + void CalcScrollOffsets( const Point& rRefPosPixel, long& rX, long& rY, BOOL bDragDrop = FALSE, USHORT nBorderWidth = 10 ); - void EndTracking(); - BOOL IsTextHit( SvLBoxEntry* pEntry, const Point& rDocPos ); - void MakeVisible( const Rectangle& rDocPos,BOOL bInScrollBarEvent=FALSE); - void AdjustAtGrid( SvLBoxEntry* pStart = 0 ); - void SetTextMode( SvIconViewTextMode, SvLBoxEntry* pEntry = 0 ); + void EndTracking(); + BOOL IsTextHit( SvLBoxEntry* pEntry, const Point& rDocPos ); + void MakeVisible( const Rectangle& rDocPos,BOOL bInScrollBarEvent=FALSE); + void AdjustAtGrid( SvLBoxEntry* pStart = 0 ); + void SetTextMode( SvIconViewTextMode, SvLBoxEntry* pEntry = 0 ); SvIconViewTextMode GetTextMode( const SvLBoxEntry* pEntry = 0, const SvIcnVwDataEntry* pViewData = 0 ) const; - void ShowFocusRect( const SvLBoxEntry* pEntry ); + void ShowFocusRect( const SvLBoxEntry* pEntry ); }; inline void SvImpIconView::MakeVisible( SvLBoxEntry* pEntry ) diff --git a/svtools/source/inc/svtaccessiblefactory.hxx b/svtools/source/inc/svtaccessiblefactory.hxx index 909f113cbf60..380a06834589 100644 --- a/svtools/source/inc/svtaccessiblefactory.hxx +++ b/svtools/source/inc/svtaccessiblefactory.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/svtools/source/inc/unoiface.hxx b/svtools/source/inc/unoiface.hxx index 5b5667aad85e..ab9ba5c6559b 100644 --- a/svtools/source/inc/unoiface.hxx +++ b/svtools/source/inc/unoiface.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,12 +54,12 @@ namespace com { namespace sun { namespace star { namespace util { class SvNumberFormatsSupplierObj; -// ---------------------------------------------------- -// class VCLXMultiLineEdit -// ---------------------------------------------------- -class VCLXMultiLineEdit : public ::com::sun::star::awt::XTextComponent, - public ::com::sun::star::awt::XTextArea, - public ::com::sun::star::awt::XTextLayoutConstrains, +// ---------------------------------------------------- +// class VCLXMultiLineEdit +// ---------------------------------------------------- +class VCLXMultiLineEdit : public ::com::sun::star::awt::XTextComponent, + public ::com::sun::star::awt::XTextArea, + public ::com::sun::star::awt::XTextLayoutConstrains, public VCLXWindow { private: @@ -74,13 +74,13 @@ public: ~VCLXMultiLineEdit(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { VCLXWindow::acquire(); } - void SAL_CALL release() throw() { VCLXWindow::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { VCLXWindow::acquire(); } + void SAL_CALL release() throw() { VCLXWindow::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XTextComponent void SAL_CALL addTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener >& l ) throw(::com::sun::star::uno::RuntimeException); @@ -120,29 +120,29 @@ public: }; -// ---------------------------------------------------- -// class VCLXFileControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXFileControl +// ---------------------------------------------------- class VCLXFileControl : ::com::sun::star::awt::XTextComponent, public ::com::sun::star::awt::XTextLayoutConstrains, public VCLXWindow { protected: - DECL_LINK( ModifyHdl, Edit* ); - TextListenerMultiplexer maTextListeners; + DECL_LINK( ModifyHdl, Edit* ); + TextListenerMultiplexer maTextListeners; public: VCLXFileControl(); ~VCLXFileControl(); - void SetWindow( Window* pWindow ); + void SetWindow( Window* pWindow ); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { VCLXWindow::acquire(); } - void SAL_CALL release() throw() { VCLXWindow::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { VCLXWindow::acquire(); } + void SAL_CALL release() throw() { VCLXWindow::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XTextComponent void SAL_CALL addTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener >& l ) throw(::com::sun::star::uno::RuntimeException); @@ -173,19 +173,19 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- -// class SVTXFormattedField -// ---------------------------------------------------- +// ---------------------------------------------------- +// class SVTXFormattedField +// ---------------------------------------------------- class SVTXFormattedField : public VCLXSpinField { protected: - SvNumberFormatsSupplierObj* m_pCurrentSupplier; - sal_Bool bIsStandardSupplier; + SvNumberFormatsSupplierObj* m_pCurrentSupplier; + sal_Bool bIsStandardSupplier; - sal_Int32 nKeyToSetDelayed; - - FormattedField* GetFormattedField() const { return (FormattedField*)GetWindow(); } + sal_Int32 nKeyToSetDelayed; + + FormattedField* GetFormattedField() const { return (FormattedField*)GetWindow(); } public: SVTXFormattedField(); @@ -197,29 +197,29 @@ public: protected: ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > getFormatsSupplier(void) const; - void setFormatsSupplier(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > & xSupplier); - sal_Int32 getFormatKey(void) const; - void setFormatKey(sal_Int32 nKey); + void setFormatsSupplier(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > & xSupplier); + sal_Int32 getFormatKey(void) const; + void setFormatKey(sal_Int32 nKey); - void SetValue(const ::com::sun::star::uno::Any& rValue); - ::com::sun::star::uno::Any GetValue(); + void SetValue(const ::com::sun::star::uno::Any& rValue); + ::com::sun::star::uno::Any GetValue(); - void SetTreatAsNumber(sal_Bool bSet); - sal_Bool GetTreatAsNumber(); + void SetTreatAsNumber(sal_Bool bSet); + sal_Bool GetTreatAsNumber(); - void SetDefaultValue(const ::com::sun::star::uno::Any& rValue); - ::com::sun::star::uno::Any GetDefaultValue(); + void SetDefaultValue(const ::com::sun::star::uno::Any& rValue); + ::com::sun::star::uno::Any GetDefaultValue(); - void SetMinValue(const ::com::sun::star::uno::Any& rValue); - ::com::sun::star::uno::Any GetMinValue(); + void SetMinValue(const ::com::sun::star::uno::Any& rValue); + ::com::sun::star::uno::Any GetMinValue(); - void SetMaxValue(const ::com::sun::star::uno::Any& rValue); - ::com::sun::star::uno::Any GetMaxValue(); + void SetMaxValue(const ::com::sun::star::uno::Any& rValue); + ::com::sun::star::uno::Any GetMaxValue(); - void NotifyTextListeners(); - ::com::sun::star::uno::Any convertEffectiveValue(const ::com::sun::star::uno::Any& rValue); + void NotifyTextListeners(); + ::com::sun::star::uno::Any convertEffectiveValue(const ::com::sun::star::uno::Any& rValue); - virtual void SetWindow(Window* _pWindow); + virtual void SetWindow(Window* _pWindow); static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } @@ -227,9 +227,9 @@ protected: -// ---------------------------------------------------- -// class SVTXRoadmap -// ---------------------------------------------------- +// ---------------------------------------------------- +// class SVTXRoadmap +// ---------------------------------------------------- namespace svt { @@ -249,17 +249,17 @@ typedef ::cppu::ImplInheritanceHelper3 < VCLXGraphicControl , ::com::sun::star::awt::XItemEventBroadcaster > SVTXRoadmap_Base; class SVTXRoadmap : public SVTXRoadmap_Base - - + + { private: - ItemListenerMultiplexer maItemListeners; - + ItemListenerMultiplexer maItemListeners; + RMItemData CurRMItemData; RMItemData GetRMItemData( const ::com::sun::star::container::ContainerEvent& _rEvent ); -protected: - ::svt::ORoadmap* GetRoadmap() const { return (::svt::ORoadmap*)GetWindow(); } +protected: + ::svt::ORoadmap* GetRoadmap() const { return (::svt::ORoadmap*)GetWindow(); } void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); ~SVTXRoadmap(); @@ -276,8 +276,8 @@ public: // XContainerListener void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& rEvent )throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& rEvent )throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& rEvent )throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& rEvent )throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& rEvent )throw(::com::sun::star::uno::RuntimeException); // XItemEventBroadcaster virtual void SAL_CALL addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw (::com::sun::star::uno::RuntimeException); @@ -297,9 +297,9 @@ protected: -// ---------------------------------------------------- -// class SVTXNumericField -// ---------------------------------------------------- +// ---------------------------------------------------- +// class SVTXNumericField +// ---------------------------------------------------- class SVTXNumericField : public ::com::sun::star::awt::XNumericField, public SVTXFormattedField { public: @@ -307,13 +307,13 @@ public: ~SVTXNumericField(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { SVTXFormattedField::acquire(); } - void SAL_CALL release() throw() { SVTXFormattedField::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { SVTXFormattedField::acquire(); } + void SAL_CALL release() throw() { SVTXFormattedField::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XNumericField void SAL_CALL setValue( double Value ) throw(::com::sun::star::uno::RuntimeException); @@ -337,9 +337,9 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; - // ---------------------------------------------------- -// class VCLXCurrencyField -// ---------------------------------------------------- + // ---------------------------------------------------- +// class VCLXCurrencyField +// ---------------------------------------------------- class SVTXCurrencyField : public ::com::sun::star::awt::XCurrencyField, public SVTXFormattedField { public: @@ -347,13 +347,13 @@ public: ~SVTXCurrencyField(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { SVTXFormattedField::acquire(); } - void SAL_CALL release() throw() { SVTXFormattedField::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { SVTXFormattedField::acquire(); } + void SAL_CALL release() throw() { SVTXFormattedField::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::awt::XVclWindowPeer void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); @@ -381,40 +381,40 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- -// class VCLXProgressBar -// ---------------------------------------------------- -class VCLXProgressBar : public ::com::sun::star::awt::XProgressBar, +// ---------------------------------------------------- +// class VCLXProgressBar +// ---------------------------------------------------- +class VCLXProgressBar : public ::com::sun::star::awt::XProgressBar, public VCLXWindow { private: - sal_Int32 m_nValue; - sal_Int32 m_nValueMin; - sal_Int32 m_nValueMax; + sal_Int32 m_nValue; + sal_Int32 m_nValueMin; + sal_Int32 m_nValueMax; protected: - void ImplUpdateValue(); + void ImplUpdateValue(); public: VCLXProgressBar(); ~VCLXProgressBar(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { VCLXWindow::acquire(); } - void SAL_CALL release() throw() { VCLXWindow::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { VCLXWindow::acquire(); } + void SAL_CALL release() throw() { VCLXWindow::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); - // ::com::sun::star::awt::XProgressBar + // ::com::sun::star::awt::XProgressBar void SAL_CALL setForegroundColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL setBackgroundColor( sal_Int32 nColor ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL setValue( sal_Int32 nValue ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL setRange( sal_Int32 nMin, sal_Int32 nMax ) throw(::com::sun::star::uno::RuntimeException ); + void SAL_CALL setRange( sal_Int32 nMin, sal_Int32 nMax ) throw(::com::sun::star::uno::RuntimeException ); sal_Int32 SAL_CALL getValue() throw(::com::sun::star::uno::RuntimeException); - + // ::com::sun::star::awt::VclWindowPeer void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); @@ -423,9 +423,9 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -// ---------------------------------------------------- -// class SVTXDateField -// ---------------------------------------------------- +// ---------------------------------------------------- +// class SVTXDateField +// ---------------------------------------------------- class SVTXDateField : public VCLXDateField { public: @@ -439,6 +439,6 @@ public: virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } }; -#endif // _SVT_UNOIFACE_HXX +#endif // _SVT_UNOIFACE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/inc/xbmread.hxx b/svtools/source/inc/xbmread.hxx index 030a09a6185e..537c2e98111b 100644 --- a/svtools/source/inc/xbmread.hxx +++ b/svtools/source/inc/xbmread.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ enum ReadState class XBMReader : public GraphicReader { - SvStream& rIStm; - Bitmap aBmp1; - BitmapWriteAccess* pAcc1; - short* pHexTable; - BitmapColor aWhite; - BitmapColor aBlack; - long nLastPos; - long nWidth; - long nHeight; - BOOL bStatus; - - void InitTable(); - ByteString FindTokenLine( SvStream* pInStm, const char* pTok1, + SvStream& rIStm; + Bitmap aBmp1; + BitmapWriteAccess* pAcc1; + short* pHexTable; + BitmapColor aWhite; + BitmapColor aBlack; + long nLastPos; + long nWidth; + long nHeight; + BOOL bStatus; + + void InitTable(); + ByteString FindTokenLine( SvStream* pInStm, const char* pTok1, const char* pTok2 = NULL, const char* pTok3 = NULL ); - long ParseDefine( const sal_Char* pDefine ); - BOOL ParseData( SvStream* pInStm, const ByteString& aLastLine, XBMFormat eFormat ); + long ParseDefine( const sal_Char* pDefine ); + BOOL ParseData( SvStream* pInStm, const ByteString& aLastLine, XBMFormat eFormat ); public: XBMReader( SvStream& rStm ); - virtual ~XBMReader(); + virtual ~XBMReader(); - ReadState ReadXBM( Graphic& rGraphic ); + ReadState ReadXBM( Graphic& rGraphic ); }; #endif // _XBMPRIVATE diff --git a/svtools/source/inc/xpmread.hxx b/svtools/source/inc/xpmread.hxx index 0ef3d625525a..e81dee92b814 100644 --- a/svtools/source/inc/xpmread.hxx +++ b/svtools/source/inc/xpmread.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,24 +33,24 @@ #ifdef _XPMPRIVATE -#define XPMTEMPBUFSIZE 0x00008000 -#define XPMSTRINGBUF 0x00008000 +#define XPMTEMPBUFSIZE 0x00008000 +#define XPMSTRINGBUF 0x00008000 -#define XPMIDENTIFIER 0x00000001 // mnIdentifier includes on of the six phases -#define XPMDEFINITION 0x00000002 // the XPM format consists of -#define XPMVALUES 0x00000003 -#define XPMCOLORS 0x00000004 -#define XPMPIXELS 0x00000005 -#define XPMEXTENSIONS 0x00000006 -#define XPMENDEXT 0x00000007 +#define XPMIDENTIFIER 0x00000001 // mnIdentifier includes on of the six phases +#define XPMDEFINITION 0x00000002 // the XPM format consists of +#define XPMVALUES 0x00000003 +#define XPMCOLORS 0x00000004 +#define XPMPIXELS 0x00000005 +#define XPMEXTENSIONS 0x00000006 +#define XPMENDEXT 0x00000007 -#define XPMREMARK 0x00000001 // defines used by mnStatus -#define XPMDOUBLE 0x00000002 -#define XPMSTRING 0x00000004 -#define XPMFINISHED 0x00000008 +#define XPMREMARK 0x00000001 // defines used by mnStatus +#define XPMDOUBLE 0x00000002 +#define XPMSTRING 0x00000004 +#define XPMFINISHED 0x00000008 -#define XPMCASESENSITIVE 0x00000001 +#define XPMCASESENSITIVE 0x00000001 #define XPMCASENONSENSITIVE 0x00000002 // --------- @@ -75,48 +75,48 @@ class XPMReader : public GraphicReader { private: - SvStream& mrIStm; - Bitmap maBmp; - BitmapWriteAccess* mpAcc; - Bitmap maMaskBmp; - BitmapWriteAccess* mpMaskAcc; - long mnLastPos; - - ULONG mnWidth; - ULONG mnHeight; - ULONG mnColors; - ULONG mnCpp; // characters per pix - BOOL mbTransparent; - BOOL mbStatus; - ULONG mnStatus; - ULONG mnIdentifier; - BYTE mcThisByte; - BYTE mcLastByte; - ULONG mnTempAvail; - BYTE* mpTempBuf; - BYTE* mpTempPtr; - BYTE* mpFastColorTable; - BYTE* mpColMap; - ULONG mnStringSize; - BYTE* mpStringBuf; - ULONG mnParaSize; - BYTE* mpPara; - - BOOL ImplGetString( void ); - BOOL ImplGetColor( ULONG ); - BOOL ImplGetScanLine( ULONG ); - BOOL ImplGetColSub( BYTE* ); - BOOL ImplGetColKey( BYTE ); - void ImplGetRGBHex( BYTE*, ULONG ); - BOOL ImplGetPara( ULONG numb ); - BOOL ImplCompare( BYTE*, BYTE*, ULONG, ULONG nmode = XPMCASENONSENSITIVE ); - ULONG ImplGetULONG( ULONG nPara ); + SvStream& mrIStm; + Bitmap maBmp; + BitmapWriteAccess* mpAcc; + Bitmap maMaskBmp; + BitmapWriteAccess* mpMaskAcc; + long mnLastPos; + + ULONG mnWidth; + ULONG mnHeight; + ULONG mnColors; + ULONG mnCpp; // characters per pix + BOOL mbTransparent; + BOOL mbStatus; + ULONG mnStatus; + ULONG mnIdentifier; + BYTE mcThisByte; + BYTE mcLastByte; + ULONG mnTempAvail; + BYTE* mpTempBuf; + BYTE* mpTempPtr; + BYTE* mpFastColorTable; + BYTE* mpColMap; + ULONG mnStringSize; + BYTE* mpStringBuf; + ULONG mnParaSize; + BYTE* mpPara; + + BOOL ImplGetString( void ); + BOOL ImplGetColor( ULONG ); + BOOL ImplGetScanLine( ULONG ); + BOOL ImplGetColSub( BYTE* ); + BOOL ImplGetColKey( BYTE ); + void ImplGetRGBHex( BYTE*, ULONG ); + BOOL ImplGetPara( ULONG numb ); + BOOL ImplCompare( BYTE*, BYTE*, ULONG, ULONG nmode = XPMCASENONSENSITIVE ); + ULONG ImplGetULONG( ULONG nPara ); public: XPMReader( SvStream& rStm ); - virtual ~XPMReader(); + virtual ~XPMReader(); - ReadState ReadXPM( Graphic& rGraphic ); + ReadState ReadXPM( Graphic& rGraphic ); }; #endif // _XPMPRIVATE diff --git a/svtools/source/java/javacontext.cxx b/svtools/source/java/javacontext.cxx index 56b72ef1453c..9d3ca3815b57 100644 --- a/svtools/source/java/javacontext.cxx +++ b/svtools/source/java/javacontext.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/svtools/source/java/javaerror.src b/svtools/source/java/javaerror.src index d5990c05a663..48dd29f25d6e 100644 --- a/svtools/source/java/javaerror.src +++ b/svtools/source/java/javaerror.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 @@ -52,7 +52,7 @@ ErrorBox ERRORBOX_JVMCREATIONFAILED { Buttons = WB_OK; DefButton = WB_DEF_OK ; - Message[ en-US ] = "%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. The selected JRE is defective. Please select another version or install a new JRE and select it under Tools - Options - %PRODUCTNAME - Java."; + Message[ en-US ] = "%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. The selected JRE is defective. Please select another version or install a new JRE and select it under Tools - Options - %PRODUCTNAME - Java."; }; ErrorBox ERRORBOX_RESTARTREQUIRED diff --git a/svtools/source/java/javainteractionhandler.cxx b/svtools/source/java/javainteractionhandler.cxx index 6c76d463216e..b4029344c4dc 100644 --- a/svtools/source/java/javainteractionhandler.cxx +++ b/svtools/source/java/javainteractionhandler.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -121,12 +121,12 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque com::sun::star::java::JavaNotFoundException e1; com::sun::star::java::InvalidJavaSettingsException e2; - com::sun::star::java::JavaDisabledException e3; - com::sun::star::java::JavaVMCreationFailureException e4; + com::sun::star::java::JavaDisabledException e3; + com::sun::star::java::JavaVMCreationFailureException e4; com::sun::star::java::RestartRequiredException e5; // Try to recover the Exception type in the any and // react accordingly. - USHORT nResult = RET_CANCEL; + USHORT nResult = RET_CANCEL; ::rtl::OUString aParameter; if ( anyExc >>= e1 ) diff --git a/svtools/source/java/patchjavaerror.src b/svtools/source/java/patchjavaerror.src index d5990c05a663..48dd29f25d6e 100644 --- a/svtools/source/java/patchjavaerror.src +++ b/svtools/source/java/patchjavaerror.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 @@ -52,7 +52,7 @@ ErrorBox ERRORBOX_JVMCREATIONFAILED { Buttons = WB_OK; DefButton = WB_DEF_OK ; - Message[ en-US ] = "%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. The selected JRE is defective. Please select another version or install a new JRE and select it under Tools - Options - %PRODUCTNAME - Java."; + Message[ en-US ] = "%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. The selected JRE is defective. Please select another version or install a new JRE and select it under Tools - Options - %PRODUCTNAME - Java."; }; ErrorBox ERRORBOX_RESTARTREQUIRED diff --git a/svtools/source/misc/acceleratorexecute.cxx b/svtools/source/misc/acceleratorexecute.cxx index fea433503989..1f044cb147c1 100644 --- a/svtools/source/misc/acceleratorexecute.cxx +++ b/svtools/source/misc/acceleratorexecute.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -228,7 +228,7 @@ sal_Bool AcceleratorExecute::execute(const css::awt::KeyEvent& aAWTKey) css::util::URL aURL; aURL.Complete = sCommand; xParser->parseStrict(aURL); - + // ask for dispatch object css::uno::Reference< css::frame::XDispatch > xDispatch = xProvider->queryDispatch(aURL, ::rtl::OUString(), 0); sal_Bool bRet = xDispatch.is(); @@ -248,16 +248,16 @@ css::awt::KeyEvent AcceleratorExecute::st_VCLKey2AWTKey(const KeyCode& aVCLKey) css::awt::KeyEvent aAWTKey; aAWTKey.Modifiers = 0; aAWTKey.KeyCode = (sal_Int16)aVCLKey.GetCode(); - + if (aVCLKey.IsShift()) - aAWTKey.Modifiers |= css::awt::KeyModifier::SHIFT; + aAWTKey.Modifiers |= css::awt::KeyModifier::SHIFT; if (aVCLKey.IsMod1()) - aAWTKey.Modifiers |= css::awt::KeyModifier::MOD1; + aAWTKey.Modifiers |= css::awt::KeyModifier::MOD1; if (aVCLKey.IsMod2()) aAWTKey.Modifiers |= css::awt::KeyModifier::MOD2; if (aVCLKey.IsMod3()) - aAWTKey.Modifiers |= css::awt::KeyModifier::MOD3; - return aAWTKey; + aAWTKey.Modifiers |= css::awt::KeyModifier::MOD3; + return aAWTKey; } //----------------------------------------------- @@ -268,7 +268,7 @@ KeyCode AcceleratorExecute::st_AWTKey2VCLKey(const css::awt::KeyEvent& aAWTKey) sal_Bool bMod2 = ((aAWTKey.Modifiers & css::awt::KeyModifier::MOD2 ) == css::awt::KeyModifier::MOD2 ); sal_Bool bMod3 = ((aAWTKey.Modifiers & css::awt::KeyModifier::MOD3 ) == css::awt::KeyModifier::MOD3 ); USHORT nKey = (USHORT)aAWTKey.KeyCode; - + return KeyCode(nKey, bShift, bMod1, bMod2, bMod3); } //----------------------------------------------- @@ -281,12 +281,12 @@ KeyCode AcceleratorExecute::st_AWTKey2VCLKey(const css::awt::KeyEvent& aAWTKey) { // SAFE -> ---------------------------------- ::osl::ResettableMutexGuard aLock(m_aLock); - + css::uno::Reference< css::ui::XAcceleratorConfiguration > xGlobalCfg = m_xGlobalCfg; css::uno::Reference< css::ui::XAcceleratorConfiguration > xModuleCfg = m_xModuleCfg; css::uno::Reference< css::ui::XAcceleratorConfiguration > xDocCfg = m_xDocCfg ; - - aLock.clear(); + + aLock.clear(); // <- SAFE ---------------------------------- ::rtl::OUString sCommand; @@ -320,7 +320,7 @@ KeyCode AcceleratorExecute::st_AWTKey2VCLKey(const css::awt::KeyEvent& aAWTKey) } catch(const css::container::NoSuchElementException&) {} - + // fall back to functional key codes if( aKey.Modifiers == 0 ) { @@ -328,91 +328,91 @@ KeyCode AcceleratorExecute::st_AWTKey2VCLKey(const css::awt::KeyEvent& aAWTKey) { case com::sun::star::awt::Key::DELETE_TO_BEGIN_OF_LINE: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DelToStartOfLine" ) ); - + case com::sun::star::awt::Key::DELETE_TO_END_OF_LINE: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DelToEndOfLine" ) ); - + case com::sun::star::awt::Key::DELETE_TO_BEGIN_OF_PARAGRAPH: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DelToStartOfPara" ) ); - + case com::sun::star::awt::Key::DELETE_TO_END_OF_PARAGRAPH: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DelToEndOfPara" ) ); - + case com::sun::star::awt::Key::DELETE_WORD_BACKWARD: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DelToStartOfWord" ) ); - + case com::sun::star::awt::Key::DELETE_WORD_FORWARD: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DelToEndOfWord" ) ); - + case com::sun::star::awt::Key::INSERT_LINEBREAK: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:InsertLinebreak" ) ); - + case com::sun::star::awt::Key::INSERT_PARAGRAPH: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:InsertPara" ) ); - + case com::sun::star::awt::Key::MOVE_WORD_BACKWARD: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToPrevWord" ) ); - + case com::sun::star::awt::Key::MOVE_WORD_FORWARD: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToNextWord" ) ); - + case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_LINE: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToStartOfLine" ) ); - + case com::sun::star::awt::Key::MOVE_TO_END_OF_LINE: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToEndOfLine" ) ); - + case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToStartOfPara" ) ); - + case com::sun::star::awt::Key::MOVE_TO_END_OF_PARAGRAPH: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToEndOfPara" ) ); - + case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToStartOfDoc" ) ); - + case com::sun::star::awt::Key::MOVE_TO_END_OF_DOCUMENT: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GoToEndOfDoc" ) ); - + case com::sun::star::awt::Key::SELECT_BACKWARD: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CharLeftSel" ) ); - + case com::sun::star::awt::Key::SELECT_FORWARD: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CharRightSel" ) ); - + case com::sun::star::awt::Key::SELECT_WORD_BACKWARD: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:WordLeftSel" ) ); - + case com::sun::star::awt::Key::SELECT_WORD_FORWARD: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:WordRightSel" ) ); - + case com::sun::star::awt::Key::SELECT_WORD: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:SelectWord" ) ); - + case com::sun::star::awt::Key::SELECT_LINE: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "" ) ); - + case com::sun::star::awt::Key::SELECT_PARAGRAPH: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:SelectText" ) ); - + case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_LINE: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:StartOfLineSel" ) ); - + case com::sun::star::awt::Key::SELECT_TO_END_OF_LINE: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:EndOfLineSel" ) ); case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:StartOfParaSel" ) ); - + case com::sun::star::awt::Key::SELECT_TO_END_OF_PARAGRAPH: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:EndOfParaSel" ) ); - + case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:StartOfDocumentSel" ) ); - + case com::sun::star::awt::Key::SELECT_TO_END_OF_DOCUMENT: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:EndOfDocumentSel" ) ); - + case com::sun::star::awt::Key::SELECT_ALL: return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:SelectAll" ) ); default: diff --git a/svtools/source/misc/bindablecontrolhelper.cxx b/svtools/source/misc/bindablecontrolhelper.cxx index d9a1df8f8a41..230dbe263f24 100644 --- a/svtools/source/misc/bindablecontrolhelper.cxx +++ b/svtools/source/misc/bindablecontrolhelper.cxx @@ -51,7 +51,7 @@ namespace svt //........................................................................ #ifndef C2U -#define C2U(cChar) rtl::OUString::createFromAscii(cChar) +#define C2U(cChar) rtl::OUString::createFromAscii(cChar) #endif using namespace ::com::sun::star; diff --git a/svtools/source/misc/chartprettypainter.cxx b/svtools/source/misc/chartprettypainter.cxx index 4d73588ec51c..85d51e974710 100644 --- a/svtools/source/misc/chartprettypainter.cxx +++ b/svtools/source/misc/chartprettypainter.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -136,7 +136,7 @@ bool ChartPrettyPainter::DoPrettyPaintChart( uno::Reference< frame::XModel > xCh (void)e; DBG_ERROR( "Chart cannot be painted pretty!" ); } - return false; + return false; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/misc/cliplistener.cxx b/svtools/source/misc/cliplistener.cxx index 741e62cb64a8..5d49f808f798 100644 --- a/svtools/source/misc/cliplistener.cxx +++ b/svtools/source/misc/cliplistener.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/svtools/source/misc/dialogclosedlistener.cxx b/svtools/source/misc/dialogclosedlistener.cxx index a1edf0e5b859..7cc4533896b1 100644 --- a/svtools/source/misc/dialogclosedlistener.cxx +++ b/svtools/source/misc/dialogclosedlistener.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/svtools/source/misc/dialogcontrolling.cxx b/svtools/source/misc/dialogcontrolling.cxx index c46ebfa7f85d..907d0bc8699d 100644 --- a/svtools/source/misc/dialogcontrolling.cxx +++ b/svtools/source/misc/dialogcontrolling.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx index f146a84a969e..dde707c0bd4b 100644 --- a/svtools/source/misc/ehdl.cxx +++ b/svtools/source/misc/ehdl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 USHORT aWndFunc( Window *pWin, // Parent des Dialoges USHORT nFlags, - const String &rErr, // Fehlertext + const String &rErr, // Fehlertext const String &rAction) // Actiontext /* [Beschreibung] diff --git a/svtools/source/misc/ehdl.src b/svtools/source/misc/ehdl.src index 436e06b7f3c5..ec20938a9411 100644 --- a/svtools/source/misc/ehdl.src +++ b/svtools/source/misc/ehdl.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/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx index 22c8d889bd83..23805a459aa1 100644 --- a/svtools/source/misc/embedhlp.cxx +++ b/svtools/source/misc/embedhlp.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -296,7 +296,7 @@ EmbeddedObjectRef::EmbeddedObjectRef( const EmbeddedObjectRef& rObj ) EmbeddedObjectRef::~EmbeddedObjectRef() { delete mpImp->pGraphic; - if ( mpImp->pHCGraphic ) + if ( mpImp->pHCGraphic ) DELETEZ( mpImp->pHCGraphic ); Clear(); } @@ -448,7 +448,7 @@ void EmbeddedObjectRef::GetReplacement( BOOL bUpdate ) DELETEZ( mpImp->pGraphic ); mpImp->aMediaType = ::rtl::OUString(); mpImp->pGraphic = new Graphic; - if ( mpImp->pHCGraphic ) + if ( mpImp->pHCGraphic ) DELETEZ( mpImp->pHCGraphic ); mpImp->mnGraphicVersion++; } @@ -594,7 +594,7 @@ Graphic* EmbeddedObjectRef::GetHCGraphic() const if ( !pStream->GetError() ) { GraphicFilter* pGF = GraphicFilter::GetGraphicFilter(); - Graphic* pGraphic = new Graphic(); + Graphic* pGraphic = new Graphic(); if ( pGF->ImportGraphic( *pGraphic, String(), *pStream, GRFILTER_FORMAT_DONTKNOW ) == 0 ) mpImp->pHCGraphic = pGraphic; else @@ -617,7 +617,7 @@ void EmbeddedObjectRef::SetGraphicStream( const uno::Reference< io::XInputStream delete mpImp->pGraphic; mpImp->pGraphic = new Graphic(); mpImp->aMediaType = rMediaType; - if ( mpImp->pHCGraphic ) + if ( mpImp->pHCGraphic ) DELETEZ( mpImp->pHCGraphic ); mpImp->mnGraphicVersion++; @@ -628,7 +628,7 @@ void EmbeddedObjectRef::SetGraphicStream( const uno::Reference< io::XInputStream GraphicFilter* pGF = GraphicFilter::GetGraphicFilter(); pGF->ImportGraphic( *mpImp->pGraphic, String(), *pGraphicStream, GRFILTER_FORMAT_DONTKNOW ); mpImp->mnGraphicVersion++; - + if ( mpImp->pContainer ) { pGraphicStream->Seek( 0 ); @@ -650,7 +650,7 @@ void EmbeddedObjectRef::SetGraphic( const Graphic& rGraphic, const ::rtl::OUStri delete mpImp->pGraphic; mpImp->pGraphic = new Graphic( rGraphic ); mpImp->aMediaType = rMediaType; - if ( mpImp->pHCGraphic ) + if ( mpImp->pHCGraphic ) DELETEZ( mpImp->pHCGraphic ); mpImp->mnGraphicVersion++; @@ -750,8 +750,8 @@ void EmbeddedObjectRef::DrawPaintReplacement( const Rectangle &rRect, const Stri if( nHeight > 0 ) { aPt.Y() = nHeight; - Point aP = rRect.TopLeft(); - Size aBmpSize = aBmp.GetSizePixel(); + Point aP = rRect.TopLeft(); + Size aBmpSize = aBmp.GetSizePixel(); // Bitmap einpassen if( nHeight * 10 / nWidth > aBmpSize.Height() * 10 / aBmpSize.Width() ) @@ -887,7 +887,7 @@ void EmbeddedObjectRef::UpdateReplacementOnDemand() { DELETEZ( mpImp->pGraphic ); mpImp->bNeedUpdate = sal_True; - if ( mpImp->pHCGraphic ) + if ( mpImp->pHCGraphic ) DELETEZ( mpImp->pHCGraphic ); mpImp->mnGraphicVersion++; diff --git a/svtools/source/misc/embedtransfer.cxx b/svtools/source/misc/embedtransfer.cxx index 8944bc126d18..1c0a2963951f 100644 --- a/svtools/source/misc/embedtransfer.cxx +++ b/svtools/source/misc/embedtransfer.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/svtools/source/misc/errtxt.src b/svtools/source/misc/errtxt.src index f33896e20003..2c1f788709e8 100644 --- a/svtools/source/misc/errtxt.src +++ b/svtools/source/misc/errtxt.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/svtools/source/misc/helpagent.src b/svtools/source/misc/helpagent.src index 1f2eaaa291a3..1acb5d24383a 100644 --- a/svtools/source/misc/helpagent.src +++ b/svtools/source/misc/helpagent.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/svtools/source/misc/helpagentwindow.cxx b/svtools/source/misc/helpagentwindow.cxx index 46118ffbabfc..7aa9ebf3e427 100644 --- a/svtools/source/misc/helpagentwindow.cxx +++ b/svtools/source/misc/helpagentwindow.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ #include <svtools/svtools.hrc> #include <svtools/helpid.hrc> -#define WB_AGENT_STYLE 0 +#define WB_AGENT_STYLE 0 //........................................................................ namespace svt @@ -57,7 +57,7 @@ namespace svt public: CloserButton_Impl( Window* pParent, WinBits nBits ) : ImageButton( pParent, nBits ) {} - virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ); }; //-------------------------------------------------------------------- @@ -123,10 +123,10 @@ namespace svt { FloatingWindow::Paint(rRect); - Size aOutputSize( GetOutputSizePixel() ); - Point aPoint=Point(); - Rectangle aOutputRect( aPoint, aOutputSize ); - Rectangle aInnerRect( aOutputRect ); + Size aOutputSize( GetOutputSizePixel() ); + Point aPoint=Point(); + Rectangle aOutputRect( aPoint, aOutputSize ); + Rectangle aInnerRect( aOutputRect ); // paint the background SetLineColor( GetSettings().GetStyleSettings().GetFaceColor() ); @@ -182,7 +182,7 @@ namespace svt } //........................................................................ -} // namespace svt +} // namespace svt //........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx index 19148344a6f4..9442d27f6bdd 100644 --- a/svtools/source/misc/imagemgr.cxx +++ b/svtools/source/misc/imagemgr.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ // globals ******************************************************************* -#define NO_INDEX ((USHORT)0xFFFF) -#define CONTENT_HELPER ::utl::UCBContentHelper -#define ASCII_STRING(s) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(s) ) +#define NO_INDEX ((USHORT)0xFFFF) +#define CONTENT_HELPER ::utl::UCBContentHelper +#define ASCII_STRING(s) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(s) ) struct SvtExtensionResIdMapping_Impl { diff --git a/svtools/source/misc/imagemgr.src b/svtools/source/misc/imagemgr.src index 5cd0a714aa9b..fc7dc8c4ebf9 100644 --- a/svtools/source/misc/imagemgr.src +++ b/svtools/source/misc/imagemgr.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/svtools/source/misc/imageresourceaccess.cxx b/svtools/source/misc/imageresourceaccess.cxx index 47a68a5684ea..648abac134cc 100644 --- a/svtools/source/misc/imageresourceaccess.cxx +++ b/svtools/source/misc/imageresourceaccess.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -98,7 +98,7 @@ namespace svt { return m_xInput; } - + //-------------------------------------------------------------------- Reference< XOutputStream > SAL_CALL StreamSupplier::getOutputStream( ) throw (RuntimeException) { @@ -113,7 +113,7 @@ namespace svt m_xSeekable->seek( location ); } - + //-------------------------------------------------------------------- ::sal_Int64 SAL_CALL StreamSupplier::getPosition( ) throw (IOException, RuntimeException) { @@ -122,7 +122,7 @@ namespace svt return m_xSeekable->getPosition(); } - + //-------------------------------------------------------------------- ::sal_Int64 SAL_CALL StreamSupplier::getLength( ) throw (IOException, RuntimeException) { diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx index 105eb763fb7b..a7d670117a61 100644 --- a/svtools/source/misc/imap.cxx +++ b/svtools/source/misc/imap.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ DBG_NAME( ImageMap ) -#define SCALEPOINT(aPT,aFracX,aFracY) (aPT).X()=((aPT).X()*(aFracX).GetNumerator())/(aFracX).GetDenominator(); \ +#define SCALEPOINT(aPT,aFracX,aFracY) (aPT).X()=((aPT).X()*(aFracX).GetNumerator())/(aFracX).GetDenominator(); \ (aPT).Y()=((aPT).Y()*(aFracY).GetNumerator())/(aFracY).GetDenominator(); @@ -68,7 +68,7 @@ IMapObject::IMapObject() { } -IMapObject::IMapObject( const String& rURL, const String& rAltText, const String& rDesc, +IMapObject::IMapObject( const String& rURL, const String& rAltText, const String& rDesc, const String& rTarget, const String& rName, BOOL bURLActive ) : aURL( rURL ) , aAltText( rAltText ) @@ -101,8 +101,8 @@ UINT16 IMapObject::GetVersion() const void IMapObject::Write( SvStream& rOStm, const String& rBaseURL ) const { - IMapCompat* pCompat; - const rtl_TextEncoding eEncoding = gsl_getSystemTextEncoding(); + IMapCompat* pCompat; + const rtl_TextEncoding eEncoding = gsl_getSystemTextEncoding(); rOStm << GetType(); rOStm << GetVersion(); @@ -126,15 +126,15 @@ void IMapObject::Write( SvStream& rOStm, const String& rBaseURL ) const /****************************************************************************** |* -|* Binaer-Import +|* Binaer-Import |* \******************************************************************************/ void IMapObject::Read( SvStream& rIStm, const String& rBaseURL ) { - IMapCompat* pCompat; - rtl_TextEncoding nTextEncoding; - ByteString aString; + IMapCompat* pCompat; + rtl_TextEncoding nTextEncoding; + ByteString aString; // Typ und Version ueberlesen wir rIStm.SeekRel( 2 ); @@ -216,11 +216,11 @@ IMapRectangleObject::IMapRectangleObject( const Rectangle& rRect, const String& rURL, const String& rAltText, const String& rDesc, - const String& rTarget, + const String& rTarget, const String& rName, BOOL bURLActive, BOOL bPixelCoords ) : - IMapObject ( rURL, rAltText, rDesc, rTarget, rName, bURLActive ) + IMapObject ( rURL, rAltText, rDesc, rTarget, rName, bURLActive ) { ImpConstruct( rRect, bPixelCoords ); } @@ -297,7 +297,7 @@ BOOL IMapRectangleObject::IsHit( const Point& rPoint ) const Rectangle IMapRectangleObject::GetRectangle( BOOL bPixelCoords ) const { - Rectangle aNewRect; + Rectangle aNewRect; if ( bPixelCoords ) aNewRect = Application::GetDefaultDevice()->LogicToPixel( aRect, MapMode( MAP_100TH_MM ) ); @@ -316,8 +316,8 @@ Rectangle IMapRectangleObject::GetRectangle( BOOL bPixelCoords ) const void IMapRectangleObject::Scale( const Fraction& rFracX, const Fraction& rFracY ) { - Point aTL( aRect.TopLeft() ); - Point aBR( aRect.BottomRight() ); + Point aTL( aRect.TopLeft() ); + Point aBR( aRect.BottomRight() ); if ( rFracX.GetDenominator() && rFracY.GetDenominator() ) { @@ -353,7 +353,7 @@ IMapCircleObject::IMapCircleObject( const Point& rCenter, ULONG nCircleRadius, const String& rName, BOOL bURLActive, BOOL bPixelCoords ) : - IMapObject ( rURL, rAltText, rDesc, rTarget, rName, bURLActive ) + IMapObject ( rURL, rAltText, rDesc, rTarget, rName, bURLActive ) { ImpConstruct( rCenter, nCircleRadius, bPixelCoords ); } @@ -369,7 +369,7 @@ void IMapCircleObject::ImpConstruct( const Point& rCenter, ULONG nRad, BOOL bPix { if ( bPixel ) { - MapMode aMap100( MAP_100TH_MM ); + MapMode aMap100( MAP_100TH_MM ); aCenter = Application::GetDefaultDevice()->PixelToLogic( rCenter, aMap100 ); nRadius = Application::GetDefaultDevice()->PixelToLogic( Size( nRad, 0 ), aMap100 ).Width(); @@ -434,8 +434,8 @@ UINT16 IMapCircleObject::GetType() const BOOL IMapCircleObject::IsHit( const Point& rPoint ) const { - const Point aPoint( aCenter - rPoint ); - BOOL bRet = FALSE; + const Point aPoint( aCenter - rPoint ); + BOOL bRet = FALSE; if ( (ULONG) sqrt( (double) aPoint.X() * aPoint.X() + aPoint.Y() * aPoint.Y() ) <= nRadius ) @@ -547,8 +547,8 @@ IMapPolygonObject::IMapPolygonObject( const Polygon& rPoly, const String& rName, BOOL bURLActive, BOOL bPixelCoords ) : - IMapObject ( rURL, rAltText, rDesc, rTarget, rName, bURLActive ), - bEllipse ( FALSE ) + IMapObject ( rURL, rAltText, rDesc, rTarget, rName, bURLActive ), + bEllipse ( FALSE ) { ImpConstruct( rPoly, bPixelCoords ); } @@ -578,8 +578,8 @@ void IMapPolygonObject::ImpConstruct( const Polygon& rPoly, BOOL bPixel ) void IMapPolygonObject::WriteIMapObject( SvStream& rOStm ) const { rOStm << aPoly; - rOStm << bEllipse; // >= Version 2 - rOStm << aEllipse; // >= Version 2 + rOStm << bEllipse; // >= Version 2 + rOStm << aEllipse; // >= Version 2 } @@ -634,7 +634,7 @@ BOOL IMapPolygonObject::IsHit( const Point& rPoint ) const Polygon IMapPolygonObject::GetPolygon( BOOL bPixelCoords ) const { - Polygon aNewPoly; + Polygon aNewPoly; if ( bPixelCoords ) aNewPoly = Application::GetDefaultDevice()->LogicToPixel( aPoly, MapMode( MAP_100TH_MM ) ); @@ -685,8 +685,8 @@ void IMapPolygonObject::Scale( const Fraction& rFracX, const Fraction& rFracY ) if ( bEllipse ) { - Point aTL( aEllipse.TopLeft() ); - Point aBR( aEllipse.BottomRight() ); + Point aTL( aEllipse.TopLeft() ); + Point aBR( aEllipse.BottomRight() ); if ( rFracX.GetDenominator() && rFracY.GetDenominator() ) { @@ -711,10 +711,10 @@ BOOL IMapPolygonObject::IsEqual( const IMapPolygonObject& rEqObj ) if ( IMapObject::IsEqual( rEqObj ) ) { - const Polygon& rEqPoly = rEqObj.aPoly; - const USHORT nCount = aPoly.GetSize(); - const USHORT nEqCount = rEqPoly.GetSize(); - BOOL bDifferent = FALSE; + const Polygon& rEqPoly = rEqObj.aPoly; + const USHORT nCount = aPoly.GetSize(); + const USHORT nEqCount = rEqPoly.GetSize(); + BOOL bDifferent = FALSE; if ( nCount == nEqCount ) { @@ -748,7 +748,7 @@ BOOL IMapPolygonObject::IsEqual( const IMapPolygonObject& rEqObj ) \******************************************************************************/ ImageMap::ImageMap( const String& rName ) : - aName ( rName ) + aName ( rName ) { } @@ -877,9 +877,9 @@ ImageMap& ImageMap::operator=( const ImageMap& rImageMap ) BOOL ImageMap::operator==( const ImageMap& rImageMap ) { - const USHORT nCount = (USHORT) maList.Count(); - const USHORT nEqCount = rImageMap.GetIMapObjectCount(); - BOOL bRet = FALSE; + const USHORT nCount = (USHORT) maList.Count(); + const USHORT nEqCount = rImageMap.GetIMapObjectCount(); + BOOL bRet = FALSE; if ( nCount == nEqCount ) { @@ -1030,8 +1030,8 @@ IMapObject* ImageMap::GetHitIMapObject( const Size& rTotalSize, Rectangle ImageMap::GetBoundRect() const { - Rectangle aBoundRect; - ULONG nCount = maList.Count(); + Rectangle aBoundRect; + ULONG nCount = maList.Count(); for ( ULONG i = 0; i < nCount; i++ ) aBoundRect.Union( ( (IMapObject*) maList.GetObject( i ) )->GetBoundRect() ); @@ -1084,7 +1084,7 @@ void ImageMap::Scale( const Fraction& rFracX, const Fraction& rFracY ) void ImageMap::ImpWriteImageMap( SvStream& rOStm, const String& rBaseURL ) const { IMapObject* pObj; - USHORT nCount = (USHORT) maList.Count(); + USHORT nCount = (USHORT) maList.Count(); for ( USHORT i = 0; i < nCount; i++ ) { @@ -1151,12 +1151,12 @@ void ImageMap::ImpReadImageMap( SvStream& rIStm, USHORT nCount, const String& rB void ImageMap::Write( SvStream& rOStm, const String& rBaseURL ) const { - IMapCompat* pCompat; + IMapCompat* pCompat; String aImageName( GetName() ); - String aDummy; - USHORT nOldFormat = rOStm.GetNumberFormatInt(); + String aDummy; + USHORT nOldFormat = rOStm.GetNumberFormatInt(); UINT16 nCount = (UINT16) GetIMapObjectCount(); - const rtl_TextEncoding eEncoding = gsl_getSystemTextEncoding(); + const rtl_TextEncoding eEncoding = gsl_getSystemTextEncoding(); rOStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); @@ -1188,10 +1188,10 @@ void ImageMap::Write( SvStream& rOStm, const String& rBaseURL ) const void ImageMap::Read( SvStream& rIStm, const String& rBaseURL ) { - ByteString aString; - char cMagic[6]; - USHORT nOldFormat = rIStm.GetNumberFormatInt(); - UINT16 nCount; + ByteString aString; + char cMagic[6]; + USHORT nOldFormat = rIStm.GetNumberFormatInt(); + UINT16 nCount; rIStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); rIStm.Read( cMagic, sizeof( cMagic ) ); diff --git a/svtools/source/misc/imap2.cxx b/svtools/source/misc/imap2.cxx index d1cb4ddafd72..e57991f18632 100644 --- a/svtools/source/misc/imap2.cxx +++ b/svtools/source/misc/imap2.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,7 +70,7 @@ TYPEINIT0_AUTOFACTORY( ImageMap ); void IMapObject::AppendCERNCoords( const Point& rPoint100, ByteString& rStr ) const { - const Point aPixPt( Application::GetDefaultDevice()->LogicToPixel( rPoint100, MapMode( MAP_100TH_MM ) ) ); + const Point aPixPt( Application::GetDefaultDevice()->LogicToPixel( rPoint100, MapMode( MAP_100TH_MM ) ) ); rStr += '('; rStr += ByteString::CreateFromInt32( aPixPt.X() ); @@ -88,7 +88,7 @@ void IMapObject::AppendCERNCoords( const Point& rPoint100, ByteString& rStr ) co void IMapObject::AppendNCSACoords( const Point& rPoint100, ByteString& rStr ) const { - const Point aPixPt( Application::GetDefaultDevice()->LogicToPixel( rPoint100, MapMode( MAP_100TH_MM ) ) ); + const Point aPixPt( Application::GetDefaultDevice()->LogicToPixel( rPoint100, MapMode( MAP_100TH_MM ) ) ); rStr += ByteString::CreateFromInt32( aPixPt.X() ); rStr += ','; @@ -215,8 +215,8 @@ void IMapCircleObject::WriteNCSA( SvStream& rOStm, const String& rBaseURL ) cons void IMapPolygonObject::WriteCERN( SvStream& rOStm, const String& rBaseURL ) const { - ByteString aStr( "polygon " ); - const USHORT nCount = aPoly.GetSize(); + ByteString aStr( "polygon " ); + const USHORT nCount = aPoly.GetSize(); for ( USHORT i = 0; i < nCount; i++ ) AppendCERNCoords( aPoly[ i ], aStr ); @@ -235,8 +235,8 @@ void IMapPolygonObject::WriteCERN( SvStream& rOStm, const String& rBaseURL ) co void IMapPolygonObject::WriteNCSA( SvStream& rOStm, const String& rBaseURL ) const { - ByteString aStr( "poly " ); - const USHORT nCount = Min( aPoly.GetSize(), (USHORT) 100 ); + ByteString aStr( "poly " ); + const USHORT nCount = Min( aPoly.GetSize(), (USHORT) 100 ); AppendNCSAURL( aStr, rBaseURL ); @@ -280,7 +280,7 @@ void ImageMap::Write( SvStream& rOStm, ULONG nFormat, const String& rBaseURL ) c void ImageMap::ImpWriteCERN( SvStream& rOStm, const String& rBaseURL ) const { IMapObject* pObj; - USHORT nCount = (USHORT) maList.Count(); + USHORT nCount = (USHORT) maList.Count(); for ( USHORT i = 0; i < nCount; i++ ) { @@ -316,7 +316,7 @@ void ImageMap::ImpWriteCERN( SvStream& rOStm, const String& rBaseURL ) const void ImageMap::ImpWriteNCSA( SvStream& rOStm, const String& rBaseURL ) const { IMapObject* pObj; - USHORT nCount = (USHORT) maList.Count(); + USHORT nCount = (USHORT) maList.Count(); for ( USHORT i = 0; i < nCount; i++ ) { @@ -401,16 +401,16 @@ ULONG ImageMap::ImpReadCERN( SvStream& rIStm, const String& rBaseURL ) void ImageMap::ImpReadCERNLine( const ByteString& rLine, const String& rBaseURL ) { - ByteString aStr( rLine ); - ByteString aToken; + ByteString aStr( rLine ); + ByteString aToken; aStr.EraseLeadingChars( ' ' ); aStr.EraseLeadingChars( '\t' ); aStr.EraseAllChars( ';' ); aStr.ToLowerAscii(); - const char* pStr = aStr.GetBuffer(); - char cChar = *pStr++; + const char* pStr = aStr.GetBuffer(); + char cChar = *pStr++; // Anweisung finden while( ( cChar >= 'a' ) && ( cChar <= 'z' ) && NOTEOL( cChar ) ) @@ -423,18 +423,18 @@ void ImageMap::ImpReadCERNLine( const ByteString& rLine, const String& rBaseURL { if ( ( aToken == "rectangle" ) || ( aToken == "rect" ) ) { - const Point aTopLeft( ImpReadCERNCoords( &pStr ) ); - const Point aBottomRight( ImpReadCERNCoords( &pStr ) ); + const Point aTopLeft( ImpReadCERNCoords( &pStr ) ); + const Point aBottomRight( ImpReadCERNCoords( &pStr ) ); const String aURL( ImpReadCERNURL( &pStr, rBaseURL ) ); - const Rectangle aRect( aTopLeft, aBottomRight ); + const Rectangle aRect( aTopLeft, aBottomRight ); IMapRectangleObject* pObj = new IMapRectangleObject( aRect, aURL, String(), String(), String(), String() ); maList.Insert( pObj, LIST_APPEND ); } else if ( ( aToken == "circle" ) || ( aToken == "circ" ) ) { - const Point aCenter( ImpReadCERNCoords( &pStr ) ); - const long nRadius = ImpReadCERNRadius( &pStr ); + const Point aCenter( ImpReadCERNCoords( &pStr ) ); + const long nRadius = ImpReadCERNRadius( &pStr ); const String aURL( ImpReadCERNURL( &pStr, rBaseURL ) ); IMapCircleObject* pObj = new IMapCircleObject( aCenter, nRadius, aURL, String(), String(), String(), String() ); @@ -442,9 +442,9 @@ void ImageMap::ImpReadCERNLine( const ByteString& rLine, const String& rBaseURL } else if ( ( aToken == "polygon" ) || ( aToken == "poly" ) ) { - const USHORT nCount = aStr.GetTokenCount( '(' ) - 1; - Polygon aPoly( nCount ); - String aURL; + const USHORT nCount = aStr.GetTokenCount( '(' ) - 1; + Polygon aPoly( nCount ); + String aURL; for ( USHORT i = 0; i < nCount; i++ ) aPoly[ i ] = ImpReadCERNCoords( &pStr ); @@ -466,10 +466,10 @@ void ImageMap::ImpReadCERNLine( const ByteString& rLine, const String& rBaseURL Point ImageMap::ImpReadCERNCoords( const char** ppStr ) { - String aStrX; - String aStrY; - Point aPt; - char cChar = *(*ppStr)++; + String aStrX; + String aStrY; + Point aPt; + char cChar = *(*ppStr)++; while( NOTEOL( cChar ) && ( ( cChar < '0' ) || ( cChar > '9' ) ) ) cChar = *(*ppStr)++; @@ -513,8 +513,8 @@ Point ImageMap::ImpReadCERNCoords( const char** ppStr ) long ImageMap::ImpReadCERNRadius( const char** ppStr ) { - String aStr; - char cChar = *(*ppStr)++; + String aStr; + char cChar = *(*ppStr)++; while( NOTEOL( cChar ) && ( ( cChar < '0' ) || ( cChar > '9' ) ) ) cChar = *(*ppStr)++; @@ -540,7 +540,7 @@ long ImageMap::ImpReadCERNRadius( const char** ppStr ) String ImageMap::ImpReadCERNURL( const char** ppStr, const String& rBaseURL ) { - String aStr( String::CreateFromAscii( *ppStr ) ); + String aStr( String::CreateFromAscii( *ppStr ) ); aStr.EraseLeadingChars( ' ' ); aStr.EraseLeadingChars( '\t' ); @@ -579,16 +579,16 @@ ULONG ImageMap::ImpReadNCSA( SvStream& rIStm, const String& rBaseURL ) void ImageMap::ImpReadNCSALine( const ByteString& rLine, const String& rBaseURL ) { - ByteString aStr( rLine ); - ByteString aToken; + ByteString aStr( rLine ); + ByteString aToken; aStr.EraseLeadingChars( ' ' ); aStr.EraseLeadingChars( '\t' ); aStr.EraseAllChars( ';' ); aStr.ToLowerAscii(); - const char* pStr = aStr.GetBuffer(); - char cChar = *pStr++; + const char* pStr = aStr.GetBuffer(); + char cChar = *pStr++; // Anweisung finden while( ( cChar >= 'a' ) && ( cChar <= 'z' ) && NOTEOL( cChar ) ) @@ -602,9 +602,9 @@ void ImageMap::ImpReadNCSALine( const ByteString& rLine, const String& rBaseURL if ( aToken == "rect" ) { const String aURL( ImpReadNCSAURL( &pStr, rBaseURL ) ); - const Point aTopLeft( ImpReadNCSACoords( &pStr ) ); - const Point aBottomRight( ImpReadNCSACoords( &pStr ) ); - const Rectangle aRect( aTopLeft, aBottomRight ); + const Point aTopLeft( ImpReadNCSACoords( &pStr ) ); + const Point aBottomRight( ImpReadNCSACoords( &pStr ) ); + const Rectangle aRect( aTopLeft, aBottomRight ); IMapRectangleObject* pObj = new IMapRectangleObject( aRect, aURL, String(), String(), String(), String() ); maList.Insert( pObj, LIST_APPEND ); @@ -612,9 +612,9 @@ void ImageMap::ImpReadNCSALine( const ByteString& rLine, const String& rBaseURL else if ( aToken == "circle" ) { const String aURL( ImpReadNCSAURL( &pStr, rBaseURL ) ); - const Point aCenter( ImpReadNCSACoords( &pStr ) ); - const Point aDX( aCenter - ImpReadNCSACoords( &pStr ) ); - long nRadius = (long) sqrt( (double) aDX.X() * aDX.X() + + const Point aCenter( ImpReadNCSACoords( &pStr ) ); + const Point aDX( aCenter - ImpReadNCSACoords( &pStr ) ); + long nRadius = (long) sqrt( (double) aDX.X() * aDX.X() + (double) aDX.Y() * aDX.Y() ); IMapCircleObject* pObj = new IMapCircleObject( aCenter, nRadius, aURL, String(), String(), String(), String() ); @@ -622,9 +622,9 @@ void ImageMap::ImpReadNCSALine( const ByteString& rLine, const String& rBaseURL } else if ( aToken == "poly" ) { - const USHORT nCount = aStr.GetTokenCount( ',' ) - 1; + const USHORT nCount = aStr.GetTokenCount( ',' ) - 1; const String aURL( ImpReadNCSAURL( &pStr, rBaseURL ) ); - Polygon aPoly( nCount ); + Polygon aPoly( nCount ); for ( USHORT i = 0; i < nCount; i++ ) aPoly[ i ] = ImpReadNCSACoords( &pStr ); @@ -644,8 +644,8 @@ void ImageMap::ImpReadNCSALine( const ByteString& rLine, const String& rBaseURL String ImageMap::ImpReadNCSAURL( const char** ppStr, const String& rBaseURL ) { - String aStr; - char cChar = *(*ppStr)++; + String aStr; + char cChar = *(*ppStr)++; while( NOTEOL( cChar ) && ( ( cChar == ' ' ) || ( cChar == '\t' ) ) ) cChar = *(*ppStr)++; @@ -671,10 +671,10 @@ String ImageMap::ImpReadNCSAURL( const char** ppStr, const String& rBaseURL ) Point ImageMap::ImpReadNCSACoords( const char** ppStr ) { - String aStrX; - String aStrY; - Point aPt; - char cChar = *(*ppStr)++; + String aStrX; + String aStrY; + Point aPt; + char cChar = *(*ppStr)++; while( NOTEOL( cChar ) && ( ( cChar < '0' ) || ( cChar > '9' ) ) ) cChar = *(*ppStr)++; @@ -714,9 +714,9 @@ Point ImageMap::ImpReadNCSACoords( const char** ppStr ) ULONG ImageMap::ImpDetectFormat( SvStream& rIStm ) { - ULONG nPos = rIStm.Tell(); - ULONG nRet = IMAP_FORMAT_BIN; - char cMagic[6]; + ULONG nPos = rIStm.Tell(); + ULONG nRet = IMAP_FORMAT_BIN; + char cMagic[6]; rIStm.Read( cMagic, sizeof( cMagic ) ); @@ -724,8 +724,8 @@ ULONG ImageMap::ImpDetectFormat( SvStream& rIStm ) // untersuchen wir das Format if ( memcmp( cMagic, IMAPMAGIC, sizeof( cMagic ) ) ) { - ByteString aStr; - long nCount = 128; + ByteString aStr; + long nCount = 128; rIStm.Seek( nPos ); while ( rIStm.ReadLine( aStr ) && nCount-- ) diff --git a/svtools/source/misc/imap3.cxx b/svtools/source/misc/imap3.cxx index 1072121a3c5d..2d05c942a036 100644 --- a/svtools/source/misc/imap3.cxx +++ b/svtools/source/misc/imap3.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ \******************************************************************************/ IMapCompat::IMapCompat( SvStream& rStm, const USHORT nStreamMode ) : - pRWStm ( &rStm ), - nStmMode ( nStreamMode ) + pRWStm ( &rStm ), + nStmMode ( nStreamMode ) { DBG_ASSERT( nStreamMode == STREAM_READ || nStreamMode == STREAM_WRITE, "Wrong Mode!" ); @@ -78,7 +78,7 @@ IMapCompat::~IMapCompat() { if ( nStmMode == STREAM_WRITE ) { - const ULONG nEndPos = pRWStm->Tell(); + const ULONG nEndPos = pRWStm->Tell(); pRWStm->Seek( nCompatPos ); *pRWStm << (UINT32) ( nEndPos - nTotalSize ); diff --git a/svtools/source/misc/itemdel.cxx b/svtools/source/misc/itemdel.cxx index 184b631cec65..0de0560471eb 100644 --- a/svtools/source/misc/itemdel.cxx +++ b/svtools/source/misc/itemdel.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ DBG_NAME(SfxItemDesruptor_Impl); class SfxItemDesruptor_Impl { SfxPoolItem *pItem; - Link aLink; + Link aLink; private: DECL_LINK( Delete, void * ); diff --git a/svtools/source/misc/langhelp.cxx b/svtools/source/misc/langhelp.cxx index fe99763cf825..3e406c4c9673 100644 --- a/svtools/source/misc/langhelp.cxx +++ b/svtools/source/misc/langhelp.cxx @@ -35,7 +35,7 @@ void localizeWebserviceURI( ::rtl::OUString& rURI ) { ::rtl::OUString aLang = Application::GetSettings().GetUILocale().Language; - if ( aLang.equalsIgnoreAsciiCaseAscii( "pt" ) + if ( aLang.equalsIgnoreAsciiCaseAscii( "pt" ) && Application::GetSettings().GetUILocale().Country.equalsIgnoreAsciiCaseAscii("br") ) { aLang = ::rtl::OUString::createFromAscii("pt-br"); diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx index 1a139a2ff966..2edf816a29af 100644 --- a/svtools/source/misc/langtab.cxx +++ b/svtools/source/misc/langtab.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,24 +52,24 @@ SVT_DLLPUBLIC const String ApplyLreOrRleEmbedding( const String &rText ) const USHORT nLen = rText.Len(); if (nLen == 0) return String(); - + const sal_Unicode cLRE_Embedding = 0x202A; // the start char of an LRE embedding const sal_Unicode cRLE_Embedding = 0x202B; // the start char of an RLE embedding const sal_Unicode cPopDirectionalFormat = 0x202C; // the unicode PDF (POP_DIRECTIONAL_FORMAT) char that terminates an LRE/RLE embedding - + // check if there are alreay embedding characters at the strings start // if so change nothing const sal_Unicode cChar = rText.GetBuffer()[0]; if (cChar == cLRE_Embedding || cChar == cRLE_Embedding) return rText; - + // since we only call the function getCharacterDirection // it does not matter which locale the CharClass is for. // Thus we can readily make use of SvtSysLocale::GetCharClass() // which should come at no cost... SvtSysLocale aSysLocale; const CharClass &rCharClass = aSysLocale.GetCharClass(); - + // we should look for the first non-neutral LTR or RTL character // and use that to determine the embedding of the whole text... // Thus we can avoid to check every character of the text. @@ -87,27 +87,27 @@ SVT_DLLPUBLIC const String ApplyLreOrRleEmbedding( const String &rText ) case i18n::DirectionProperty_ARABIC_NUMBER : // yes! arabic numbers are written from left to right { bIsRtlText = false; - bFound = true; + bFound = true; break; } - + case i18n::DirectionProperty_RIGHT_TO_LEFT : case i18n::DirectionProperty_RIGHT_TO_LEFT_ARABIC : case i18n::DirectionProperty_RIGHT_TO_LEFT_EMBEDDING : case i18n::DirectionProperty_RIGHT_TO_LEFT_OVERRIDE : - { + { bIsRtlText = true; - bFound = true; + bFound = true; break; } - + default: { // nothing to be done, character is considered to be neutral we need to look further ... - } - } + } + } } - + sal_Unicode cStart = cLRE_Embedding; // default is to use LRE embedding characters if (bIsRtlText) cStart = cRLE_Embedding; // then use RLE embedding @@ -121,7 +121,7 @@ SVT_DLLPUBLIC const String ApplyLreOrRleEmbedding( const String &rText ) } return aRes; -} +} //------------------------------------------------------------------------ @@ -151,7 +151,7 @@ const String& SvtLanguageTable::GetString( const LanguageType eType ) const // generally raise an error. OSL_ENSURE( eLang == LANGUAGE_ENGLISH, "language entry not found in resource" ); - + nPos = FindIndex( LANGUAGE_DONTKNOW ); if ( RESARRAY_INDEX_NOTFOUND != nPos && nPos < Count() ) @@ -181,7 +181,7 @@ LanguageType SvtLanguageTable::GetType( const String& rStr ) const eType = LanguageType( GetValue( i ) ); break; } - } + } return eType; } @@ -191,7 +191,7 @@ sal_uInt32 SvtLanguageTable::GetEntryCount() const { return Count(); } - + //------------------------------------------------------------------------ LanguageType SvtLanguageTable::GetTypeAtIndex( sal_uInt32 nIndex ) const diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src index e521fbdba570..b28a57e4a39e 100644 --- a/svtools/source/misc/langtab.src +++ b/svtools/source/misc/langtab.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 @@ -186,7 +186,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE < "Swahili (Kenya)" ; LANGUAGE_SWAHILI ; > ; < "Swedish (Sweden)" ; LANGUAGE_SWEDISH ; > ; < "Swedish (Finland)" ; LANGUAGE_SWEDISH_FINLAND ; > ; - < "Tajik" ; LANGUAGE_TAJIK ; > ; + < "Tajik" ; LANGUAGE_TAJIK ; > ; < "Tamil" ; LANGUAGE_TAMIL ; > ; < "Tatar" ; LANGUAGE_TATAR ; > ; < "Telugu" ; LANGUAGE_TELUGU ; > ; diff --git a/svtools/source/misc/stringtransfer.cxx b/svtools/source/misc/stringtransfer.cxx index 0d6165abd3e2..348824449a87 100644 --- a/svtools/source/misc/stringtransfer.cxx +++ b/svtools/source/misc/stringtransfer.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -82,7 +82,7 @@ namespace svt // check for a string format const DataFlavorExVector& rFormats = aClipboardData.GetDataFlavorExVector(); - for ( DataFlavorExVector::const_iterator aSearch = rFormats.begin(); + for ( DataFlavorExVector::const_iterator aSearch = rFormats.begin(); aSearch != rFormats.end(); ++aSearch ) @@ -108,7 +108,7 @@ namespace svt } //........................................................................ -} // namespace svt +} // namespace svt //........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/misc/svtaccessiblefactory.cxx b/svtools/source/misc/svtaccessiblefactory.cxx index 80d766354dfc..5ad3c23ac75f 100644 --- a/svtools/source/misc/svtaccessiblefactory.cxx +++ b/svtools/source/misc/svtaccessiblefactory.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/svtools/source/misc/svtdata.cxx b/svtools/source/misc/svtdata.cxx index 9429ac014df9..6643659bffdd 100644 --- a/svtools/source/misc/svtdata.cxx +++ b/svtools/source/misc/svtdata.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx index 366037c7a1d3..39e7f0be8bdc 100644 --- a/svtools/source/misc/templatefoldercache.cxx +++ b/svtools/source/misc/templatefoldercache.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,13 +97,13 @@ namespace svt //--------------------------------------------------------------------- sal_Bool operator == ( const util::DateTime& _rLHS, const util::DateTime& _rRHS ) { - return _rLHS.HundredthSeconds == _rRHS.HundredthSeconds - && _rLHS.Seconds == _rRHS.Seconds - && _rLHS.Minutes == _rRHS.Minutes - && _rLHS.Hours == _rRHS.Hours - && _rLHS.Day == _rRHS.Day - && _rLHS.Month == _rRHS.Month - && _rLHS.Year == _rRHS.Year; + return _rLHS.HundredthSeconds == _rRHS.HundredthSeconds + && _rLHS.Seconds == _rRHS.Seconds + && _rLHS.Minutes == _rRHS.Minutes + && _rLHS.Hours == _rRHS.Hours + && _rLHS.Day == _rRHS.Day + && _rLHS.Month == _rRHS.Month + && _rLHS.Year == _rRHS.Year; } //--------------------------------------------------------------------- @@ -116,7 +116,7 @@ namespace svt //= TemplateContent //===================================================================== struct TemplateContent; - typedef ::std::vector< ::rtl::Reference< TemplateContent > > TemplateFolderContent; + typedef ::std::vector< ::rtl::Reference< TemplateContent > > TemplateFolderContent; typedef TemplateFolderContent::const_iterator ConstFolderIterator; typedef TemplateFolderContent::iterator FolderIterator; @@ -127,13 +127,13 @@ namespace svt public: private: - INetURLObject m_aURL; - String m_sLocalName; // redundant - last segment of m_aURL - util::DateTime m_aLastModified; // date of last modification as reported by UCP - TemplateFolderContent m_aSubContents; // sorted (by name) list of the children + INetURLObject m_aURL; + String m_sLocalName; // redundant - last segment of m_aURL + util::DateTime m_aLastModified; // date of last modification as reported by UCP + TemplateFolderContent m_aSubContents; // sorted (by name) list of the children private: - inline void implResetDate( ) + inline void implResetDate( ) { m_aLastModified.HundredthSeconds = m_aLastModified.Seconds = m_aLastModified.Minutes = m_aLastModified.Hours = 0; m_aLastModified.Day = m_aLastModified.Month = m_aLastModified.Year = 0; @@ -148,20 +148,20 @@ namespace svt TemplateContent( const INetURLObject& _rURL, const util::DateTime& _rLastModified ); // attribute access - inline String getName( ) const { return m_sLocalName; } - inline String getURL( ) const { return m_aURL.GetMainURL( INetURLObject::DECODE_TO_IURI ); } - inline void setModDate( const util::DateTime& _rDate ) { m_aLastModified = _rDate; } - inline const util::DateTime& getModDate( ) const { return m_aLastModified; } + inline String getName( ) const { return m_sLocalName; } + inline String getURL( ) const { return m_aURL.GetMainURL( INetURLObject::DECODE_TO_IURI ); } + inline void setModDate( const util::DateTime& _rDate ) { m_aLastModified = _rDate; } + inline const util::DateTime& getModDate( ) const { return m_aLastModified; } - inline TemplateFolderContent& getSubContents() { return m_aSubContents; } - inline const TemplateFolderContent& getSubContents() const { return m_aSubContents; } + inline TemplateFolderContent& getSubContents() { return m_aSubContents; } + inline const TemplateFolderContent& getSubContents() const { return m_aSubContents; } inline ConstFolderIterator begin() const { return m_aSubContents.begin(); } inline ConstFolderIterator end() const { return m_aSubContents.end(); } inline TemplateFolderContent::size_type - size() const { return m_aSubContents.size(); } + size() const { return m_aSubContents.size(); } - inline void push_back( const ::rtl::Reference< TemplateContent >& _rxNewElement ) + inline void push_back( const ::rtl::Reference< TemplateContent >& _rxNewElement ) { m_aSubContents.push_back( _rxNewElement ); } }; @@ -207,16 +207,16 @@ namespace svt //--------------------------------------------------------------------- /// compares two TemplateContent by URL struct TemplateContentURLLess - :public ::std::binary_function < ::rtl::Reference< TemplateContent > - , ::rtl::Reference< TemplateContent > - , bool + :public ::std::binary_function < ::rtl::Reference< TemplateContent > + , ::rtl::Reference< TemplateContent > + , bool > { bool operator() ( const ::rtl::Reference< TemplateContent >& _rxLHS, const ::rtl::Reference< TemplateContent >& _rxRHS ) const { - return _rxLHS->getURL() < _rxRHS->getURL() - ? true - : false; + return _rxLHS->getURL() < _rxRHS->getURL() + ? true + : false; } }; @@ -253,9 +253,9 @@ namespace svt /** does a deep compare of two template contents */ struct TemplateContentEqual - :public ::std::binary_function < ::rtl::Reference< TemplateContent > - , ::rtl::Reference< TemplateContent > - , bool + :public ::std::binary_function < ::rtl::Reference< TemplateContent > + , ::rtl::Reference< TemplateContent > + , bool > { //................................................................. @@ -278,7 +278,7 @@ namespace svt return false; if ( _rLHS->getSubContents().size() ) - { // there are children + { // there are children // -> compare them ::std::pair< FolderIterator, FolderIterator > aFirstDifferent = ::std::mismatch( _rLHS->getSubContents().begin(), @@ -299,7 +299,7 @@ namespace svt struct StorageHelper { protected: - SvStream& m_rStorage; + SvStream& m_rStorage; StorageHelper( SvStream& _rStorage ) : m_rStorage( _rStorage ) { } }; @@ -469,46 +469,46 @@ namespace svt class TemplateFolderCacheImpl { private: - TemplateFolderContent m_aPreviousState; // the current state of the template dirs (as found on the HD) - TemplateFolderContent m_aCurrentState; // the previous state of the template dirs (as found in the cache file) + TemplateFolderContent m_aPreviousState; // the current state of the template dirs (as found on the HD) + TemplateFolderContent m_aCurrentState; // the previous state of the template dirs (as found in the cache file) osl::Mutex m_aMutex; // will be lazy inited; never access directly; use getOfficeInstDirs(). uno::Reference< util::XOfficeInstallationDirectories > m_xOfficeInstDirs; - SvStream* m_pCacheStream; - sal_Bool m_bNeedsUpdate : 1; - sal_Bool m_bKnowState : 1; - sal_Bool m_bValidCurrentState : 1; - sal_Bool m_bAutoStoreState : 1; + SvStream* m_pCacheStream; + sal_Bool m_bNeedsUpdate : 1; + sal_Bool m_bKnowState : 1; + sal_Bool m_bValidCurrentState : 1; + sal_Bool m_bAutoStoreState : 1; public: TemplateFolderCacheImpl( sal_Bool _bAutoStoreState ); ~TemplateFolderCacheImpl( ); - sal_Bool needsUpdate( sal_Bool _bForceCheck ); - void storeState( sal_Bool _bForceRetrieval ); + sal_Bool needsUpdate( sal_Bool _bForceCheck ); + void storeState( sal_Bool _bForceRetrieval ); private: - void initTemplDirs( ::std::vector< String >& _rRootDirs ); - sal_Bool openCacheStream( sal_Bool _bForRead ); - void closeCacheStream( ); + void initTemplDirs( ::std::vector< String >& _rRootDirs ); + sal_Bool openCacheStream( sal_Bool _bForRead ); + void closeCacheStream( ); /// read the state of the dirs from the cache file - sal_Bool readPreviousState(); + sal_Bool readPreviousState(); /// read the current state of the dirs - sal_Bool readCurrentState(); + sal_Bool readCurrentState(); - String implParseSmart( const String& _rPath ); + String implParseSmart( const String& _rPath ); - sal_Bool implReadFolder( const ::rtl::Reference< TemplateContent >& _rxRoot ); + sal_Bool implReadFolder( const ::rtl::Reference< TemplateContent >& _rxRoot ); - static String getCacheFileName(); - static sal_Int32 getMagicNumber(); - static void normalize( TemplateFolderContent& _rState ); + static String getCacheFileName(); + static sal_Int32 getMagicNumber(); + static void normalize( TemplateFolderContent& _rState ); // @return <TRUE/> if the states equal - static sal_Bool equalStates( const TemplateFolderContent& _rLHS, const TemplateFolderContent& _rRHS ); + static sal_Bool equalStates( const TemplateFolderContent& _rLHS, const TemplateFolderContent& _rRHS ); // late initialize m_xOfficeInstDirs uno::Reference< util::XOfficeInstallationDirectories > getOfficeInstDirs(); @@ -516,11 +516,11 @@ namespace svt //--------------------------------------------------------------------- TemplateFolderCacheImpl::TemplateFolderCacheImpl( sal_Bool _bAutoStoreState ) - :m_pCacheStream ( NULL ) - ,m_bNeedsUpdate ( sal_True ) - ,m_bKnowState ( sal_False ) - ,m_bValidCurrentState ( sal_False ) - ,m_bAutoStoreState ( _bAutoStoreState ) + :m_pCacheStream ( NULL ) + ,m_bNeedsUpdate ( sal_True ) + ,m_bKnowState ( sal_False ) + ,m_bValidCurrentState ( sal_False ) + ,m_bAutoStoreState ( _bAutoStoreState ) { } @@ -585,7 +585,7 @@ namespace svt if ( m_bValidCurrentState && openCacheStream( sal_False ) ) { - *m_pCacheStream << getMagicNumber(); + *m_pCacheStream << getMagicNumber(); // store the template root folders // the size @@ -673,16 +673,16 @@ namespace svt ::rtl::Reference< TemplateContent > xChild = new TemplateContent( aSubContentURL ); // the modified date - xChild->setModDate( xRow->getTimestamp( 2 ) ); // date modified + xChild->setModDate( xRow->getTimestamp( 2 ) ); // date modified if ( xRow->wasNull() ) - xChild->setModDate( xRow->getTimestamp( 3 ) ); // fallback: date created + xChild->setModDate( xRow->getTimestamp( 3 ) ); // fallback: date created // push back this content _rxRoot->push_back( xChild ); // is it a folder? if ( xRow->getBoolean( 4 ) && !xRow->wasNull() ) - { // yes -> step down + { // yes -> step down ConstFolderIterator aNextLevelRoot = _rxRoot->end(); --aNextLevelRoot; implReadFolder( *aNextLevelRoot ); @@ -707,8 +707,8 @@ namespace svt m_aCurrentState.swap( aTemplateFolderContent ); // the template directories from the config - String aDirs = SvtPathOptions().GetTemplatePath(); - sal_uInt16 nDirs = aDirs.GetTokenCount( ';' ); + String aDirs = SvtPathOptions().GetTemplatePath(); + sal_uInt16 nDirs = aDirs.GetTokenCount( ';' ); m_aCurrentState.reserve( nDirs ); // loop through all the root-level template folders @@ -798,7 +798,7 @@ namespace svt // open the stream m_pCacheStream = UcbStreamHelper::CreateStream( aStorageURL.GetMainURL( INetURLObject::DECODE_TO_IURI ), - _bForRead ? STREAM_READ | STREAM_NOCREATE : STREAM_WRITE | STREAM_TRUNC ); + _bForRead ? STREAM_READ | STREAM_NOCREATE : STREAM_WRITE | STREAM_TRUNC ); DBG_ASSERT( m_pCacheStream, "TemplateFolderCacheImpl::openCacheStream: could not open/create the cache stream!" ); if ( m_pCacheStream && m_pCacheStream->GetErrorCode() ) { @@ -824,7 +824,7 @@ namespace svt { // open the stream which contains the cached state of the directories if ( openCacheStream( sal_True ) ) - { // opening the stream succeeded + { // opening the stream succeeded if ( readPreviousState() ) { m_bNeedsUpdate = !equalStates( m_aPreviousState, m_aCurrentState ); @@ -915,7 +915,7 @@ namespace svt } //......................................................................... -} // namespace sfx2 +} // namespace sfx2 //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index 50ad17317955..567a47d7ed84 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -394,14 +394,14 @@ Any SAL_CALL TransferableHelper::getTransferData( const DataFlavor& rFlavor ) th if( maAny >>= aSeq ) { - SvMemoryStream* pSrcStm = new SvMemoryStream( (char*) aSeq.getConstArray(), aSeq.getLength(), STREAM_WRITE | STREAM_TRUNC ); - GDIMetaFile aMtf; + SvMemoryStream* pSrcStm = new SvMemoryStream( (char*) aSeq.getConstArray(), aSeq.getLength(), STREAM_WRITE | STREAM_TRUNC ); + GDIMetaFile aMtf; *pSrcStm >> aMtf; delete pSrcStm; - Graphic aGraphic( aMtf ); - SvMemoryStream aDstStm( 65535, 65535 ); + Graphic aGraphic( aMtf ); + SvMemoryStream aDstStm( 65535, 65535 ); if( GraphicConverter::Export( aDstStm, aGraphic, CVT_EMF ) == ERRCODE_NONE ) { @@ -424,14 +424,14 @@ Any SAL_CALL TransferableHelper::getTransferData( const DataFlavor& rFlavor ) th if( maAny >>= aSeq ) { - SvMemoryStream* pSrcStm = new SvMemoryStream( (char*) aSeq.getConstArray(), aSeq.getLength(), STREAM_WRITE | STREAM_TRUNC ); - GDIMetaFile aMtf; + SvMemoryStream* pSrcStm = new SvMemoryStream( (char*) aSeq.getConstArray(), aSeq.getLength(), STREAM_WRITE | STREAM_TRUNC ); + GDIMetaFile aMtf; *pSrcStm >> aMtf; delete pSrcStm; - SvMemoryStream aDstStm( 65535, 65535 ); - + SvMemoryStream aDstStm( 65535, 65535 ); + // taking wmf without file header if ( ConvertGDIMetaFileToWMF( aMtf, aDstStm, NULL, FALSE ) ) { @@ -482,9 +482,9 @@ Sequence< DataFlavor > SAL_CALL TransferableHelper::getTransferDataFlavors() thr { } - Sequence< DataFlavor > aRet( mpFormats->size() ); - DataFlavorExVector::iterator aIter( mpFormats->begin() ), aEnd( mpFormats->end() ); - sal_uInt32 nCurPos = 0; + Sequence< DataFlavor > aRet( mpFormats->size() ); + DataFlavorExVector::iterator aIter( mpFormats->begin() ), aEnd( mpFormats->end() ); + sal_uInt32 nCurPos = 0; while( aIter != aEnd ) { @@ -499,7 +499,7 @@ Sequence< DataFlavor > SAL_CALL TransferableHelper::getTransferDataFlavors() thr sal_Bool SAL_CALL TransferableHelper::isDataFlavorSupported( const DataFlavor& rFlavor ) throw( RuntimeException ) { const SolarMutexGuard aGuard; - sal_Bool bRet = sal_False; + sal_Bool bRet = sal_False; try { @@ -625,8 +625,8 @@ void TransferableHelper::ImplFlush() { if( mxClipboard.is() ) { - Reference< XFlushableClipboard > xFlushableClipboard( mxClipboard, UNO_QUERY ); - const sal_uInt32 nRef = Application::ReleaseSolarMutex(); + Reference< XFlushableClipboard > xFlushableClipboard( mxClipboard, UNO_QUERY ); + const sal_uInt32 nRef = Application::ReleaseSolarMutex(); try { @@ -744,8 +744,8 @@ void TransferableHelper::RemoveFormat( const DataFlavor& rFlavor ) sal_Bool TransferableHelper::HasFormat( SotFormatStringId nFormat ) { - DataFlavorExVector::iterator aIter( mpFormats->begin() ), aEnd( mpFormats->end() ); - sal_Bool bRet = sal_False; + DataFlavorExVector::iterator aIter( mpFormats->begin() ), aEnd( mpFormats->end() ); + sal_Bool bRet = sal_False; while( aIter != aEnd ) { @@ -787,9 +787,9 @@ sal_Bool TransferableHelper::SetString( const ::rtl::OUString& rString, const Da SotExchange::GetFormatDataFlavor( FORMAT_FILE, aFileFlavor ) && TransferableDataHelper::IsEqual( aFileFlavor, rFlavor ) ) { - const String aString( rString ); - const ByteString aByteStr( aString, gsl_getSystemTextEncoding() ); - Sequence< sal_Int8 > aSeq( aByteStr.Len() + 1 ); + const String aString( rString ); + const ByteString aByteStr( aString, gsl_getSystemTextEncoding() ); + Sequence< sal_Int8 > aSeq( aByteStr.Len() + 1 ); rtl_copyMemory( aSeq.getArray(), aByteStr.GetBuffer(), aByteStr.Len() ); aSeq[ aByteStr.Len() ] = 0; @@ -928,9 +928,9 @@ sal_Bool TransferableHelper::SetINetBookmark( const INetBookmark& rBmk, #ifdef WNT case SOT_FORMATSTR_ID_FILEGRPDESCRIPTOR: { - Sequence< sal_Int8 > aSeq( sizeof( FILEGROUPDESCRIPTOR ) ); - FILEGROUPDESCRIPTOR* pFDesc = (FILEGROUPDESCRIPTOR*) aSeq.getArray(); - FILEDESCRIPTOR& rFDesc1 = pFDesc->fgd[ 0 ]; + Sequence< sal_Int8 > aSeq( sizeof( FILEGROUPDESCRIPTOR ) ); + FILEGROUPDESCRIPTOR* pFDesc = (FILEGROUPDESCRIPTOR*) aSeq.getArray(); + FILEDESCRIPTOR& rFDesc1 = pFDesc->fgd[ 0 ]; pFDesc->cItems = 1; memset( &rFDesc1, 0, sizeof( FILEDESCRIPTOR ) ); @@ -1005,8 +1005,8 @@ sal_Bool TransferableHelper::SetObject( void* pUserObject, sal_uInt32 nUserObjec if( pUserObject && WriteObject( xStm, pUserObject, nUserObjectId, rFlavor ) ) { - const sal_uInt32 nLen = xStm->Seek( STREAM_SEEK_TO_END ); - Sequence< sal_Int8 > aSeq( nLen ); + const sal_uInt32 nLen = xStm->Seek( STREAM_SEEK_TO_END ); + Sequence< sal_Int8 > aSeq( nLen ); xStm->Seek( STREAM_SEEK_TO_BEGIN ); xStm->Read( aSeq.getArray(), nLen ); @@ -1014,9 +1014,9 @@ sal_Bool TransferableHelper::SetObject( void* pUserObject, sal_uInt32 nUserObjec if( nLen && ( SotExchange::GetFormat( rFlavor ) == SOT_FORMAT_STRING ) ) { //JP 24.7.2001: as I know was this only for the writer application and this - // writes now UTF16 format into the stream + // writes now UTF16 format into the stream //JP 6.8.2001: and now it writes UTF8 because then exist no problem with - // little / big endians! - Bug 88121 + // little / big endians! - Bug 88121 maAny <<= ::rtl::OUString( reinterpret_cast< const sal_Char* >( aSeq.getConstArray() ), nLen - 1, RTL_TEXTENCODING_UTF8 ); } else @@ -1161,19 +1161,19 @@ void TransferableHelper::StartDrag( Window* pWindow, sal_Int8 nDnDSourceActions, if( pWindow->IsMouseCaptured() ) pWindow->ReleaseMouse(); - const Point aPt( pWindow->GetPointerPosPixel() ); + const Point aPt( pWindow->GetPointerPosPixel() ); // On Mac OS X we are forced to execute 'startDrag' synchronously // contrary to the XDragSource interface specification because - // we can receive drag events from the system only in the main + // we can receive drag events from the system only in the main // thread #if !defined(QUARTZ) const sal_uInt32 nRef = Application::ReleaseSolarMutex(); -#endif +#endif try { - DragGestureEvent aEvt; + DragGestureEvent aEvt; aEvt.DragAction = DNDConstants::ACTION_COPY; aEvt.DragOriginX = aPt.X(); aEvt.DragOriginY = aPt.Y(); @@ -1188,7 +1188,7 @@ void TransferableHelper::StartDrag( Window* pWindow, sal_Int8 nDnDSourceActions, // See above for the reason of this define #if !defined(QUARTZ) Application::AcquireSolarMutex( nRef ); -#endif +#endif } } @@ -1212,7 +1212,7 @@ Reference< XClipboard> TransferableHelper::GetSystemClipboard() if( pFocusWindow ) return pFocusWindow->GetClipboard(); - return Reference< XClipboard > (); + return Reference< XClipboard > (); } // ----------------------------------------------------------------------------- @@ -1243,7 +1243,7 @@ class TransferableClipboardNotifier : public ::cppu::WeakImplHelper1< XClipboard private: ::osl::Mutex& mrMutex; Reference< XClipboardNotifier > mxNotifier; - TransferableDataHelper* mpListener; + TransferableDataHelper* mpListener; protected: // XClipboardListener @@ -1415,7 +1415,7 @@ void TransferableDataHelper::FillDataFlavorExVector( const Sequence< DataFlavor { Reference< XMultiServiceFactory > xFact( ::comphelper::getProcessServiceFactory() ); Reference< XMimeContentTypeFactory > xMimeFact; - DataFlavorEx aFlavorEx; + DataFlavorEx aFlavorEx; const ::rtl::OUString aCharsetStr( ::rtl::OUString::createFromAscii( "charset" ) ); if( xFact.is() ) @@ -1425,7 +1425,7 @@ void TransferableDataHelper::FillDataFlavorExVector( const Sequence< DataFlavor for( sal_Int32 i = 0; i < rDataFlavorSeq.getLength(); i++ ) { - const DataFlavor& rFlavor = rDataFlavorSeq[ i ]; + const DataFlavor& rFlavor = rDataFlavorSeq[ i ]; Reference< XMimeContentType > xMimeType; try @@ -1542,8 +1542,8 @@ sal_Bool TransferableDataHelper::HasFormat( SotFormatStringId nFormat ) const { ::osl::MutexGuard aGuard( mpImpl->maMutex ); - DataFlavorExVector::iterator aIter( mpFormats->begin() ), aEnd( mpFormats->end() ); - sal_Bool bRet = sal_False; + DataFlavorExVector::iterator aIter( mpFormats->begin() ), aEnd( mpFormats->end() ); + sal_Bool bRet = sal_False; while( aIter != aEnd ) { @@ -1563,8 +1563,8 @@ sal_Bool TransferableDataHelper::HasFormat( const DataFlavor& rFlavor ) const { ::osl::MutexGuard aGuard( mpImpl->maMutex ); - DataFlavorExVector::iterator aIter( mpFormats->begin() ), aEnd( mpFormats->end() ); - sal_Bool bRet = sal_False; + DataFlavorExVector::iterator aIter( mpFormats->begin() ), aEnd( mpFormats->end() ); + sal_Bool bRet = sal_False; while( aIter != aEnd ) { @@ -1638,7 +1638,7 @@ Reference< XTransferable > TransferableDataHelper::GetXTransferable() const // ----------------------------------------------------------------------------- -Any TransferableDataHelper::GetAny( SotFormatStringId nFormat ) const +Any TransferableDataHelper::GetAny( SotFormatStringId nFormat ) const { Any aReturn; @@ -1771,8 +1771,8 @@ sal_Bool TransferableDataHelper::GetBitmap( SotFormatStringId nFormat, Bitmap& r sal_Bool TransferableDataHelper::GetBitmap( const DataFlavor& rFlavor, Bitmap& rBmp ) { SotStorageStreamRef xStm; - DataFlavor aSubstFlavor; - sal_Bool bRet = GetSotStorageStream( rFlavor, xStm ); + DataFlavor aSubstFlavor; + sal_Bool bRet = GetSotStorageStream( rFlavor, xStm ); if( bRet ) { @@ -1826,8 +1826,8 @@ sal_Bool TransferableDataHelper::GetGDIMetaFile( SotFormatStringId nFormat, GDIM sal_Bool TransferableDataHelper::GetGDIMetaFile( const DataFlavor& rFlavor, GDIMetaFile& rMtf ) { SotStorageStreamRef xStm; - DataFlavor aSubstFlavor; - sal_Bool bRet = sal_False; + DataFlavor aSubstFlavor; + sal_Bool bRet = sal_False; if( GetSotStorageStream( rFlavor, xStm ) ) { @@ -1878,10 +1878,10 @@ sal_Bool TransferableDataHelper::GetGraphic( SotFormatStringId nFormat, Graphic& sal_Bool TransferableDataHelper::GetGraphic( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, Graphic& rGraphic ) { - DataFlavor aFlavor; - sal_Bool bRet = sal_False; + DataFlavor aFlavor; + sal_Bool bRet = sal_False; - if( SotExchange::GetFormatDataFlavor( SOT_FORMAT_BITMAP, aFlavor ) && + if( SotExchange::GetFormatDataFlavor( SOT_FORMAT_BITMAP, aFlavor ) && TransferableDataHelper::IsEqual( aFlavor, rFlavor ) ) { Bitmap aBmp; @@ -1924,7 +1924,7 @@ sal_Bool TransferableDataHelper::GetImageMap( SotFormatStringId nFormat, ImageMa sal_Bool TransferableDataHelper::GetImageMap( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, ImageMap& rIMap ) { SotStorageStreamRef xStm; - sal_Bool bRet = GetSotStorageStream( rFlavor, xStm ); + sal_Bool bRet = GetSotStorageStream( rFlavor, xStm ); if( bRet ) { @@ -1982,8 +1982,8 @@ sal_Bool TransferableDataHelper::GetINetBookmark( const ::com::sun::star::datatr } else { - String aURL, aDesc; - sal_uInt16 nStart = aString.Search( '@' ), nLen = (sal_uInt16) aString.ToInt32(); + String aURL, aDesc; + sal_uInt16 nStart = aString.Search( '@' ), nLen = (sal_uInt16) aString.ToInt32(); if( !nLen && aString.GetChar( 0 ) != '0' ) { @@ -2040,8 +2040,8 @@ sal_Bool TransferableDataHelper::GetINetBookmark( const ::com::sun::star::datatr if( pFDesc->cItems ) { - ByteString aDesc( pFDesc->fgd[ 0 ].cFileName ); - rtl_TextEncoding eTextEncoding = gsl_getSystemTextEncoding(); + ByteString aDesc( pFDesc->fgd[ 0 ].cFileName ); + rtl_TextEncoding eTextEncoding = gsl_getSystemTextEncoding(); if( ( aDesc.Len() > 4 ) && aDesc.Copy( aDesc.Len() - 4 ).EqualsIgnoreCaseAscii( ".URL" ) ) { @@ -2066,8 +2066,8 @@ sal_Bool TransferableDataHelper::GetINetBookmark( const ::com::sun::star::datatr if( pStream ) { - ByteString aLine; - sal_Bool bSttFnd = sal_False; + ByteString aLine; + sal_Bool bSttFnd = sal_False; while( pStream->ReadLine( aLine ) ) { @@ -2196,8 +2196,8 @@ sal_Bool TransferableDataHelper::GetSotStorageStream( SotFormatStringId nFormat, sal_Bool TransferableDataHelper::GetSotStorageStream( const DataFlavor& rFlavor, SotStorageStreamRef& rxStream ) { - Sequence< sal_Int8 > aSeq; - sal_Bool bRet = GetSequence( rFlavor, aSeq ); + Sequence< sal_Int8 > aSeq; + sal_Bool bRet = GetSequence( rFlavor, aSeq ); if( bRet ) { @@ -2219,8 +2219,8 @@ sal_Bool TransferableDataHelper::GetInputStream( SotFormatStringId nFormat, Refe sal_Bool TransferableDataHelper::GetInputStream( const DataFlavor& rFlavor, Reference < XInputStream >& rxStream ) { - Sequence< sal_Int8 > aSeq; - sal_Bool bRet = GetSequence( rFlavor, aSeq ); + Sequence< sal_Int8 > aSeq; + sal_Bool bRet = GetSequence( rFlavor, aSeq ); if( bRet ) rxStream = new ::comphelper::SequenceInputStream( aSeq ); @@ -2286,8 +2286,8 @@ TransferableDataHelper TransferableDataHelper::CreateFromSystemClipboard( Window { DBG_ASSERT( pWindow, "Window pointer is NULL" ); - Reference< XClipboard > xClipboard; - TransferableDataHelper aRet; + Reference< XClipboard > xClipboard; + TransferableDataHelper aRet; if( pWindow ) xClipboard = pWindow->GetClipboard(); @@ -2321,8 +2321,8 @@ TransferableDataHelper TransferableDataHelper::CreateFromSelection( Window* pWin { DBG_ASSERT( pWindow, "Window pointer is NULL" ); - Reference< XClipboard > xSelection; - TransferableDataHelper aRet; + Reference< XClipboard > xSelection; + TransferableDataHelper aRet; if( pWindow ) xSelection = pWindow->GetPrimarySelection(); @@ -2358,7 +2358,7 @@ sal_Bool TransferableDataHelper::IsEqual( const ::com::sun::star::datatransfer:: { Reference< XMultiServiceFactory > xFact( ::comphelper::getProcessServiceFactory() ); Reference< XMimeContentTypeFactory > xMimeFact; - sal_Bool bRet = sal_False; + sal_Bool bRet = sal_False; try { diff --git a/svtools/source/misc/transfer2.cxx b/svtools/source/misc/transfer2.cxx index 3ef70f236b0d..8d31d86fd068 100644 --- a/svtools/source/misc/transfer2.cxx +++ b/svtools/source/misc/transfer2.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -339,8 +339,8 @@ sal_Int8 DropTargetHelper::ExecuteDrop( const ExecuteDropEvent& ) sal_Bool DropTargetHelper::IsDropFormatSupported( SotFormatStringId nFormat ) { - DataFlavorExVector::iterator aIter( mpFormats->begin() ), aEnd( mpFormats->end() ); - sal_Bool bRet = sal_False; + DataFlavorExVector::iterator aIter( mpFormats->begin() ), aEnd( mpFormats->end() ); + sal_Bool bRet = sal_False; while( aIter != aEnd ) { @@ -358,8 +358,8 @@ sal_Bool DropTargetHelper::IsDropFormatSupported( SotFormatStringId nFormat ) sal_Bool DropTargetHelper::IsDropFormatSupported( const DataFlavor& rFlavor ) { - DataFlavorExVector::iterator aIter( mpFormats->begin() ), aEnd( mpFormats->end() ); - sal_Bool bRet = sal_False; + DataFlavorExVector::iterator aIter( mpFormats->begin() ), aEnd( mpFormats->end() ); + sal_Bool bRet = sal_False; while( aIter != aEnd ) { @@ -433,7 +433,7 @@ void TransferDataContainer::AddSupportedFormats() sal_Bool TransferDataContainer::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) { - TDataCntnrEntryList::iterator aIter( pImpl->aFmtList.begin() ), + TDataCntnrEntryList::iterator aIter( pImpl->aFmtList.begin() ), aEnd( pImpl->aFmtList.end() ); sal_Bool bFnd = sal_False; ULONG nFmtId = SotExchange::GetFormat( rFlavor ); diff --git a/svtools/source/misc/unitconv.cxx b/svtools/source/misc/unitconv.cxx index 130c8edc24c8..4a5a4827c3e2 100644 --- a/svtools/source/misc/unitconv.cxx +++ b/svtools/source/misc/unitconv.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 @@ -40,7 +40,7 @@ void SetFieldUnit( MetricField& rField, FieldUnit eUnit, BOOL bAll ) { - sal_Int64 nFirst = rField.Denormalize( rField.GetFirst( FUNIT_TWIP ) ); + sal_Int64 nFirst = rField.Denormalize( rField.GetFirst( FUNIT_TWIP ) ); sal_Int64 nLast = rField.Denormalize( rField.GetLast( FUNIT_TWIP ) ); sal_Int64 nMin = rField.Denormalize( rField.GetMin( FUNIT_TWIP ) ); sal_Int64 nMax = rField.Denormalize( rField.GetMax( FUNIT_TWIP ) ); @@ -174,10 +174,10 @@ long CalcToUnit( float nIn, SfxMapUnit eUnit ) { // nIn ist in Points - DBG_ASSERT( eUnit == SFX_MAPUNIT_TWIP || - eUnit == SFX_MAPUNIT_100TH_MM || - eUnit == SFX_MAPUNIT_10TH_MM || - eUnit == SFX_MAPUNIT_MM || + DBG_ASSERT( eUnit == SFX_MAPUNIT_TWIP || + eUnit == SFX_MAPUNIT_100TH_MM || + eUnit == SFX_MAPUNIT_10TH_MM || + eUnit == SFX_MAPUNIT_MM || eUnit == SFX_MAPUNIT_CM, "this unit is not implemented" ); float nTmp = nIn; @@ -187,17 +187,17 @@ long CalcToUnit( float nIn, SfxMapUnit eUnit ) switch ( eUnit ) { - case SFX_MAPUNIT_100TH_MM: nTmp *= 100; break; - case SFX_MAPUNIT_10TH_MM: nTmp *= 10; break; - case SFX_MAPUNIT_MM: break; - case SFX_MAPUNIT_CM: nTmp /= 10; break; + case SFX_MAPUNIT_100TH_MM: nTmp *= 100; break; + case SFX_MAPUNIT_10TH_MM: nTmp *= 10; break; + case SFX_MAPUNIT_MM: break; + case SFX_MAPUNIT_CM: nTmp /= 10; break; default: ;//prevent warning } nTmp *= 20; long nRet = (long)nTmp; return nRet; -//! return (long)(nTmp * 20); +//! return (long)(nTmp * 20); } // ----------------------------------------------------------------------- @@ -356,10 +356,10 @@ long ConvertValueToUnit( long nVal, SfxMapUnit eUnit ) long CalcToPoint( long nIn, SfxMapUnit eUnit, USHORT nFaktor ) { - DBG_ASSERT( eUnit == SFX_MAPUNIT_TWIP || - eUnit == SFX_MAPUNIT_100TH_MM || - eUnit == SFX_MAPUNIT_10TH_MM || - eUnit == SFX_MAPUNIT_MM || + DBG_ASSERT( eUnit == SFX_MAPUNIT_TWIP || + eUnit == SFX_MAPUNIT_100TH_MM || + eUnit == SFX_MAPUNIT_10TH_MM || + eUnit == SFX_MAPUNIT_MM || eUnit == SFX_MAPUNIT_CM, "this unit is not implemented" ); long nRet = 0; @@ -371,10 +371,10 @@ long CalcToPoint( long nIn, SfxMapUnit eUnit, USHORT nFaktor ) switch ( eUnit ) { - case SFX_MAPUNIT_100TH_MM: nRet /= 100; break; - case SFX_MAPUNIT_10TH_MM: nRet /= 10; break; - case SFX_MAPUNIT_MM: break; - case SFX_MAPUNIT_CM: nRet *= 10; break; + case SFX_MAPUNIT_100TH_MM: nRet /= 100; break; + case SFX_MAPUNIT_10TH_MM: nRet /= 10; break; + case SFX_MAPUNIT_MM: break; + case SFX_MAPUNIT_CM: nRet *= 10; break; default: ;//prevent warning } @@ -707,20 +707,20 @@ long Nothing( long nIn ) FUNC_CONVERT ConvertTable[6][6] = { -// CM, MM INCH POINT PICAS=32 TWIPS - { Nothing, CMToMM, CMToInch, CMToPoint, CMToPica, CMToTwips }, - { MMToCM, Nothing, MMToInch, MMToPoint, MMToPica, MMToTwips }, - { InchToCM, InchToMM, Nothing, InchToPoint, InchToPica, InchToTwips }, - { PointToCM, PointToMM, PointToInch, Nothing, PointToPica, PointToTwips }, - { PicaToCM, PicaToMM, PicaToInch, PicaToPoint, Nothing, PicaToTwips }, - { TwipsToCM, TwipsToMM, TwipsToInch, TwipsToPoint,TwipsToPica, Nothing } +// CM, MM INCH POINT PICAS=32 TWIPS + { Nothing, CMToMM, CMToInch, CMToPoint, CMToPica, CMToTwips }, + { MMToCM, Nothing, MMToInch, MMToPoint, MMToPica, MMToTwips }, + { InchToCM, InchToMM, Nothing, InchToPoint, InchToPica, InchToTwips }, + { PointToCM, PointToMM, PointToInch, Nothing, PointToPica, PointToTwips }, + { PicaToCM, PicaToMM, PicaToInch, PicaToPoint, Nothing, PicaToTwips }, + { TwipsToCM, TwipsToMM, TwipsToInch, TwipsToPoint,TwipsToPica, Nothing } }; // ----------------------------------------------------------------------- long TransformMetric( long nVal, FieldUnit aOld, FieldUnit aNew ) { - if ( aOld == FUNIT_NONE || aNew == FUNIT_NONE || + if ( aOld == FUNIT_NONE || aNew == FUNIT_NONE || aOld == FUNIT_CUSTOM || aNew == FUNIT_CUSTOM ) { return nVal; diff --git a/svtools/source/misc/wallitem.cxx b/svtools/source/misc/wallitem.cxx index 147cd0a6b154..82cd8aadb394 100644 --- a/svtools/source/misc/wallitem.cxx +++ b/svtools/source/misc/wallitem.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/svtools/source/misc/xwindowitem.cxx b/svtools/source/misc/xwindowitem.cxx index d801d06317b8..791b7e72501b 100644 --- a/svtools/source/misc/xwindowitem.cxx +++ b/svtools/source/misc/xwindowitem.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ using namespace ::com::sun::star; TYPEINIT1_FACTORY( XWindowItem, SfxPoolItem, new XWindowItem ); - -XWindowItem::XWindowItem() : + +XWindowItem::XWindowItem() : SfxPoolItem() { } @@ -58,16 +58,16 @@ XWindowItem::XWindowItem( USHORT nWhichId, Window * pWin ) : } } - + XWindowItem::XWindowItem( USHORT nWhichId, uno::Reference< awt::XWindow > & rxWin ) : - SfxPoolItem( nWhichId ), + SfxPoolItem( nWhichId ), m_xWin( rxWin ) { -} +} XWindowItem::XWindowItem( const XWindowItem &rItem ) : - SfxPoolItem( Which() ), + SfxPoolItem( Which() ), m_xWin( rItem.m_xWin ) { } @@ -77,12 +77,12 @@ XWindowItem::~XWindowItem() { } - + SfxPoolItem * XWindowItem::Clone( SfxItemPool* /*pPool*/ ) const { return new XWindowItem( *this ); } - + int XWindowItem::operator == ( const SfxPoolItem & rAttr ) const { diff --git a/svtools/source/plugapp/commtest.cxx b/svtools/source/plugapp/commtest.cxx index 6dc88e4d9645..7c5dd316569a 100644 --- a/svtools/source/plugapp/commtest.cxx +++ b/svtools/source/plugapp/commtest.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -142,23 +142,23 @@ void CommunicationTester::Main() Execute(); } -#define SWITCH( pManager, ManagerClass ) \ -{ \ - if ( pManager ) \ - { \ - pManager->StopCommunication(); \ - new DelayedDeleter( 1000, pManager ); \ - pTB->SetItemState( pTB->GetCurItemId(), STATE_NOCHECK ); \ - pManager = NULL; \ - } \ - else \ - { \ - pManager = new ManagerClass; \ +#define SWITCH( pManager, ManagerClass ) \ +{ \ + if ( pManager ) \ + { \ + pManager->StopCommunication(); \ + new DelayedDeleter( 1000, pManager ); \ + pTB->SetItemState( pTB->GetCurItemId(), STATE_NOCHECK ); \ + pManager = NULL; \ + } \ + else \ + { \ + pManager = new ManagerClass; \ pManager->SetConnectionOpenedHdl( LINK( this, CommunicationTester, ConnectionOpened ) );\ pManager->SetConnectionClosedHdl( LINK( this, CommunicationTester, ConnectionClosed ) );\ pManager->SetDataReceivedHdl( LINK( this, CommunicationTester, DataReceived ) );\ - pTB->SetItemState( pTB->GetCurItemId(), STATE_CHECK ); \ - } \ + pTB->SetItemState( pTB->GetCurItemId(), STATE_CHECK ); \ + } \ } @@ -170,14 +170,14 @@ IMPL_LINK( CommunicationTester, TBClick, ToolBox*, pTB ) { SWITCH( pServerTcp, CommunicationManagerServerViaSocket( TCP_PORT, (USHORT) 32000 ) ); if ( pServerTcp ) - pServerTcp->StartCommunication(); // Am Port horchen + pServerTcp->StartCommunication(); // Am Port horchen } break; case CLIENT_TCP: { SWITCH( pClientTcp, CommunicationManagerClientViaSocket( "localhost", TCP_PORT ) ); if ( pClientTcp ) - pClientTcp->StartCommunication(); // Eine Verbindung aufbauen + pClientTcp->StartCommunication(); // Eine Verbindung aufbauen } break; case BCST_BROOKER: diff --git a/svtools/source/plugapp/commtest.hrc b/svtools/source/plugapp/commtest.hrc index f0f646b49bfc..973d1ac06089 100644 --- a/svtools/source/plugapp/commtest.hrc +++ b/svtools/source/plugapp/commtest.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,8 +27,8 @@ #define TBMenu 256 -#define SERVER_TCP 1 -#define CLIENT_TCP 2 -#define BCST_BROOKER 3 -#define BCST_LISTEN 4 -#define BCST_SEND 5 +#define SERVER_TCP 1 +#define CLIENT_TCP 2 +#define BCST_BROOKER 3 +#define BCST_LISTEN 4 +#define BCST_SEND 5 diff --git a/svtools/source/plugapp/commtest.src b/svtools/source/plugapp/commtest.src index 7073699f4956..47c1fd0acab1 100644 --- a/svtools/source/plugapp/commtest.src +++ b/svtools/source/plugapp/commtest.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 @@ ToolBox TBMenu { Pos = MAP_APPFONT( 0, 0 ); Size = MAP_APPFONT( 100, 20 ); LineCount = 2; -// FloatingLines = 2; +// FloatingLines = 2; ItemList = { ToolBoxItem { Identifier = SERVER_TCP; diff --git a/svtools/source/plugapp/testtool.hrc b/svtools/source/plugapp/testtool.hrc index d6a234b74236..e8d1c04ac699 100644 --- a/svtools/source/plugapp/testtool.hrc +++ b/svtools/source/plugapp/testtool.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,32 +24,32 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define TTSTART 12345 +#define TTSTART 12345 -#define DisplayHidToolBox ( TTSTART + 0 ) -#define TT_SHOW 1 -#define TT_SHOW2 ( TTSTART + 1 ) -#define TT_OUTPUT 3 -#define TT_SEND_DATA 4 -#define TT_ALLWIN 5 -#define TT_KURZNAME 6 -#define TT_LANGNAME 7 +#define DisplayHidToolBox ( TTSTART + 0 ) +#define TT_SHOW 1 +#define TT_SHOW2 ( TTSTART + 1 ) +#define TT_OUTPUT 3 +#define TT_SEND_DATA 4 +#define TT_ALLWIN 5 +#define TT_KURZNAME 6 +#define TT_LANGNAME 7 #define TT_ALTERNATE_CAPTION ( TTSTART + 2 ) #define TT_INLINE_TRANSLATION ( TTSTART + 3) -#define TT_GB_TRANSLATION 1 -#define TT_E_NEW 2 -#define TT_FT_OLD 3 -#define TT_GB_COMMENT 4 -#define TT_E_COMMENT 5 +#define TT_GB_TRANSLATION 1 +#define TT_E_NEW 2 +#define TT_FT_OLD 3 +#define TT_GB_COMMENT 4 +#define TT_E_COMMENT 5 -#define TT_PB_SELECT 6 -#define TT_PB_RESTORE 7 -#define TT_PB_ACCEPT 8 -#define TT_PB_NEXT 9 +#define TT_PB_SELECT 6 +#define TT_PB_RESTORE 7 +#define TT_PB_ACCEPT 8 +#define TT_PB_NEXT 9 #define TT_DISCARD_CHANGED_DATA ( TTSTART + 4 ) -#define TT_NO_CONTROL ( TTSTART + 5 ) +#define TT_NO_CONTROL ( TTSTART + 5 ) -#define TT_GPF ( TTSTART + 6 ) +#define TT_GPF ( TTSTART + 6 ) diff --git a/svtools/source/plugapp/testtool.src b/svtools/source/plugapp/testtool.src index 9cc52c58f013..f7c905202ad2 100644 --- a/svtools/source/plugapp/testtool.src +++ b/svtools/source/plugapp/testtool.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,10 +28,10 @@ #include <svl/solar.hrc> -#define Control_Control 5 -#define Control_Border 7 -#define Button_Button Control_Control -#define ButtonWidth 40 +#define Control_Control 5 +#define Control_Border 7 +#define Button_Button Control_Control +#define ButtonWidth 40 ToolBox DisplayHidToolBox { diff --git a/svtools/source/plugapp/ttprops.cxx b/svtools/source/plugapp/ttprops.cxx index fb556cfcebc1..53e483408acd 100644 --- a/svtools/source/plugapp/ttprops.cxx +++ b/svtools/source/plugapp/ttprops.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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/svtools/source/productregistration/productregistration.cxx b/svtools/source/productregistration/productregistration.cxx index 1a76a939def7..890d57f5546b 100644 --- a/svtools/source/productregistration/productregistration.cxx +++ b/svtools/source/productregistration/productregistration.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ namespace svt struct EqualsOUString : public ::std::unary_function< OUString, sal_Bool > { - const OUString& m_rCompare; + const OUString& m_rCompare; EqualsOUString( const OUString& _rCompare ) : m_rCompare( _rCompare ) { } sal_Bool operator() ( const OUString& _rCompare ) @@ -298,7 +298,7 @@ namespace svt static sal_Bool bFirstEncounter( sal_True ); if ( bFirstEncounter ) - { // during this session, this event was never triggered before .... + { // during this session, this event was never triggered before .... bFirstEncounter = sal_False; sal_Bool bDeactivateJob = sal_True; @@ -309,7 +309,7 @@ namespace svt utl::RegOptions::DialogPermission ePermission( aRegOptions.getDialogPermission() ); if ( utl::RegOptions::dpDisabled != ePermission ) - { // the dialog is _not_ disabled + { // the dialog is _not_ disabled // for this session, I'm no interested in the dialog registration anymore aRegOptions.markSessionDone( ); @@ -317,7 +317,7 @@ namespace svt if ( ( utl::RegOptions::dpNotThisSession == ePermission ) // first trigger session not reached || ( utl::RegOptions::dpRemindLater == ePermission ) // or at a later reminder date ) - { // the dialog should be executed during one of the next sessions + { // the dialog should be executed during one of the next sessions bDeactivateJob = sal_False; } else @@ -449,7 +449,7 @@ namespace svt } //........................................................................ -} // namespace svt +} // namespace svt //........................................................................ extern "C" diff --git a/svtools/source/productregistration/productregistration.hxx b/svtools/source/productregistration/productregistration.hxx index edebe0cc9ba1..25de90332460 100644 --- a/svtools/source/productregistration/productregistration.hxx +++ b/svtools/source/productregistration/productregistration.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,10 +43,10 @@ namespace svt //==================================================================== //= OProductRegistration //==================================================================== - typedef ::cppu::WeakImplHelper3 < ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::task::XJobExecutor - , ::com::sun::star::task::XJob - > OProductRegistration_Base; + typedef ::cppu::WeakImplHelper3 < ::com::sun::star::lang::XServiceInfo + , ::com::sun::star::task::XJobExecutor + , ::com::sun::star::task::XJob + > OProductRegistration_Base; class OProductRegistration : public OProductRegistration_Base { @@ -94,7 +94,7 @@ namespace svt }; //........................................................................ -} // namespace svt +} // namespace svt //........................................................................ #endif // SVTOOLS_PRODUCTREGISTRATION_HXX diff --git a/svtools/source/productregistration/registrationdlg.cxx b/svtools/source/productregistration/registrationdlg.cxx index 3e3ba5f64d52..f44158279ad0 100644 --- a/svtools/source/productregistration/registrationdlg.cxx +++ b/svtools/source/productregistration/registrationdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,16 +58,16 @@ namespace svt //-------------------------------------------------------------------- RegistrationDialog::RegistrationDialog( Window* _pWindow, const ResId& _rResId, bool _bEvalVersion ) :ModalDialog( _pWindow, _rResId ) - ,m_eResponse ( urRegisterLater ) - ,m_aLogo ( this, ResId( FI_LOGO, *_rResId.GetResMgr() ) ) - ,m_aIntro ( this, ResId( FT_INTRO, *_rResId.GetResMgr() ) ) - ,m_aNow ( this, ResId( RB_NOW, *_rResId.GetResMgr() ) ) - ,m_aLater ( this, ResId( RB_LATER, *_rResId.GetResMgr() ) ) - ,m_aNever ( this, ResId( RB_NEVER, *_rResId.GetResMgr() ) ) - ,m_aAlreadyDone ( this, ResId( RB_DONE, *_rResId.GetResMgr() ) ) - ,m_aSeparator ( this, ResId( FL_SEPARATOR, *_rResId.GetResMgr() ) ) - ,m_aOK ( this, ResId( BTN_OK, *_rResId.GetResMgr() ) ) - ,m_aHelp ( this, ResId( BTN_HELP, *_rResId.GetResMgr() ) ) + ,m_eResponse ( urRegisterLater ) + ,m_aLogo ( this, ResId( FI_LOGO, *_rResId.GetResMgr() ) ) + ,m_aIntro ( this, ResId( FT_INTRO, *_rResId.GetResMgr() ) ) + ,m_aNow ( this, ResId( RB_NOW, *_rResId.GetResMgr() ) ) + ,m_aLater ( this, ResId( RB_LATER, *_rResId.GetResMgr() ) ) + ,m_aNever ( this, ResId( RB_NEVER, *_rResId.GetResMgr() ) ) + ,m_aAlreadyDone ( this, ResId( RB_DONE, *_rResId.GetResMgr() ) ) + ,m_aSeparator ( this, ResId( FL_SEPARATOR, *_rResId.GetResMgr() ) ) + ,m_aOK ( this, ResId( BTN_OK, *_rResId.GetResMgr() ) ) + ,m_aHelp ( this, ResId( BTN_HELP, *_rResId.GetResMgr() ) ) { if ( _bEvalVersion ) { // if we're an eval version, we need to hide two of the options @@ -144,7 +144,7 @@ namespace svt { long nHandled; if( rNEvt.GetType() == EVENT_KEYINPUT && - rNEvt.GetKeyEvent()->GetCharCode() && + rNEvt.GetKeyEvent()->GetCharCode() && rNEvt.GetKeyEvent()->GetKeyCode().GetCode() == KEY_ESCAPE) { EndDialog(RET_CANCEL); @@ -153,11 +153,11 @@ namespace svt else nHandled = ModalDialog::PreNotify( rNEvt ); return nHandled; - } + } //........................................................................ -} // namespace svt +} // namespace svt //........................................................................ diff --git a/svtools/source/productregistration/registrationdlg.hrc b/svtools/source/productregistration/registrationdlg.hrc index cfcde5f8c9b3..9685e8e8e432 100644 --- a/svtools/source/productregistration/registrationdlg.hrc +++ b/svtools/source/productregistration/registrationdlg.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 @@ #ifndef SVTOOLS_REGISTRATIONDLG_HRC #define SVTOOLS_REGISTRATIONDLG_HRC -#define FI_LOGO 1 -#define FT_INTRO 2 -#define RB_NOW 3 -#define RB_LATER 4 -#define RB_NEVER 5 -#define RB_DONE 6 -#define FL_SEPARATOR 7 -#define BTN_OK 8 -#define BTN_HELP 9 -#define STR_COMPLETE_INTRO 10 +#define FI_LOGO 1 +#define FT_INTRO 2 +#define RB_NOW 3 +#define RB_LATER 4 +#define RB_NEVER 5 +#define RB_DONE 6 +#define FL_SEPARATOR 7 +#define BTN_OK 8 +#define BTN_HELP 9 +#define STR_COMPLETE_INTRO 10 #endif // SVTOOLS_REGISTRATIONDLG_HRC diff --git a/svtools/source/productregistration/registrationdlg.hxx b/svtools/source/productregistration/registrationdlg.hxx index 48126d63efae..78ffb3a02f29 100644 --- a/svtools/source/productregistration/registrationdlg.hxx +++ b/svtools/source/productregistration/registrationdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,28 +53,28 @@ namespace svt }; private: - UserResponse m_eResponse; + UserResponse m_eResponse; - FixedImage m_aLogo; - FixedText m_aIntro; + FixedImage m_aLogo; + FixedText m_aIntro; - RadioButton m_aNow; - RadioButton m_aLater; - RadioButton m_aNever; - RadioButton m_aAlreadyDone; + RadioButton m_aNow; + RadioButton m_aLater; + RadioButton m_aNever; + RadioButton m_aAlreadyDone; - FixedLine m_aSeparator; + FixedLine m_aSeparator; - OKButton m_aOK; - HelpButton m_aHelp; + OKButton m_aOK; + HelpButton m_aHelp; public: RegistrationDialog( Window* _pWindow, const ResId& _rResId, bool _bEvalVersion ); - virtual short Execute(); + virtual short Execute(); virtual long PreNotify( NotifyEvent& rNEvt ); - inline UserResponse getResponse() const { return m_eResponse; } + inline UserResponse getResponse() const { return m_eResponse; } }; diff --git a/svtools/source/productregistration/registrationdlg.src b/svtools/source/productregistration/registrationdlg.src index c4cdcbcbe3ec..ea0226ae4b22 100644 --- a/svtools/source/productregistration/registrationdlg.src +++ b/svtools/source/productregistration/registrationdlg.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/svtools/source/svhtml/htmlkywd.cxx b/svtools/source/svhtml/htmlkywd.cxx index 48b9db7a84fe..ad1373966cf9 100644 --- a/svtools/source/svhtml/htmlkywd.cxx +++ b/svtools/source/svhtml/htmlkywd.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,156 +53,156 @@ struct HTML_TokenEntry static int __FAR_DATA bSortKeyWords = FALSE; static HTML_TokenEntry __FAR_DATA aHTMLTokenTab[] = { - {{OOO_STRING_SVTOOLS_HTML_area}, HTML_AREA}, // Netscape 2.0 - {{OOO_STRING_SVTOOLS_HTML_base}, HTML_BASE}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_comment}, HTML_COMMENT}, - {{OOO_STRING_SVTOOLS_HTML_doctype}, HTML_DOCTYPE}, - {{OOO_STRING_SVTOOLS_HTML_embed}, HTML_EMBED}, // Netscape 2.0 - {{OOO_STRING_SVTOOLS_HTML_figureoverlay}, HTML_FIGUREOVERLAY}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_horzrule}, HTML_HORZRULE}, - {{OOO_STRING_SVTOOLS_HTML_horztab}, HTML_HORZTAB}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_image}, HTML_IMAGE}, - {{OOO_STRING_SVTOOLS_HTML_image2}, HTML_IMAGE}, - {{OOO_STRING_SVTOOLS_HTML_input}, HTML_INPUT}, - {{OOO_STRING_SVTOOLS_HTML_isindex}, HTML_ISINDEX}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_li}, HTML_LI_ON}, - {{OOO_STRING_SVTOOLS_HTML_linebreak}, HTML_LINEBREAK}, - {{OOO_STRING_SVTOOLS_HTML_link}, HTML_LINK}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_meta}, HTML_META}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_nextid}, HTML_NEXTID}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_of}, HTML_OF}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_option}, HTML_OPTION}, - {{OOO_STRING_SVTOOLS_HTML_param}, HTML_PARAM}, // HotJava - {{OOO_STRING_SVTOOLS_HTML_range}, HTML_RANGE}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_spacer}, HTML_SPACER}, // Netscape 3.0b5 - {{OOO_STRING_SVTOOLS_HTML_wbr}, HTML_WBR}, // Netscape - - {{OOO_STRING_SVTOOLS_HTML_abbreviation}, HTML_ABBREVIATION_ON}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_above}, HTML_ABOVE_ON}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_acronym}, HTML_ACRONYM_ON}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_address}, HTML_ADDRESS_ON}, - {{OOO_STRING_SVTOOLS_HTML_anchor}, HTML_ANCHOR_ON}, - {{OOO_STRING_SVTOOLS_HTML_applet}, HTML_APPLET_ON}, // HotJava - {{OOO_STRING_SVTOOLS_HTML_array}, HTML_ARRAY_ON}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_author}, HTML_AUTHOR_ON}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_banner}, HTML_BANNER_ON}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_bar}, HTML_BAR_ON}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_basefont}, HTML_BASEFONT_ON}, // Netscape - {{OOO_STRING_SVTOOLS_HTML_below}, HTML_BELOW_ON}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_bigprint}, HTML_BIGPRINT_ON}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_blink}, HTML_BLINK_ON}, // Netscape - {{OOO_STRING_SVTOOLS_HTML_blockquote}, HTML_BLOCKQUOTE_ON}, - {{OOO_STRING_SVTOOLS_HTML_blockquote30}, HTML_BLOCKQUOTE30_ON}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_body}, HTML_BODY_ON}, - {{OOO_STRING_SVTOOLS_HTML_bold}, HTML_BOLD_ON}, - {{OOO_STRING_SVTOOLS_HTML_boldtext}, HTML_BOLDTEXT_ON}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_box}, HTML_BOX_ON}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_caption}, HTML_CAPTION_ON}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_center}, HTML_CENTER_ON}, // Netscape - {{OOO_STRING_SVTOOLS_HTML_citiation}, HTML_CITIATION_ON}, - {{OOO_STRING_SVTOOLS_HTML_col}, HTML_COL_ON}, // HTML 3 Table Model Draft - {{OOO_STRING_SVTOOLS_HTML_colgroup}, HTML_COLGROUP_ON}, // HTML 3 Table Model Draft - {{OOO_STRING_SVTOOLS_HTML_code}, HTML_CODE_ON}, - {{OOO_STRING_SVTOOLS_HTML_credit}, HTML_CREDIT_ON}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_dd}, HTML_DD_ON}, - {{OOO_STRING_SVTOOLS_HTML_deflist}, HTML_DEFLIST_ON}, - {{OOO_STRING_SVTOOLS_HTML_deletedtext}, HTML_DELETEDTEXT_ON}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_dirlist}, HTML_DIRLIST_ON}, - {{OOO_STRING_SVTOOLS_HTML_division}, HTML_DIVISION_ON}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_dot}, HTML_DOT_ON}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_doubledot}, HTML_DOUBLEDOT_ON}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_dt}, HTML_DT_ON}, - {{OOO_STRING_SVTOOLS_HTML_emphasis}, HTML_EMPHASIS_ON}, - {{OOO_STRING_SVTOOLS_HTML_figure}, HTML_FIGURE_ON}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_font}, HTML_FONT_ON}, // Netscpe - {{OOO_STRING_SVTOOLS_HTML_footnote}, HTML_FOOTNOTE_ON}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_form}, HTML_FORM_ON}, - {{OOO_STRING_SVTOOLS_HTML_frame}, HTML_FRAME_ON}, // Netscape 2.0 - {{OOO_STRING_SVTOOLS_HTML_frameset}, HTML_FRAMESET_ON}, // Netscape 2.0 - {{OOO_STRING_SVTOOLS_HTML_hat}, HTML_HAT_ON}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_head}, HTML_HEAD_ON}, - {{OOO_STRING_SVTOOLS_HTML_head1}, HTML_HEAD1_ON}, - {{OOO_STRING_SVTOOLS_HTML_head2}, HTML_HEAD2_ON}, - {{OOO_STRING_SVTOOLS_HTML_head3}, HTML_HEAD3_ON}, - {{OOO_STRING_SVTOOLS_HTML_head4}, HTML_HEAD4_ON}, - {{OOO_STRING_SVTOOLS_HTML_head5}, HTML_HEAD5_ON}, - {{OOO_STRING_SVTOOLS_HTML_head6}, HTML_HEAD6_ON}, - {{OOO_STRING_SVTOOLS_HTML_html}, HTML_HTML_ON}, - {{OOO_STRING_SVTOOLS_HTML_iframe}, HTML_IFRAME_ON}, // IE 3.0b2 - {{OOO_STRING_SVTOOLS_HTML_ilayer}, HTML_ILAYER_ON}, - {{OOO_STRING_SVTOOLS_HTML_insertedtext}, HTML_INSERTEDTEXT_ON}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_italic}, HTML_ITALIC_ON}, - {{OOO_STRING_SVTOOLS_HTML_item}, HTML_ITEM_ON}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_keyboard}, HTML_KEYBOARD_ON}, - {{OOO_STRING_SVTOOLS_HTML_language}, HTML_LANGUAGE_ON}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_layer}, HTML_LAYER_ON}, - {{OOO_STRING_SVTOOLS_HTML_listheader}, HTML_LISTHEADER_ON}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_map}, HTML_MAP_ON}, // Netscape 2.0 - {{OOO_STRING_SVTOOLS_HTML_math}, HTML_MATH_ON}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_menulist}, HTML_MENULIST_ON}, - {{OOO_STRING_SVTOOLS_HTML_multicol}, HTML_MULTICOL_ON}, // Netscape 3.0b5 - {{OOO_STRING_SVTOOLS_HTML_nobr}, HTML_NOBR_ON}, // Netscape - {{OOO_STRING_SVTOOLS_HTML_noembed}, HTML_NOEMBED_ON}, // Netscape 2.0 ??? - {{OOO_STRING_SVTOOLS_HTML_noframe}, HTML_NOFRAMES_ON}, // Netscape 2.0 ??? - {{OOO_STRING_SVTOOLS_HTML_noframes}, HTML_NOFRAMES_ON}, // Netscape 2.0 - {{OOO_STRING_SVTOOLS_HTML_noscript}, HTML_NOSCRIPT_ON}, // Netscape 3.0 - {{OOO_STRING_SVTOOLS_HTML_note}, HTML_NOTE_ON}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_object}, HTML_OBJECT_ON}, - {{OOO_STRING_SVTOOLS_HTML_orderlist}, HTML_ORDERLIST_ON}, - {{OOO_STRING_SVTOOLS_HTML_parabreak}, HTML_PARABREAK_ON}, - {{OOO_STRING_SVTOOLS_HTML_person}, HTML_PERSON_ON}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_plaintext}, HTML_PLAINTEXT_ON}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_preformtxt}, HTML_PREFORMTXT_ON}, - {{OOO_STRING_SVTOOLS_HTML_root}, HTML_ROOT_ON}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_row}, HTML_ROW_ON}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_sample}, HTML_SAMPLE_ON}, - {{OOO_STRING_SVTOOLS_HTML_script}, HTML_SCRIPT_ON}, // HTML 3.2 - {{OOO_STRING_SVTOOLS_HTML_select}, HTML_SELECT_ON}, - {{OOO_STRING_SVTOOLS_HTML_shortquote}, HTML_SHORTQUOTE_ON}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_smallprint}, HTML_SMALLPRINT_ON}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_span}, HTML_SPAN_ON}, // Style Sheets - {{OOO_STRING_SVTOOLS_HTML_squareroot}, HTML_SQUAREROOT_ON}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_strikethrough},HTML_STRIKETHROUGH_ON}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_strong}, HTML_STRONG_ON}, - {{OOO_STRING_SVTOOLS_HTML_style}, HTML_STYLE_ON}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_subscript}, HTML_SUBSCRIPT_ON}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_superscript}, HTML_SUPERSCRIPT_ON}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_table}, HTML_TABLE_ON}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_tabledata}, HTML_TABLEDATA_ON}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_tableheader}, HTML_TABLEHEADER_ON}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_tablerow}, HTML_TABLEROW_ON}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_tbody}, HTML_TBODY_ON}, // HTML 3 Table Model Draft - {{OOO_STRING_SVTOOLS_HTML_teletype}, HTML_TELETYPE_ON}, - {{OOO_STRING_SVTOOLS_HTML_text}, HTML_TEXT_ON}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_textarea}, HTML_TEXTAREA_ON}, - {{OOO_STRING_SVTOOLS_HTML_textflow}, HTML_TEXTFLOW_ON}, - {{OOO_STRING_SVTOOLS_HTML_tfoot}, HTML_TFOOT_ON}, // HTML 3 Table Model Draft - {{OOO_STRING_SVTOOLS_HTML_thead}, HTML_THEAD_ON}, // HTML 3 Table Model Draft - {{OOO_STRING_SVTOOLS_HTML_tilde}, HTML_TILDE_ON}, // HTML 3.0 - {{OOO_STRING_SVTOOLS_HTML_title}, HTML_TITLE_ON}, - {{OOO_STRING_SVTOOLS_HTML_underline}, HTML_UNDERLINE_ON}, - {{OOO_STRING_SVTOOLS_HTML_unorderlist}, HTML_UNORDERLIST_ON}, - {{OOO_STRING_SVTOOLS_HTML_variable}, HTML_VARIABLE_ON}, - {{OOO_STRING_SVTOOLS_HTML_vector}, HTML_VECTOR_ON}, // HTML 3.0 - - {{OOO_STRING_SVTOOLS_HTML_xmp}, HTML_XMP_ON}, - {{OOO_STRING_SVTOOLS_HTML_listing}, HTML_LISTING_ON}, - - {{OOO_STRING_SVTOOLS_HTML_definstance}, HTML_DEFINSTANCE_ON}, - {{OOO_STRING_SVTOOLS_HTML_strike}, HTML_STRIKE_ON}, - - {{OOO_STRING_SVTOOLS_HTML_bgsound}, HTML_BGSOUND}, - {{OOO_STRING_SVTOOLS_HTML_comment2}, HTML_COMMENT2_ON}, - {{OOO_STRING_SVTOOLS_HTML_marquee}, HTML_MARQUEE_ON}, - {{OOO_STRING_SVTOOLS_HTML_plaintext2}, HTML_PLAINTEXT2_ON}, - - {{OOO_STRING_SVTOOLS_HTML_sdfield}, HTML_SDFIELD_ON} + {{OOO_STRING_SVTOOLS_HTML_area}, HTML_AREA}, // Netscape 2.0 + {{OOO_STRING_SVTOOLS_HTML_base}, HTML_BASE}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_comment}, HTML_COMMENT}, + {{OOO_STRING_SVTOOLS_HTML_doctype}, HTML_DOCTYPE}, + {{OOO_STRING_SVTOOLS_HTML_embed}, HTML_EMBED}, // Netscape 2.0 + {{OOO_STRING_SVTOOLS_HTML_figureoverlay}, HTML_FIGUREOVERLAY}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_horzrule}, HTML_HORZRULE}, + {{OOO_STRING_SVTOOLS_HTML_horztab}, HTML_HORZTAB}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_image}, HTML_IMAGE}, + {{OOO_STRING_SVTOOLS_HTML_image2}, HTML_IMAGE}, + {{OOO_STRING_SVTOOLS_HTML_input}, HTML_INPUT}, + {{OOO_STRING_SVTOOLS_HTML_isindex}, HTML_ISINDEX}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_li}, HTML_LI_ON}, + {{OOO_STRING_SVTOOLS_HTML_linebreak}, HTML_LINEBREAK}, + {{OOO_STRING_SVTOOLS_HTML_link}, HTML_LINK}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_meta}, HTML_META}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_nextid}, HTML_NEXTID}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_of}, HTML_OF}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_option}, HTML_OPTION}, + {{OOO_STRING_SVTOOLS_HTML_param}, HTML_PARAM}, // HotJava + {{OOO_STRING_SVTOOLS_HTML_range}, HTML_RANGE}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_spacer}, HTML_SPACER}, // Netscape 3.0b5 + {{OOO_STRING_SVTOOLS_HTML_wbr}, HTML_WBR}, // Netscape + + {{OOO_STRING_SVTOOLS_HTML_abbreviation}, HTML_ABBREVIATION_ON}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_above}, HTML_ABOVE_ON}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_acronym}, HTML_ACRONYM_ON}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_address}, HTML_ADDRESS_ON}, + {{OOO_STRING_SVTOOLS_HTML_anchor}, HTML_ANCHOR_ON}, + {{OOO_STRING_SVTOOLS_HTML_applet}, HTML_APPLET_ON}, // HotJava + {{OOO_STRING_SVTOOLS_HTML_array}, HTML_ARRAY_ON}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_author}, HTML_AUTHOR_ON}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_banner}, HTML_BANNER_ON}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_bar}, HTML_BAR_ON}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_basefont}, HTML_BASEFONT_ON}, // Netscape + {{OOO_STRING_SVTOOLS_HTML_below}, HTML_BELOW_ON}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_bigprint}, HTML_BIGPRINT_ON}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_blink}, HTML_BLINK_ON}, // Netscape + {{OOO_STRING_SVTOOLS_HTML_blockquote}, HTML_BLOCKQUOTE_ON}, + {{OOO_STRING_SVTOOLS_HTML_blockquote30}, HTML_BLOCKQUOTE30_ON}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_body}, HTML_BODY_ON}, + {{OOO_STRING_SVTOOLS_HTML_bold}, HTML_BOLD_ON}, + {{OOO_STRING_SVTOOLS_HTML_boldtext}, HTML_BOLDTEXT_ON}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_box}, HTML_BOX_ON}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_caption}, HTML_CAPTION_ON}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_center}, HTML_CENTER_ON}, // Netscape + {{OOO_STRING_SVTOOLS_HTML_citiation}, HTML_CITIATION_ON}, + {{OOO_STRING_SVTOOLS_HTML_col}, HTML_COL_ON}, // HTML 3 Table Model Draft + {{OOO_STRING_SVTOOLS_HTML_colgroup}, HTML_COLGROUP_ON}, // HTML 3 Table Model Draft + {{OOO_STRING_SVTOOLS_HTML_code}, HTML_CODE_ON}, + {{OOO_STRING_SVTOOLS_HTML_credit}, HTML_CREDIT_ON}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_dd}, HTML_DD_ON}, + {{OOO_STRING_SVTOOLS_HTML_deflist}, HTML_DEFLIST_ON}, + {{OOO_STRING_SVTOOLS_HTML_deletedtext}, HTML_DELETEDTEXT_ON}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_dirlist}, HTML_DIRLIST_ON}, + {{OOO_STRING_SVTOOLS_HTML_division}, HTML_DIVISION_ON}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_dot}, HTML_DOT_ON}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_doubledot}, HTML_DOUBLEDOT_ON}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_dt}, HTML_DT_ON}, + {{OOO_STRING_SVTOOLS_HTML_emphasis}, HTML_EMPHASIS_ON}, + {{OOO_STRING_SVTOOLS_HTML_figure}, HTML_FIGURE_ON}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_font}, HTML_FONT_ON}, // Netscpe + {{OOO_STRING_SVTOOLS_HTML_footnote}, HTML_FOOTNOTE_ON}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_form}, HTML_FORM_ON}, + {{OOO_STRING_SVTOOLS_HTML_frame}, HTML_FRAME_ON}, // Netscape 2.0 + {{OOO_STRING_SVTOOLS_HTML_frameset}, HTML_FRAMESET_ON}, // Netscape 2.0 + {{OOO_STRING_SVTOOLS_HTML_hat}, HTML_HAT_ON}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_head}, HTML_HEAD_ON}, + {{OOO_STRING_SVTOOLS_HTML_head1}, HTML_HEAD1_ON}, + {{OOO_STRING_SVTOOLS_HTML_head2}, HTML_HEAD2_ON}, + {{OOO_STRING_SVTOOLS_HTML_head3}, HTML_HEAD3_ON}, + {{OOO_STRING_SVTOOLS_HTML_head4}, HTML_HEAD4_ON}, + {{OOO_STRING_SVTOOLS_HTML_head5}, HTML_HEAD5_ON}, + {{OOO_STRING_SVTOOLS_HTML_head6}, HTML_HEAD6_ON}, + {{OOO_STRING_SVTOOLS_HTML_html}, HTML_HTML_ON}, + {{OOO_STRING_SVTOOLS_HTML_iframe}, HTML_IFRAME_ON}, // IE 3.0b2 + {{OOO_STRING_SVTOOLS_HTML_ilayer}, HTML_ILAYER_ON}, + {{OOO_STRING_SVTOOLS_HTML_insertedtext}, HTML_INSERTEDTEXT_ON}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_italic}, HTML_ITALIC_ON}, + {{OOO_STRING_SVTOOLS_HTML_item}, HTML_ITEM_ON}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_keyboard}, HTML_KEYBOARD_ON}, + {{OOO_STRING_SVTOOLS_HTML_language}, HTML_LANGUAGE_ON}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_layer}, HTML_LAYER_ON}, + {{OOO_STRING_SVTOOLS_HTML_listheader}, HTML_LISTHEADER_ON}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_map}, HTML_MAP_ON}, // Netscape 2.0 + {{OOO_STRING_SVTOOLS_HTML_math}, HTML_MATH_ON}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_menulist}, HTML_MENULIST_ON}, + {{OOO_STRING_SVTOOLS_HTML_multicol}, HTML_MULTICOL_ON}, // Netscape 3.0b5 + {{OOO_STRING_SVTOOLS_HTML_nobr}, HTML_NOBR_ON}, // Netscape + {{OOO_STRING_SVTOOLS_HTML_noembed}, HTML_NOEMBED_ON}, // Netscape 2.0 ??? + {{OOO_STRING_SVTOOLS_HTML_noframe}, HTML_NOFRAMES_ON}, // Netscape 2.0 ??? + {{OOO_STRING_SVTOOLS_HTML_noframes}, HTML_NOFRAMES_ON}, // Netscape 2.0 + {{OOO_STRING_SVTOOLS_HTML_noscript}, HTML_NOSCRIPT_ON}, // Netscape 3.0 + {{OOO_STRING_SVTOOLS_HTML_note}, HTML_NOTE_ON}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_object}, HTML_OBJECT_ON}, + {{OOO_STRING_SVTOOLS_HTML_orderlist}, HTML_ORDERLIST_ON}, + {{OOO_STRING_SVTOOLS_HTML_parabreak}, HTML_PARABREAK_ON}, + {{OOO_STRING_SVTOOLS_HTML_person}, HTML_PERSON_ON}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_plaintext}, HTML_PLAINTEXT_ON}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_preformtxt}, HTML_PREFORMTXT_ON}, + {{OOO_STRING_SVTOOLS_HTML_root}, HTML_ROOT_ON}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_row}, HTML_ROW_ON}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_sample}, HTML_SAMPLE_ON}, + {{OOO_STRING_SVTOOLS_HTML_script}, HTML_SCRIPT_ON}, // HTML 3.2 + {{OOO_STRING_SVTOOLS_HTML_select}, HTML_SELECT_ON}, + {{OOO_STRING_SVTOOLS_HTML_shortquote}, HTML_SHORTQUOTE_ON}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_smallprint}, HTML_SMALLPRINT_ON}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_span}, HTML_SPAN_ON}, // Style Sheets + {{OOO_STRING_SVTOOLS_HTML_squareroot}, HTML_SQUAREROOT_ON}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_strikethrough},HTML_STRIKETHROUGH_ON}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_strong}, HTML_STRONG_ON}, + {{OOO_STRING_SVTOOLS_HTML_style}, HTML_STYLE_ON}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_subscript}, HTML_SUBSCRIPT_ON}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_superscript}, HTML_SUPERSCRIPT_ON}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_table}, HTML_TABLE_ON}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_tabledata}, HTML_TABLEDATA_ON}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_tableheader}, HTML_TABLEHEADER_ON}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_tablerow}, HTML_TABLEROW_ON}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_tbody}, HTML_TBODY_ON}, // HTML 3 Table Model Draft + {{OOO_STRING_SVTOOLS_HTML_teletype}, HTML_TELETYPE_ON}, + {{OOO_STRING_SVTOOLS_HTML_text}, HTML_TEXT_ON}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_textarea}, HTML_TEXTAREA_ON}, + {{OOO_STRING_SVTOOLS_HTML_textflow}, HTML_TEXTFLOW_ON}, + {{OOO_STRING_SVTOOLS_HTML_tfoot}, HTML_TFOOT_ON}, // HTML 3 Table Model Draft + {{OOO_STRING_SVTOOLS_HTML_thead}, HTML_THEAD_ON}, // HTML 3 Table Model Draft + {{OOO_STRING_SVTOOLS_HTML_tilde}, HTML_TILDE_ON}, // HTML 3.0 + {{OOO_STRING_SVTOOLS_HTML_title}, HTML_TITLE_ON}, + {{OOO_STRING_SVTOOLS_HTML_underline}, HTML_UNDERLINE_ON}, + {{OOO_STRING_SVTOOLS_HTML_unorderlist}, HTML_UNORDERLIST_ON}, + {{OOO_STRING_SVTOOLS_HTML_variable}, HTML_VARIABLE_ON}, + {{OOO_STRING_SVTOOLS_HTML_vector}, HTML_VECTOR_ON}, // HTML 3.0 + + {{OOO_STRING_SVTOOLS_HTML_xmp}, HTML_XMP_ON}, + {{OOO_STRING_SVTOOLS_HTML_listing}, HTML_LISTING_ON}, + + {{OOO_STRING_SVTOOLS_HTML_definstance}, HTML_DEFINSTANCE_ON}, + {{OOO_STRING_SVTOOLS_HTML_strike}, HTML_STRIKE_ON}, + + {{OOO_STRING_SVTOOLS_HTML_bgsound}, HTML_BGSOUND}, + {{OOO_STRING_SVTOOLS_HTML_comment2}, HTML_COMMENT2_ON}, + {{OOO_STRING_SVTOOLS_HTML_marquee}, HTML_MARQUEE_ON}, + {{OOO_STRING_SVTOOLS_HTML_plaintext2}, HTML_PLAINTEXT2_ON}, + + {{OOO_STRING_SVTOOLS_HTML_sdfield}, HTML_SDFIELD_ON} }; extern "C" { - + static int #if defined( WNT ) __cdecl @@ -231,7 +231,7 @@ static int nRet = strcmp( ((HTML_TokenEntry*)pFirst)->sToken, ((HTML_TokenEntry*)pSecond)->sToken ); } - + return nRet; } @@ -283,82 +283,82 @@ struct HTML_CharEntry static int __FAR_DATA bSortCharKeyWords = FALSE; static HTML_CharEntry __FAR_DATA aHTMLCharNameTab[] = { - {{OOO_STRING_SVTOOLS_HTML_C_lt}, 60}, - {{OOO_STRING_SVTOOLS_HTML_C_gt}, 62}, - {{OOO_STRING_SVTOOLS_HTML_C_amp}, 38}, - {{OOO_STRING_SVTOOLS_HTML_C_quot}, 34}, - - {{OOO_STRING_SVTOOLS_HTML_C_Agrave}, 192}, - {{OOO_STRING_SVTOOLS_HTML_C_Aacute}, 193}, - {{OOO_STRING_SVTOOLS_HTML_C_Acirc}, 194}, - {{OOO_STRING_SVTOOLS_HTML_C_Atilde}, 195}, - {{OOO_STRING_SVTOOLS_HTML_C_Auml}, 196}, - {{OOO_STRING_SVTOOLS_HTML_C_Aring}, 197}, - {{OOO_STRING_SVTOOLS_HTML_C_AElig}, 198}, - {{OOO_STRING_SVTOOLS_HTML_C_Ccedil}, 199}, - {{OOO_STRING_SVTOOLS_HTML_C_Egrave}, 200}, - {{OOO_STRING_SVTOOLS_HTML_C_Eacute}, 201}, - {{OOO_STRING_SVTOOLS_HTML_C_Ecirc}, 202}, - {{OOO_STRING_SVTOOLS_HTML_C_Euml}, 203}, - {{OOO_STRING_SVTOOLS_HTML_C_Igrave}, 204}, - {{OOO_STRING_SVTOOLS_HTML_C_Iacute}, 205}, - {{OOO_STRING_SVTOOLS_HTML_C_Icirc}, 206}, - {{OOO_STRING_SVTOOLS_HTML_C_Iuml}, 207}, - {{OOO_STRING_SVTOOLS_HTML_C_ETH}, 208}, - {{OOO_STRING_SVTOOLS_HTML_C_Ntilde}, 209}, - {{OOO_STRING_SVTOOLS_HTML_C_Ograve}, 210}, - {{OOO_STRING_SVTOOLS_HTML_C_Oacute}, 211}, - {{OOO_STRING_SVTOOLS_HTML_C_Ocirc}, 212}, - {{OOO_STRING_SVTOOLS_HTML_C_Otilde}, 213}, - {{OOO_STRING_SVTOOLS_HTML_C_Ouml}, 214}, - {{OOO_STRING_SVTOOLS_HTML_C_Oslash}, 216}, - {{OOO_STRING_SVTOOLS_HTML_C_Ugrave}, 217}, - {{OOO_STRING_SVTOOLS_HTML_C_Uacute}, 218}, - {{OOO_STRING_SVTOOLS_HTML_C_Ucirc}, 219}, - {{OOO_STRING_SVTOOLS_HTML_C_Uuml}, 220}, - {{OOO_STRING_SVTOOLS_HTML_C_Yacute}, 221}, - - {{OOO_STRING_SVTOOLS_HTML_C_THORN}, 222}, - {{OOO_STRING_SVTOOLS_HTML_C_szlig}, 223}, - - {{OOO_STRING_SVTOOLS_HTML_S_agrave}, 224}, - {{OOO_STRING_SVTOOLS_HTML_S_aacute}, 225}, - {{OOO_STRING_SVTOOLS_HTML_S_acirc}, 226}, - {{OOO_STRING_SVTOOLS_HTML_S_atilde}, 227}, - {{OOO_STRING_SVTOOLS_HTML_S_auml}, 228}, - {{OOO_STRING_SVTOOLS_HTML_S_aring}, 229}, - {{OOO_STRING_SVTOOLS_HTML_S_aelig}, 230}, - {{OOO_STRING_SVTOOLS_HTML_S_ccedil}, 231}, - {{OOO_STRING_SVTOOLS_HTML_S_egrave}, 232}, - {{OOO_STRING_SVTOOLS_HTML_S_eacute}, 233}, - {{OOO_STRING_SVTOOLS_HTML_S_ecirc}, 234}, - {{OOO_STRING_SVTOOLS_HTML_S_euml}, 235}, - {{OOO_STRING_SVTOOLS_HTML_S_igrave}, 236}, - {{OOO_STRING_SVTOOLS_HTML_S_iacute}, 237}, - {{OOO_STRING_SVTOOLS_HTML_S_icirc}, 238}, - {{OOO_STRING_SVTOOLS_HTML_S_iuml}, 239}, - {{OOO_STRING_SVTOOLS_HTML_S_eth}, 240}, - {{OOO_STRING_SVTOOLS_HTML_S_ntilde}, 241}, - {{OOO_STRING_SVTOOLS_HTML_S_ograve}, 242}, - {{OOO_STRING_SVTOOLS_HTML_S_oacute}, 243}, - {{OOO_STRING_SVTOOLS_HTML_S_ocirc}, 244}, - {{OOO_STRING_SVTOOLS_HTML_S_otilde}, 245}, - {{OOO_STRING_SVTOOLS_HTML_S_ouml}, 246}, - {{OOO_STRING_SVTOOLS_HTML_S_oslash}, 248}, - {{OOO_STRING_SVTOOLS_HTML_S_ugrave}, 249}, - {{OOO_STRING_SVTOOLS_HTML_S_uacute}, 250}, - {{OOO_STRING_SVTOOLS_HTML_S_ucirc}, 251}, - {{OOO_STRING_SVTOOLS_HTML_S_uuml}, 252}, - {{OOO_STRING_SVTOOLS_HTML_S_yacute}, 253}, - {{OOO_STRING_SVTOOLS_HTML_S_thorn}, 254}, - {{OOO_STRING_SVTOOLS_HTML_S_yuml}, 255}, + {{OOO_STRING_SVTOOLS_HTML_C_lt}, 60}, + {{OOO_STRING_SVTOOLS_HTML_C_gt}, 62}, + {{OOO_STRING_SVTOOLS_HTML_C_amp}, 38}, + {{OOO_STRING_SVTOOLS_HTML_C_quot}, 34}, + + {{OOO_STRING_SVTOOLS_HTML_C_Agrave}, 192}, + {{OOO_STRING_SVTOOLS_HTML_C_Aacute}, 193}, + {{OOO_STRING_SVTOOLS_HTML_C_Acirc}, 194}, + {{OOO_STRING_SVTOOLS_HTML_C_Atilde}, 195}, + {{OOO_STRING_SVTOOLS_HTML_C_Auml}, 196}, + {{OOO_STRING_SVTOOLS_HTML_C_Aring}, 197}, + {{OOO_STRING_SVTOOLS_HTML_C_AElig}, 198}, + {{OOO_STRING_SVTOOLS_HTML_C_Ccedil}, 199}, + {{OOO_STRING_SVTOOLS_HTML_C_Egrave}, 200}, + {{OOO_STRING_SVTOOLS_HTML_C_Eacute}, 201}, + {{OOO_STRING_SVTOOLS_HTML_C_Ecirc}, 202}, + {{OOO_STRING_SVTOOLS_HTML_C_Euml}, 203}, + {{OOO_STRING_SVTOOLS_HTML_C_Igrave}, 204}, + {{OOO_STRING_SVTOOLS_HTML_C_Iacute}, 205}, + {{OOO_STRING_SVTOOLS_HTML_C_Icirc}, 206}, + {{OOO_STRING_SVTOOLS_HTML_C_Iuml}, 207}, + {{OOO_STRING_SVTOOLS_HTML_C_ETH}, 208}, + {{OOO_STRING_SVTOOLS_HTML_C_Ntilde}, 209}, + {{OOO_STRING_SVTOOLS_HTML_C_Ograve}, 210}, + {{OOO_STRING_SVTOOLS_HTML_C_Oacute}, 211}, + {{OOO_STRING_SVTOOLS_HTML_C_Ocirc}, 212}, + {{OOO_STRING_SVTOOLS_HTML_C_Otilde}, 213}, + {{OOO_STRING_SVTOOLS_HTML_C_Ouml}, 214}, + {{OOO_STRING_SVTOOLS_HTML_C_Oslash}, 216}, + {{OOO_STRING_SVTOOLS_HTML_C_Ugrave}, 217}, + {{OOO_STRING_SVTOOLS_HTML_C_Uacute}, 218}, + {{OOO_STRING_SVTOOLS_HTML_C_Ucirc}, 219}, + {{OOO_STRING_SVTOOLS_HTML_C_Uuml}, 220}, + {{OOO_STRING_SVTOOLS_HTML_C_Yacute}, 221}, + + {{OOO_STRING_SVTOOLS_HTML_C_THORN}, 222}, + {{OOO_STRING_SVTOOLS_HTML_C_szlig}, 223}, + + {{OOO_STRING_SVTOOLS_HTML_S_agrave}, 224}, + {{OOO_STRING_SVTOOLS_HTML_S_aacute}, 225}, + {{OOO_STRING_SVTOOLS_HTML_S_acirc}, 226}, + {{OOO_STRING_SVTOOLS_HTML_S_atilde}, 227}, + {{OOO_STRING_SVTOOLS_HTML_S_auml}, 228}, + {{OOO_STRING_SVTOOLS_HTML_S_aring}, 229}, + {{OOO_STRING_SVTOOLS_HTML_S_aelig}, 230}, + {{OOO_STRING_SVTOOLS_HTML_S_ccedil}, 231}, + {{OOO_STRING_SVTOOLS_HTML_S_egrave}, 232}, + {{OOO_STRING_SVTOOLS_HTML_S_eacute}, 233}, + {{OOO_STRING_SVTOOLS_HTML_S_ecirc}, 234}, + {{OOO_STRING_SVTOOLS_HTML_S_euml}, 235}, + {{OOO_STRING_SVTOOLS_HTML_S_igrave}, 236}, + {{OOO_STRING_SVTOOLS_HTML_S_iacute}, 237}, + {{OOO_STRING_SVTOOLS_HTML_S_icirc}, 238}, + {{OOO_STRING_SVTOOLS_HTML_S_iuml}, 239}, + {{OOO_STRING_SVTOOLS_HTML_S_eth}, 240}, + {{OOO_STRING_SVTOOLS_HTML_S_ntilde}, 241}, + {{OOO_STRING_SVTOOLS_HTML_S_ograve}, 242}, + {{OOO_STRING_SVTOOLS_HTML_S_oacute}, 243}, + {{OOO_STRING_SVTOOLS_HTML_S_ocirc}, 244}, + {{OOO_STRING_SVTOOLS_HTML_S_otilde}, 245}, + {{OOO_STRING_SVTOOLS_HTML_S_ouml}, 246}, + {{OOO_STRING_SVTOOLS_HTML_S_oslash}, 248}, + {{OOO_STRING_SVTOOLS_HTML_S_ugrave}, 249}, + {{OOO_STRING_SVTOOLS_HTML_S_uacute}, 250}, + {{OOO_STRING_SVTOOLS_HTML_S_ucirc}, 251}, + {{OOO_STRING_SVTOOLS_HTML_S_uuml}, 252}, + {{OOO_STRING_SVTOOLS_HTML_S_yacute}, 253}, + {{OOO_STRING_SVTOOLS_HTML_S_thorn}, 254}, + {{OOO_STRING_SVTOOLS_HTML_S_yuml}, 255}, // Sonderzeichen - {{OOO_STRING_SVTOOLS_HTML_S_acute}, 180}, - {{OOO_STRING_SVTOOLS_HTML_S_brvbar}, 166}, + {{OOO_STRING_SVTOOLS_HTML_S_acute}, 180}, + {{OOO_STRING_SVTOOLS_HTML_S_brvbar}, 166}, {{OOO_STRING_SVTOOLS_HTML_S_cedil}, 184}, {{OOO_STRING_SVTOOLS_HTML_S_cent}, 162}, - {{OOO_STRING_SVTOOLS_HTML_S_copy}, 169}, + {{OOO_STRING_SVTOOLS_HTML_S_copy}, 169}, {{OOO_STRING_SVTOOLS_HTML_S_curren}, 164}, {{OOO_STRING_SVTOOLS_HTML_S_deg}, 176}, {{OOO_STRING_SVTOOLS_HTML_S_divide}, 247}, @@ -378,7 +378,7 @@ static HTML_CharEntry __FAR_DATA aHTMLCharNameTab[] = { {{OOO_STRING_SVTOOLS_HTML_S_plusmn}, 177}, {{OOO_STRING_SVTOOLS_HTML_S_pound}, 163}, {{OOO_STRING_SVTOOLS_HTML_S_raquo}, 187}, - {{OOO_STRING_SVTOOLS_HTML_S_reg}, 174}, + {{OOO_STRING_SVTOOLS_HTML_S_reg}, 174}, {{OOO_STRING_SVTOOLS_HTML_S_sect}, 167}, {{OOO_STRING_SVTOOLS_HTML_S_sup1}, 185}, {{OOO_STRING_SVTOOLS_HTML_S_sup2}, 178}, @@ -388,171 +388,171 @@ static HTML_CharEntry __FAR_DATA aHTMLCharNameTab[] = { {{OOO_STRING_SVTOOLS_HTML_S_yen}, 165}, // Netscape kennt noch ein paar in Grossbuchstaben ... - {{OOO_STRING_SVTOOLS_HTML_C_LT}, 60}, - {{OOO_STRING_SVTOOLS_HTML_C_GT}, 62}, - {{OOO_STRING_SVTOOLS_HTML_C_AMP}, 38}, - {{OOO_STRING_SVTOOLS_HTML_C_QUOT}, 34}, - {{OOO_STRING_SVTOOLS_HTML_S_COPY}, 169}, - {{OOO_STRING_SVTOOLS_HTML_S_REG}, 174}, + {{OOO_STRING_SVTOOLS_HTML_C_LT}, 60}, + {{OOO_STRING_SVTOOLS_HTML_C_GT}, 62}, + {{OOO_STRING_SVTOOLS_HTML_C_AMP}, 38}, + {{OOO_STRING_SVTOOLS_HTML_C_QUOT}, 34}, + {{OOO_STRING_SVTOOLS_HTML_S_COPY}, 169}, + {{OOO_STRING_SVTOOLS_HTML_S_REG}, 174}, // Sonderzeichen, die zu Tokens konvertiert werden !!! - {{OOO_STRING_SVTOOLS_HTML_S_nbsp}, 1}, - {{OOO_STRING_SVTOOLS_HTML_S_shy}, 2}, + {{OOO_STRING_SVTOOLS_HTML_S_nbsp}, 1}, + {{OOO_STRING_SVTOOLS_HTML_S_shy}, 2}, // HTML4 - {{OOO_STRING_SVTOOLS_HTML_S_OElig}, 338}, - {{OOO_STRING_SVTOOLS_HTML_S_oelig}, 339}, - {{OOO_STRING_SVTOOLS_HTML_S_Scaron}, 352}, - {{OOO_STRING_SVTOOLS_HTML_S_scaron}, 353}, - {{OOO_STRING_SVTOOLS_HTML_S_Yuml}, 376}, - {{OOO_STRING_SVTOOLS_HTML_S_fnof}, 402}, - {{OOO_STRING_SVTOOLS_HTML_S_circ}, 710}, - {{OOO_STRING_SVTOOLS_HTML_S_tilde}, 732}, - {{OOO_STRING_SVTOOLS_HTML_S_Alpha}, 913}, - {{OOO_STRING_SVTOOLS_HTML_S_Beta}, 914}, - {{OOO_STRING_SVTOOLS_HTML_S_Gamma}, 915}, - {{OOO_STRING_SVTOOLS_HTML_S_Delta}, 916}, - {{OOO_STRING_SVTOOLS_HTML_S_Epsilon}, 917}, - {{OOO_STRING_SVTOOLS_HTML_S_Zeta}, 918}, - {{OOO_STRING_SVTOOLS_HTML_S_Eta}, 919}, - {{OOO_STRING_SVTOOLS_HTML_S_Theta}, 920}, - {{OOO_STRING_SVTOOLS_HTML_S_Iota}, 921}, - {{OOO_STRING_SVTOOLS_HTML_S_Kappa}, 922}, - {{OOO_STRING_SVTOOLS_HTML_S_Lambda}, 923}, - {{OOO_STRING_SVTOOLS_HTML_S_Mu}, 924}, - {{OOO_STRING_SVTOOLS_HTML_S_Nu}, 925}, - {{OOO_STRING_SVTOOLS_HTML_S_Xi}, 926}, - {{OOO_STRING_SVTOOLS_HTML_S_Omicron}, 927}, - {{OOO_STRING_SVTOOLS_HTML_S_Pi}, 928}, - {{OOO_STRING_SVTOOLS_HTML_S_Rho}, 929}, - {{OOO_STRING_SVTOOLS_HTML_S_Sigma}, 931}, - {{OOO_STRING_SVTOOLS_HTML_S_Tau}, 932}, - {{OOO_STRING_SVTOOLS_HTML_S_Upsilon}, 933}, - {{OOO_STRING_SVTOOLS_HTML_S_Phi}, 934}, - {{OOO_STRING_SVTOOLS_HTML_S_Chi}, 935}, - {{OOO_STRING_SVTOOLS_HTML_S_Psi}, 936}, - {{OOO_STRING_SVTOOLS_HTML_S_Omega}, 937}, - {{OOO_STRING_SVTOOLS_HTML_S_alpha}, 945}, - {{OOO_STRING_SVTOOLS_HTML_S_beta}, 946}, - {{OOO_STRING_SVTOOLS_HTML_S_gamma}, 947}, - {{OOO_STRING_SVTOOLS_HTML_S_delta}, 948}, - {{OOO_STRING_SVTOOLS_HTML_S_epsilon}, 949}, - {{OOO_STRING_SVTOOLS_HTML_S_zeta}, 950}, - {{OOO_STRING_SVTOOLS_HTML_S_eta}, 951}, - {{OOO_STRING_SVTOOLS_HTML_S_theta}, 952}, - {{OOO_STRING_SVTOOLS_HTML_S_iota}, 953}, - {{OOO_STRING_SVTOOLS_HTML_S_kappa}, 954}, - {{OOO_STRING_SVTOOLS_HTML_S_lambda}, 955}, - {{OOO_STRING_SVTOOLS_HTML_S_mu}, 956}, - {{OOO_STRING_SVTOOLS_HTML_S_nu}, 957}, - {{OOO_STRING_SVTOOLS_HTML_S_xi}, 958}, - {{OOO_STRING_SVTOOLS_HTML_S_omicron}, 959}, - {{OOO_STRING_SVTOOLS_HTML_S_pi}, 960}, - {{OOO_STRING_SVTOOLS_HTML_S_rho}, 961}, - {{OOO_STRING_SVTOOLS_HTML_S_sigmaf}, 962}, - {{OOO_STRING_SVTOOLS_HTML_S_sigma}, 963}, - {{OOO_STRING_SVTOOLS_HTML_S_tau}, 964}, - {{OOO_STRING_SVTOOLS_HTML_S_upsilon}, 965}, - {{OOO_STRING_SVTOOLS_HTML_S_phi}, 966}, - {{OOO_STRING_SVTOOLS_HTML_S_chi}, 967}, - {{OOO_STRING_SVTOOLS_HTML_S_psi}, 968}, - {{OOO_STRING_SVTOOLS_HTML_S_omega}, 969}, - {{OOO_STRING_SVTOOLS_HTML_S_thetasym}, 977}, - {{OOO_STRING_SVTOOLS_HTML_S_upsih}, 978}, - {{OOO_STRING_SVTOOLS_HTML_S_piv}, 982}, - {{OOO_STRING_SVTOOLS_HTML_S_ensp}, 8194}, - {{OOO_STRING_SVTOOLS_HTML_S_emsp}, 8195}, - {{OOO_STRING_SVTOOLS_HTML_S_thinsp}, 8201}, - {{OOO_STRING_SVTOOLS_HTML_S_zwnj}, 8204}, - {{OOO_STRING_SVTOOLS_HTML_S_zwj}, 8205}, - {{OOO_STRING_SVTOOLS_HTML_S_lrm}, 8206}, - {{OOO_STRING_SVTOOLS_HTML_S_rlm}, 8207}, - {{OOO_STRING_SVTOOLS_HTML_S_ndash}, 8211}, - {{OOO_STRING_SVTOOLS_HTML_S_mdash}, 8212}, - {{OOO_STRING_SVTOOLS_HTML_S_lsquo}, 8216}, - {{OOO_STRING_SVTOOLS_HTML_S_rsquo}, 8217}, - {{OOO_STRING_SVTOOLS_HTML_S_sbquo}, 8218}, - {{OOO_STRING_SVTOOLS_HTML_S_ldquo}, 8220}, - {{OOO_STRING_SVTOOLS_HTML_S_rdquo}, 8221}, - {{OOO_STRING_SVTOOLS_HTML_S_bdquo}, 8222}, - {{OOO_STRING_SVTOOLS_HTML_S_dagger}, 8224}, - {{OOO_STRING_SVTOOLS_HTML_S_Dagger}, 8225}, - {{OOO_STRING_SVTOOLS_HTML_S_bull}, 8226}, - {{OOO_STRING_SVTOOLS_HTML_S_hellip}, 8230}, - {{OOO_STRING_SVTOOLS_HTML_S_permil}, 8240}, - {{OOO_STRING_SVTOOLS_HTML_S_prime}, 8242}, - {{OOO_STRING_SVTOOLS_HTML_S_Prime}, 8243}, - {{OOO_STRING_SVTOOLS_HTML_S_lsaquo}, 8249}, - {{OOO_STRING_SVTOOLS_HTML_S_rsaquo}, 8250}, - {{OOO_STRING_SVTOOLS_HTML_S_oline}, 8254}, - {{OOO_STRING_SVTOOLS_HTML_S_frasl}, 8260}, - {{OOO_STRING_SVTOOLS_HTML_S_euro}, 8364}, - {{OOO_STRING_SVTOOLS_HTML_S_image}, 8465}, - {{OOO_STRING_SVTOOLS_HTML_S_weierp}, 8472}, - {{OOO_STRING_SVTOOLS_HTML_S_real}, 8476}, - {{OOO_STRING_SVTOOLS_HTML_S_trade}, 8482}, - {{OOO_STRING_SVTOOLS_HTML_S_alefsym}, 8501}, - {{OOO_STRING_SVTOOLS_HTML_S_larr}, 8592}, - {{OOO_STRING_SVTOOLS_HTML_S_uarr}, 8593}, - {{OOO_STRING_SVTOOLS_HTML_S_rarr}, 8594}, - {{OOO_STRING_SVTOOLS_HTML_S_darr}, 8595}, - {{OOO_STRING_SVTOOLS_HTML_S_harr}, 8596}, - {{OOO_STRING_SVTOOLS_HTML_S_crarr}, 8629}, - {{OOO_STRING_SVTOOLS_HTML_S_lArr}, 8656}, - {{OOO_STRING_SVTOOLS_HTML_S_uArr}, 8657}, - {{OOO_STRING_SVTOOLS_HTML_S_rArr}, 8658}, - {{OOO_STRING_SVTOOLS_HTML_S_dArr}, 8659}, - {{OOO_STRING_SVTOOLS_HTML_S_hArr}, 8660}, - {{OOO_STRING_SVTOOLS_HTML_S_forall}, 8704}, - {{OOO_STRING_SVTOOLS_HTML_S_part}, 8706}, - {{OOO_STRING_SVTOOLS_HTML_S_exist}, 8707}, - {{OOO_STRING_SVTOOLS_HTML_S_empty}, 8709}, - {{OOO_STRING_SVTOOLS_HTML_S_nabla}, 8711}, - {{OOO_STRING_SVTOOLS_HTML_S_isin}, 8712}, - {{OOO_STRING_SVTOOLS_HTML_S_notin}, 8713}, - {{OOO_STRING_SVTOOLS_HTML_S_ni}, 8715}, - {{OOO_STRING_SVTOOLS_HTML_S_prod}, 8719}, - {{OOO_STRING_SVTOOLS_HTML_S_sum}, 8721}, - {{OOO_STRING_SVTOOLS_HTML_S_minus}, 8722}, - {{OOO_STRING_SVTOOLS_HTML_S_lowast}, 8727}, - {{OOO_STRING_SVTOOLS_HTML_S_radic}, 8730}, - {{OOO_STRING_SVTOOLS_HTML_S_prop}, 8733}, - {{OOO_STRING_SVTOOLS_HTML_S_infin}, 8734}, - {{OOO_STRING_SVTOOLS_HTML_S_ang}, 8736}, - {{OOO_STRING_SVTOOLS_HTML_S_and}, 8743}, - {{OOO_STRING_SVTOOLS_HTML_S_or}, 8744}, - {{OOO_STRING_SVTOOLS_HTML_S_cap}, 8745}, - {{OOO_STRING_SVTOOLS_HTML_S_cup}, 8746}, - {{OOO_STRING_SVTOOLS_HTML_S_int}, 8747}, - {{OOO_STRING_SVTOOLS_HTML_S_there4}, 8756}, - {{OOO_STRING_SVTOOLS_HTML_S_sim}, 8764}, - {{OOO_STRING_SVTOOLS_HTML_S_cong}, 8773}, - {{OOO_STRING_SVTOOLS_HTML_S_asymp}, 8776}, - {{OOO_STRING_SVTOOLS_HTML_S_ne}, 8800}, - {{OOO_STRING_SVTOOLS_HTML_S_equiv}, 8801}, - {{OOO_STRING_SVTOOLS_HTML_S_le}, 8804}, - {{OOO_STRING_SVTOOLS_HTML_S_ge}, 8805}, - {{OOO_STRING_SVTOOLS_HTML_S_sub}, 8834}, - {{OOO_STRING_SVTOOLS_HTML_S_sup}, 8835}, - {{OOO_STRING_SVTOOLS_HTML_S_nsub}, 8836}, - {{OOO_STRING_SVTOOLS_HTML_S_sube}, 8838}, - {{OOO_STRING_SVTOOLS_HTML_S_supe}, 8839}, - {{OOO_STRING_SVTOOLS_HTML_S_oplus}, 8853}, - {{OOO_STRING_SVTOOLS_HTML_S_otimes}, 8855}, - {{OOO_STRING_SVTOOLS_HTML_S_perp}, 8869}, - {{OOO_STRING_SVTOOLS_HTML_S_sdot}, 8901}, - {{OOO_STRING_SVTOOLS_HTML_S_lceil}, 8968}, - {{OOO_STRING_SVTOOLS_HTML_S_rceil}, 8969}, - {{OOO_STRING_SVTOOLS_HTML_S_lfloor}, 8970}, - {{OOO_STRING_SVTOOLS_HTML_S_rfloor}, 8971}, - {{OOO_STRING_SVTOOLS_HTML_S_lang}, 9001}, - {{OOO_STRING_SVTOOLS_HTML_S_rang}, 9002}, - {{OOO_STRING_SVTOOLS_HTML_S_loz}, 9674}, - {{OOO_STRING_SVTOOLS_HTML_S_spades}, 9824}, - {{OOO_STRING_SVTOOLS_HTML_S_clubs}, 9827}, - {{OOO_STRING_SVTOOLS_HTML_S_hearts}, 9829}, - {{OOO_STRING_SVTOOLS_HTML_S_diams}, 9830} + {{OOO_STRING_SVTOOLS_HTML_S_OElig}, 338}, + {{OOO_STRING_SVTOOLS_HTML_S_oelig}, 339}, + {{OOO_STRING_SVTOOLS_HTML_S_Scaron}, 352}, + {{OOO_STRING_SVTOOLS_HTML_S_scaron}, 353}, + {{OOO_STRING_SVTOOLS_HTML_S_Yuml}, 376}, + {{OOO_STRING_SVTOOLS_HTML_S_fnof}, 402}, + {{OOO_STRING_SVTOOLS_HTML_S_circ}, 710}, + {{OOO_STRING_SVTOOLS_HTML_S_tilde}, 732}, + {{OOO_STRING_SVTOOLS_HTML_S_Alpha}, 913}, + {{OOO_STRING_SVTOOLS_HTML_S_Beta}, 914}, + {{OOO_STRING_SVTOOLS_HTML_S_Gamma}, 915}, + {{OOO_STRING_SVTOOLS_HTML_S_Delta}, 916}, + {{OOO_STRING_SVTOOLS_HTML_S_Epsilon}, 917}, + {{OOO_STRING_SVTOOLS_HTML_S_Zeta}, 918}, + {{OOO_STRING_SVTOOLS_HTML_S_Eta}, 919}, + {{OOO_STRING_SVTOOLS_HTML_S_Theta}, 920}, + {{OOO_STRING_SVTOOLS_HTML_S_Iota}, 921}, + {{OOO_STRING_SVTOOLS_HTML_S_Kappa}, 922}, + {{OOO_STRING_SVTOOLS_HTML_S_Lambda}, 923}, + {{OOO_STRING_SVTOOLS_HTML_S_Mu}, 924}, + {{OOO_STRING_SVTOOLS_HTML_S_Nu}, 925}, + {{OOO_STRING_SVTOOLS_HTML_S_Xi}, 926}, + {{OOO_STRING_SVTOOLS_HTML_S_Omicron}, 927}, + {{OOO_STRING_SVTOOLS_HTML_S_Pi}, 928}, + {{OOO_STRING_SVTOOLS_HTML_S_Rho}, 929}, + {{OOO_STRING_SVTOOLS_HTML_S_Sigma}, 931}, + {{OOO_STRING_SVTOOLS_HTML_S_Tau}, 932}, + {{OOO_STRING_SVTOOLS_HTML_S_Upsilon}, 933}, + {{OOO_STRING_SVTOOLS_HTML_S_Phi}, 934}, + {{OOO_STRING_SVTOOLS_HTML_S_Chi}, 935}, + {{OOO_STRING_SVTOOLS_HTML_S_Psi}, 936}, + {{OOO_STRING_SVTOOLS_HTML_S_Omega}, 937}, + {{OOO_STRING_SVTOOLS_HTML_S_alpha}, 945}, + {{OOO_STRING_SVTOOLS_HTML_S_beta}, 946}, + {{OOO_STRING_SVTOOLS_HTML_S_gamma}, 947}, + {{OOO_STRING_SVTOOLS_HTML_S_delta}, 948}, + {{OOO_STRING_SVTOOLS_HTML_S_epsilon}, 949}, + {{OOO_STRING_SVTOOLS_HTML_S_zeta}, 950}, + {{OOO_STRING_SVTOOLS_HTML_S_eta}, 951}, + {{OOO_STRING_SVTOOLS_HTML_S_theta}, 952}, + {{OOO_STRING_SVTOOLS_HTML_S_iota}, 953}, + {{OOO_STRING_SVTOOLS_HTML_S_kappa}, 954}, + {{OOO_STRING_SVTOOLS_HTML_S_lambda}, 955}, + {{OOO_STRING_SVTOOLS_HTML_S_mu}, 956}, + {{OOO_STRING_SVTOOLS_HTML_S_nu}, 957}, + {{OOO_STRING_SVTOOLS_HTML_S_xi}, 958}, + {{OOO_STRING_SVTOOLS_HTML_S_omicron}, 959}, + {{OOO_STRING_SVTOOLS_HTML_S_pi}, 960}, + {{OOO_STRING_SVTOOLS_HTML_S_rho}, 961}, + {{OOO_STRING_SVTOOLS_HTML_S_sigmaf}, 962}, + {{OOO_STRING_SVTOOLS_HTML_S_sigma}, 963}, + {{OOO_STRING_SVTOOLS_HTML_S_tau}, 964}, + {{OOO_STRING_SVTOOLS_HTML_S_upsilon}, 965}, + {{OOO_STRING_SVTOOLS_HTML_S_phi}, 966}, + {{OOO_STRING_SVTOOLS_HTML_S_chi}, 967}, + {{OOO_STRING_SVTOOLS_HTML_S_psi}, 968}, + {{OOO_STRING_SVTOOLS_HTML_S_omega}, 969}, + {{OOO_STRING_SVTOOLS_HTML_S_thetasym}, 977}, + {{OOO_STRING_SVTOOLS_HTML_S_upsih}, 978}, + {{OOO_STRING_SVTOOLS_HTML_S_piv}, 982}, + {{OOO_STRING_SVTOOLS_HTML_S_ensp}, 8194}, + {{OOO_STRING_SVTOOLS_HTML_S_emsp}, 8195}, + {{OOO_STRING_SVTOOLS_HTML_S_thinsp}, 8201}, + {{OOO_STRING_SVTOOLS_HTML_S_zwnj}, 8204}, + {{OOO_STRING_SVTOOLS_HTML_S_zwj}, 8205}, + {{OOO_STRING_SVTOOLS_HTML_S_lrm}, 8206}, + {{OOO_STRING_SVTOOLS_HTML_S_rlm}, 8207}, + {{OOO_STRING_SVTOOLS_HTML_S_ndash}, 8211}, + {{OOO_STRING_SVTOOLS_HTML_S_mdash}, 8212}, + {{OOO_STRING_SVTOOLS_HTML_S_lsquo}, 8216}, + {{OOO_STRING_SVTOOLS_HTML_S_rsquo}, 8217}, + {{OOO_STRING_SVTOOLS_HTML_S_sbquo}, 8218}, + {{OOO_STRING_SVTOOLS_HTML_S_ldquo}, 8220}, + {{OOO_STRING_SVTOOLS_HTML_S_rdquo}, 8221}, + {{OOO_STRING_SVTOOLS_HTML_S_bdquo}, 8222}, + {{OOO_STRING_SVTOOLS_HTML_S_dagger}, 8224}, + {{OOO_STRING_SVTOOLS_HTML_S_Dagger}, 8225}, + {{OOO_STRING_SVTOOLS_HTML_S_bull}, 8226}, + {{OOO_STRING_SVTOOLS_HTML_S_hellip}, 8230}, + {{OOO_STRING_SVTOOLS_HTML_S_permil}, 8240}, + {{OOO_STRING_SVTOOLS_HTML_S_prime}, 8242}, + {{OOO_STRING_SVTOOLS_HTML_S_Prime}, 8243}, + {{OOO_STRING_SVTOOLS_HTML_S_lsaquo}, 8249}, + {{OOO_STRING_SVTOOLS_HTML_S_rsaquo}, 8250}, + {{OOO_STRING_SVTOOLS_HTML_S_oline}, 8254}, + {{OOO_STRING_SVTOOLS_HTML_S_frasl}, 8260}, + {{OOO_STRING_SVTOOLS_HTML_S_euro}, 8364}, + {{OOO_STRING_SVTOOLS_HTML_S_image}, 8465}, + {{OOO_STRING_SVTOOLS_HTML_S_weierp}, 8472}, + {{OOO_STRING_SVTOOLS_HTML_S_real}, 8476}, + {{OOO_STRING_SVTOOLS_HTML_S_trade}, 8482}, + {{OOO_STRING_SVTOOLS_HTML_S_alefsym}, 8501}, + {{OOO_STRING_SVTOOLS_HTML_S_larr}, 8592}, + {{OOO_STRING_SVTOOLS_HTML_S_uarr}, 8593}, + {{OOO_STRING_SVTOOLS_HTML_S_rarr}, 8594}, + {{OOO_STRING_SVTOOLS_HTML_S_darr}, 8595}, + {{OOO_STRING_SVTOOLS_HTML_S_harr}, 8596}, + {{OOO_STRING_SVTOOLS_HTML_S_crarr}, 8629}, + {{OOO_STRING_SVTOOLS_HTML_S_lArr}, 8656}, + {{OOO_STRING_SVTOOLS_HTML_S_uArr}, 8657}, + {{OOO_STRING_SVTOOLS_HTML_S_rArr}, 8658}, + {{OOO_STRING_SVTOOLS_HTML_S_dArr}, 8659}, + {{OOO_STRING_SVTOOLS_HTML_S_hArr}, 8660}, + {{OOO_STRING_SVTOOLS_HTML_S_forall}, 8704}, + {{OOO_STRING_SVTOOLS_HTML_S_part}, 8706}, + {{OOO_STRING_SVTOOLS_HTML_S_exist}, 8707}, + {{OOO_STRING_SVTOOLS_HTML_S_empty}, 8709}, + {{OOO_STRING_SVTOOLS_HTML_S_nabla}, 8711}, + {{OOO_STRING_SVTOOLS_HTML_S_isin}, 8712}, + {{OOO_STRING_SVTOOLS_HTML_S_notin}, 8713}, + {{OOO_STRING_SVTOOLS_HTML_S_ni}, 8715}, + {{OOO_STRING_SVTOOLS_HTML_S_prod}, 8719}, + {{OOO_STRING_SVTOOLS_HTML_S_sum}, 8721}, + {{OOO_STRING_SVTOOLS_HTML_S_minus}, 8722}, + {{OOO_STRING_SVTOOLS_HTML_S_lowast}, 8727}, + {{OOO_STRING_SVTOOLS_HTML_S_radic}, 8730}, + {{OOO_STRING_SVTOOLS_HTML_S_prop}, 8733}, + {{OOO_STRING_SVTOOLS_HTML_S_infin}, 8734}, + {{OOO_STRING_SVTOOLS_HTML_S_ang}, 8736}, + {{OOO_STRING_SVTOOLS_HTML_S_and}, 8743}, + {{OOO_STRING_SVTOOLS_HTML_S_or}, 8744}, + {{OOO_STRING_SVTOOLS_HTML_S_cap}, 8745}, + {{OOO_STRING_SVTOOLS_HTML_S_cup}, 8746}, + {{OOO_STRING_SVTOOLS_HTML_S_int}, 8747}, + {{OOO_STRING_SVTOOLS_HTML_S_there4}, 8756}, + {{OOO_STRING_SVTOOLS_HTML_S_sim}, 8764}, + {{OOO_STRING_SVTOOLS_HTML_S_cong}, 8773}, + {{OOO_STRING_SVTOOLS_HTML_S_asymp}, 8776}, + {{OOO_STRING_SVTOOLS_HTML_S_ne}, 8800}, + {{OOO_STRING_SVTOOLS_HTML_S_equiv}, 8801}, + {{OOO_STRING_SVTOOLS_HTML_S_le}, 8804}, + {{OOO_STRING_SVTOOLS_HTML_S_ge}, 8805}, + {{OOO_STRING_SVTOOLS_HTML_S_sub}, 8834}, + {{OOO_STRING_SVTOOLS_HTML_S_sup}, 8835}, + {{OOO_STRING_SVTOOLS_HTML_S_nsub}, 8836}, + {{OOO_STRING_SVTOOLS_HTML_S_sube}, 8838}, + {{OOO_STRING_SVTOOLS_HTML_S_supe}, 8839}, + {{OOO_STRING_SVTOOLS_HTML_S_oplus}, 8853}, + {{OOO_STRING_SVTOOLS_HTML_S_otimes}, 8855}, + {{OOO_STRING_SVTOOLS_HTML_S_perp}, 8869}, + {{OOO_STRING_SVTOOLS_HTML_S_sdot}, 8901}, + {{OOO_STRING_SVTOOLS_HTML_S_lceil}, 8968}, + {{OOO_STRING_SVTOOLS_HTML_S_rceil}, 8969}, + {{OOO_STRING_SVTOOLS_HTML_S_lfloor}, 8970}, + {{OOO_STRING_SVTOOLS_HTML_S_rfloor}, 8971}, + {{OOO_STRING_SVTOOLS_HTML_S_lang}, 9001}, + {{OOO_STRING_SVTOOLS_HTML_S_rang}, 9002}, + {{OOO_STRING_SVTOOLS_HTML_S_loz}, 9674}, + {{OOO_STRING_SVTOOLS_HTML_S_spades}, 9824}, + {{OOO_STRING_SVTOOLS_HTML_S_clubs}, 9827}, + {{OOO_STRING_SVTOOLS_HTML_S_hearts}, 9829}, + {{OOO_STRING_SVTOOLS_HTML_S_diams}, 9830} }; extern "C" @@ -586,7 +586,7 @@ static int nRet = strcmp( ((HTML_CharEntry*)pFirst)->sName, ((HTML_CharEntry*)pSecond)->sName ); } - + return nRet; } @@ -626,203 +626,203 @@ static int __FAR_DATA bSortOptionKeyWords = FALSE; static HTML_TokenEntry __FAR_DATA aHTMLOptionTab[] = { // Attribute ohne Wert - {{OOO_STRING_SVTOOLS_HTML_O_box}, HTML_O_BOX}, - {{OOO_STRING_SVTOOLS_HTML_O_checked}, HTML_O_CHECKED}, - {{OOO_STRING_SVTOOLS_HTML_O_compact}, HTML_O_COMPACT}, - {{OOO_STRING_SVTOOLS_HTML_O_continue}, HTML_O_CONTINUE}, - {{OOO_STRING_SVTOOLS_HTML_O_controls}, HTML_O_CONTROLS}, // IExplorer 2.0 - {{OOO_STRING_SVTOOLS_HTML_O_declare}, HTML_O_DECLARE}, - {{OOO_STRING_SVTOOLS_HTML_O_disabled}, HTML_O_DISABLED}, - {{OOO_STRING_SVTOOLS_HTML_O_folded}, HTML_O_FOLDED}, // Netscape internal - {{OOO_STRING_SVTOOLS_HTML_O_ismap}, HTML_O_ISMAP}, - {{OOO_STRING_SVTOOLS_HTML_O_mayscript}, HTML_O_MAYSCRIPT}, - {{OOO_STRING_SVTOOLS_HTML_O_multiple}, HTML_O_MULTIPLE}, - {{OOO_STRING_SVTOOLS_HTML_O_noflow}, HTML_O_NOFLOW}, - {{OOO_STRING_SVTOOLS_HTML_O_nohref}, HTML_O_NOHREF}, // Netscape 2.0 - {{OOO_STRING_SVTOOLS_HTML_O_noresize}, HTML_O_NORESIZE}, // Netscape 2.0 - {{OOO_STRING_SVTOOLS_HTML_O_noshade}, HTML_O_NOSHADE}, // Netscape 2.0 - {{OOO_STRING_SVTOOLS_HTML_O_nowrap}, HTML_O_NOWRAP}, - {{OOO_STRING_SVTOOLS_HTML_O_plain}, HTML_O_PLAIN}, - {{OOO_STRING_SVTOOLS_HTML_O_sdfixed}, HTML_O_SDFIXED}, - {{OOO_STRING_SVTOOLS_HTML_O_selected}, HTML_O_SELECTED}, - {{OOO_STRING_SVTOOLS_HTML_O_shapes}, HTML_O_SHAPES}, + {{OOO_STRING_SVTOOLS_HTML_O_box}, HTML_O_BOX}, + {{OOO_STRING_SVTOOLS_HTML_O_checked}, HTML_O_CHECKED}, + {{OOO_STRING_SVTOOLS_HTML_O_compact}, HTML_O_COMPACT}, + {{OOO_STRING_SVTOOLS_HTML_O_continue}, HTML_O_CONTINUE}, + {{OOO_STRING_SVTOOLS_HTML_O_controls}, HTML_O_CONTROLS}, // IExplorer 2.0 + {{OOO_STRING_SVTOOLS_HTML_O_declare}, HTML_O_DECLARE}, + {{OOO_STRING_SVTOOLS_HTML_O_disabled}, HTML_O_DISABLED}, + {{OOO_STRING_SVTOOLS_HTML_O_folded}, HTML_O_FOLDED}, // Netscape internal + {{OOO_STRING_SVTOOLS_HTML_O_ismap}, HTML_O_ISMAP}, + {{OOO_STRING_SVTOOLS_HTML_O_mayscript}, HTML_O_MAYSCRIPT}, + {{OOO_STRING_SVTOOLS_HTML_O_multiple}, HTML_O_MULTIPLE}, + {{OOO_STRING_SVTOOLS_HTML_O_noflow}, HTML_O_NOFLOW}, + {{OOO_STRING_SVTOOLS_HTML_O_nohref}, HTML_O_NOHREF}, // Netscape 2.0 + {{OOO_STRING_SVTOOLS_HTML_O_noresize}, HTML_O_NORESIZE}, // Netscape 2.0 + {{OOO_STRING_SVTOOLS_HTML_O_noshade}, HTML_O_NOSHADE}, // Netscape 2.0 + {{OOO_STRING_SVTOOLS_HTML_O_nowrap}, HTML_O_NOWRAP}, + {{OOO_STRING_SVTOOLS_HTML_O_plain}, HTML_O_PLAIN}, + {{OOO_STRING_SVTOOLS_HTML_O_sdfixed}, HTML_O_SDFIXED}, + {{OOO_STRING_SVTOOLS_HTML_O_selected}, HTML_O_SELECTED}, + {{OOO_STRING_SVTOOLS_HTML_O_shapes}, HTML_O_SHAPES}, // Attribute mit einem String als Wert - {{OOO_STRING_SVTOOLS_HTML_O_above}, HTML_O_ABOVE}, - {{OOO_STRING_SVTOOLS_HTML_O_accept}, HTML_O_ACCEPT}, - {{OOO_STRING_SVTOOLS_HTML_O_accesskey}, HTML_O_ACCESSKEY}, - {{OOO_STRING_SVTOOLS_HTML_O_add_date}, HTML_O_ADD_DATE}, // Netscape internal - {{OOO_STRING_SVTOOLS_HTML_O_alt}, HTML_O_ALT}, - {{OOO_STRING_SVTOOLS_HTML_O_axes}, HTML_O_AXES}, - {{OOO_STRING_SVTOOLS_HTML_O_axis}, HTML_O_AXIS}, - {{OOO_STRING_SVTOOLS_HTML_O_below}, HTML_O_BELOW}, - {{OOO_STRING_SVTOOLS_HTML_O_char}, HTML_O_CHAR}, // HTML 3 Table Model Draft - {{OOO_STRING_SVTOOLS_HTML_O_class}, HTML_O_CLASS}, - {{OOO_STRING_SVTOOLS_HTML_O_clip}, HTML_O_CLIP}, - {{OOO_STRING_SVTOOLS_HTML_O_code}, HTML_O_CODE}, // HotJava - {{OOO_STRING_SVTOOLS_HTML_O_codetype}, HTML_O_CODETYPE}, - {{OOO_STRING_SVTOOLS_HTML_O_colspec}, HTML_O_COLSPEC}, - {{OOO_STRING_SVTOOLS_HTML_O_content}, HTML_O_CONTENT}, - {{OOO_STRING_SVTOOLS_HTML_O_coords}, HTML_O_COORDS}, // Netscape 2.0 - {{OOO_STRING_SVTOOLS_HTML_O_dp}, HTML_O_DP}, - {{OOO_STRING_SVTOOLS_HTML_O_enctype}, HTML_O_ENCTYPE}, - {{OOO_STRING_SVTOOLS_HTML_O_error}, HTML_O_ERROR}, - {{OOO_STRING_SVTOOLS_HTML_O_face}, HTML_O_FACE}, // IExplorer 2.0 + {{OOO_STRING_SVTOOLS_HTML_O_above}, HTML_O_ABOVE}, + {{OOO_STRING_SVTOOLS_HTML_O_accept}, HTML_O_ACCEPT}, + {{OOO_STRING_SVTOOLS_HTML_O_accesskey}, HTML_O_ACCESSKEY}, + {{OOO_STRING_SVTOOLS_HTML_O_add_date}, HTML_O_ADD_DATE}, // Netscape internal + {{OOO_STRING_SVTOOLS_HTML_O_alt}, HTML_O_ALT}, + {{OOO_STRING_SVTOOLS_HTML_O_axes}, HTML_O_AXES}, + {{OOO_STRING_SVTOOLS_HTML_O_axis}, HTML_O_AXIS}, + {{OOO_STRING_SVTOOLS_HTML_O_below}, HTML_O_BELOW}, + {{OOO_STRING_SVTOOLS_HTML_O_char}, HTML_O_CHAR}, // HTML 3 Table Model Draft + {{OOO_STRING_SVTOOLS_HTML_O_class}, HTML_O_CLASS}, + {{OOO_STRING_SVTOOLS_HTML_O_clip}, HTML_O_CLIP}, + {{OOO_STRING_SVTOOLS_HTML_O_code}, HTML_O_CODE}, // HotJava + {{OOO_STRING_SVTOOLS_HTML_O_codetype}, HTML_O_CODETYPE}, + {{OOO_STRING_SVTOOLS_HTML_O_colspec}, HTML_O_COLSPEC}, + {{OOO_STRING_SVTOOLS_HTML_O_content}, HTML_O_CONTENT}, + {{OOO_STRING_SVTOOLS_HTML_O_coords}, HTML_O_COORDS}, // Netscape 2.0 + {{OOO_STRING_SVTOOLS_HTML_O_dp}, HTML_O_DP}, + {{OOO_STRING_SVTOOLS_HTML_O_enctype}, HTML_O_ENCTYPE}, + {{OOO_STRING_SVTOOLS_HTML_O_error}, HTML_O_ERROR}, + {{OOO_STRING_SVTOOLS_HTML_O_face}, HTML_O_FACE}, // IExplorer 2.0 {{OOO_STRING_SVTOOLS_HTML_O_frameborder}, HTML_O_FRAMEBORDER}, // IExplorer 3.0 - {{OOO_STRING_SVTOOLS_HTML_O_httpequiv}, HTML_O_HTTPEQUIV}, - {{OOO_STRING_SVTOOLS_HTML_O_language}, HTML_O_LANGUAGE}, // JavaScript - {{OOO_STRING_SVTOOLS_HTML_O_last_modified}, HTML_O_LAST_MODIFIED}, // Netscape internal - {{OOO_STRING_SVTOOLS_HTML_O_last_visit}, HTML_O_LAST_VISIT}, // Netscape internal - {{OOO_STRING_SVTOOLS_HTML_O_md}, HTML_O_MD}, - {{OOO_STRING_SVTOOLS_HTML_O_n}, HTML_O_N}, - {{OOO_STRING_SVTOOLS_HTML_O_name}, HTML_O_NAME}, - {{OOO_STRING_SVTOOLS_HTML_O_notation}, HTML_O_NOTATION}, - {{OOO_STRING_SVTOOLS_HTML_O_prompt}, HTML_O_PROMPT}, - {{OOO_STRING_SVTOOLS_HTML_O_shape}, HTML_O_SHAPE}, - {{OOO_STRING_SVTOOLS_HTML_O_standby}, HTML_O_STANDBY}, - {{OOO_STRING_SVTOOLS_HTML_O_style}, HTML_O_STYLE}, - {{OOO_STRING_SVTOOLS_HTML_O_title}, HTML_O_TITLE}, - {{OOO_STRING_SVTOOLS_HTML_O_value}, HTML_O_VALUE}, - {{OOO_STRING_SVTOOLS_HTML_O_SDval}, HTML_O_SDVAL}, // StarDiv NumberValue - {{OOO_STRING_SVTOOLS_HTML_O_SDnum}, HTML_O_SDNUM}, // StarDiv NumberFormat - {{OOO_STRING_SVTOOLS_HTML_O_sdlibrary}, HTML_O_SDLIBRARY}, - {{OOO_STRING_SVTOOLS_HTML_O_sdmodule}, HTML_O_SDMODULE}, + {{OOO_STRING_SVTOOLS_HTML_O_httpequiv}, HTML_O_HTTPEQUIV}, + {{OOO_STRING_SVTOOLS_HTML_O_language}, HTML_O_LANGUAGE}, // JavaScript + {{OOO_STRING_SVTOOLS_HTML_O_last_modified}, HTML_O_LAST_MODIFIED}, // Netscape internal + {{OOO_STRING_SVTOOLS_HTML_O_last_visit}, HTML_O_LAST_VISIT}, // Netscape internal + {{OOO_STRING_SVTOOLS_HTML_O_md}, HTML_O_MD}, + {{OOO_STRING_SVTOOLS_HTML_O_n}, HTML_O_N}, + {{OOO_STRING_SVTOOLS_HTML_O_name}, HTML_O_NAME}, + {{OOO_STRING_SVTOOLS_HTML_O_notation}, HTML_O_NOTATION}, + {{OOO_STRING_SVTOOLS_HTML_O_prompt}, HTML_O_PROMPT}, + {{OOO_STRING_SVTOOLS_HTML_O_shape}, HTML_O_SHAPE}, + {{OOO_STRING_SVTOOLS_HTML_O_standby}, HTML_O_STANDBY}, + {{OOO_STRING_SVTOOLS_HTML_O_style}, HTML_O_STYLE}, + {{OOO_STRING_SVTOOLS_HTML_O_title}, HTML_O_TITLE}, + {{OOO_STRING_SVTOOLS_HTML_O_value}, HTML_O_VALUE}, + {{OOO_STRING_SVTOOLS_HTML_O_SDval}, HTML_O_SDVAL}, // StarDiv NumberValue + {{OOO_STRING_SVTOOLS_HTML_O_SDnum}, HTML_O_SDNUM}, // StarDiv NumberFormat + {{OOO_STRING_SVTOOLS_HTML_O_sdlibrary}, HTML_O_SDLIBRARY}, + {{OOO_STRING_SVTOOLS_HTML_O_sdmodule}, HTML_O_SDMODULE}, // Attribute mit einem SGML-Identifier als Wert - {{OOO_STRING_SVTOOLS_HTML_O_from}, HTML_O_FROM}, - {{OOO_STRING_SVTOOLS_HTML_O_id}, HTML_O_ID}, - {{OOO_STRING_SVTOOLS_HTML_O_target}, HTML_O_TARGET}, // Netscape 2.0 - {{OOO_STRING_SVTOOLS_HTML_O_to}, HTML_O_TO}, - {{OOO_STRING_SVTOOLS_HTML_O_until}, HTML_O_UNTIL}, + {{OOO_STRING_SVTOOLS_HTML_O_from}, HTML_O_FROM}, + {{OOO_STRING_SVTOOLS_HTML_O_id}, HTML_O_ID}, + {{OOO_STRING_SVTOOLS_HTML_O_target}, HTML_O_TARGET}, // Netscape 2.0 + {{OOO_STRING_SVTOOLS_HTML_O_to}, HTML_O_TO}, + {{OOO_STRING_SVTOOLS_HTML_O_until}, HTML_O_UNTIL}, // Attribute mit einem URI als Wert - {{OOO_STRING_SVTOOLS_HTML_O_action}, HTML_O_ACTION}, - {{OOO_STRING_SVTOOLS_HTML_O_archive}, HTML_O_ARCHIVE}, - {{OOO_STRING_SVTOOLS_HTML_O_background}, HTML_O_BACKGROUND}, - {{OOO_STRING_SVTOOLS_HTML_O_classid}, HTML_O_CLASSID}, - {{OOO_STRING_SVTOOLS_HTML_O_codebase}, HTML_O_CODEBASE}, // HotJava - {{OOO_STRING_SVTOOLS_HTML_O_data}, HTML_O_DATA}, - {{OOO_STRING_SVTOOLS_HTML_O_dynsrc}, HTML_O_DYNSRC}, // IExplorer 3.0b1 - {{OOO_STRING_SVTOOLS_HTML_O_dynsync}, HTML_O_DYNSYNC}, // IExplorer 2.0 - {{OOO_STRING_SVTOOLS_HTML_O_imagemap}, HTML_O_IMAGEMAP}, - {{OOO_STRING_SVTOOLS_HTML_O_href}, HTML_O_HREF}, - {{OOO_STRING_SVTOOLS_HTML_O_lowsrc}, HTML_O_LOWSRC}, // Netscape 3.0 - {{OOO_STRING_SVTOOLS_HTML_O_script}, HTML_O_SCRIPT}, - {{OOO_STRING_SVTOOLS_HTML_O_src}, HTML_O_SRC}, - {{OOO_STRING_SVTOOLS_HTML_O_usemap}, HTML_O_USEMAP}, // Netscape 2.0 + {{OOO_STRING_SVTOOLS_HTML_O_action}, HTML_O_ACTION}, + {{OOO_STRING_SVTOOLS_HTML_O_archive}, HTML_O_ARCHIVE}, + {{OOO_STRING_SVTOOLS_HTML_O_background}, HTML_O_BACKGROUND}, + {{OOO_STRING_SVTOOLS_HTML_O_classid}, HTML_O_CLASSID}, + {{OOO_STRING_SVTOOLS_HTML_O_codebase}, HTML_O_CODEBASE}, // HotJava + {{OOO_STRING_SVTOOLS_HTML_O_data}, HTML_O_DATA}, + {{OOO_STRING_SVTOOLS_HTML_O_dynsrc}, HTML_O_DYNSRC}, // IExplorer 3.0b1 + {{OOO_STRING_SVTOOLS_HTML_O_dynsync}, HTML_O_DYNSYNC}, // IExplorer 2.0 + {{OOO_STRING_SVTOOLS_HTML_O_imagemap}, HTML_O_IMAGEMAP}, + {{OOO_STRING_SVTOOLS_HTML_O_href}, HTML_O_HREF}, + {{OOO_STRING_SVTOOLS_HTML_O_lowsrc}, HTML_O_LOWSRC}, // Netscape 3.0 + {{OOO_STRING_SVTOOLS_HTML_O_script}, HTML_O_SCRIPT}, + {{OOO_STRING_SVTOOLS_HTML_O_src}, HTML_O_SRC}, + {{OOO_STRING_SVTOOLS_HTML_O_usemap}, HTML_O_USEMAP}, // Netscape 2.0 // Attribute mit Entity-Namen als Wert - {{OOO_STRING_SVTOOLS_HTML_O_dingbat}, HTML_O_DINGBAT}, - {{OOO_STRING_SVTOOLS_HTML_O_sym}, HTML_O_SYM}, + {{OOO_STRING_SVTOOLS_HTML_O_dingbat}, HTML_O_DINGBAT}, + {{OOO_STRING_SVTOOLS_HTML_O_sym}, HTML_O_SYM}, // Attribute mit einer Farbe als Wert (alle Netscape) - {{OOO_STRING_SVTOOLS_HTML_O_alink}, HTML_O_ALINK}, - {{OOO_STRING_SVTOOLS_HTML_O_bgcolor}, HTML_O_BGCOLOR}, + {{OOO_STRING_SVTOOLS_HTML_O_alink}, HTML_O_ALINK}, + {{OOO_STRING_SVTOOLS_HTML_O_bgcolor}, HTML_O_BGCOLOR}, {{OOO_STRING_SVTOOLS_HTML_O_bordercolor}, HTML_O_BORDERCOLOR}, // IExplorer 2.0 {{OOO_STRING_SVTOOLS_HTML_O_bordercolorlight}, HTML_O_BORDERCOLORLIGHT}, // IExplorer 2.0 {{OOO_STRING_SVTOOLS_HTML_O_bordercolordark}, HTML_O_BORDERCOLORDARK}, // IExplorer 2.0 - {{OOO_STRING_SVTOOLS_HTML_O_color}, HTML_O_COLOR}, - {{OOO_STRING_SVTOOLS_HTML_O_link}, HTML_O_LINK}, - {{OOO_STRING_SVTOOLS_HTML_O_text}, HTML_O_TEXT}, - {{OOO_STRING_SVTOOLS_HTML_O_vlink}, HTML_O_VLINK}, + {{OOO_STRING_SVTOOLS_HTML_O_color}, HTML_O_COLOR}, + {{OOO_STRING_SVTOOLS_HTML_O_link}, HTML_O_LINK}, + {{OOO_STRING_SVTOOLS_HTML_O_text}, HTML_O_TEXT}, + {{OOO_STRING_SVTOOLS_HTML_O_vlink}, HTML_O_VLINK}, // Attribute mit einem numerischen Wert - {{OOO_STRING_SVTOOLS_HTML_O_border}, HTML_O_BORDER}, + {{OOO_STRING_SVTOOLS_HTML_O_border}, HTML_O_BORDER}, {{OOO_STRING_SVTOOLS_HTML_O_cellspacing},HTML_O_CELLSPACING}, // HTML 3 Table Model Draft {{OOO_STRING_SVTOOLS_HTML_O_cellpadding},HTML_O_CELLPADDING}, // HTML 3 Table Model Draft - {{OOO_STRING_SVTOOLS_HTML_O_charoff}, HTML_O_CHAROFF}, // HTML 3 Table Model Draft - {{OOO_STRING_SVTOOLS_HTML_O_colspan}, HTML_O_COLSPAN}, + {{OOO_STRING_SVTOOLS_HTML_O_charoff}, HTML_O_CHAROFF}, // HTML 3 Table Model Draft + {{OOO_STRING_SVTOOLS_HTML_O_colspan}, HTML_O_COLSPAN}, {{OOO_STRING_SVTOOLS_HTML_O_framespacing}, HTML_O_FRAMESPACING}, // IExplorer 3.0 - {{OOO_STRING_SVTOOLS_HTML_O_gutter}, HTML_O_GUTTER}, // Netscape 3.0b5 - {{OOO_STRING_SVTOOLS_HTML_O_indent}, HTML_O_INDENT}, - {{OOO_STRING_SVTOOLS_HTML_O_height}, HTML_O_HEIGHT}, - {{OOO_STRING_SVTOOLS_HTML_O_hspace}, HTML_O_HSPACE}, // Netscape - {{OOO_STRING_SVTOOLS_HTML_O_left}, HTML_O_LEFT}, - {{OOO_STRING_SVTOOLS_HTML_O_leftmargin}, HTML_O_LEFTMARGIN}, // IExplorer 2.0 - {{OOO_STRING_SVTOOLS_HTML_O_loop}, HTML_O_LOOP}, // IExplorer 2.0 + {{OOO_STRING_SVTOOLS_HTML_O_gutter}, HTML_O_GUTTER}, // Netscape 3.0b5 + {{OOO_STRING_SVTOOLS_HTML_O_indent}, HTML_O_INDENT}, + {{OOO_STRING_SVTOOLS_HTML_O_height}, HTML_O_HEIGHT}, + {{OOO_STRING_SVTOOLS_HTML_O_hspace}, HTML_O_HSPACE}, // Netscape + {{OOO_STRING_SVTOOLS_HTML_O_left}, HTML_O_LEFT}, + {{OOO_STRING_SVTOOLS_HTML_O_leftmargin}, HTML_O_LEFTMARGIN}, // IExplorer 2.0 + {{OOO_STRING_SVTOOLS_HTML_O_loop}, HTML_O_LOOP}, // IExplorer 2.0 {{OOO_STRING_SVTOOLS_HTML_O_marginheight},HTML_O_MARGINHEIGHT}, // Netscape 2.0 {{OOO_STRING_SVTOOLS_HTML_O_marginwidth},HTML_O_MARGINWIDTH}, // Netscape 2.0 - {{OOO_STRING_SVTOOLS_HTML_O_max}, HTML_O_MAX}, - {{OOO_STRING_SVTOOLS_HTML_O_maxlength}, HTML_O_MAXLENGTH}, - {{OOO_STRING_SVTOOLS_HTML_O_min}, HTML_O_MIN}, - {{OOO_STRING_SVTOOLS_HTML_O_pagex}, HTML_O_PAGEX}, - {{OOO_STRING_SVTOOLS_HTML_O_pagey}, HTML_O_PAGEY}, - {{OOO_STRING_SVTOOLS_HTML_O_pointsize}, HTML_O_POINTSIZE}, - {{OOO_STRING_SVTOOLS_HTML_O_rowspan}, HTML_O_ROWSPAN}, + {{OOO_STRING_SVTOOLS_HTML_O_max}, HTML_O_MAX}, + {{OOO_STRING_SVTOOLS_HTML_O_maxlength}, HTML_O_MAXLENGTH}, + {{OOO_STRING_SVTOOLS_HTML_O_min}, HTML_O_MIN}, + {{OOO_STRING_SVTOOLS_HTML_O_pagex}, HTML_O_PAGEX}, + {{OOO_STRING_SVTOOLS_HTML_O_pagey}, HTML_O_PAGEY}, + {{OOO_STRING_SVTOOLS_HTML_O_pointsize}, HTML_O_POINTSIZE}, + {{OOO_STRING_SVTOOLS_HTML_O_rowspan}, HTML_O_ROWSPAN}, {{OOO_STRING_SVTOOLS_HTML_O_scrollamount}, HTML_O_SCROLLAMOUNT}, // IExplorer 2.0 {{OOO_STRING_SVTOOLS_HTML_O_scrolldelay}, HTML_O_SCROLLDELAY}, // IExplorer 2.0 - {{OOO_STRING_SVTOOLS_HTML_O_seqnum}, HTML_O_SEQNUM}, - {{OOO_STRING_SVTOOLS_HTML_O_skip}, HTML_O_SKIP}, - {{OOO_STRING_SVTOOLS_HTML_O_span}, HTML_O_SPAN}, // HTML 3 Table Model Draft - {{OOO_STRING_SVTOOLS_HTML_O_tabindex}, HTML_O_TABINDEX}, - {{OOO_STRING_SVTOOLS_HTML_O_top}, HTML_O_TOP}, - {{OOO_STRING_SVTOOLS_HTML_O_topmargin}, HTML_O_TOPMARGIN}, // IExplorer 2.0 - {{OOO_STRING_SVTOOLS_HTML_O_vspace}, HTML_O_VSPACE}, // Netscape - {{OOO_STRING_SVTOOLS_HTML_O_weight}, HTML_O_WEIGHT}, - {{OOO_STRING_SVTOOLS_HTML_O_width}, HTML_O_WIDTH}, - {{OOO_STRING_SVTOOLS_HTML_O_x}, HTML_O_X}, - {{OOO_STRING_SVTOOLS_HTML_O_y}, HTML_O_Y}, - {{OOO_STRING_SVTOOLS_HTML_O_zindex}, HTML_O_ZINDEX}, + {{OOO_STRING_SVTOOLS_HTML_O_seqnum}, HTML_O_SEQNUM}, + {{OOO_STRING_SVTOOLS_HTML_O_skip}, HTML_O_SKIP}, + {{OOO_STRING_SVTOOLS_HTML_O_span}, HTML_O_SPAN}, // HTML 3 Table Model Draft + {{OOO_STRING_SVTOOLS_HTML_O_tabindex}, HTML_O_TABINDEX}, + {{OOO_STRING_SVTOOLS_HTML_O_top}, HTML_O_TOP}, + {{OOO_STRING_SVTOOLS_HTML_O_topmargin}, HTML_O_TOPMARGIN}, // IExplorer 2.0 + {{OOO_STRING_SVTOOLS_HTML_O_vspace}, HTML_O_VSPACE}, // Netscape + {{OOO_STRING_SVTOOLS_HTML_O_weight}, HTML_O_WEIGHT}, + {{OOO_STRING_SVTOOLS_HTML_O_width}, HTML_O_WIDTH}, + {{OOO_STRING_SVTOOLS_HTML_O_x}, HTML_O_X}, + {{OOO_STRING_SVTOOLS_HTML_O_y}, HTML_O_Y}, + {{OOO_STRING_SVTOOLS_HTML_O_zindex}, HTML_O_ZINDEX}, // Attribute mit Enum-Werten {{OOO_STRING_SVTOOLS_HTML_O_bgproperties}, HTML_O_BGPROPERTIES}, // IExplorer 2.0 - {{OOO_STRING_SVTOOLS_HTML_O_behavior}, HTML_O_BEHAVIOR}, // IExplorer 2.0 - {{OOO_STRING_SVTOOLS_HTML_O_clear}, HTML_O_CLEAR}, - {{OOO_STRING_SVTOOLS_HTML_O_dir}, HTML_O_DIR}, // HTML 3 Table Model Draft - {{OOO_STRING_SVTOOLS_HTML_O_direction}, HTML_O_DIRECTION}, // IExplorer 2.0 - {{OOO_STRING_SVTOOLS_HTML_O_format}, HTML_O_FORMAT}, - {{OOO_STRING_SVTOOLS_HTML_O_frame}, HTML_O_FRAME}, // HTML 3 Table Model Draft - {{OOO_STRING_SVTOOLS_HTML_O_lang}, HTML_O_LANG}, - {{OOO_STRING_SVTOOLS_HTML_O_method}, HTML_O_METHOD}, - {{OOO_STRING_SVTOOLS_HTML_O_palette}, HTML_O_PALETTE}, - {{OOO_STRING_SVTOOLS_HTML_O_rel}, HTML_O_REL}, - {{OOO_STRING_SVTOOLS_HTML_O_rev}, HTML_O_REV}, - {{OOO_STRING_SVTOOLS_HTML_O_rules}, HTML_O_RULES}, // HTML 3 Table Model Draft - {{OOO_STRING_SVTOOLS_HTML_O_scrolling}, HTML_O_SCROLLING}, // Netscape 2.0 - {{OOO_STRING_SVTOOLS_HTML_O_sdreadonly}, HTML_O_SDREADONLY}, - {{OOO_STRING_SVTOOLS_HTML_O_subtype}, HTML_O_SUBTYPE}, - {{OOO_STRING_SVTOOLS_HTML_O_type}, HTML_O_TYPE}, - {{OOO_STRING_SVTOOLS_HTML_O_valign}, HTML_O_VALIGN}, - {{OOO_STRING_SVTOOLS_HTML_O_valuetype}, HTML_O_VALUETYPE}, - {{OOO_STRING_SVTOOLS_HTML_O_wrap}, HTML_O_WRAP}, - {{OOO_STRING_SVTOOLS_HTML_O_visibility}, HTML_O_VISIBILITY}, + {{OOO_STRING_SVTOOLS_HTML_O_behavior}, HTML_O_BEHAVIOR}, // IExplorer 2.0 + {{OOO_STRING_SVTOOLS_HTML_O_clear}, HTML_O_CLEAR}, + {{OOO_STRING_SVTOOLS_HTML_O_dir}, HTML_O_DIR}, // HTML 3 Table Model Draft + {{OOO_STRING_SVTOOLS_HTML_O_direction}, HTML_O_DIRECTION}, // IExplorer 2.0 + {{OOO_STRING_SVTOOLS_HTML_O_format}, HTML_O_FORMAT}, + {{OOO_STRING_SVTOOLS_HTML_O_frame}, HTML_O_FRAME}, // HTML 3 Table Model Draft + {{OOO_STRING_SVTOOLS_HTML_O_lang}, HTML_O_LANG}, + {{OOO_STRING_SVTOOLS_HTML_O_method}, HTML_O_METHOD}, + {{OOO_STRING_SVTOOLS_HTML_O_palette}, HTML_O_PALETTE}, + {{OOO_STRING_SVTOOLS_HTML_O_rel}, HTML_O_REL}, + {{OOO_STRING_SVTOOLS_HTML_O_rev}, HTML_O_REV}, + {{OOO_STRING_SVTOOLS_HTML_O_rules}, HTML_O_RULES}, // HTML 3 Table Model Draft + {{OOO_STRING_SVTOOLS_HTML_O_scrolling}, HTML_O_SCROLLING}, // Netscape 2.0 + {{OOO_STRING_SVTOOLS_HTML_O_sdreadonly}, HTML_O_SDREADONLY}, + {{OOO_STRING_SVTOOLS_HTML_O_subtype}, HTML_O_SUBTYPE}, + {{OOO_STRING_SVTOOLS_HTML_O_type}, HTML_O_TYPE}, + {{OOO_STRING_SVTOOLS_HTML_O_valign}, HTML_O_VALIGN}, + {{OOO_STRING_SVTOOLS_HTML_O_valuetype}, HTML_O_VALUETYPE}, + {{OOO_STRING_SVTOOLS_HTML_O_wrap}, HTML_O_WRAP}, + {{OOO_STRING_SVTOOLS_HTML_O_visibility}, HTML_O_VISIBILITY}, // Attribute mit Script-Code als Wert - {{OOO_STRING_SVTOOLS_HTML_O_onblur}, HTML_O_ONBLUR}, // JavaScript - {{OOO_STRING_SVTOOLS_HTML_O_onchange}, HTML_O_ONCHANGE}, // JavaScript - {{OOO_STRING_SVTOOLS_HTML_O_onclick}, HTML_O_ONCLICK}, // JavaScript - {{OOO_STRING_SVTOOLS_HTML_O_onfocus}, HTML_O_ONFOCUS}, // JavaScript - {{OOO_STRING_SVTOOLS_HTML_O_onload}, HTML_O_ONLOAD}, // JavaScript + {{OOO_STRING_SVTOOLS_HTML_O_onblur}, HTML_O_ONBLUR}, // JavaScript + {{OOO_STRING_SVTOOLS_HTML_O_onchange}, HTML_O_ONCHANGE}, // JavaScript + {{OOO_STRING_SVTOOLS_HTML_O_onclick}, HTML_O_ONCLICK}, // JavaScript + {{OOO_STRING_SVTOOLS_HTML_O_onfocus}, HTML_O_ONFOCUS}, // JavaScript + {{OOO_STRING_SVTOOLS_HTML_O_onload}, HTML_O_ONLOAD}, // JavaScript {{OOO_STRING_SVTOOLS_HTML_O_onmouseover}, HTML_O_ONMOUSEOVER}, // JavaScript - {{OOO_STRING_SVTOOLS_HTML_O_onreset}, HTML_O_ONRESET}, // JavaScript - {{OOO_STRING_SVTOOLS_HTML_O_onselect}, HTML_O_ONSELECT}, // JavaScript - {{OOO_STRING_SVTOOLS_HTML_O_onsubmit}, HTML_O_ONSUBMIT}, // JavaScript - {{OOO_STRING_SVTOOLS_HTML_O_onunload}, HTML_O_ONUNLOAD}, // JavaScript - {{OOO_STRING_SVTOOLS_HTML_O_onabort}, HTML_O_ONABORT}, // JavaScript - {{OOO_STRING_SVTOOLS_HTML_O_onerror}, HTML_O_ONERROR}, // JavaScript - {{OOO_STRING_SVTOOLS_HTML_O_onmouseout}, HTML_O_ONMOUSEOUT}, // JavaScript - - {{OOO_STRING_SVTOOLS_HTML_O_SDonblur}, HTML_O_SDONBLUR}, // StarBasic - {{OOO_STRING_SVTOOLS_HTML_O_SDonchange}, HTML_O_SDONCHANGE}, // StarBasic - {{OOO_STRING_SVTOOLS_HTML_O_SDonclick}, HTML_O_SDONCLICK}, // StarBasic - {{OOO_STRING_SVTOOLS_HTML_O_SDonfocus}, HTML_O_SDONFOCUS}, // StarBasic - {{OOO_STRING_SVTOOLS_HTML_O_SDonload}, HTML_O_SDONLOAD}, // StarBasic - {{OOO_STRING_SVTOOLS_HTML_O_SDonmouseover}, HTML_O_SDONMOUSEOVER}, // StarBasic - {{OOO_STRING_SVTOOLS_HTML_O_SDonreset}, HTML_O_SDONRESET}, // StarBasic - {{OOO_STRING_SVTOOLS_HTML_O_SDonselect}, HTML_O_SDONSELECT}, // StarBasic - {{OOO_STRING_SVTOOLS_HTML_O_SDonsubmit}, HTML_O_SDONSUBMIT}, // StarBasic - {{OOO_STRING_SVTOOLS_HTML_O_SDonunload}, HTML_O_SDONUNLOAD}, // StarBasic - {{OOO_STRING_SVTOOLS_HTML_O_SDonabort}, HTML_O_SDONABORT}, // StarBasic - {{OOO_STRING_SVTOOLS_HTML_O_SDonerror}, HTML_O_SDONERROR}, // StarBasic - {{OOO_STRING_SVTOOLS_HTML_O_SDonmouseout}, HTML_O_SDONMOUSEOUT}, // StarBasic + {{OOO_STRING_SVTOOLS_HTML_O_onreset}, HTML_O_ONRESET}, // JavaScript + {{OOO_STRING_SVTOOLS_HTML_O_onselect}, HTML_O_ONSELECT}, // JavaScript + {{OOO_STRING_SVTOOLS_HTML_O_onsubmit}, HTML_O_ONSUBMIT}, // JavaScript + {{OOO_STRING_SVTOOLS_HTML_O_onunload}, HTML_O_ONUNLOAD}, // JavaScript + {{OOO_STRING_SVTOOLS_HTML_O_onabort}, HTML_O_ONABORT}, // JavaScript + {{OOO_STRING_SVTOOLS_HTML_O_onerror}, HTML_O_ONERROR}, // JavaScript + {{OOO_STRING_SVTOOLS_HTML_O_onmouseout}, HTML_O_ONMOUSEOUT}, // JavaScript + + {{OOO_STRING_SVTOOLS_HTML_O_SDonblur}, HTML_O_SDONBLUR}, // StarBasic + {{OOO_STRING_SVTOOLS_HTML_O_SDonchange}, HTML_O_SDONCHANGE}, // StarBasic + {{OOO_STRING_SVTOOLS_HTML_O_SDonclick}, HTML_O_SDONCLICK}, // StarBasic + {{OOO_STRING_SVTOOLS_HTML_O_SDonfocus}, HTML_O_SDONFOCUS}, // StarBasic + {{OOO_STRING_SVTOOLS_HTML_O_SDonload}, HTML_O_SDONLOAD}, // StarBasic + {{OOO_STRING_SVTOOLS_HTML_O_SDonmouseover}, HTML_O_SDONMOUSEOVER}, // StarBasic + {{OOO_STRING_SVTOOLS_HTML_O_SDonreset}, HTML_O_SDONRESET}, // StarBasic + {{OOO_STRING_SVTOOLS_HTML_O_SDonselect}, HTML_O_SDONSELECT}, // StarBasic + {{OOO_STRING_SVTOOLS_HTML_O_SDonsubmit}, HTML_O_SDONSUBMIT}, // StarBasic + {{OOO_STRING_SVTOOLS_HTML_O_SDonunload}, HTML_O_SDONUNLOAD}, // StarBasic + {{OOO_STRING_SVTOOLS_HTML_O_SDonabort}, HTML_O_SDONABORT}, // StarBasic + {{OOO_STRING_SVTOOLS_HTML_O_SDonerror}, HTML_O_SDONERROR}, // StarBasic + {{OOO_STRING_SVTOOLS_HTML_O_SDonmouseout}, HTML_O_SDONMOUSEOUT}, // StarBasic // Attribute mit Kontext-abhaengigen Werten - {{OOO_STRING_SVTOOLS_HTML_O_align}, HTML_O_ALIGN}, - {{OOO_STRING_SVTOOLS_HTML_O_cols}, HTML_O_COLS}, // Netscape 2.0 vs HTML 2.0 - {{OOO_STRING_SVTOOLS_HTML_O_rows}, HTML_O_ROWS}, // Netscape 2.0 vs HTML 2.0 - {{OOO_STRING_SVTOOLS_HTML_O_size}, HTML_O_SIZE}, - {{OOO_STRING_SVTOOLS_HTML_O_start}, HTML_O_START}, // Netscape 2.0 vs IExplorer 2.0 - {{OOO_STRING_SVTOOLS_HTML_O_units}, HTML_O_UNITS} + {{OOO_STRING_SVTOOLS_HTML_O_align}, HTML_O_ALIGN}, + {{OOO_STRING_SVTOOLS_HTML_O_cols}, HTML_O_COLS}, // Netscape 2.0 vs HTML 2.0 + {{OOO_STRING_SVTOOLS_HTML_O_rows}, HTML_O_ROWS}, // Netscape 2.0 vs HTML 2.0 + {{OOO_STRING_SVTOOLS_HTML_O_size}, HTML_O_SIZE}, + {{OOO_STRING_SVTOOLS_HTML_O_start}, HTML_O_START}, // Netscape 2.0 vs IExplorer 2.0 + {{OOO_STRING_SVTOOLS_HTML_O_units}, HTML_O_UNITS} }; int GetHTMLOption( const String& rName ) @@ -856,7 +856,7 @@ int GetHTMLOption( const String& rName ) // Flag: Farb-Tabelle wurde schon sortiert struct HTML_ColorEntry { - union + union { const sal_Char* sName; const String *pUName; @@ -1047,7 +1047,7 @@ static int nRet = strcmp( ((HTML_ColorEntry*)pFirst)->sName, ((HTML_ColorEntry*)pSecond)->sName ); } - + return nRet; } diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx index d2ad0bb205ce..e8bb83358d9f 100644 --- a/svtools/source/svhtml/htmlout.cxx +++ b/svtools/source/svhtml/htmlout.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,14 +58,14 @@ const sal_Char __FAR_DATA HTMLOutFuncs::sNewLine[] = "\015\012"; HTMLOutContext::HTMLOutContext( rtl_TextEncoding eDestEnc ) { - m_eDestEnc = RTL_TEXTENCODING_DONTKNOW == eDestEnc + m_eDestEnc = RTL_TEXTENCODING_DONTKNOW == eDestEnc ? gsl_getSystemTextEncoding() : eDestEnc; m_hConv = rtl_createUnicodeToTextConverter( eDestEnc ); - DBG_ASSERT( m_hConv, + DBG_ASSERT( m_hConv, "HTMLOutContext::HTMLOutContext: no converter for source encoding" ); - m_hContext = m_hConv ? rtl_createUnicodeToTextContext( m_hConv ) + m_hContext = m_hConv ? rtl_createUnicodeToTextContext( m_hConv ) : (rtl_TextToUnicodeContext)1; } @@ -75,7 +75,7 @@ HTMLOutContext::~HTMLOutContext() rtl_destroyUnicodeToTextConverter( m_hConv ); } -const sal_Char *lcl_svhtml_GetEntityForChar( sal_Unicode c, +const sal_Char *lcl_svhtml_GetEntityForChar( sal_Unicode c, rtl_TextEncoding eDestEnc ) { const sal_Char* pStr = 0; @@ -93,29 +93,29 @@ const sal_Char *lcl_svhtml_GetEntityForChar( sal_Unicode c, case 184: // ccedil case 193: // Aacute case 194: // Acirc - case 196: // Auml + case 196: // Auml case 199: // Ccedil case 201: // Eacute - case 203: // Euml + case 203: // Euml case 205: // Iacute case 206: // Icirc case 211: // Oacute case 212: // Ocirc - case 214: // Ouml + case 214: // Ouml case 215: // times case 218: // Uacute - case 220: // Uuml + case 220: // Uuml case 221: // Yacute case 225: // aacute case 226: // acirc - case 228: // auml + case 228: // auml case 233: // eacute - case 235: // euml + case 235: // euml case 237: // iacute case 238: // icirc case 243: // oacute case 244: // ocirc - case 246: // ouml + case 246: // ouml case 247: // divide case 250: // uacute case 252: // uuml @@ -130,216 +130,216 @@ const sal_Char *lcl_svhtml_GetEntityForChar( sal_Unicode c, switch( c ) { -// case '\x0a': return HTMLOutFuncs::Out_Tag( rStream, OOO_STRING_SVTOOLS_HTML_linebreak ); - - case '<': pStr = OOO_STRING_SVTOOLS_HTML_C_lt; break; - case '>': pStr = OOO_STRING_SVTOOLS_HTML_C_gt; break; - case '&': pStr = OOO_STRING_SVTOOLS_HTML_C_amp; break; - case '"': pStr = OOO_STRING_SVTOOLS_HTML_C_quot; break; - - case 161: pStr = OOO_STRING_SVTOOLS_HTML_S_iexcl; break; - case 162: pStr = OOO_STRING_SVTOOLS_HTML_S_cent; break; - case 163: pStr = OOO_STRING_SVTOOLS_HTML_S_pound; break; - case 164: pStr = OOO_STRING_SVTOOLS_HTML_S_curren; break; - case 165: pStr = OOO_STRING_SVTOOLS_HTML_S_yen; break; - case 166: pStr = OOO_STRING_SVTOOLS_HTML_S_brvbar; break; - case 167: pStr = OOO_STRING_SVTOOLS_HTML_S_sect; break; - case 168: pStr = OOO_STRING_SVTOOLS_HTML_S_uml; break; - case 169: pStr = OOO_STRING_SVTOOLS_HTML_S_copy; break; - case 170: pStr = OOO_STRING_SVTOOLS_HTML_S_ordf; break; - case 171: pStr = OOO_STRING_SVTOOLS_HTML_S_laquo; break; - case 172: pStr = OOO_STRING_SVTOOLS_HTML_S_not; break; - case 174: pStr = OOO_STRING_SVTOOLS_HTML_S_reg; break; - case 175: pStr = OOO_STRING_SVTOOLS_HTML_S_macr; break; - case 176: pStr = OOO_STRING_SVTOOLS_HTML_S_deg; break; - case 177: pStr = OOO_STRING_SVTOOLS_HTML_S_plusmn; break; - case 178: pStr = OOO_STRING_SVTOOLS_HTML_S_sup2; break; - case 179: pStr = OOO_STRING_SVTOOLS_HTML_S_sup3; break; - case 180: pStr = OOO_STRING_SVTOOLS_HTML_S_acute; break; - case 181: pStr = OOO_STRING_SVTOOLS_HTML_S_micro; break; - case 182: pStr = OOO_STRING_SVTOOLS_HTML_S_para; break; - case 183: pStr = OOO_STRING_SVTOOLS_HTML_S_middot; break; - case 184: pStr = OOO_STRING_SVTOOLS_HTML_S_cedil; break; - case 185: pStr = OOO_STRING_SVTOOLS_HTML_S_sup1; break; - case 186: pStr = OOO_STRING_SVTOOLS_HTML_S_ordm; break; - case 187: pStr = OOO_STRING_SVTOOLS_HTML_S_raquo; break; - case 188: pStr = OOO_STRING_SVTOOLS_HTML_S_frac14; break; - case 189: pStr = OOO_STRING_SVTOOLS_HTML_S_frac12; break; - case 190: pStr = OOO_STRING_SVTOOLS_HTML_S_frac34; break; - case 191: pStr = OOO_STRING_SVTOOLS_HTML_S_iquest; break; - - case 192: pStr = OOO_STRING_SVTOOLS_HTML_C_Agrave; break; - case 193: pStr = OOO_STRING_SVTOOLS_HTML_C_Aacute; break; - case 194: pStr = OOO_STRING_SVTOOLS_HTML_C_Acirc; break; - case 195: pStr = OOO_STRING_SVTOOLS_HTML_C_Atilde; break; - case 196: pStr = OOO_STRING_SVTOOLS_HTML_C_Auml; break; - case 197: pStr = OOO_STRING_SVTOOLS_HTML_C_Aring; break; - case 198: pStr = OOO_STRING_SVTOOLS_HTML_C_AElig; break; - case 199: pStr = OOO_STRING_SVTOOLS_HTML_C_Ccedil; break; - case 200: pStr = OOO_STRING_SVTOOLS_HTML_C_Egrave; break; - case 201: pStr = OOO_STRING_SVTOOLS_HTML_C_Eacute; break; - case 202: pStr = OOO_STRING_SVTOOLS_HTML_C_Ecirc; break; - case 203: pStr = OOO_STRING_SVTOOLS_HTML_C_Euml; break; - case 204: pStr = OOO_STRING_SVTOOLS_HTML_C_Igrave; break; - case 205: pStr = OOO_STRING_SVTOOLS_HTML_C_Iacute; break; - case 206: pStr = OOO_STRING_SVTOOLS_HTML_C_Icirc; break; - case 207: pStr = OOO_STRING_SVTOOLS_HTML_C_Iuml; break; - case 208: pStr = OOO_STRING_SVTOOLS_HTML_C_ETH; break; - case 209: pStr = OOO_STRING_SVTOOLS_HTML_C_Ntilde; break; - case 210: pStr = OOO_STRING_SVTOOLS_HTML_C_Ograve; break; - case 211: pStr = OOO_STRING_SVTOOLS_HTML_C_Oacute; break; - case 212: pStr = OOO_STRING_SVTOOLS_HTML_C_Ocirc; break; - case 213: pStr = OOO_STRING_SVTOOLS_HTML_C_Otilde; break; - case 214: pStr = OOO_STRING_SVTOOLS_HTML_C_Ouml; break; - case 215: pStr = OOO_STRING_SVTOOLS_HTML_S_times; break; - case 216: pStr = OOO_STRING_SVTOOLS_HTML_C_Oslash; break; - case 217: pStr = OOO_STRING_SVTOOLS_HTML_C_Ugrave; break; - case 218: pStr = OOO_STRING_SVTOOLS_HTML_C_Uacute; break; - case 219: pStr = OOO_STRING_SVTOOLS_HTML_C_Ucirc; break; - case 220: pStr = OOO_STRING_SVTOOLS_HTML_C_Uuml; break; - case 221: pStr = OOO_STRING_SVTOOLS_HTML_C_Yacute; break; - - case 222: pStr = OOO_STRING_SVTOOLS_HTML_C_THORN; break; - case 223: pStr = OOO_STRING_SVTOOLS_HTML_C_szlig; break; - - case 224: pStr = OOO_STRING_SVTOOLS_HTML_S_agrave; break; - case 225: pStr = OOO_STRING_SVTOOLS_HTML_S_aacute; break; - case 226: pStr = OOO_STRING_SVTOOLS_HTML_S_acirc; break; - case 227: pStr = OOO_STRING_SVTOOLS_HTML_S_atilde; break; - case 228: pStr = OOO_STRING_SVTOOLS_HTML_S_auml; break; - case 229: pStr = OOO_STRING_SVTOOLS_HTML_S_aring; break; - case 230: pStr = OOO_STRING_SVTOOLS_HTML_S_aelig; break; - case 231: pStr = OOO_STRING_SVTOOLS_HTML_S_ccedil; break; - case 232: pStr = OOO_STRING_SVTOOLS_HTML_S_egrave; break; - case 233: pStr = OOO_STRING_SVTOOLS_HTML_S_eacute; break; - case 234: pStr = OOO_STRING_SVTOOLS_HTML_S_ecirc; break; - case 235: pStr = OOO_STRING_SVTOOLS_HTML_S_euml; break; - case 236: pStr = OOO_STRING_SVTOOLS_HTML_S_igrave; break; - case 237: pStr = OOO_STRING_SVTOOLS_HTML_S_iacute; break; - case 238: pStr = OOO_STRING_SVTOOLS_HTML_S_icirc; break; - case 239: pStr = OOO_STRING_SVTOOLS_HTML_S_iuml; break; - case 240: pStr = OOO_STRING_SVTOOLS_HTML_S_eth; break; - case 241: pStr = OOO_STRING_SVTOOLS_HTML_S_ntilde; break; - case 242: pStr = OOO_STRING_SVTOOLS_HTML_S_ograve; break; - case 243: pStr = OOO_STRING_SVTOOLS_HTML_S_oacute; break; - case 244: pStr = OOO_STRING_SVTOOLS_HTML_S_ocirc; break; - case 245: pStr = OOO_STRING_SVTOOLS_HTML_S_otilde; break; - case 246: pStr = OOO_STRING_SVTOOLS_HTML_S_ouml; break; - case 247: pStr = OOO_STRING_SVTOOLS_HTML_S_divide; break; - case 248: pStr = OOO_STRING_SVTOOLS_HTML_S_oslash; break; - case 249: pStr = OOO_STRING_SVTOOLS_HTML_S_ugrave; break; - case 250: pStr = OOO_STRING_SVTOOLS_HTML_S_uacute; break; - case 251: pStr = OOO_STRING_SVTOOLS_HTML_S_ucirc; break; - case 252: pStr = OOO_STRING_SVTOOLS_HTML_S_uuml; break; - case 253: pStr = OOO_STRING_SVTOOLS_HTML_S_yacute; break; - case 254: pStr = OOO_STRING_SVTOOLS_HTML_S_thorn; break; - case 255: pStr = OOO_STRING_SVTOOLS_HTML_S_yuml; break; - - case 338: pStr = OOO_STRING_SVTOOLS_HTML_S_OElig; break; - case 339: pStr = OOO_STRING_SVTOOLS_HTML_S_oelig; break; - case 352: pStr = OOO_STRING_SVTOOLS_HTML_S_Scaron; break; - case 353: pStr = OOO_STRING_SVTOOLS_HTML_S_scaron; break; - case 376: pStr = OOO_STRING_SVTOOLS_HTML_S_Yuml; break; - case 402: pStr = OOO_STRING_SVTOOLS_HTML_S_fnof; break; - case 710: pStr = OOO_STRING_SVTOOLS_HTML_S_circ; break; - case 732: pStr = OOO_STRING_SVTOOLS_HTML_S_tilde; break; +// case '\x0a': return HTMLOutFuncs::Out_Tag( rStream, OOO_STRING_SVTOOLS_HTML_linebreak ); + + case '<': pStr = OOO_STRING_SVTOOLS_HTML_C_lt; break; + case '>': pStr = OOO_STRING_SVTOOLS_HTML_C_gt; break; + case '&': pStr = OOO_STRING_SVTOOLS_HTML_C_amp; break; + case '"': pStr = OOO_STRING_SVTOOLS_HTML_C_quot; break; + + case 161: pStr = OOO_STRING_SVTOOLS_HTML_S_iexcl; break; + case 162: pStr = OOO_STRING_SVTOOLS_HTML_S_cent; break; + case 163: pStr = OOO_STRING_SVTOOLS_HTML_S_pound; break; + case 164: pStr = OOO_STRING_SVTOOLS_HTML_S_curren; break; + case 165: pStr = OOO_STRING_SVTOOLS_HTML_S_yen; break; + case 166: pStr = OOO_STRING_SVTOOLS_HTML_S_brvbar; break; + case 167: pStr = OOO_STRING_SVTOOLS_HTML_S_sect; break; + case 168: pStr = OOO_STRING_SVTOOLS_HTML_S_uml; break; + case 169: pStr = OOO_STRING_SVTOOLS_HTML_S_copy; break; + case 170: pStr = OOO_STRING_SVTOOLS_HTML_S_ordf; break; + case 171: pStr = OOO_STRING_SVTOOLS_HTML_S_laquo; break; + case 172: pStr = OOO_STRING_SVTOOLS_HTML_S_not; break; + case 174: pStr = OOO_STRING_SVTOOLS_HTML_S_reg; break; + case 175: pStr = OOO_STRING_SVTOOLS_HTML_S_macr; break; + case 176: pStr = OOO_STRING_SVTOOLS_HTML_S_deg; break; + case 177: pStr = OOO_STRING_SVTOOLS_HTML_S_plusmn; break; + case 178: pStr = OOO_STRING_SVTOOLS_HTML_S_sup2; break; + case 179: pStr = OOO_STRING_SVTOOLS_HTML_S_sup3; break; + case 180: pStr = OOO_STRING_SVTOOLS_HTML_S_acute; break; + case 181: pStr = OOO_STRING_SVTOOLS_HTML_S_micro; break; + case 182: pStr = OOO_STRING_SVTOOLS_HTML_S_para; break; + case 183: pStr = OOO_STRING_SVTOOLS_HTML_S_middot; break; + case 184: pStr = OOO_STRING_SVTOOLS_HTML_S_cedil; break; + case 185: pStr = OOO_STRING_SVTOOLS_HTML_S_sup1; break; + case 186: pStr = OOO_STRING_SVTOOLS_HTML_S_ordm; break; + case 187: pStr = OOO_STRING_SVTOOLS_HTML_S_raquo; break; + case 188: pStr = OOO_STRING_SVTOOLS_HTML_S_frac14; break; + case 189: pStr = OOO_STRING_SVTOOLS_HTML_S_frac12; break; + case 190: pStr = OOO_STRING_SVTOOLS_HTML_S_frac34; break; + case 191: pStr = OOO_STRING_SVTOOLS_HTML_S_iquest; break; + + case 192: pStr = OOO_STRING_SVTOOLS_HTML_C_Agrave; break; + case 193: pStr = OOO_STRING_SVTOOLS_HTML_C_Aacute; break; + case 194: pStr = OOO_STRING_SVTOOLS_HTML_C_Acirc; break; + case 195: pStr = OOO_STRING_SVTOOLS_HTML_C_Atilde; break; + case 196: pStr = OOO_STRING_SVTOOLS_HTML_C_Auml; break; + case 197: pStr = OOO_STRING_SVTOOLS_HTML_C_Aring; break; + case 198: pStr = OOO_STRING_SVTOOLS_HTML_C_AElig; break; + case 199: pStr = OOO_STRING_SVTOOLS_HTML_C_Ccedil; break; + case 200: pStr = OOO_STRING_SVTOOLS_HTML_C_Egrave; break; + case 201: pStr = OOO_STRING_SVTOOLS_HTML_C_Eacute; break; + case 202: pStr = OOO_STRING_SVTOOLS_HTML_C_Ecirc; break; + case 203: pStr = OOO_STRING_SVTOOLS_HTML_C_Euml; break; + case 204: pStr = OOO_STRING_SVTOOLS_HTML_C_Igrave; break; + case 205: pStr = OOO_STRING_SVTOOLS_HTML_C_Iacute; break; + case 206: pStr = OOO_STRING_SVTOOLS_HTML_C_Icirc; break; + case 207: pStr = OOO_STRING_SVTOOLS_HTML_C_Iuml; break; + case 208: pStr = OOO_STRING_SVTOOLS_HTML_C_ETH; break; + case 209: pStr = OOO_STRING_SVTOOLS_HTML_C_Ntilde; break; + case 210: pStr = OOO_STRING_SVTOOLS_HTML_C_Ograve; break; + case 211: pStr = OOO_STRING_SVTOOLS_HTML_C_Oacute; break; + case 212: pStr = OOO_STRING_SVTOOLS_HTML_C_Ocirc; break; + case 213: pStr = OOO_STRING_SVTOOLS_HTML_C_Otilde; break; + case 214: pStr = OOO_STRING_SVTOOLS_HTML_C_Ouml; break; + case 215: pStr = OOO_STRING_SVTOOLS_HTML_S_times; break; + case 216: pStr = OOO_STRING_SVTOOLS_HTML_C_Oslash; break; + case 217: pStr = OOO_STRING_SVTOOLS_HTML_C_Ugrave; break; + case 218: pStr = OOO_STRING_SVTOOLS_HTML_C_Uacute; break; + case 219: pStr = OOO_STRING_SVTOOLS_HTML_C_Ucirc; break; + case 220: pStr = OOO_STRING_SVTOOLS_HTML_C_Uuml; break; + case 221: pStr = OOO_STRING_SVTOOLS_HTML_C_Yacute; break; + + case 222: pStr = OOO_STRING_SVTOOLS_HTML_C_THORN; break; + case 223: pStr = OOO_STRING_SVTOOLS_HTML_C_szlig; break; + + case 224: pStr = OOO_STRING_SVTOOLS_HTML_S_agrave; break; + case 225: pStr = OOO_STRING_SVTOOLS_HTML_S_aacute; break; + case 226: pStr = OOO_STRING_SVTOOLS_HTML_S_acirc; break; + case 227: pStr = OOO_STRING_SVTOOLS_HTML_S_atilde; break; + case 228: pStr = OOO_STRING_SVTOOLS_HTML_S_auml; break; + case 229: pStr = OOO_STRING_SVTOOLS_HTML_S_aring; break; + case 230: pStr = OOO_STRING_SVTOOLS_HTML_S_aelig; break; + case 231: pStr = OOO_STRING_SVTOOLS_HTML_S_ccedil; break; + case 232: pStr = OOO_STRING_SVTOOLS_HTML_S_egrave; break; + case 233: pStr = OOO_STRING_SVTOOLS_HTML_S_eacute; break; + case 234: pStr = OOO_STRING_SVTOOLS_HTML_S_ecirc; break; + case 235: pStr = OOO_STRING_SVTOOLS_HTML_S_euml; break; + case 236: pStr = OOO_STRING_SVTOOLS_HTML_S_igrave; break; + case 237: pStr = OOO_STRING_SVTOOLS_HTML_S_iacute; break; + case 238: pStr = OOO_STRING_SVTOOLS_HTML_S_icirc; break; + case 239: pStr = OOO_STRING_SVTOOLS_HTML_S_iuml; break; + case 240: pStr = OOO_STRING_SVTOOLS_HTML_S_eth; break; + case 241: pStr = OOO_STRING_SVTOOLS_HTML_S_ntilde; break; + case 242: pStr = OOO_STRING_SVTOOLS_HTML_S_ograve; break; + case 243: pStr = OOO_STRING_SVTOOLS_HTML_S_oacute; break; + case 244: pStr = OOO_STRING_SVTOOLS_HTML_S_ocirc; break; + case 245: pStr = OOO_STRING_SVTOOLS_HTML_S_otilde; break; + case 246: pStr = OOO_STRING_SVTOOLS_HTML_S_ouml; break; + case 247: pStr = OOO_STRING_SVTOOLS_HTML_S_divide; break; + case 248: pStr = OOO_STRING_SVTOOLS_HTML_S_oslash; break; + case 249: pStr = OOO_STRING_SVTOOLS_HTML_S_ugrave; break; + case 250: pStr = OOO_STRING_SVTOOLS_HTML_S_uacute; break; + case 251: pStr = OOO_STRING_SVTOOLS_HTML_S_ucirc; break; + case 252: pStr = OOO_STRING_SVTOOLS_HTML_S_uuml; break; + case 253: pStr = OOO_STRING_SVTOOLS_HTML_S_yacute; break; + case 254: pStr = OOO_STRING_SVTOOLS_HTML_S_thorn; break; + case 255: pStr = OOO_STRING_SVTOOLS_HTML_S_yuml; break; + + case 338: pStr = OOO_STRING_SVTOOLS_HTML_S_OElig; break; + case 339: pStr = OOO_STRING_SVTOOLS_HTML_S_oelig; break; + case 352: pStr = OOO_STRING_SVTOOLS_HTML_S_Scaron; break; + case 353: pStr = OOO_STRING_SVTOOLS_HTML_S_scaron; break; + case 376: pStr = OOO_STRING_SVTOOLS_HTML_S_Yuml; break; + case 402: pStr = OOO_STRING_SVTOOLS_HTML_S_fnof; break; + case 710: pStr = OOO_STRING_SVTOOLS_HTML_S_circ; break; + case 732: pStr = OOO_STRING_SVTOOLS_HTML_S_tilde; break; // Greek chars are handled later, // since they should *not* be transformed to entities // when generating Greek text (== using Greek encoding) - case 8194: pStr = OOO_STRING_SVTOOLS_HTML_S_ensp; break; - case 8195: pStr = OOO_STRING_SVTOOLS_HTML_S_emsp; break; - case 8201: pStr = OOO_STRING_SVTOOLS_HTML_S_thinsp; break; - case 8204: pStr = OOO_STRING_SVTOOLS_HTML_S_zwnj; break; - case 8205: pStr = OOO_STRING_SVTOOLS_HTML_S_zwj; break; - case 8206: pStr = OOO_STRING_SVTOOLS_HTML_S_lrm; break; - case 8207: pStr = OOO_STRING_SVTOOLS_HTML_S_rlm; break; - case 8211: pStr = OOO_STRING_SVTOOLS_HTML_S_ndash; break; - case 8212: pStr = OOO_STRING_SVTOOLS_HTML_S_mdash; break; - case 8216: pStr = OOO_STRING_SVTOOLS_HTML_S_lsquo; break; - case 8217: pStr = OOO_STRING_SVTOOLS_HTML_S_rsquo; break; - case 8218: pStr = OOO_STRING_SVTOOLS_HTML_S_sbquo; break; - case 8220: pStr = OOO_STRING_SVTOOLS_HTML_S_ldquo; break; - case 8221: pStr = OOO_STRING_SVTOOLS_HTML_S_rdquo; break; - case 8222: pStr = OOO_STRING_SVTOOLS_HTML_S_bdquo; break; - case 8224: pStr = OOO_STRING_SVTOOLS_HTML_S_dagger; break; - case 8225: pStr = OOO_STRING_SVTOOLS_HTML_S_Dagger; break; - case 8226: pStr = OOO_STRING_SVTOOLS_HTML_S_bull; break; - case 8230: pStr = OOO_STRING_SVTOOLS_HTML_S_hellip; break; - case 8240: pStr = OOO_STRING_SVTOOLS_HTML_S_permil; break; - case 8242: pStr = OOO_STRING_SVTOOLS_HTML_S_prime; break; - case 8243: pStr = OOO_STRING_SVTOOLS_HTML_S_Prime; break; - case 8249: pStr = OOO_STRING_SVTOOLS_HTML_S_lsaquo; break; - case 8250: pStr = OOO_STRING_SVTOOLS_HTML_S_rsaquo; break; - case 8254: pStr = OOO_STRING_SVTOOLS_HTML_S_oline; break; - case 8260: pStr = OOO_STRING_SVTOOLS_HTML_S_frasl; break; - case 8364: pStr = OOO_STRING_SVTOOLS_HTML_S_euro; break; - case 8465: pStr = OOO_STRING_SVTOOLS_HTML_S_image; break; - case 8472: pStr = OOO_STRING_SVTOOLS_HTML_S_weierp; break; - case 8476: pStr = OOO_STRING_SVTOOLS_HTML_S_real; break; - case 8482: pStr = OOO_STRING_SVTOOLS_HTML_S_trade; break; - case 8501: pStr = OOO_STRING_SVTOOLS_HTML_S_alefsym; break; - case 8592: pStr = OOO_STRING_SVTOOLS_HTML_S_larr; break; - case 8593: pStr = OOO_STRING_SVTOOLS_HTML_S_uarr; break; - case 8594: pStr = OOO_STRING_SVTOOLS_HTML_S_rarr; break; - case 8595: pStr = OOO_STRING_SVTOOLS_HTML_S_darr; break; - case 8596: pStr = OOO_STRING_SVTOOLS_HTML_S_harr; break; - case 8629: pStr = OOO_STRING_SVTOOLS_HTML_S_crarr; break; - case 8656: pStr = OOO_STRING_SVTOOLS_HTML_S_lArr; break; - case 8657: pStr = OOO_STRING_SVTOOLS_HTML_S_uArr; break; - case 8658: pStr = OOO_STRING_SVTOOLS_HTML_S_rArr; break; - case 8659: pStr = OOO_STRING_SVTOOLS_HTML_S_dArr; break; - case 8660: pStr = OOO_STRING_SVTOOLS_HTML_S_hArr; break; - case 8704: pStr = OOO_STRING_SVTOOLS_HTML_S_forall; break; - case 8706: pStr = OOO_STRING_SVTOOLS_HTML_S_part; break; - case 8707: pStr = OOO_STRING_SVTOOLS_HTML_S_exist; break; - case 8709: pStr = OOO_STRING_SVTOOLS_HTML_S_empty; break; - case 8711: pStr = OOO_STRING_SVTOOLS_HTML_S_nabla; break; - case 8712: pStr = OOO_STRING_SVTOOLS_HTML_S_isin; break; - case 8713: pStr = OOO_STRING_SVTOOLS_HTML_S_notin; break; - case 8715: pStr = OOO_STRING_SVTOOLS_HTML_S_ni; break; - case 8719: pStr = OOO_STRING_SVTOOLS_HTML_S_prod; break; - case 8721: pStr = OOO_STRING_SVTOOLS_HTML_S_sum; break; - case 8722: pStr = OOO_STRING_SVTOOLS_HTML_S_minus; break; - case 8727: pStr = OOO_STRING_SVTOOLS_HTML_S_lowast; break; - case 8730: pStr = OOO_STRING_SVTOOLS_HTML_S_radic; break; - case 8733: pStr = OOO_STRING_SVTOOLS_HTML_S_prop; break; - case 8734: pStr = OOO_STRING_SVTOOLS_HTML_S_infin; break; - case 8736: pStr = OOO_STRING_SVTOOLS_HTML_S_ang; break; - case 8743: pStr = OOO_STRING_SVTOOLS_HTML_S_and; break; - case 8744: pStr = OOO_STRING_SVTOOLS_HTML_S_or; break; - case 8745: pStr = OOO_STRING_SVTOOLS_HTML_S_cap; break; - case 8746: pStr = OOO_STRING_SVTOOLS_HTML_S_cup; break; - case 8747: pStr = OOO_STRING_SVTOOLS_HTML_S_int; break; - case 8756: pStr = OOO_STRING_SVTOOLS_HTML_S_there4; break; - case 8764: pStr = OOO_STRING_SVTOOLS_HTML_S_sim; break; - case 8773: pStr = OOO_STRING_SVTOOLS_HTML_S_cong; break; - case 8776: pStr = OOO_STRING_SVTOOLS_HTML_S_asymp; break; - case 8800: pStr = OOO_STRING_SVTOOLS_HTML_S_ne; break; - case 8801: pStr = OOO_STRING_SVTOOLS_HTML_S_equiv; break; - case 8804: pStr = OOO_STRING_SVTOOLS_HTML_S_le; break; - case 8805: pStr = OOO_STRING_SVTOOLS_HTML_S_ge; break; - case 8834: pStr = OOO_STRING_SVTOOLS_HTML_S_sub; break; - case 8835: pStr = OOO_STRING_SVTOOLS_HTML_S_sup; break; - case 8836: pStr = OOO_STRING_SVTOOLS_HTML_S_nsub; break; - case 8838: pStr = OOO_STRING_SVTOOLS_HTML_S_sube; break; - case 8839: pStr = OOO_STRING_SVTOOLS_HTML_S_supe; break; - case 8853: pStr = OOO_STRING_SVTOOLS_HTML_S_oplus; break; - case 8855: pStr = OOO_STRING_SVTOOLS_HTML_S_otimes; break; - case 8869: pStr = OOO_STRING_SVTOOLS_HTML_S_perp; break; - case 8901: pStr = OOO_STRING_SVTOOLS_HTML_S_sdot; break; - case 8968: pStr = OOO_STRING_SVTOOLS_HTML_S_lceil; break; - case 8969: pStr = OOO_STRING_SVTOOLS_HTML_S_rceil; break; - case 8970: pStr = OOO_STRING_SVTOOLS_HTML_S_lfloor; break; - case 8971: pStr = OOO_STRING_SVTOOLS_HTML_S_rfloor; break; - case 9001: pStr = OOO_STRING_SVTOOLS_HTML_S_lang; break; - case 9002: pStr = OOO_STRING_SVTOOLS_HTML_S_rang; break; - case 9674: pStr = OOO_STRING_SVTOOLS_HTML_S_loz; break; - case 9824: pStr = OOO_STRING_SVTOOLS_HTML_S_spades; break; - case 9827: pStr = OOO_STRING_SVTOOLS_HTML_S_clubs; break; - case 9829: pStr = OOO_STRING_SVTOOLS_HTML_S_hearts; break; - case 9830: pStr = OOO_STRING_SVTOOLS_HTML_S_diams; break; + case 8194: pStr = OOO_STRING_SVTOOLS_HTML_S_ensp; break; + case 8195: pStr = OOO_STRING_SVTOOLS_HTML_S_emsp; break; + case 8201: pStr = OOO_STRING_SVTOOLS_HTML_S_thinsp; break; + case 8204: pStr = OOO_STRING_SVTOOLS_HTML_S_zwnj; break; + case 8205: pStr = OOO_STRING_SVTOOLS_HTML_S_zwj; break; + case 8206: pStr = OOO_STRING_SVTOOLS_HTML_S_lrm; break; + case 8207: pStr = OOO_STRING_SVTOOLS_HTML_S_rlm; break; + case 8211: pStr = OOO_STRING_SVTOOLS_HTML_S_ndash; break; + case 8212: pStr = OOO_STRING_SVTOOLS_HTML_S_mdash; break; + case 8216: pStr = OOO_STRING_SVTOOLS_HTML_S_lsquo; break; + case 8217: pStr = OOO_STRING_SVTOOLS_HTML_S_rsquo; break; + case 8218: pStr = OOO_STRING_SVTOOLS_HTML_S_sbquo; break; + case 8220: pStr = OOO_STRING_SVTOOLS_HTML_S_ldquo; break; + case 8221: pStr = OOO_STRING_SVTOOLS_HTML_S_rdquo; break; + case 8222: pStr = OOO_STRING_SVTOOLS_HTML_S_bdquo; break; + case 8224: pStr = OOO_STRING_SVTOOLS_HTML_S_dagger; break; + case 8225: pStr = OOO_STRING_SVTOOLS_HTML_S_Dagger; break; + case 8226: pStr = OOO_STRING_SVTOOLS_HTML_S_bull; break; + case 8230: pStr = OOO_STRING_SVTOOLS_HTML_S_hellip; break; + case 8240: pStr = OOO_STRING_SVTOOLS_HTML_S_permil; break; + case 8242: pStr = OOO_STRING_SVTOOLS_HTML_S_prime; break; + case 8243: pStr = OOO_STRING_SVTOOLS_HTML_S_Prime; break; + case 8249: pStr = OOO_STRING_SVTOOLS_HTML_S_lsaquo; break; + case 8250: pStr = OOO_STRING_SVTOOLS_HTML_S_rsaquo; break; + case 8254: pStr = OOO_STRING_SVTOOLS_HTML_S_oline; break; + case 8260: pStr = OOO_STRING_SVTOOLS_HTML_S_frasl; break; + case 8364: pStr = OOO_STRING_SVTOOLS_HTML_S_euro; break; + case 8465: pStr = OOO_STRING_SVTOOLS_HTML_S_image; break; + case 8472: pStr = OOO_STRING_SVTOOLS_HTML_S_weierp; break; + case 8476: pStr = OOO_STRING_SVTOOLS_HTML_S_real; break; + case 8482: pStr = OOO_STRING_SVTOOLS_HTML_S_trade; break; + case 8501: pStr = OOO_STRING_SVTOOLS_HTML_S_alefsym; break; + case 8592: pStr = OOO_STRING_SVTOOLS_HTML_S_larr; break; + case 8593: pStr = OOO_STRING_SVTOOLS_HTML_S_uarr; break; + case 8594: pStr = OOO_STRING_SVTOOLS_HTML_S_rarr; break; + case 8595: pStr = OOO_STRING_SVTOOLS_HTML_S_darr; break; + case 8596: pStr = OOO_STRING_SVTOOLS_HTML_S_harr; break; + case 8629: pStr = OOO_STRING_SVTOOLS_HTML_S_crarr; break; + case 8656: pStr = OOO_STRING_SVTOOLS_HTML_S_lArr; break; + case 8657: pStr = OOO_STRING_SVTOOLS_HTML_S_uArr; break; + case 8658: pStr = OOO_STRING_SVTOOLS_HTML_S_rArr; break; + case 8659: pStr = OOO_STRING_SVTOOLS_HTML_S_dArr; break; + case 8660: pStr = OOO_STRING_SVTOOLS_HTML_S_hArr; break; + case 8704: pStr = OOO_STRING_SVTOOLS_HTML_S_forall; break; + case 8706: pStr = OOO_STRING_SVTOOLS_HTML_S_part; break; + case 8707: pStr = OOO_STRING_SVTOOLS_HTML_S_exist; break; + case 8709: pStr = OOO_STRING_SVTOOLS_HTML_S_empty; break; + case 8711: pStr = OOO_STRING_SVTOOLS_HTML_S_nabla; break; + case 8712: pStr = OOO_STRING_SVTOOLS_HTML_S_isin; break; + case 8713: pStr = OOO_STRING_SVTOOLS_HTML_S_notin; break; + case 8715: pStr = OOO_STRING_SVTOOLS_HTML_S_ni; break; + case 8719: pStr = OOO_STRING_SVTOOLS_HTML_S_prod; break; + case 8721: pStr = OOO_STRING_SVTOOLS_HTML_S_sum; break; + case 8722: pStr = OOO_STRING_SVTOOLS_HTML_S_minus; break; + case 8727: pStr = OOO_STRING_SVTOOLS_HTML_S_lowast; break; + case 8730: pStr = OOO_STRING_SVTOOLS_HTML_S_radic; break; + case 8733: pStr = OOO_STRING_SVTOOLS_HTML_S_prop; break; + case 8734: pStr = OOO_STRING_SVTOOLS_HTML_S_infin; break; + case 8736: pStr = OOO_STRING_SVTOOLS_HTML_S_ang; break; + case 8743: pStr = OOO_STRING_SVTOOLS_HTML_S_and; break; + case 8744: pStr = OOO_STRING_SVTOOLS_HTML_S_or; break; + case 8745: pStr = OOO_STRING_SVTOOLS_HTML_S_cap; break; + case 8746: pStr = OOO_STRING_SVTOOLS_HTML_S_cup; break; + case 8747: pStr = OOO_STRING_SVTOOLS_HTML_S_int; break; + case 8756: pStr = OOO_STRING_SVTOOLS_HTML_S_there4; break; + case 8764: pStr = OOO_STRING_SVTOOLS_HTML_S_sim; break; + case 8773: pStr = OOO_STRING_SVTOOLS_HTML_S_cong; break; + case 8776: pStr = OOO_STRING_SVTOOLS_HTML_S_asymp; break; + case 8800: pStr = OOO_STRING_SVTOOLS_HTML_S_ne; break; + case 8801: pStr = OOO_STRING_SVTOOLS_HTML_S_equiv; break; + case 8804: pStr = OOO_STRING_SVTOOLS_HTML_S_le; break; + case 8805: pStr = OOO_STRING_SVTOOLS_HTML_S_ge; break; + case 8834: pStr = OOO_STRING_SVTOOLS_HTML_S_sub; break; + case 8835: pStr = OOO_STRING_SVTOOLS_HTML_S_sup; break; + case 8836: pStr = OOO_STRING_SVTOOLS_HTML_S_nsub; break; + case 8838: pStr = OOO_STRING_SVTOOLS_HTML_S_sube; break; + case 8839: pStr = OOO_STRING_SVTOOLS_HTML_S_supe; break; + case 8853: pStr = OOO_STRING_SVTOOLS_HTML_S_oplus; break; + case 8855: pStr = OOO_STRING_SVTOOLS_HTML_S_otimes; break; + case 8869: pStr = OOO_STRING_SVTOOLS_HTML_S_perp; break; + case 8901: pStr = OOO_STRING_SVTOOLS_HTML_S_sdot; break; + case 8968: pStr = OOO_STRING_SVTOOLS_HTML_S_lceil; break; + case 8969: pStr = OOO_STRING_SVTOOLS_HTML_S_rceil; break; + case 8970: pStr = OOO_STRING_SVTOOLS_HTML_S_lfloor; break; + case 8971: pStr = OOO_STRING_SVTOOLS_HTML_S_rfloor; break; + case 9001: pStr = OOO_STRING_SVTOOLS_HTML_S_lang; break; + case 9002: pStr = OOO_STRING_SVTOOLS_HTML_S_rang; break; + case 9674: pStr = OOO_STRING_SVTOOLS_HTML_S_loz; break; + case 9824: pStr = OOO_STRING_SVTOOLS_HTML_S_spades; break; + case 9827: pStr = OOO_STRING_SVTOOLS_HTML_S_clubs; break; + case 9829: pStr = OOO_STRING_SVTOOLS_HTML_S_hearts; break; + case 9830: pStr = OOO_STRING_SVTOOLS_HTML_S_diams; break; } // Greek chars: if we do not produce a Greek encoding, @@ -350,58 +350,58 @@ const sal_Char *lcl_svhtml_GetEntityForChar( sal_Unicode c, { switch( c ) { - case 913: pStr = OOO_STRING_SVTOOLS_HTML_S_Alpha; break; - case 914: pStr = OOO_STRING_SVTOOLS_HTML_S_Beta; break; - case 915: pStr = OOO_STRING_SVTOOLS_HTML_S_Gamma; break; - case 916: pStr = OOO_STRING_SVTOOLS_HTML_S_Delta; break; - case 917: pStr = OOO_STRING_SVTOOLS_HTML_S_Epsilon; break; - case 918: pStr = OOO_STRING_SVTOOLS_HTML_S_Zeta; break; - case 919: pStr = OOO_STRING_SVTOOLS_HTML_S_Eta; break; - case 920: pStr = OOO_STRING_SVTOOLS_HTML_S_Theta; break; - case 921: pStr = OOO_STRING_SVTOOLS_HTML_S_Iota; break; - case 922: pStr = OOO_STRING_SVTOOLS_HTML_S_Kappa; break; - case 923: pStr = OOO_STRING_SVTOOLS_HTML_S_Lambda; break; - case 924: pStr = OOO_STRING_SVTOOLS_HTML_S_Mu; break; - case 925: pStr = OOO_STRING_SVTOOLS_HTML_S_Nu; break; - case 926: pStr = OOO_STRING_SVTOOLS_HTML_S_Xi; break; - case 927: pStr = OOO_STRING_SVTOOLS_HTML_S_Omicron; break; - case 928: pStr = OOO_STRING_SVTOOLS_HTML_S_Pi; break; - case 929: pStr = OOO_STRING_SVTOOLS_HTML_S_Rho; break; - case 931: pStr = OOO_STRING_SVTOOLS_HTML_S_Sigma; break; - case 932: pStr = OOO_STRING_SVTOOLS_HTML_S_Tau; break; - case 933: pStr = OOO_STRING_SVTOOLS_HTML_S_Upsilon; break; - case 934: pStr = OOO_STRING_SVTOOLS_HTML_S_Phi; break; - case 935: pStr = OOO_STRING_SVTOOLS_HTML_S_Chi; break; - case 936: pStr = OOO_STRING_SVTOOLS_HTML_S_Psi; break; - case 937: pStr = OOO_STRING_SVTOOLS_HTML_S_Omega; break; - case 945: pStr = OOO_STRING_SVTOOLS_HTML_S_alpha; break; - case 946: pStr = OOO_STRING_SVTOOLS_HTML_S_beta; break; - case 947: pStr = OOO_STRING_SVTOOLS_HTML_S_gamma; break; - case 948: pStr = OOO_STRING_SVTOOLS_HTML_S_delta; break; - case 949: pStr = OOO_STRING_SVTOOLS_HTML_S_epsilon; break; - case 950: pStr = OOO_STRING_SVTOOLS_HTML_S_zeta; break; - case 951: pStr = OOO_STRING_SVTOOLS_HTML_S_eta; break; - case 952: pStr = OOO_STRING_SVTOOLS_HTML_S_theta; break; - case 953: pStr = OOO_STRING_SVTOOLS_HTML_S_iota; break; - case 954: pStr = OOO_STRING_SVTOOLS_HTML_S_kappa; break; - case 955: pStr = OOO_STRING_SVTOOLS_HTML_S_lambda; break; - case 956: pStr = OOO_STRING_SVTOOLS_HTML_S_mu; break; - case 957: pStr = OOO_STRING_SVTOOLS_HTML_S_nu; break; - case 958: pStr = OOO_STRING_SVTOOLS_HTML_S_xi; break; - case 959: pStr = OOO_STRING_SVTOOLS_HTML_S_omicron; break; - case 960: pStr = OOO_STRING_SVTOOLS_HTML_S_pi; break; - case 961: pStr = OOO_STRING_SVTOOLS_HTML_S_rho; break; - case 962: pStr = OOO_STRING_SVTOOLS_HTML_S_sigmaf; break; - case 963: pStr = OOO_STRING_SVTOOLS_HTML_S_sigma; break; - case 964: pStr = OOO_STRING_SVTOOLS_HTML_S_tau; break; - case 965: pStr = OOO_STRING_SVTOOLS_HTML_S_upsilon; break; - case 966: pStr = OOO_STRING_SVTOOLS_HTML_S_phi; break; - case 967: pStr = OOO_STRING_SVTOOLS_HTML_S_chi; break; - case 968: pStr = OOO_STRING_SVTOOLS_HTML_S_psi; break; - case 969: pStr = OOO_STRING_SVTOOLS_HTML_S_omega; break; - case 977: pStr = OOO_STRING_SVTOOLS_HTML_S_thetasym;break; - case 978: pStr = OOO_STRING_SVTOOLS_HTML_S_upsih; break; - case 982: pStr = OOO_STRING_SVTOOLS_HTML_S_piv; break; + case 913: pStr = OOO_STRING_SVTOOLS_HTML_S_Alpha; break; + case 914: pStr = OOO_STRING_SVTOOLS_HTML_S_Beta; break; + case 915: pStr = OOO_STRING_SVTOOLS_HTML_S_Gamma; break; + case 916: pStr = OOO_STRING_SVTOOLS_HTML_S_Delta; break; + case 917: pStr = OOO_STRING_SVTOOLS_HTML_S_Epsilon; break; + case 918: pStr = OOO_STRING_SVTOOLS_HTML_S_Zeta; break; + case 919: pStr = OOO_STRING_SVTOOLS_HTML_S_Eta; break; + case 920: pStr = OOO_STRING_SVTOOLS_HTML_S_Theta; break; + case 921: pStr = OOO_STRING_SVTOOLS_HTML_S_Iota; break; + case 922: pStr = OOO_STRING_SVTOOLS_HTML_S_Kappa; break; + case 923: pStr = OOO_STRING_SVTOOLS_HTML_S_Lambda; break; + case 924: pStr = OOO_STRING_SVTOOLS_HTML_S_Mu; break; + case 925: pStr = OOO_STRING_SVTOOLS_HTML_S_Nu; break; + case 926: pStr = OOO_STRING_SVTOOLS_HTML_S_Xi; break; + case 927: pStr = OOO_STRING_SVTOOLS_HTML_S_Omicron; break; + case 928: pStr = OOO_STRING_SVTOOLS_HTML_S_Pi; break; + case 929: pStr = OOO_STRING_SVTOOLS_HTML_S_Rho; break; + case 931: pStr = OOO_STRING_SVTOOLS_HTML_S_Sigma; break; + case 932: pStr = OOO_STRING_SVTOOLS_HTML_S_Tau; break; + case 933: pStr = OOO_STRING_SVTOOLS_HTML_S_Upsilon; break; + case 934: pStr = OOO_STRING_SVTOOLS_HTML_S_Phi; break; + case 935: pStr = OOO_STRING_SVTOOLS_HTML_S_Chi; break; + case 936: pStr = OOO_STRING_SVTOOLS_HTML_S_Psi; break; + case 937: pStr = OOO_STRING_SVTOOLS_HTML_S_Omega; break; + case 945: pStr = OOO_STRING_SVTOOLS_HTML_S_alpha; break; + case 946: pStr = OOO_STRING_SVTOOLS_HTML_S_beta; break; + case 947: pStr = OOO_STRING_SVTOOLS_HTML_S_gamma; break; + case 948: pStr = OOO_STRING_SVTOOLS_HTML_S_delta; break; + case 949: pStr = OOO_STRING_SVTOOLS_HTML_S_epsilon; break; + case 950: pStr = OOO_STRING_SVTOOLS_HTML_S_zeta; break; + case 951: pStr = OOO_STRING_SVTOOLS_HTML_S_eta; break; + case 952: pStr = OOO_STRING_SVTOOLS_HTML_S_theta; break; + case 953: pStr = OOO_STRING_SVTOOLS_HTML_S_iota; break; + case 954: pStr = OOO_STRING_SVTOOLS_HTML_S_kappa; break; + case 955: pStr = OOO_STRING_SVTOOLS_HTML_S_lambda; break; + case 956: pStr = OOO_STRING_SVTOOLS_HTML_S_mu; break; + case 957: pStr = OOO_STRING_SVTOOLS_HTML_S_nu; break; + case 958: pStr = OOO_STRING_SVTOOLS_HTML_S_xi; break; + case 959: pStr = OOO_STRING_SVTOOLS_HTML_S_omicron; break; + case 960: pStr = OOO_STRING_SVTOOLS_HTML_S_pi; break; + case 961: pStr = OOO_STRING_SVTOOLS_HTML_S_rho; break; + case 962: pStr = OOO_STRING_SVTOOLS_HTML_S_sigmaf; break; + case 963: pStr = OOO_STRING_SVTOOLS_HTML_S_sigma; break; + case 964: pStr = OOO_STRING_SVTOOLS_HTML_S_tau; break; + case 965: pStr = OOO_STRING_SVTOOLS_HTML_S_upsilon; break; + case 966: pStr = OOO_STRING_SVTOOLS_HTML_S_phi; break; + case 967: pStr = OOO_STRING_SVTOOLS_HTML_S_chi; break; + case 968: pStr = OOO_STRING_SVTOOLS_HTML_S_psi; break; + case 969: pStr = OOO_STRING_SVTOOLS_HTML_S_omega; break; + case 977: pStr = OOO_STRING_SVTOOLS_HTML_S_thetasym;break; + case 978: pStr = OOO_STRING_SVTOOLS_HTML_S_upsih; break; + case 982: pStr = OOO_STRING_SVTOOLS_HTML_S_piv; break; } } @@ -417,13 +417,13 @@ void lcl_ConvertCharToHTML( sal_Unicode c, ByteString& rDest, const sal_Char *pStr = 0; switch( c ) { - case 0xA0: // is a hard blank + case 0xA0: // is a hard blank //!! the TextConverter has a problem with this character - so change it to // a hard space - that's the same as our 5.2 - case 0x2011: // is a hard hyphen + case 0x2011: // is a hard hyphen pStr = OOO_STRING_SVTOOLS_HTML_S_nbsp; break; - case 0xAD: // is a soft hyphen + case 0xAD: // is a soft hyphen pStr = OOO_STRING_SVTOOLS_HTML_S_shy; break; default: @@ -445,9 +445,9 @@ void lcl_ConvertCharToHTML( sal_Unicode c, ByteString& rDest, RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR; if( pStr ) { - sal_Size nLen = rtl_convertUnicodeToText( + sal_Size nLen = rtl_convertUnicodeToText( rContext.m_hConv, rContext.m_hContext, &c, 0, - cBuffer, TXTCONV_BUFFER_SIZE, + cBuffer, TXTCONV_BUFFER_SIZE, nFlags|RTL_UNICODETOTEXT_FLAGS_FLUSH, &nInfo, &nSrcChars ); DBG_ASSERT( (nInfo & (RTL_UNICODETOTEXT_INFO_ERROR|RTL_UNICODETOTEXT_INFO_DESTBUFFERTOSMALL)) == 0, "HTMLOut: error while flushing" ); @@ -458,7 +458,7 @@ void lcl_ConvertCharToHTML( sal_Unicode c, ByteString& rDest, } else { - sal_Size nLen = rtl_convertUnicodeToText( rContext.m_hConv, + sal_Size nLen = rtl_convertUnicodeToText( rContext.m_hConv, rContext.m_hContext, &c, 1, cBuffer, TXTCONV_BUFFER_SIZE, nFlags, @@ -474,9 +474,9 @@ void lcl_ConvertCharToHTML( sal_Unicode c, ByteString& rDest, // If the character could not be converted to the destination // character set, the UNICODE character is exported as character // entity. - nLen = rtl_convertUnicodeToText( + nLen = rtl_convertUnicodeToText( rContext.m_hConv, rContext.m_hContext, &c, 0, - cBuffer, TXTCONV_BUFFER_SIZE, + cBuffer, TXTCONV_BUFFER_SIZE, nFlags|RTL_UNICODETOTEXT_FLAGS_FLUSH, &nInfo, &nSrcChars ); DBG_ASSERT( (nInfo & (RTL_UNICODETOTEXT_INFO_ERROR|RTL_UNICODETOTEXT_INFO_DESTBUFFERTOSMALL)) == 0, "HTMLOut: error while flushing" ); @@ -504,7 +504,7 @@ sal_Bool lcl_FlushToAscii( ByteString& rDest, HTMLOutContext& rContext ) RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR| RTL_UNICODETOTEXT_FLAGS_FLUSH| RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR; - sal_Size nLen = rtl_convertUnicodeToText( + sal_Size nLen = rtl_convertUnicodeToText( rContext.m_hConv, rContext.m_hContext, &c, 0, cBuffer, TXTCONV_BUFFER_SIZE, nFlags, &nInfo, &nSrcChars ); @@ -538,7 +538,7 @@ SvStream& HTMLOutFuncs::Out_AsciiTag( SvStream& rStream, const sal_Char *pStr, } SvStream& HTMLOutFuncs::Out_Char( SvStream& rStream, sal_Unicode c, - HTMLOutContext& rContext, + HTMLOutContext& rContext, String *pNonConvertableChars ) { ByteString sOut; @@ -572,7 +572,7 @@ SvStream& HTMLOutFuncs::FlushToAscii( SvStream& rStream, SvStream& HTMLOutFuncs::Out_Hex( SvStream& rStream, ULONG nHex, BYTE nLen, rtl_TextEncoding ) -{ // in einen Stream aus +{ // in einen Stream aus sal_Char aNToABuf[] = "0000000000000000"; DBG_ASSERT( nLen < sizeof(aNToABuf), "zu viele Stellen" ); @@ -621,7 +621,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream, const sal_Char *pIndentArea, const sal_Char *pIndentMap, rtl_TextEncoding eDestEnc, - String *pNonConvertableChars ) + String *pNonConvertableChars ) { if( RTL_TEXTENCODING_DONTKNOW == eDestEnc ) eDestEnc = gsl_getSystemTextEncoding(); @@ -777,7 +777,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream, return rStream; } -SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm, +SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm, const String& rBaseURL, const String& rSource, const String& rLanguage, @@ -945,7 +945,7 @@ ByteString& HTMLOutFuncs::CreateTableDataOptionsValNum( ByteString& aStrTD, ((aStrTD += ' ') += OOO_STRING_SVTOOLS_HTML_O_SDnum) += "=\""; (aStrTD += ByteString::CreateFromInt32( Application::GetSettings().GetLanguage() )) - += ';'; // Language fuer Format 0 + += ';'; // Language fuer Format 0 if ( nFormat ) { ByteString aNumStr; diff --git a/svtools/source/svhtml/htmlsupp.cxx b/svtools/source/svhtml/htmlsupp.cxx index 8d1421c1d932..c6e5606bcb2e 100644 --- a/svtools/source/svhtml/htmlsupp.cxx +++ b/svtools/source/svhtml/htmlsupp.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ static HTMLOptionEnum __READONLY_DATA aScriptLangOptEnums[] = { - { OOO_STRING_SVTOOLS_HTML_LG_starbasic, HTML_SL_STARBASIC }, - { OOO_STRING_SVTOOLS_HTML_LG_javascript, HTML_SL_JAVASCRIPT }, - { OOO_STRING_SVTOOLS_HTML_LG_javascript11,HTML_SL_JAVASCRIPT }, - { OOO_STRING_SVTOOLS_HTML_LG_livescript, HTML_SL_JAVASCRIPT }, -// { OOO_STRING_SVTOOLS_HTML_LG_unused_javascript, HTML_SL_UNUSEDJS }, -// { OOO_STRING_SVTOOLS_HTML_LG_vbscript, HTML_SL_VBSCRIPT }, -// { OOO_STRING_SVTOOLS_HTML_LG_starone, HTML_SL_STARONE }, - { 0, 0 } + { OOO_STRING_SVTOOLS_HTML_LG_starbasic, HTML_SL_STARBASIC }, + { OOO_STRING_SVTOOLS_HTML_LG_javascript, HTML_SL_JAVASCRIPT }, + { OOO_STRING_SVTOOLS_HTML_LG_javascript11,HTML_SL_JAVASCRIPT }, + { OOO_STRING_SVTOOLS_HTML_LG_livescript, HTML_SL_JAVASCRIPT }, +// { OOO_STRING_SVTOOLS_HTML_LG_unused_javascript, HTML_SL_UNUSEDJS }, +// { OOO_STRING_SVTOOLS_HTML_LG_vbscript, HTML_SL_VBSCRIPT }, +// { OOO_STRING_SVTOOLS_HTML_LG_starone, HTML_SL_STARONE }, + { 0, 0 } }; BOOL HTMLParser::ParseScriptOptions( String& rLangString, const String& rBaseURL, diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx index 94d7ba445438..c08729ac3e60 100644 --- a/svtools/source/svhtml/parhtml.cxx +++ b/svtools/source/svhtml/parhtml.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,45 +69,45 @@ const sal_Int32 MAX_ENTITY_LEN( 8L ); // <INPUT TYPE=xxx> static HTMLOptionEnum __READONLY_DATA aInputTypeOptEnums[] = { - { OOO_STRING_SVTOOLS_HTML_IT_text, HTML_IT_TEXT }, - { OOO_STRING_SVTOOLS_HTML_IT_password, HTML_IT_PASSWORD }, - { OOO_STRING_SVTOOLS_HTML_IT_checkbox, HTML_IT_CHECKBOX }, - { OOO_STRING_SVTOOLS_HTML_IT_radio, HTML_IT_RADIO }, - { OOO_STRING_SVTOOLS_HTML_IT_range, HTML_IT_RANGE }, - { OOO_STRING_SVTOOLS_HTML_IT_scribble, HTML_IT_SCRIBBLE }, - { OOO_STRING_SVTOOLS_HTML_IT_file, HTML_IT_FILE }, - { OOO_STRING_SVTOOLS_HTML_IT_hidden, HTML_IT_HIDDEN }, - { OOO_STRING_SVTOOLS_HTML_IT_submit, HTML_IT_SUBMIT }, - { OOO_STRING_SVTOOLS_HTML_IT_image, HTML_IT_IMAGE }, - { OOO_STRING_SVTOOLS_HTML_IT_reset, HTML_IT_RESET }, - { OOO_STRING_SVTOOLS_HTML_IT_button, HTML_IT_BUTTON }, - { 0, 0 } + { OOO_STRING_SVTOOLS_HTML_IT_text, HTML_IT_TEXT }, + { OOO_STRING_SVTOOLS_HTML_IT_password, HTML_IT_PASSWORD }, + { OOO_STRING_SVTOOLS_HTML_IT_checkbox, HTML_IT_CHECKBOX }, + { OOO_STRING_SVTOOLS_HTML_IT_radio, HTML_IT_RADIO }, + { OOO_STRING_SVTOOLS_HTML_IT_range, HTML_IT_RANGE }, + { OOO_STRING_SVTOOLS_HTML_IT_scribble, HTML_IT_SCRIBBLE }, + { OOO_STRING_SVTOOLS_HTML_IT_file, HTML_IT_FILE }, + { OOO_STRING_SVTOOLS_HTML_IT_hidden, HTML_IT_HIDDEN }, + { OOO_STRING_SVTOOLS_HTML_IT_submit, HTML_IT_SUBMIT }, + { OOO_STRING_SVTOOLS_HTML_IT_image, HTML_IT_IMAGE }, + { OOO_STRING_SVTOOLS_HTML_IT_reset, HTML_IT_RESET }, + { OOO_STRING_SVTOOLS_HTML_IT_button, HTML_IT_BUTTON }, + { 0, 0 } }; // <TABLE FRAME=xxx> static HTMLOptionEnum __READONLY_DATA aTableFrameOptEnums[] = { - { OOO_STRING_SVTOOLS_HTML_TF_void, HTML_TF_VOID }, - { OOO_STRING_SVTOOLS_HTML_TF_above, HTML_TF_ABOVE }, - { OOO_STRING_SVTOOLS_HTML_TF_below, HTML_TF_BELOW }, - { OOO_STRING_SVTOOLS_HTML_TF_hsides, HTML_TF_HSIDES }, - { OOO_STRING_SVTOOLS_HTML_TF_lhs, HTML_TF_LHS }, - { OOO_STRING_SVTOOLS_HTML_TF_rhs, HTML_TF_RHS }, - { OOO_STRING_SVTOOLS_HTML_TF_vsides, HTML_TF_VSIDES }, - { OOO_STRING_SVTOOLS_HTML_TF_box, HTML_TF_BOX }, - { OOO_STRING_SVTOOLS_HTML_TF_border, HTML_TF_BOX }, - { 0, 0 } + { OOO_STRING_SVTOOLS_HTML_TF_void, HTML_TF_VOID }, + { OOO_STRING_SVTOOLS_HTML_TF_above, HTML_TF_ABOVE }, + { OOO_STRING_SVTOOLS_HTML_TF_below, HTML_TF_BELOW }, + { OOO_STRING_SVTOOLS_HTML_TF_hsides, HTML_TF_HSIDES }, + { OOO_STRING_SVTOOLS_HTML_TF_lhs, HTML_TF_LHS }, + { OOO_STRING_SVTOOLS_HTML_TF_rhs, HTML_TF_RHS }, + { OOO_STRING_SVTOOLS_HTML_TF_vsides, HTML_TF_VSIDES }, + { OOO_STRING_SVTOOLS_HTML_TF_box, HTML_TF_BOX }, + { OOO_STRING_SVTOOLS_HTML_TF_border, HTML_TF_BOX }, + { 0, 0 } }; // <TABLE RULES=xxx> static HTMLOptionEnum __READONLY_DATA aTableRulesOptEnums[] = { - { OOO_STRING_SVTOOLS_HTML_TR_none, HTML_TR_NONE }, - { OOO_STRING_SVTOOLS_HTML_TR_groups, HTML_TR_GROUPS }, - { OOO_STRING_SVTOOLS_HTML_TR_rows, HTML_TR_ROWS }, - { OOO_STRING_SVTOOLS_HTML_TR_cols, HTML_TR_COLS }, - { OOO_STRING_SVTOOLS_HTML_TR_all, HTML_TR_ALL }, - { 0, 0 } + { OOO_STRING_SVTOOLS_HTML_TR_none, HTML_TR_NONE }, + { OOO_STRING_SVTOOLS_HTML_TR_groups, HTML_TR_GROUPS }, + { OOO_STRING_SVTOOLS_HTML_TR_rows, HTML_TR_ROWS }, + { OOO_STRING_SVTOOLS_HTML_TR_cols, HTML_TR_COLS }, + { OOO_STRING_SVTOOLS_HTML_TR_all, HTML_TR_ALL }, + { 0, 0 } }; @@ -348,7 +348,7 @@ SvParserState __EXPORT HTMLParser::CallParser() AddRef(); Continue( 0 ); if( SVPAR_PENDING != eState ) - ReleaseRef(); // dann brauchen wir den Parser nicht mehr! + ReleaseRef(); // dann brauchen wir den Parser nicht mehr! return eState; } @@ -367,7 +367,7 @@ void HTMLParser::Continue( int nToken ) NextToken( nToken ); if( IsParserWorking() ) - SaveState( 0 ); // bis hierhin abgearbeitet, + SaveState( 0 ); // bis hierhin abgearbeitet, // weiter mit neuem Token! nToken = GetNextToken(); } @@ -379,7 +379,7 @@ int HTMLParser::FilterToken( int nToken ) { case sal_Unicode(EOF): nToken = 0; - break; // nicht verschicken + break; // nicht verschicken case HTML_HEAD_OFF: bIsInBody = TRUE; @@ -400,7 +400,7 @@ int HTMLParser::FilterToken( int nToken ) case HTML_HTML_OFF: nToken = 0; bReadPRE = bReadListing = bReadXMP = FALSE; - break; // HTML_ON wurde auch nicht verschickt ! + break; // HTML_ON wurde auch nicht verschickt ! case HTML_PREFORMTXT_ON: StartPRE(); @@ -564,15 +564,15 @@ int HTMLParser::ScanText( const sal_Unicode cBreak ) } } - if( !cChar ) // unbekanntes Zeichen? + if( !cChar ) // unbekanntes Zeichen? { // dann im Stream zurueck, das '&' als Zeichen // einfuegen und mit dem nachfolgenden Zeichen // wieder aufsetzen sTmpBuffer.append( (sal_Unicode)'&' ); -// rInput.SeekRel( -(long)(++nPos*GetCharSize()) ); -// nlLinePos -= nPos; +// rInput.SeekRel( -(long)(++nPos*GetCharSize()) ); +// nlLinePos -= nPos; DBG_ASSERT( rInput.Tell()-nStreamPos == (ULONG)(nPos+1)*GetCharSize(), "Falsche Stream-Position" ); @@ -616,8 +616,8 @@ int HTMLParser::ScanText( const sal_Unicode cBreak ) { // mit dem Zeichen wieder aufsetzen nNextCh = '&'; -// rInput.SeekRel( -(long)(++nPos*GetCharSize()) ); -// nlLinePos -= nPos; +// rInput.SeekRel( -(long)(++nPos*GetCharSize()) ); +// nlLinePos -= nPos; DBG_ASSERT( rInput.Tell()-nStreamPos == (ULONG)(nPos+1)*GetCharSize(), "Falsche Stream-Position" ); @@ -732,8 +732,8 @@ int HTMLParser::ScanText( const sal_Unicode cBreak ) { // MIB 20.11.98: Das macht hier keinen Sinn, oder doch: Zumindest wird // abcä<EOF> nicht angezeigt, also lassen wir das in Zukunft. -// if( '>' != cBreak ) -// eState = SVPAR_ACCEPTED; +// if( '>' != cBreak ) +// eState = SVPAR_ACCEPTED; bWeiter = FALSE; } else @@ -747,7 +747,7 @@ int HTMLParser::ScanText( const sal_Unicode cBreak ) if( '>'==cBreak ) sTmpBuffer.append( nNextCh ); else - bWeiter = FALSE; // Abbrechen, String zusammen + bWeiter = FALSE; // Abbrechen, String zusammen break; case '\f': @@ -777,7 +777,7 @@ int HTMLParser::ScanText( const sal_Unicode cBreak ) break; } // Bug 18984: CR-LF -> Blank - // Folge von CR/LF/BLANK/TAB nur in ein Blank wandeln + // Folge von CR/LF/BLANK/TAB nur in ein Blank wandeln // kein break!! case '\t': if( '\t'==nNextCh && bReadPRE && '>'!=cBreak ) @@ -1108,7 +1108,7 @@ int __EXPORT HTMLParser::_GetNextToken() if( pOptions->Count() ) pOptions->DeleteAndDestroy( 0, pOptions->Count() ); - if( !IsParserWorking() ) // wenn schon Fehler, dann nicht weiter! + if( !IsParserWorking() ) // wenn schon Fehler, dann nicht weiter! return 0; BOOL bReadNextCharSave = bReadNextChar; @@ -1117,7 +1117,7 @@ int __EXPORT HTMLParser::_GetNextToken() DBG_ASSERT( !bEndTokenFound, "</SCRIPT> gelesen und trotzdem noch ein Zeichen lesen?" ); nNextCh = GetNextChar(); - if( !IsParserWorking() ) // wenn schon Fehler, dann nicht weiter! + if( !IsParserWorking() ) // wenn schon Fehler, dann nicht weiter! return 0; bReadNextChar = FALSE; } @@ -1452,7 +1452,7 @@ scan_text: } while( !nRet && SVPAR_WORKING == eState ); if( SVPAR_PENDING == eState ) - nRet = -1; // irgendwas ungueltiges + nRet = -1; // irgendwas ungueltiges return nRet; } @@ -1501,8 +1501,8 @@ const HTMLOptions *HTMLParser::GetOptions( USHORT *pNoConvertToken ) const // Netscape achtet aber nur auf "=" und Leerzeichen (siehe // Mozilla: PA_FetchRequestedNameValues in // lipparse/pa_mdl.c -// while( nPos < aToken.Len() && -// ( '-'==(c=aToken[nPos]) || isalnum(c) || '.'==c || '_'==c) ) +// while( nPos < aToken.Len() && +// ( '-'==(c=aToken[nPos]) || isalnum(c) || '.'==c || '_'==c) ) while( nPos < aToken.Len() && '=' != (cChar=aToken.GetChar(nPos)) && HTML_ISPRINTABLE(cChar) && !HTML_ISSPACE(cChar) ) nPos++; @@ -1510,7 +1510,7 @@ const HTMLOptions *HTMLParser::GetOptions( USHORT *pNoConvertToken ) const String sName( aToken.Copy( nStt, nPos-nStt ) ); //JP 23.03.97: die PlugIns wollen die TokenName im "Original" haben -// also nur fuers Suchen in UpperCase wandeln +// also nur fuers Suchen in UpperCase wandeln String sNameUpperCase( sName ); sNameUpperCase.ToUpperAscii(); @@ -1846,7 +1846,7 @@ int HTMLParser::FilterXMP( int nToken ) case HTML_TEXTTOKEN: case HTML_NONBREAKSPACE: case HTML_SOFTHYPH: - break; // bleiben erhalten + break; // bleiben erhalten default: if( nToken ) @@ -1887,7 +1887,7 @@ int HTMLParser::FilterListing( int nToken ) case HTML_TEXTTOKEN: case HTML_NONBREAKSPACE: case HTML_SOFTHYPH: - break; // bleiben erhalten + break; // bleiben erhalten default: if( nToken ) diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx index e567e0151537..23f5c7a96f2f 100644 --- a/svtools/source/svrtf/parrtf.cxx +++ b/svtools/source/svrtf/parrtf.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#include <stdio.h> // for EOF +#include <stdio.h> // for EOF #include <rtl/tencinfo.h> #include <tools/stream.hxx> #include <tools/debug.hxx> @@ -47,7 +47,7 @@ SV_IMPL_VARARR( RtfParserStates_Impl, RtfParserState_Impl ) SvRTFParser::SvRTFParser( SvStream& rIn, BYTE nStackSize ) : SvParser( rIn, nStackSize ), - eUNICodeSet( RTL_TEXTENCODING_MS_1252 ), // default ist ANSI-CodeSet + eUNICodeSet( RTL_TEXTENCODING_MS_1252 ), // default ist ANSI-CodeSet nUCharOverread( 1 ) { // default ist ANSI-CodeSet @@ -77,11 +77,11 @@ int SvRTFParser::_GetNextToken() case '{': case '}': case '\\': - case '+': // habe ich in einem RTF-File gefunden - case '~': // nonbreaking space - case '-': // optional hyphen - case '_': // nonbreaking hyphen - case '\'': // HexValue + case '+': // habe ich in einem RTF-File gefunden + case '~': // nonbreaking space + case '-': // optional hyphen + case '_': // nonbreaking hyphen + case '\'': // HexValue nNextCh = '\\'; rInput.SeekRel( -1 ); ScanText(); @@ -89,13 +89,13 @@ int SvRTFParser::_GetNextToken() bNextCh = 0 == nNextCh; break; - case '*': // ignoreflag + case '*': // ignoreflag nRet = RTF_IGNOREFLAG; break; - case ':': // subentry in an index entry + case ':': // subentry in an index entry nRet = RTF_SUBENTRYINDEX; break; - case '|': // formula-charakter + case '|': // formula-charakter nRet = RTF_FORMULA; break; @@ -151,12 +151,12 @@ int SvRTFParser::_GetNextToken() nTokenValue = -nTokenValue; bTokenHasValue=true; } - else if( bNegValue ) // das Minus wieder zurueck + else if( bNegValue ) // das Minus wieder zurueck { nNextCh = '-'; rInput.SeekRel( -1 ); } - if( ' ' == nNextCh ) // Blank gehoert zum Token! + if( ' ' == nNextCh ) // Blank gehoert zum Token! nNextCh = GetNextChar(); // suche das Token in der Tabelle: @@ -173,7 +173,7 @@ int SvRTFParser::_GetNextToken() { nUCharOverread = (BYTE)nTokenValue; #if 1 - //cmc: other ifdef breaks #i3584 + //cmc: other ifdef breaks #i3584 aParserStates[ aParserStates.Count()-1]. nUCharOverread = nUCharOverread; #else @@ -396,16 +396,16 @@ void SvRTFParser::ScanText( const sal_Unicode cBreak ) case '\\': case '}': case '{': - case '+': // habe ich in einem RTF-File gefunden + case '+': // habe ich in einem RTF-File gefunden aStrBuffer.Append(nNextCh); break; - case '~': // nonbreaking space + case '~': // nonbreaking space aStrBuffer.Append(static_cast< sal_Unicode >(0xA0)); break; - case '-': // optional hyphen + case '-': // optional hyphen aStrBuffer.Append(static_cast< sal_Unicode >(0xAD)); break; - case '_': // nonbreaking hyphen + case '_': // nonbreaking hyphen aStrBuffer.Append(static_cast< sal_Unicode >(0x2011)); break; @@ -453,7 +453,7 @@ void SvRTFParser::ScanText( const sal_Unicode cBreak ) else { nNextCh = '\\'; - bWeiter = false; // Abbrechen, String zusammen + bWeiter = false; // Abbrechen, String zusammen } } break; @@ -461,7 +461,7 @@ void SvRTFParser::ScanText( const sal_Unicode cBreak ) default: rInput.SeekRel( -1 ); nNextCh = '\\'; - bWeiter = false; // Abbrechen, String zusammen + bWeiter = false; // Abbrechen, String zusammen break; } } @@ -517,10 +517,10 @@ short SvRTFParser::_inSkipGroup=0; void SvRTFParser::SkipGroup() { short nBrackets=1; -if (_inSkipGroup>0) +if (_inSkipGroup>0) return; _inSkipGroup++; -#if 1 //#i16185# fecking \bin keyword +#if 1 //#i16185# fecking \bin keyword do { switch (nNextCh) @@ -577,9 +577,9 @@ _inSkipGroup++; _inSkipGroup--; } -void SvRTFParser::ReadUnknownData() { SkipGroup(); } -void SvRTFParser::ReadBitmapData() { SkipGroup(); } -void SvRTFParser::ReadOLEData() { SkipGroup(); } +void SvRTFParser::ReadUnknownData() { SkipGroup(); } +void SvRTFParser::ReadBitmapData() { SkipGroup(); } +void SvRTFParser::ReadOLEData() { SkipGroup(); } SvParserState SvRTFParser::CallParser() @@ -590,7 +590,7 @@ SvParserState SvRTFParser::CallParser() eState = SVPAR_WORKING; nOpenBrakets = 0; SetSrcEncoding( eCodeSet = RTL_TEXTENCODING_MS_1252 ); - eUNICodeSet = RTL_TEXTENCODING_MS_1252; // default ist ANSI-CodeSet + eUNICodeSet = RTL_TEXTENCODING_MS_1252; // default ist ANSI-CodeSet // die 1. beiden Token muessen '{' und \\rtf sein !! if( '{' == GetNextToken() && RTF_RTF == GetNextToken() ) @@ -598,7 +598,7 @@ SvParserState SvRTFParser::CallParser() AddRef(); Continue( 0 ); if( SVPAR_PENDING != eState ) - ReleaseRef(); // dann brauchen wir den Parser nicht mehr! + ReleaseRef(); // dann brauchen wir den Parser nicht mehr! } else eState = SVPAR_ERROR; @@ -608,8 +608,8 @@ SvParserState SvRTFParser::CallParser() void SvRTFParser::Continue( int nToken ) { -// DBG_ASSERT( SVPAR_CS_DONTKNOW == GetCharSet(), -// "Zeichensatz wurde geaendert." ); +// DBG_ASSERT( SVPAR_CS_DONTKNOW == GetCharSet(), +// "Zeichensatz wurde geaendert." ); if( !nToken ) nToken = GetNextToken(); @@ -639,25 +639,25 @@ void SvRTFParser::Continue( int nToken ) nToken = GetNextToken(); if( '}' != nToken ) eState = SVPAR_ERROR; - break; // auf zum naechsten Token!! + break; // auf zum naechsten Token!! } } goto NEXTTOKEN; case RTF_UNKNOWNCONTROL: - break; // unbekannte Token ueberspringen + break; // unbekannte Token ueberspringen case RTF_NEXTTYPE: - case RTF_ANSITYPE: - SetSrcEncoding( eCodeSet = RTL_TEXTENCODING_MS_1252 ); + case RTF_ANSITYPE: + SetSrcEncoding( eCodeSet = RTL_TEXTENCODING_MS_1252 ); break; - case RTF_MACTYPE: - SetSrcEncoding( eCodeSet = RTL_TEXTENCODING_APPLE_ROMAN ); + case RTF_MACTYPE: + SetSrcEncoding( eCodeSet = RTL_TEXTENCODING_APPLE_ROMAN ); break; - case RTF_PCTYPE: - SetSrcEncoding( eCodeSet = RTL_TEXTENCODING_IBM_437 ); + case RTF_PCTYPE: + SetSrcEncoding( eCodeSet = RTL_TEXTENCODING_IBM_437 ); break; - case RTF_PCATYPE: - SetSrcEncoding( eCodeSet = RTL_TEXTENCODING_IBM_850 ); + case RTF_PCATYPE: + SetSrcEncoding( eCodeSet = RTL_TEXTENCODING_IBM_850 ); break; case RTF_ANSICPG: eCodeSet = rtl_getTextEncodingFromWindowsCodePage(nTokenValue); @@ -669,7 +669,7 @@ NEXTTOKEN: break; } if( IsParserWorking() ) - SaveState( 0 ); // bis hierhin abgearbeitet, + SaveState( 0 ); // bis hierhin abgearbeitet, // weiter mit neuem Token! nToken = GetNextToken(); } diff --git a/svtools/source/svrtf/rtfkey2.cxx b/svtools/source/svrtf/rtfkey2.cxx index e2e2bef0f721..f294865637fb 100644 --- a/svtools/source/svrtf/rtfkey2.cxx +++ b/svtools/source/svrtf/rtfkey2.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -1042,25 +1042,25 @@ sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULTHDASHDD, "\\ulthdashdd" ); sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULHWAVE, "\\ulhwave" ); sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULULDBWAVE, "\\ululdbwave" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LOCH, "\\loch" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HICH, "\\hich" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DBCH, "\\dbch" ); +sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LOCH, "\\loch" ); +sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HICH, "\\hich" ); +sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DBCH, "\\dbch" ); sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LANGFE, "\\langfe" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ADEFLANG, "\\adeflang" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ADEFF, "\\adeff" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ACCNONE, "\\accnone" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ACCDOT, "\\accdot" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ACCCOMMA, "\\acccomma" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TWOINONE, "\\twoinone" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HORZVERT, "\\horzvert" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FAHANG, "\\fahang" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FAVAR, "\\favar" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FACENTER, "\\facenter" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FAROMAN, "\\faroman" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FAFIXED, "\\fafixed" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOCWRAP, "\\nocwrap" ); +sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ADEFLANG, "\\adeflang" ); +sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ADEFF, "\\adeff" ); +sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ACCNONE, "\\accnone" ); +sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ACCDOT, "\\accdot" ); +sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ACCCOMMA, "\\acccomma" ); +sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TWOINONE, "\\twoinone" ); +sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HORZVERT, "\\horzvert" ); +sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FAHANG, "\\fahang" ); +sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FAVAR, "\\favar" ); +sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FACENTER, "\\facenter" ); +sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FAROMAN, "\\faroman" ); +sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FAFIXED, "\\fafixed" ); +sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOCWRAP, "\\nocwrap" ); sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOOVERFLOW,"\\nooverflow" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ASPALPHA, "\\aspalpha" ); +sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ASPALPHA, "\\aspalpha" ); // SWG spezifische Attribute sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_GRFALIGNV, "\\grfalignv" ); diff --git a/svtools/source/svrtf/rtfkeywd.cxx b/svtools/source/svrtf/rtfkeywd.cxx index feebe3d78332..9f78fb91b867 100644 --- a/svtools/source/svrtf/rtfkeywd.cxx +++ b/svtools/source/svrtf/rtfkeywd.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ static RTF_TokenEntry __FAR_DATA aRTFTokenTab[] = { {{OOO_STRING_SVTOOLS_RTF_FSCRIPT}, RTF_FSCRIPT}, {{OOO_STRING_SVTOOLS_RTF_FDECOR}, RTF_FDECOR}, {{OOO_STRING_SVTOOLS_RTF_FTECH}, RTF_FTECH}, -{{OOO_STRING_SVTOOLS_RTF_FCHARSET}, RTF_FCHARSET}, -{{OOO_STRING_SVTOOLS_RTF_FALT}, RTF_FALT}, -{{OOO_STRING_SVTOOLS_RTF_FPRQ}, RTF_FPRQ}, +{{OOO_STRING_SVTOOLS_RTF_FCHARSET}, RTF_FCHARSET}, +{{OOO_STRING_SVTOOLS_RTF_FALT}, RTF_FALT}, +{{OOO_STRING_SVTOOLS_RTF_FPRQ}, RTF_FPRQ}, {{OOO_STRING_SVTOOLS_RTF_COLORTBL}, RTF_COLORTBL}, {{OOO_STRING_SVTOOLS_RTF_RED}, RTF_RED}, {{OOO_STRING_SVTOOLS_RTF_GREEN}, RTF_GREEN}, @@ -212,9 +212,9 @@ static RTF_TokenEntry __FAR_DATA aRTFTokenTab[] = { {{OOO_STRING_SVTOOLS_RTF_VERTALJ}, RTF_VERTALJ}, {{OOO_STRING_SVTOOLS_RTF_COLS}, RTF_COLS}, {{OOO_STRING_SVTOOLS_RTF_COLSX}, RTF_COLSX}, -{{OOO_STRING_SVTOOLS_RTF_COLNO}, RTF_COLNO}, -{{OOO_STRING_SVTOOLS_RTF_COLSR}, RTF_COLSR}, -{{OOO_STRING_SVTOOLS_RTF_COLW}, RTF_COLW}, +{{OOO_STRING_SVTOOLS_RTF_COLNO}, RTF_COLNO}, +{{OOO_STRING_SVTOOLS_RTF_COLSR}, RTF_COLSR}, +{{OOO_STRING_SVTOOLS_RTF_COLW}, RTF_COLW}, {{OOO_STRING_SVTOOLS_RTF_LINEBETCOL}, RTF_LINEBETCOL}, {{OOO_STRING_SVTOOLS_RTF_ENDNHERE}, RTF_ENDNHERE}, {{OOO_STRING_SVTOOLS_RTF_TITLEPG}, RTF_TITLEPG}, @@ -235,7 +235,7 @@ static RTF_TokenEntry __FAR_DATA aRTFTokenTab[] = { {{OOO_STRING_SVTOOLS_RTF_INTBL}, RTF_INTBL}, {{OOO_STRING_SVTOOLS_RTF_KEEP}, RTF_KEEP}, {{OOO_STRING_SVTOOLS_RTF_KEEPN}, RTF_KEEPN}, -{{OOO_STRING_SVTOOLS_RTF_LEVEL}, RTF_LEVEL}, +{{OOO_STRING_SVTOOLS_RTF_LEVEL}, RTF_LEVEL}, {{OOO_STRING_SVTOOLS_RTF_SBYS}, RTF_SBYS}, {{OOO_STRING_SVTOOLS_RTF_PAGEBB}, RTF_PAGEBB}, {{OOO_STRING_SVTOOLS_RTF_NOLINE}, RTF_NOLINE}, @@ -323,9 +323,9 @@ static RTF_TokenEntry __FAR_DATA aRTFTokenTab[] = { {{OOO_STRING_SVTOOLS_RTF_UP}, RTF_UP}, {{OOO_STRING_SVTOOLS_RTF_DN}, RTF_DN}, {{OOO_STRING_SVTOOLS_RTF_REVISED}, RTF_REVISED}, -{{OOO_STRING_SVTOOLS_RTF_SUB}, RTF_SUB}, -{{OOO_STRING_SVTOOLS_RTF_NOSUPERSUB}, RTF_NOSUPERSUB}, -{{OOO_STRING_SVTOOLS_RTF_SUPER}, RTF_SUPER}, +{{OOO_STRING_SVTOOLS_RTF_SUB}, RTF_SUB}, +{{OOO_STRING_SVTOOLS_RTF_NOSUPERSUB}, RTF_NOSUPERSUB}, +{{OOO_STRING_SVTOOLS_RTF_SUPER}, RTF_SUPER}, {{OOO_STRING_SVTOOLS_RTF_CHDATE}, RTF_CHDATE}, {{OOO_STRING_SVTOOLS_RTF_CHTIME}, RTF_CHTIME}, {{OOO_STRING_SVTOOLS_RTF_CHPGN}, RTF_CHPGN}, @@ -422,7 +422,7 @@ static RTF_TokenEntry __FAR_DATA aRTFTokenTab[] = { {{OOO_STRING_SVTOOLS_RTF_CLBGBDIAG}, RTF_CLBGBDIAG}, {{OOO_STRING_SVTOOLS_RTF_CLBGCROSS}, RTF_CLBGCROSS}, {{OOO_STRING_SVTOOLS_RTF_CLBGDCROSS}, RTF_CLBGDCROSS}, -{{OOO_STRING_SVTOOLS_RTF_CLBGDKHOR}, RTF_CLBGDKHOR}, +{{OOO_STRING_SVTOOLS_RTF_CLBGDKHOR}, RTF_CLBGDKHOR}, {{OOO_STRING_SVTOOLS_RTF_CLBGDKVERT}, RTF_CLBGDKVERT}, {{OOO_STRING_SVTOOLS_RTF_CLBGDKFDIAG}, RTF_CLBGDKFDIAG}, {{OOO_STRING_SVTOOLS_RTF_CLBGDKBDIAG}, RTF_CLBGDKBDIAG}, @@ -431,307 +431,307 @@ static RTF_TokenEntry __FAR_DATA aRTFTokenTab[] = { {{OOO_STRING_SVTOOLS_RTF_CLCFPAT}, RTF_CLCFPAT}, {{OOO_STRING_SVTOOLS_RTF_CLCBPAT}, RTF_CLCBPAT}, -{{OOO_STRING_SVTOOLS_RTF_AB}, RTF_AB}, -{{OOO_STRING_SVTOOLS_RTF_ACAPS}, RTF_ACAPS}, -{{OOO_STRING_SVTOOLS_RTF_ACF}, RTF_ACF}, -{{OOO_STRING_SVTOOLS_RTF_ADDITIVE}, RTF_ADDITIVE}, -{{OOO_STRING_SVTOOLS_RTF_ADN}, RTF_ADN}, -{{OOO_STRING_SVTOOLS_RTF_AENDDOC}, RTF_AENDDOC}, -{{OOO_STRING_SVTOOLS_RTF_AENDNOTES}, RTF_AENDNOTES}, -{{OOO_STRING_SVTOOLS_RTF_AEXPND}, RTF_AEXPND}, -{{OOO_STRING_SVTOOLS_RTF_AF}, RTF_AF}, -{{OOO_STRING_SVTOOLS_RTF_AFS}, RTF_AFS}, -{{OOO_STRING_SVTOOLS_RTF_AFTNBJ}, RTF_AFTNBJ}, -{{OOO_STRING_SVTOOLS_RTF_AFTNCN}, RTF_AFTNCN}, -{{OOO_STRING_SVTOOLS_RTF_AFTNNALC}, RTF_AFTNNALC}, -{{OOO_STRING_SVTOOLS_RTF_AFTNNAR}, RTF_AFTNNAR}, -{{OOO_STRING_SVTOOLS_RTF_AFTNNAUC}, RTF_AFTNNAUC}, -{{OOO_STRING_SVTOOLS_RTF_AFTNNCHI}, RTF_AFTNNCHI}, -{{OOO_STRING_SVTOOLS_RTF_AFTNNRLC}, RTF_AFTNNRLC}, -{{OOO_STRING_SVTOOLS_RTF_AFTNNRUC}, RTF_AFTNNRUC}, -{{OOO_STRING_SVTOOLS_RTF_AFTNRESTART}, RTF_AFTNRESTART}, -{{OOO_STRING_SVTOOLS_RTF_AFTNRSTCONT}, RTF_AFTNRSTCONT}, -{{OOO_STRING_SVTOOLS_RTF_AFTNSEP}, RTF_AFTNSEP}, -{{OOO_STRING_SVTOOLS_RTF_AFTNSEPC}, RTF_AFTNSEPC}, -{{OOO_STRING_SVTOOLS_RTF_AFTNSTART}, RTF_AFTNSTART}, -{{OOO_STRING_SVTOOLS_RTF_AFTNTJ}, RTF_AFTNTJ}, -{{OOO_STRING_SVTOOLS_RTF_AI}, RTF_AI}, -{{OOO_STRING_SVTOOLS_RTF_ALANG}, RTF_ALANG}, -{{OOO_STRING_SVTOOLS_RTF_ALLPROT}, RTF_ALLPROT}, -{{OOO_STRING_SVTOOLS_RTF_ANNOTPROT}, RTF_ANNOTPROT}, -{{OOO_STRING_SVTOOLS_RTF_AOUTL}, RTF_AOUTL}, -{{OOO_STRING_SVTOOLS_RTF_ASCAPS}, RTF_ASCAPS}, -{{OOO_STRING_SVTOOLS_RTF_ASHAD}, RTF_ASHAD}, -{{OOO_STRING_SVTOOLS_RTF_ASTRIKE}, RTF_ASTRIKE}, -{{OOO_STRING_SVTOOLS_RTF_ATNAUTHOR}, RTF_ATNAUTHOR}, -{{OOO_STRING_SVTOOLS_RTF_ATNICN}, RTF_ATNICN}, -{{OOO_STRING_SVTOOLS_RTF_ATNREF}, RTF_ATNREF}, -{{OOO_STRING_SVTOOLS_RTF_ATNTIME}, RTF_ATNTIME}, -{{OOO_STRING_SVTOOLS_RTF_ATRFEND}, RTF_ATRFEND}, -{{OOO_STRING_SVTOOLS_RTF_ATRFSTART}, RTF_ATRFSTART}, -{{OOO_STRING_SVTOOLS_RTF_AUL}, RTF_AUL}, -{{OOO_STRING_SVTOOLS_RTF_AULD}, RTF_AULD}, -{{OOO_STRING_SVTOOLS_RTF_AULDB}, RTF_AULDB}, -{{OOO_STRING_SVTOOLS_RTF_AULNONE}, RTF_AULNONE}, -{{OOO_STRING_SVTOOLS_RTF_AULW}, RTF_AULW}, -{{OOO_STRING_SVTOOLS_RTF_AUP}, RTF_AUP}, -{{OOO_STRING_SVTOOLS_RTF_BKMKPUB}, RTF_BKMKPUB}, -{{OOO_STRING_SVTOOLS_RTF_BRDRDASH}, RTF_BRDRDASH}, -{{OOO_STRING_SVTOOLS_RTF_BRKFRM}, RTF_BRKFRM}, -{{OOO_STRING_SVTOOLS_RTF_CCHS}, RTF_CCHS}, -{{OOO_STRING_SVTOOLS_RTF_CPG}, RTF_CPG}, -{{OOO_STRING_SVTOOLS_RTF_CS}, RTF_CS}, -{{OOO_STRING_SVTOOLS_RTF_CVMME}, RTF_CVMME}, -{{OOO_STRING_SVTOOLS_RTF_DATAFIELD}, RTF_DATAFIELD}, -{{OOO_STRING_SVTOOLS_RTF_DO}, RTF_DO}, -{{OOO_STRING_SVTOOLS_RTF_DOBXCOLUMN}, RTF_DOBXCOLUMN}, -{{OOO_STRING_SVTOOLS_RTF_DOBXMARGIN}, RTF_DOBXMARGIN}, -{{OOO_STRING_SVTOOLS_RTF_DOBXPAGE}, RTF_DOBXPAGE}, -{{OOO_STRING_SVTOOLS_RTF_DOBYMARGIN}, RTF_DOBYMARGIN}, -{{OOO_STRING_SVTOOLS_RTF_DOBYPAGE}, RTF_DOBYPAGE}, -{{OOO_STRING_SVTOOLS_RTF_DOBYPARA}, RTF_DOBYPARA}, -{{OOO_STRING_SVTOOLS_RTF_DODHGT}, RTF_DODHGT}, -{{OOO_STRING_SVTOOLS_RTF_DOLOCK}, RTF_DOLOCK}, -{{OOO_STRING_SVTOOLS_RTF_DPAENDHOL}, RTF_DPAENDHOL}, -{{OOO_STRING_SVTOOLS_RTF_DPAENDL}, RTF_DPAENDL}, -{{OOO_STRING_SVTOOLS_RTF_DPAENDSOL}, RTF_DPAENDSOL}, -{{OOO_STRING_SVTOOLS_RTF_DPAENDW}, RTF_DPAENDW}, -{{OOO_STRING_SVTOOLS_RTF_DPARC}, RTF_DPARC}, -{{OOO_STRING_SVTOOLS_RTF_DPARCFLIPX}, RTF_DPARCFLIPX}, -{{OOO_STRING_SVTOOLS_RTF_DPARCFLIPY}, RTF_DPARCFLIPY}, -{{OOO_STRING_SVTOOLS_RTF_DPASTARTHOL}, RTF_DPASTARTHOL}, -{{OOO_STRING_SVTOOLS_RTF_DPASTARTL}, RTF_DPASTARTL}, -{{OOO_STRING_SVTOOLS_RTF_DPASTARTSOL}, RTF_DPASTARTSOL}, -{{OOO_STRING_SVTOOLS_RTF_DPASTARTW}, RTF_DPASTARTW}, -{{OOO_STRING_SVTOOLS_RTF_DPCALLOUT}, RTF_DPCALLOUT}, -{{OOO_STRING_SVTOOLS_RTF_DPCOA}, RTF_DPCOA}, -{{OOO_STRING_SVTOOLS_RTF_DPCOACCENT}, RTF_DPCOACCENT}, -{{OOO_STRING_SVTOOLS_RTF_DPCOBESTFIT}, RTF_DPCOBESTFIT}, -{{OOO_STRING_SVTOOLS_RTF_DPCOBORDER}, RTF_DPCOBORDER}, -{{OOO_STRING_SVTOOLS_RTF_DPCODABS}, RTF_DPCODABS}, -{{OOO_STRING_SVTOOLS_RTF_DPCODBOTTOM}, RTF_DPCODBOTTOM}, -{{OOO_STRING_SVTOOLS_RTF_DPCODCENTER}, RTF_DPCODCENTER}, -{{OOO_STRING_SVTOOLS_RTF_DPCODTOP}, RTF_DPCODTOP}, -{{OOO_STRING_SVTOOLS_RTF_DPCOLENGTH}, RTF_DPCOLENGTH}, -{{OOO_STRING_SVTOOLS_RTF_DPCOMINUSX}, RTF_DPCOMINUSX}, -{{OOO_STRING_SVTOOLS_RTF_DPCOMINUSY}, RTF_DPCOMINUSY}, -{{OOO_STRING_SVTOOLS_RTF_DPCOOFFSET}, RTF_DPCOOFFSET}, -{{OOO_STRING_SVTOOLS_RTF_DPCOSMARTA}, RTF_DPCOSMARTA}, -{{OOO_STRING_SVTOOLS_RTF_DPCOTDOUBLE}, RTF_DPCOTDOUBLE}, -{{OOO_STRING_SVTOOLS_RTF_DPCOTRIGHT}, RTF_DPCOTRIGHT}, -{{OOO_STRING_SVTOOLS_RTF_DPCOTSINGLE}, RTF_DPCOTSINGLE}, -{{OOO_STRING_SVTOOLS_RTF_DPCOTTRIPLE}, RTF_DPCOTTRIPLE}, -{{OOO_STRING_SVTOOLS_RTF_DPCOUNT}, RTF_DPCOUNT}, -{{OOO_STRING_SVTOOLS_RTF_DPELLIPSE}, RTF_DPELLIPSE}, -{{OOO_STRING_SVTOOLS_RTF_DPENDGROUP}, RTF_DPENDGROUP}, -{{OOO_STRING_SVTOOLS_RTF_DPFILLBGCB}, RTF_DPFILLBGCB}, -{{OOO_STRING_SVTOOLS_RTF_DPFILLBGCG}, RTF_DPFILLBGCG}, -{{OOO_STRING_SVTOOLS_RTF_DPFILLBGCR}, RTF_DPFILLBGCR}, -{{OOO_STRING_SVTOOLS_RTF_DPFILLBGGRAY}, RTF_DPFILLBGGRAY}, -{{OOO_STRING_SVTOOLS_RTF_DPFILLBGPAL}, RTF_DPFILLBGPAL}, -{{OOO_STRING_SVTOOLS_RTF_DPFILLFGCB}, RTF_DPFILLFGCB}, -{{OOO_STRING_SVTOOLS_RTF_DPFILLFGCG}, RTF_DPFILLFGCG}, -{{OOO_STRING_SVTOOLS_RTF_DPFILLFGCR}, RTF_DPFILLFGCR}, -{{OOO_STRING_SVTOOLS_RTF_DPFILLFGGRAY}, RTF_DPFILLFGGRAY}, -{{OOO_STRING_SVTOOLS_RTF_DPFILLFGPAL}, RTF_DPFILLFGPAL}, -{{OOO_STRING_SVTOOLS_RTF_DPFILLPAT}, RTF_DPFILLPAT}, -{{OOO_STRING_SVTOOLS_RTF_DPGROUP}, RTF_DPGROUP}, -{{OOO_STRING_SVTOOLS_RTF_DPLINE}, RTF_DPLINE}, -{{OOO_STRING_SVTOOLS_RTF_DPLINECOB}, RTF_DPLINECOB}, -{{OOO_STRING_SVTOOLS_RTF_DPLINECOG}, RTF_DPLINECOG}, -{{OOO_STRING_SVTOOLS_RTF_DPLINECOR}, RTF_DPLINECOR}, -{{OOO_STRING_SVTOOLS_RTF_DPLINEDADO}, RTF_DPLINEDADO}, -{{OOO_STRING_SVTOOLS_RTF_DPLINEDADODO}, RTF_DPLINEDADODO}, -{{OOO_STRING_SVTOOLS_RTF_DPLINEDASH}, RTF_DPLINEDASH}, -{{OOO_STRING_SVTOOLS_RTF_DPLINEDOT}, RTF_DPLINEDOT}, -{{OOO_STRING_SVTOOLS_RTF_DPLINEGRAY}, RTF_DPLINEGRAY}, -{{OOO_STRING_SVTOOLS_RTF_DPLINEHOLLOW}, RTF_DPLINEHOLLOW}, -{{OOO_STRING_SVTOOLS_RTF_DPLINEPAL}, RTF_DPLINEPAL}, -{{OOO_STRING_SVTOOLS_RTF_DPLINESOLID}, RTF_DPLINESOLID}, -{{OOO_STRING_SVTOOLS_RTF_DPLINEW}, RTF_DPLINEW}, -{{OOO_STRING_SVTOOLS_RTF_DPPOLYCOUNT}, RTF_DPPOLYCOUNT}, -{{OOO_STRING_SVTOOLS_RTF_DPPOLYGON}, RTF_DPPOLYGON}, -{{OOO_STRING_SVTOOLS_RTF_DPPOLYLINE}, RTF_DPPOLYLINE}, -{{OOO_STRING_SVTOOLS_RTF_DPPTX}, RTF_DPPTX}, -{{OOO_STRING_SVTOOLS_RTF_DPPTY}, RTF_DPPTY}, -{{OOO_STRING_SVTOOLS_RTF_DPRECT}, RTF_DPRECT}, -{{OOO_STRING_SVTOOLS_RTF_DPROUNDR}, RTF_DPROUNDR}, -{{OOO_STRING_SVTOOLS_RTF_DPSHADOW}, RTF_DPSHADOW}, -{{OOO_STRING_SVTOOLS_RTF_DPSHADX}, RTF_DPSHADX}, -{{OOO_STRING_SVTOOLS_RTF_DPSHADY}, RTF_DPSHADY}, -{{OOO_STRING_SVTOOLS_RTF_DPTXBX}, RTF_DPTXBX}, -{{OOO_STRING_SVTOOLS_RTF_DPTXBXMAR}, RTF_DPTXBXMAR}, -{{OOO_STRING_SVTOOLS_RTF_DPTXBXTEXT}, RTF_DPTXBXTEXT}, -{{OOO_STRING_SVTOOLS_RTF_DPX}, RTF_DPX}, -{{OOO_STRING_SVTOOLS_RTF_DPXSIZE}, RTF_DPXSIZE}, -{{OOO_STRING_SVTOOLS_RTF_DPY}, RTF_DPY}, -{{OOO_STRING_SVTOOLS_RTF_DPYSIZE}, RTF_DPYSIZE}, -{{OOO_STRING_SVTOOLS_RTF_DS}, RTF_DS}, -{{OOO_STRING_SVTOOLS_RTF_EMSPACE}, RTF_EMSPACE}, -{{OOO_STRING_SVTOOLS_RTF_ENSPACE}, RTF_ENSPACE}, -{{OOO_STRING_SVTOOLS_RTF_FBIDI}, RTF_FBIDI}, -{{OOO_STRING_SVTOOLS_RTF_FET}, RTF_FET}, -{{OOO_STRING_SVTOOLS_RTF_FID}, RTF_FID}, -{{OOO_STRING_SVTOOLS_RTF_FILE}, RTF_FILE}, -{{OOO_STRING_SVTOOLS_RTF_FILETBL}, RTF_FILETBL}, -{{OOO_STRING_SVTOOLS_RTF_FLDALT}, RTF_FLDALT}, -{{OOO_STRING_SVTOOLS_RTF_FNETWORK}, RTF_FNETWORK}, -{{OOO_STRING_SVTOOLS_RTF_FONTEMB}, RTF_FONTEMB}, -{{OOO_STRING_SVTOOLS_RTF_FONTFILE}, RTF_FONTFILE}, -{{OOO_STRING_SVTOOLS_RTF_FORMDISP}, RTF_FORMDISP}, -{{OOO_STRING_SVTOOLS_RTF_FORMPROT}, RTF_FORMPROT}, -{{OOO_STRING_SVTOOLS_RTF_FORMSHADE}, RTF_FORMSHADE}, -{{OOO_STRING_SVTOOLS_RTF_FOSNUM}, RTF_FOSNUM}, -{{OOO_STRING_SVTOOLS_RTF_FRELATIVE}, RTF_FRELATIVE}, -{{OOO_STRING_SVTOOLS_RTF_FTNALT}, RTF_FTNALT}, -{{OOO_STRING_SVTOOLS_RTF_FTNIL}, RTF_FTNIL}, -{{OOO_STRING_SVTOOLS_RTF_FTNNALC}, RTF_FTNNALC}, -{{OOO_STRING_SVTOOLS_RTF_FTNNAR}, RTF_FTNNAR}, -{{OOO_STRING_SVTOOLS_RTF_FTNNAUC}, RTF_FTNNAUC}, -{{OOO_STRING_SVTOOLS_RTF_FTNNCHI}, RTF_FTNNCHI}, -{{OOO_STRING_SVTOOLS_RTF_FTNNRLC}, RTF_FTNNRLC}, -{{OOO_STRING_SVTOOLS_RTF_FTNNRUC}, RTF_FTNNRUC}, -{{OOO_STRING_SVTOOLS_RTF_FTNRSTCONT}, RTF_FTNRSTCONT}, -{{OOO_STRING_SVTOOLS_RTF_FTNRSTPG}, RTF_FTNRSTPG}, -{{OOO_STRING_SVTOOLS_RTF_FTTRUETYPE}, RTF_FTTRUETYPE}, -{{OOO_STRING_SVTOOLS_RTF_FVALIDDOS}, RTF_FVALIDDOS}, -{{OOO_STRING_SVTOOLS_RTF_FVALIDHPFS}, RTF_FVALIDHPFS}, -{{OOO_STRING_SVTOOLS_RTF_FVALIDMAC}, RTF_FVALIDMAC}, -{{OOO_STRING_SVTOOLS_RTF_FVALIDNTFS}, RTF_FVALIDNTFS}, -{{OOO_STRING_SVTOOLS_RTF_HYPHAUTO}, RTF_HYPHAUTO}, -{{OOO_STRING_SVTOOLS_RTF_HYPHCAPS}, RTF_HYPHCAPS}, -{{OOO_STRING_SVTOOLS_RTF_HYPHCONSEC}, RTF_HYPHCONSEC}, -{{OOO_STRING_SVTOOLS_RTF_HYPHPAR}, RTF_HYPHPAR}, -{{OOO_STRING_SVTOOLS_RTF_LINKSELF}, RTF_LINKSELF}, -{{OOO_STRING_SVTOOLS_RTF_LINKSTYLES}, RTF_LINKSTYLES}, -{{OOO_STRING_SVTOOLS_RTF_LTRCH}, RTF_LTRCH}, -{{OOO_STRING_SVTOOLS_RTF_LTRDOC}, RTF_LTRDOC}, -{{OOO_STRING_SVTOOLS_RTF_LTRMARK}, RTF_LTRMARK}, -{{OOO_STRING_SVTOOLS_RTF_LTRPAR}, RTF_LTRPAR}, -{{OOO_STRING_SVTOOLS_RTF_LTRROW}, RTF_LTRROW}, -{{OOO_STRING_SVTOOLS_RTF_LTRSECT}, RTF_LTRSECT}, -{{OOO_STRING_SVTOOLS_RTF_NOCOLBAL}, RTF_NOCOLBAL}, -{{OOO_STRING_SVTOOLS_RTF_NOEXTRASPRL}, RTF_NOEXTRASPRL}, -{{OOO_STRING_SVTOOLS_RTF_NOTABIND}, RTF_NOTABIND}, -{{OOO_STRING_SVTOOLS_RTF_NOWIDCTLPAR}, RTF_NOWIDCTLPAR}, -{{OOO_STRING_SVTOOLS_RTF_OBJALIAS}, RTF_OBJALIAS}, -{{OOO_STRING_SVTOOLS_RTF_OBJALIGN}, RTF_OBJALIGN}, -{{OOO_STRING_SVTOOLS_RTF_OBJAUTLINK}, RTF_OBJAUTLINK}, -{{OOO_STRING_SVTOOLS_RTF_OBJCLASS}, RTF_OBJCLASS}, -{{OOO_STRING_SVTOOLS_RTF_OBJCROPB}, RTF_OBJCROPB}, -{{OOO_STRING_SVTOOLS_RTF_OBJCROPL}, RTF_OBJCROPL}, -{{OOO_STRING_SVTOOLS_RTF_OBJCROPR}, RTF_OBJCROPR}, -{{OOO_STRING_SVTOOLS_RTF_OBJCROPT}, RTF_OBJCROPT}, -{{OOO_STRING_SVTOOLS_RTF_OBJDATA}, RTF_OBJDATA}, -{{OOO_STRING_SVTOOLS_RTF_OBJECT}, RTF_OBJECT}, -{{OOO_STRING_SVTOOLS_RTF_OBJEMB}, RTF_OBJEMB}, -{{OOO_STRING_SVTOOLS_RTF_OBJH}, RTF_OBJH}, -{{OOO_STRING_SVTOOLS_RTF_OBJICEMB}, RTF_OBJICEMB}, -{{OOO_STRING_SVTOOLS_RTF_OBJLINK}, RTF_OBJLINK}, -{{OOO_STRING_SVTOOLS_RTF_OBJLOCK}, RTF_OBJLOCK}, -{{OOO_STRING_SVTOOLS_RTF_OBJNAME}, RTF_OBJNAME}, -{{OOO_STRING_SVTOOLS_RTF_OBJPUB}, RTF_OBJPUB}, -{{OOO_STRING_SVTOOLS_RTF_OBJSCALEX}, RTF_OBJSCALEX}, -{{OOO_STRING_SVTOOLS_RTF_OBJSCALEY}, RTF_OBJSCALEY}, -{{OOO_STRING_SVTOOLS_RTF_OBJSECT}, RTF_OBJSECT}, -{{OOO_STRING_SVTOOLS_RTF_OBJSETSIZE}, RTF_OBJSETSIZE}, -{{OOO_STRING_SVTOOLS_RTF_OBJSUB}, RTF_OBJSUB}, -{{OOO_STRING_SVTOOLS_RTF_OBJTIME}, RTF_OBJTIME}, -{{OOO_STRING_SVTOOLS_RTF_OBJTRANSY}, RTF_OBJTRANSY}, -{{OOO_STRING_SVTOOLS_RTF_OBJUPDATE}, RTF_OBJUPDATE}, -{{OOO_STRING_SVTOOLS_RTF_OBJW}, RTF_OBJW}, -{{OOO_STRING_SVTOOLS_RTF_OTBLRUL}, RTF_OTBLRUL}, -{{OOO_STRING_SVTOOLS_RTF_PGNHN}, RTF_PGNHN}, -{{OOO_STRING_SVTOOLS_RTF_PGNHNSC}, RTF_PGNHNSC}, -{{OOO_STRING_SVTOOLS_RTF_PGNHNSH}, RTF_PGNHNSH}, -{{OOO_STRING_SVTOOLS_RTF_PGNHNSM}, RTF_PGNHNSM}, -{{OOO_STRING_SVTOOLS_RTF_PGNHNSN}, RTF_PGNHNSN}, -{{OOO_STRING_SVTOOLS_RTF_PGNHNSP}, RTF_PGNHNSP}, -{{OOO_STRING_SVTOOLS_RTF_PICBMP}, RTF_PICBMP}, -{{OOO_STRING_SVTOOLS_RTF_PICBPP}, RTF_PICBPP}, -{{OOO_STRING_SVTOOLS_RTF_PN}, RTF_PN}, -{{OOO_STRING_SVTOOLS_RTF_PNACROSS}, RTF_PNACROSS}, -{{OOO_STRING_SVTOOLS_RTF_PNB}, RTF_PNB}, -{{OOO_STRING_SVTOOLS_RTF_PNCAPS}, RTF_PNCAPS}, -{{OOO_STRING_SVTOOLS_RTF_PNCARD}, RTF_PNCARD}, -{{OOO_STRING_SVTOOLS_RTF_PNCF}, RTF_PNCF}, -{{OOO_STRING_SVTOOLS_RTF_PNDEC}, RTF_PNDEC}, -{{OOO_STRING_SVTOOLS_RTF_PNF}, RTF_PNF}, -{{OOO_STRING_SVTOOLS_RTF_PNFS}, RTF_PNFS}, -{{OOO_STRING_SVTOOLS_RTF_PNHANG}, RTF_PNHANG}, -{{OOO_STRING_SVTOOLS_RTF_PNI}, RTF_PNI}, -{{OOO_STRING_SVTOOLS_RTF_PNINDENT}, RTF_PNINDENT}, -{{OOO_STRING_SVTOOLS_RTF_PNLCLTR}, RTF_PNLCLTR}, -{{OOO_STRING_SVTOOLS_RTF_PNLCRM}, RTF_PNLCRM}, -{{OOO_STRING_SVTOOLS_RTF_PNLVL}, RTF_PNLVL}, -{{OOO_STRING_SVTOOLS_RTF_PNLVLBLT}, RTF_PNLVLBLT}, -{{OOO_STRING_SVTOOLS_RTF_PNLVLBODY}, RTF_PNLVLBODY}, -{{OOO_STRING_SVTOOLS_RTF_PNLVLCONT}, RTF_PNLVLCONT}, -{{OOO_STRING_SVTOOLS_RTF_PNNUMONCE}, RTF_PNNUMONCE}, -{{OOO_STRING_SVTOOLS_RTF_PNORD}, RTF_PNORD}, -{{OOO_STRING_SVTOOLS_RTF_PNORDT}, RTF_PNORDT}, -{{OOO_STRING_SVTOOLS_RTF_PNPREV}, RTF_PNPREV}, -{{OOO_STRING_SVTOOLS_RTF_PNQC}, RTF_PNQC}, -{{OOO_STRING_SVTOOLS_RTF_PNQL}, RTF_PNQL}, -{{OOO_STRING_SVTOOLS_RTF_PNQR}, RTF_PNQR}, -{{OOO_STRING_SVTOOLS_RTF_PNRESTART}, RTF_PNRESTART}, -{{OOO_STRING_SVTOOLS_RTF_PNSCAPS}, RTF_PNSCAPS}, -{{OOO_STRING_SVTOOLS_RTF_PNSECLVL}, RTF_PNSECLVL}, -{{OOO_STRING_SVTOOLS_RTF_PNSP}, RTF_PNSP}, -{{OOO_STRING_SVTOOLS_RTF_PNSTART}, RTF_PNSTART}, -{{OOO_STRING_SVTOOLS_RTF_PNSTRIKE}, RTF_PNSTRIKE}, -{{OOO_STRING_SVTOOLS_RTF_PNTEXT}, RTF_PNTEXT}, -{{OOO_STRING_SVTOOLS_RTF_PNTXTA}, RTF_PNTXTA}, -{{OOO_STRING_SVTOOLS_RTF_PNTXTB}, RTF_PNTXTB}, -{{OOO_STRING_SVTOOLS_RTF_PNUCLTR}, RTF_PNUCLTR}, -{{OOO_STRING_SVTOOLS_RTF_PNUCRM}, RTF_PNUCRM}, -{{OOO_STRING_SVTOOLS_RTF_PNUL}, RTF_PNUL}, -{{OOO_STRING_SVTOOLS_RTF_PNULD}, RTF_PNULD}, -{{OOO_STRING_SVTOOLS_RTF_PNULDB}, RTF_PNULDB}, -{{OOO_STRING_SVTOOLS_RTF_PNULNONE}, RTF_PNULNONE}, -{{OOO_STRING_SVTOOLS_RTF_PNULW}, RTF_PNULW}, -{{OOO_STRING_SVTOOLS_RTF_PRCOLBL}, RTF_PRCOLBL}, -{{OOO_STRING_SVTOOLS_RTF_PRINTDATA}, RTF_PRINTDATA}, -{{OOO_STRING_SVTOOLS_RTF_PSZ}, RTF_PSZ}, -{{OOO_STRING_SVTOOLS_RTF_PUBAUTO}, RTF_PUBAUTO}, -{{OOO_STRING_SVTOOLS_RTF_RESULT}, RTF_RESULT}, -{{OOO_STRING_SVTOOLS_RTF_REVAUTH}, RTF_REVAUTH}, -{{OOO_STRING_SVTOOLS_RTF_REVDTTM}, RTF_REVDTTM}, -{{OOO_STRING_SVTOOLS_RTF_REVPROT}, RTF_REVPROT}, -{{OOO_STRING_SVTOOLS_RTF_REVTBL}, RTF_REVTBL}, -{{OOO_STRING_SVTOOLS_RTF_RSLTBMP}, RTF_RSLTBMP}, -{{OOO_STRING_SVTOOLS_RTF_RSLTMERGE}, RTF_RSLTMERGE}, -{{OOO_STRING_SVTOOLS_RTF_RSLTPICT}, RTF_RSLTPICT}, -{{OOO_STRING_SVTOOLS_RTF_RSLTRTF}, RTF_RSLTRTF}, -{{OOO_STRING_SVTOOLS_RTF_RSLTTXT}, RTF_RSLTTXT}, -{{OOO_STRING_SVTOOLS_RTF_RTLCH}, RTF_RTLCH}, -{{OOO_STRING_SVTOOLS_RTF_RTLDOC}, RTF_RTLDOC}, -{{OOO_STRING_SVTOOLS_RTF_RTLMARK}, RTF_RTLMARK}, -{{OOO_STRING_SVTOOLS_RTF_RTLPAR}, RTF_RTLPAR}, -{{OOO_STRING_SVTOOLS_RTF_RTLROW}, RTF_RTLROW}, -{{OOO_STRING_SVTOOLS_RTF_RTLSECT}, RTF_RTLSECT}, -{{OOO_STRING_SVTOOLS_RTF_SEC}, RTF_SEC}, -{{OOO_STRING_SVTOOLS_RTF_SECTNUM}, RTF_SECTNUM}, -{{OOO_STRING_SVTOOLS_RTF_SECTUNLOCKED}, RTF_SECTUNLOCKED}, -{{OOO_STRING_SVTOOLS_RTF_SLMULT}, RTF_SLMULT}, -{{OOO_STRING_SVTOOLS_RTF_SOFTCOL}, RTF_SOFTCOL}, -{{OOO_STRING_SVTOOLS_RTF_SOFTLHEIGHT}, RTF_SOFTLHEIGHT}, -{{OOO_STRING_SVTOOLS_RTF_SOFTLINE}, RTF_SOFTLINE}, -{{OOO_STRING_SVTOOLS_RTF_SOFTPAGE}, RTF_SOFTPAGE}, -{{OOO_STRING_SVTOOLS_RTF_SPRSSPBF}, RTF_SPRSSPBF}, -{{OOO_STRING_SVTOOLS_RTF_SPRSTSP}, RTF_SPRSTSP}, -{{OOO_STRING_SVTOOLS_RTF_SUBDOCUMENT}, RTF_SUBDOCUMENT}, -{{OOO_STRING_SVTOOLS_RTF_SWPBDR}, RTF_SWPBDR}, -{{OOO_STRING_SVTOOLS_RTF_TCN}, RTF_TCN}, -{{OOO_STRING_SVTOOLS_RTF_TRANSMF}, RTF_TRANSMF}, -{{OOO_STRING_SVTOOLS_RTF_TRBRDRB}, RTF_TRBRDRB}, -{{OOO_STRING_SVTOOLS_RTF_TRBRDRH}, RTF_TRBRDRH}, -{{OOO_STRING_SVTOOLS_RTF_TRBRDRL}, RTF_TRBRDRL}, -{{OOO_STRING_SVTOOLS_RTF_TRBRDRR}, RTF_TRBRDRR}, -{{OOO_STRING_SVTOOLS_RTF_TRBRDRT}, RTF_TRBRDRT}, -{{OOO_STRING_SVTOOLS_RTF_TRBRDRV}, RTF_TRBRDRV}, -{{OOO_STRING_SVTOOLS_RTF_TRHDR}, RTF_TRHDR}, -{{OOO_STRING_SVTOOLS_RTF_TRKEEP}, RTF_TRKEEP}, +{{OOO_STRING_SVTOOLS_RTF_AB}, RTF_AB}, +{{OOO_STRING_SVTOOLS_RTF_ACAPS}, RTF_ACAPS}, +{{OOO_STRING_SVTOOLS_RTF_ACF}, RTF_ACF}, +{{OOO_STRING_SVTOOLS_RTF_ADDITIVE}, RTF_ADDITIVE}, +{{OOO_STRING_SVTOOLS_RTF_ADN}, RTF_ADN}, +{{OOO_STRING_SVTOOLS_RTF_AENDDOC}, RTF_AENDDOC}, +{{OOO_STRING_SVTOOLS_RTF_AENDNOTES}, RTF_AENDNOTES}, +{{OOO_STRING_SVTOOLS_RTF_AEXPND}, RTF_AEXPND}, +{{OOO_STRING_SVTOOLS_RTF_AF}, RTF_AF}, +{{OOO_STRING_SVTOOLS_RTF_AFS}, RTF_AFS}, +{{OOO_STRING_SVTOOLS_RTF_AFTNBJ}, RTF_AFTNBJ}, +{{OOO_STRING_SVTOOLS_RTF_AFTNCN}, RTF_AFTNCN}, +{{OOO_STRING_SVTOOLS_RTF_AFTNNALC}, RTF_AFTNNALC}, +{{OOO_STRING_SVTOOLS_RTF_AFTNNAR}, RTF_AFTNNAR}, +{{OOO_STRING_SVTOOLS_RTF_AFTNNAUC}, RTF_AFTNNAUC}, +{{OOO_STRING_SVTOOLS_RTF_AFTNNCHI}, RTF_AFTNNCHI}, +{{OOO_STRING_SVTOOLS_RTF_AFTNNRLC}, RTF_AFTNNRLC}, +{{OOO_STRING_SVTOOLS_RTF_AFTNNRUC}, RTF_AFTNNRUC}, +{{OOO_STRING_SVTOOLS_RTF_AFTNRESTART}, RTF_AFTNRESTART}, +{{OOO_STRING_SVTOOLS_RTF_AFTNRSTCONT}, RTF_AFTNRSTCONT}, +{{OOO_STRING_SVTOOLS_RTF_AFTNSEP}, RTF_AFTNSEP}, +{{OOO_STRING_SVTOOLS_RTF_AFTNSEPC}, RTF_AFTNSEPC}, +{{OOO_STRING_SVTOOLS_RTF_AFTNSTART}, RTF_AFTNSTART}, +{{OOO_STRING_SVTOOLS_RTF_AFTNTJ}, RTF_AFTNTJ}, +{{OOO_STRING_SVTOOLS_RTF_AI}, RTF_AI}, +{{OOO_STRING_SVTOOLS_RTF_ALANG}, RTF_ALANG}, +{{OOO_STRING_SVTOOLS_RTF_ALLPROT}, RTF_ALLPROT}, +{{OOO_STRING_SVTOOLS_RTF_ANNOTPROT}, RTF_ANNOTPROT}, +{{OOO_STRING_SVTOOLS_RTF_AOUTL}, RTF_AOUTL}, +{{OOO_STRING_SVTOOLS_RTF_ASCAPS}, RTF_ASCAPS}, +{{OOO_STRING_SVTOOLS_RTF_ASHAD}, RTF_ASHAD}, +{{OOO_STRING_SVTOOLS_RTF_ASTRIKE}, RTF_ASTRIKE}, +{{OOO_STRING_SVTOOLS_RTF_ATNAUTHOR}, RTF_ATNAUTHOR}, +{{OOO_STRING_SVTOOLS_RTF_ATNICN}, RTF_ATNICN}, +{{OOO_STRING_SVTOOLS_RTF_ATNREF}, RTF_ATNREF}, +{{OOO_STRING_SVTOOLS_RTF_ATNTIME}, RTF_ATNTIME}, +{{OOO_STRING_SVTOOLS_RTF_ATRFEND}, RTF_ATRFEND}, +{{OOO_STRING_SVTOOLS_RTF_ATRFSTART}, RTF_ATRFSTART}, +{{OOO_STRING_SVTOOLS_RTF_AUL}, RTF_AUL}, +{{OOO_STRING_SVTOOLS_RTF_AULD}, RTF_AULD}, +{{OOO_STRING_SVTOOLS_RTF_AULDB}, RTF_AULDB}, +{{OOO_STRING_SVTOOLS_RTF_AULNONE}, RTF_AULNONE}, +{{OOO_STRING_SVTOOLS_RTF_AULW}, RTF_AULW}, +{{OOO_STRING_SVTOOLS_RTF_AUP}, RTF_AUP}, +{{OOO_STRING_SVTOOLS_RTF_BKMKPUB}, RTF_BKMKPUB}, +{{OOO_STRING_SVTOOLS_RTF_BRDRDASH}, RTF_BRDRDASH}, +{{OOO_STRING_SVTOOLS_RTF_BRKFRM}, RTF_BRKFRM}, +{{OOO_STRING_SVTOOLS_RTF_CCHS}, RTF_CCHS}, +{{OOO_STRING_SVTOOLS_RTF_CPG}, RTF_CPG}, +{{OOO_STRING_SVTOOLS_RTF_CS}, RTF_CS}, +{{OOO_STRING_SVTOOLS_RTF_CVMME}, RTF_CVMME}, +{{OOO_STRING_SVTOOLS_RTF_DATAFIELD}, RTF_DATAFIELD}, +{{OOO_STRING_SVTOOLS_RTF_DO}, RTF_DO}, +{{OOO_STRING_SVTOOLS_RTF_DOBXCOLUMN}, RTF_DOBXCOLUMN}, +{{OOO_STRING_SVTOOLS_RTF_DOBXMARGIN}, RTF_DOBXMARGIN}, +{{OOO_STRING_SVTOOLS_RTF_DOBXPAGE}, RTF_DOBXPAGE}, +{{OOO_STRING_SVTOOLS_RTF_DOBYMARGIN}, RTF_DOBYMARGIN}, +{{OOO_STRING_SVTOOLS_RTF_DOBYPAGE}, RTF_DOBYPAGE}, +{{OOO_STRING_SVTOOLS_RTF_DOBYPARA}, RTF_DOBYPARA}, +{{OOO_STRING_SVTOOLS_RTF_DODHGT}, RTF_DODHGT}, +{{OOO_STRING_SVTOOLS_RTF_DOLOCK}, RTF_DOLOCK}, +{{OOO_STRING_SVTOOLS_RTF_DPAENDHOL}, RTF_DPAENDHOL}, +{{OOO_STRING_SVTOOLS_RTF_DPAENDL}, RTF_DPAENDL}, +{{OOO_STRING_SVTOOLS_RTF_DPAENDSOL}, RTF_DPAENDSOL}, +{{OOO_STRING_SVTOOLS_RTF_DPAENDW}, RTF_DPAENDW}, +{{OOO_STRING_SVTOOLS_RTF_DPARC}, RTF_DPARC}, +{{OOO_STRING_SVTOOLS_RTF_DPARCFLIPX}, RTF_DPARCFLIPX}, +{{OOO_STRING_SVTOOLS_RTF_DPARCFLIPY}, RTF_DPARCFLIPY}, +{{OOO_STRING_SVTOOLS_RTF_DPASTARTHOL}, RTF_DPASTARTHOL}, +{{OOO_STRING_SVTOOLS_RTF_DPASTARTL}, RTF_DPASTARTL}, +{{OOO_STRING_SVTOOLS_RTF_DPASTARTSOL}, RTF_DPASTARTSOL}, +{{OOO_STRING_SVTOOLS_RTF_DPASTARTW}, RTF_DPASTARTW}, +{{OOO_STRING_SVTOOLS_RTF_DPCALLOUT}, RTF_DPCALLOUT}, +{{OOO_STRING_SVTOOLS_RTF_DPCOA}, RTF_DPCOA}, +{{OOO_STRING_SVTOOLS_RTF_DPCOACCENT}, RTF_DPCOACCENT}, +{{OOO_STRING_SVTOOLS_RTF_DPCOBESTFIT}, RTF_DPCOBESTFIT}, +{{OOO_STRING_SVTOOLS_RTF_DPCOBORDER}, RTF_DPCOBORDER}, +{{OOO_STRING_SVTOOLS_RTF_DPCODABS}, RTF_DPCODABS}, +{{OOO_STRING_SVTOOLS_RTF_DPCODBOTTOM}, RTF_DPCODBOTTOM}, +{{OOO_STRING_SVTOOLS_RTF_DPCODCENTER}, RTF_DPCODCENTER}, +{{OOO_STRING_SVTOOLS_RTF_DPCODTOP}, RTF_DPCODTOP}, +{{OOO_STRING_SVTOOLS_RTF_DPCOLENGTH}, RTF_DPCOLENGTH}, +{{OOO_STRING_SVTOOLS_RTF_DPCOMINUSX}, RTF_DPCOMINUSX}, +{{OOO_STRING_SVTOOLS_RTF_DPCOMINUSY}, RTF_DPCOMINUSY}, +{{OOO_STRING_SVTOOLS_RTF_DPCOOFFSET}, RTF_DPCOOFFSET}, +{{OOO_STRING_SVTOOLS_RTF_DPCOSMARTA}, RTF_DPCOSMARTA}, +{{OOO_STRING_SVTOOLS_RTF_DPCOTDOUBLE}, RTF_DPCOTDOUBLE}, +{{OOO_STRING_SVTOOLS_RTF_DPCOTRIGHT}, RTF_DPCOTRIGHT}, +{{OOO_STRING_SVTOOLS_RTF_DPCOTSINGLE}, RTF_DPCOTSINGLE}, +{{OOO_STRING_SVTOOLS_RTF_DPCOTTRIPLE}, RTF_DPCOTTRIPLE}, +{{OOO_STRING_SVTOOLS_RTF_DPCOUNT}, RTF_DPCOUNT}, +{{OOO_STRING_SVTOOLS_RTF_DPELLIPSE}, RTF_DPELLIPSE}, +{{OOO_STRING_SVTOOLS_RTF_DPENDGROUP}, RTF_DPENDGROUP}, +{{OOO_STRING_SVTOOLS_RTF_DPFILLBGCB}, RTF_DPFILLBGCB}, +{{OOO_STRING_SVTOOLS_RTF_DPFILLBGCG}, RTF_DPFILLBGCG}, +{{OOO_STRING_SVTOOLS_RTF_DPFILLBGCR}, RTF_DPFILLBGCR}, +{{OOO_STRING_SVTOOLS_RTF_DPFILLBGGRAY}, RTF_DPFILLBGGRAY}, +{{OOO_STRING_SVTOOLS_RTF_DPFILLBGPAL}, RTF_DPFILLBGPAL}, +{{OOO_STRING_SVTOOLS_RTF_DPFILLFGCB}, RTF_DPFILLFGCB}, +{{OOO_STRING_SVTOOLS_RTF_DPFILLFGCG}, RTF_DPFILLFGCG}, +{{OOO_STRING_SVTOOLS_RTF_DPFILLFGCR}, RTF_DPFILLFGCR}, +{{OOO_STRING_SVTOOLS_RTF_DPFILLFGGRAY}, RTF_DPFILLFGGRAY}, +{{OOO_STRING_SVTOOLS_RTF_DPFILLFGPAL}, RTF_DPFILLFGPAL}, +{{OOO_STRING_SVTOOLS_RTF_DPFILLPAT}, RTF_DPFILLPAT}, +{{OOO_STRING_SVTOOLS_RTF_DPGROUP}, RTF_DPGROUP}, +{{OOO_STRING_SVTOOLS_RTF_DPLINE}, RTF_DPLINE}, +{{OOO_STRING_SVTOOLS_RTF_DPLINECOB}, RTF_DPLINECOB}, +{{OOO_STRING_SVTOOLS_RTF_DPLINECOG}, RTF_DPLINECOG}, +{{OOO_STRING_SVTOOLS_RTF_DPLINECOR}, RTF_DPLINECOR}, +{{OOO_STRING_SVTOOLS_RTF_DPLINEDADO}, RTF_DPLINEDADO}, +{{OOO_STRING_SVTOOLS_RTF_DPLINEDADODO}, RTF_DPLINEDADODO}, +{{OOO_STRING_SVTOOLS_RTF_DPLINEDASH}, RTF_DPLINEDASH}, +{{OOO_STRING_SVTOOLS_RTF_DPLINEDOT}, RTF_DPLINEDOT}, +{{OOO_STRING_SVTOOLS_RTF_DPLINEGRAY}, RTF_DPLINEGRAY}, +{{OOO_STRING_SVTOOLS_RTF_DPLINEHOLLOW}, RTF_DPLINEHOLLOW}, +{{OOO_STRING_SVTOOLS_RTF_DPLINEPAL}, RTF_DPLINEPAL}, +{{OOO_STRING_SVTOOLS_RTF_DPLINESOLID}, RTF_DPLINESOLID}, +{{OOO_STRING_SVTOOLS_RTF_DPLINEW}, RTF_DPLINEW}, +{{OOO_STRING_SVTOOLS_RTF_DPPOLYCOUNT}, RTF_DPPOLYCOUNT}, +{{OOO_STRING_SVTOOLS_RTF_DPPOLYGON}, RTF_DPPOLYGON}, +{{OOO_STRING_SVTOOLS_RTF_DPPOLYLINE}, RTF_DPPOLYLINE}, +{{OOO_STRING_SVTOOLS_RTF_DPPTX}, RTF_DPPTX}, +{{OOO_STRING_SVTOOLS_RTF_DPPTY}, RTF_DPPTY}, +{{OOO_STRING_SVTOOLS_RTF_DPRECT}, RTF_DPRECT}, +{{OOO_STRING_SVTOOLS_RTF_DPROUNDR}, RTF_DPROUNDR}, +{{OOO_STRING_SVTOOLS_RTF_DPSHADOW}, RTF_DPSHADOW}, +{{OOO_STRING_SVTOOLS_RTF_DPSHADX}, RTF_DPSHADX}, +{{OOO_STRING_SVTOOLS_RTF_DPSHADY}, RTF_DPSHADY}, +{{OOO_STRING_SVTOOLS_RTF_DPTXBX}, RTF_DPTXBX}, +{{OOO_STRING_SVTOOLS_RTF_DPTXBXMAR}, RTF_DPTXBXMAR}, +{{OOO_STRING_SVTOOLS_RTF_DPTXBXTEXT}, RTF_DPTXBXTEXT}, +{{OOO_STRING_SVTOOLS_RTF_DPX}, RTF_DPX}, +{{OOO_STRING_SVTOOLS_RTF_DPXSIZE}, RTF_DPXSIZE}, +{{OOO_STRING_SVTOOLS_RTF_DPY}, RTF_DPY}, +{{OOO_STRING_SVTOOLS_RTF_DPYSIZE}, RTF_DPYSIZE}, +{{OOO_STRING_SVTOOLS_RTF_DS}, RTF_DS}, +{{OOO_STRING_SVTOOLS_RTF_EMSPACE}, RTF_EMSPACE}, +{{OOO_STRING_SVTOOLS_RTF_ENSPACE}, RTF_ENSPACE}, +{{OOO_STRING_SVTOOLS_RTF_FBIDI}, RTF_FBIDI}, +{{OOO_STRING_SVTOOLS_RTF_FET}, RTF_FET}, +{{OOO_STRING_SVTOOLS_RTF_FID}, RTF_FID}, +{{OOO_STRING_SVTOOLS_RTF_FILE}, RTF_FILE}, +{{OOO_STRING_SVTOOLS_RTF_FILETBL}, RTF_FILETBL}, +{{OOO_STRING_SVTOOLS_RTF_FLDALT}, RTF_FLDALT}, +{{OOO_STRING_SVTOOLS_RTF_FNETWORK}, RTF_FNETWORK}, +{{OOO_STRING_SVTOOLS_RTF_FONTEMB}, RTF_FONTEMB}, +{{OOO_STRING_SVTOOLS_RTF_FONTFILE}, RTF_FONTFILE}, +{{OOO_STRING_SVTOOLS_RTF_FORMDISP}, RTF_FORMDISP}, +{{OOO_STRING_SVTOOLS_RTF_FORMPROT}, RTF_FORMPROT}, +{{OOO_STRING_SVTOOLS_RTF_FORMSHADE}, RTF_FORMSHADE}, +{{OOO_STRING_SVTOOLS_RTF_FOSNUM}, RTF_FOSNUM}, +{{OOO_STRING_SVTOOLS_RTF_FRELATIVE}, RTF_FRELATIVE}, +{{OOO_STRING_SVTOOLS_RTF_FTNALT}, RTF_FTNALT}, +{{OOO_STRING_SVTOOLS_RTF_FTNIL}, RTF_FTNIL}, +{{OOO_STRING_SVTOOLS_RTF_FTNNALC}, RTF_FTNNALC}, +{{OOO_STRING_SVTOOLS_RTF_FTNNAR}, RTF_FTNNAR}, +{{OOO_STRING_SVTOOLS_RTF_FTNNAUC}, RTF_FTNNAUC}, +{{OOO_STRING_SVTOOLS_RTF_FTNNCHI}, RTF_FTNNCHI}, +{{OOO_STRING_SVTOOLS_RTF_FTNNRLC}, RTF_FTNNRLC}, +{{OOO_STRING_SVTOOLS_RTF_FTNNRUC}, RTF_FTNNRUC}, +{{OOO_STRING_SVTOOLS_RTF_FTNRSTCONT}, RTF_FTNRSTCONT}, +{{OOO_STRING_SVTOOLS_RTF_FTNRSTPG}, RTF_FTNRSTPG}, +{{OOO_STRING_SVTOOLS_RTF_FTTRUETYPE}, RTF_FTTRUETYPE}, +{{OOO_STRING_SVTOOLS_RTF_FVALIDDOS}, RTF_FVALIDDOS}, +{{OOO_STRING_SVTOOLS_RTF_FVALIDHPFS}, RTF_FVALIDHPFS}, +{{OOO_STRING_SVTOOLS_RTF_FVALIDMAC}, RTF_FVALIDMAC}, +{{OOO_STRING_SVTOOLS_RTF_FVALIDNTFS}, RTF_FVALIDNTFS}, +{{OOO_STRING_SVTOOLS_RTF_HYPHAUTO}, RTF_HYPHAUTO}, +{{OOO_STRING_SVTOOLS_RTF_HYPHCAPS}, RTF_HYPHCAPS}, +{{OOO_STRING_SVTOOLS_RTF_HYPHCONSEC}, RTF_HYPHCONSEC}, +{{OOO_STRING_SVTOOLS_RTF_HYPHPAR}, RTF_HYPHPAR}, +{{OOO_STRING_SVTOOLS_RTF_LINKSELF}, RTF_LINKSELF}, +{{OOO_STRING_SVTOOLS_RTF_LINKSTYLES}, RTF_LINKSTYLES}, +{{OOO_STRING_SVTOOLS_RTF_LTRCH}, RTF_LTRCH}, +{{OOO_STRING_SVTOOLS_RTF_LTRDOC}, RTF_LTRDOC}, +{{OOO_STRING_SVTOOLS_RTF_LTRMARK}, RTF_LTRMARK}, +{{OOO_STRING_SVTOOLS_RTF_LTRPAR}, RTF_LTRPAR}, +{{OOO_STRING_SVTOOLS_RTF_LTRROW}, RTF_LTRROW}, +{{OOO_STRING_SVTOOLS_RTF_LTRSECT}, RTF_LTRSECT}, +{{OOO_STRING_SVTOOLS_RTF_NOCOLBAL}, RTF_NOCOLBAL}, +{{OOO_STRING_SVTOOLS_RTF_NOEXTRASPRL}, RTF_NOEXTRASPRL}, +{{OOO_STRING_SVTOOLS_RTF_NOTABIND}, RTF_NOTABIND}, +{{OOO_STRING_SVTOOLS_RTF_NOWIDCTLPAR}, RTF_NOWIDCTLPAR}, +{{OOO_STRING_SVTOOLS_RTF_OBJALIAS}, RTF_OBJALIAS}, +{{OOO_STRING_SVTOOLS_RTF_OBJALIGN}, RTF_OBJALIGN}, +{{OOO_STRING_SVTOOLS_RTF_OBJAUTLINK}, RTF_OBJAUTLINK}, +{{OOO_STRING_SVTOOLS_RTF_OBJCLASS}, RTF_OBJCLASS}, +{{OOO_STRING_SVTOOLS_RTF_OBJCROPB}, RTF_OBJCROPB}, +{{OOO_STRING_SVTOOLS_RTF_OBJCROPL}, RTF_OBJCROPL}, +{{OOO_STRING_SVTOOLS_RTF_OBJCROPR}, RTF_OBJCROPR}, +{{OOO_STRING_SVTOOLS_RTF_OBJCROPT}, RTF_OBJCROPT}, +{{OOO_STRING_SVTOOLS_RTF_OBJDATA}, RTF_OBJDATA}, +{{OOO_STRING_SVTOOLS_RTF_OBJECT}, RTF_OBJECT}, +{{OOO_STRING_SVTOOLS_RTF_OBJEMB}, RTF_OBJEMB}, +{{OOO_STRING_SVTOOLS_RTF_OBJH}, RTF_OBJH}, +{{OOO_STRING_SVTOOLS_RTF_OBJICEMB}, RTF_OBJICEMB}, +{{OOO_STRING_SVTOOLS_RTF_OBJLINK}, RTF_OBJLINK}, +{{OOO_STRING_SVTOOLS_RTF_OBJLOCK}, RTF_OBJLOCK}, +{{OOO_STRING_SVTOOLS_RTF_OBJNAME}, RTF_OBJNAME}, +{{OOO_STRING_SVTOOLS_RTF_OBJPUB}, RTF_OBJPUB}, +{{OOO_STRING_SVTOOLS_RTF_OBJSCALEX}, RTF_OBJSCALEX}, +{{OOO_STRING_SVTOOLS_RTF_OBJSCALEY}, RTF_OBJSCALEY}, +{{OOO_STRING_SVTOOLS_RTF_OBJSECT}, RTF_OBJSECT}, +{{OOO_STRING_SVTOOLS_RTF_OBJSETSIZE}, RTF_OBJSETSIZE}, +{{OOO_STRING_SVTOOLS_RTF_OBJSUB}, RTF_OBJSUB}, +{{OOO_STRING_SVTOOLS_RTF_OBJTIME}, RTF_OBJTIME}, +{{OOO_STRING_SVTOOLS_RTF_OBJTRANSY}, RTF_OBJTRANSY}, +{{OOO_STRING_SVTOOLS_RTF_OBJUPDATE}, RTF_OBJUPDATE}, +{{OOO_STRING_SVTOOLS_RTF_OBJW}, RTF_OBJW}, +{{OOO_STRING_SVTOOLS_RTF_OTBLRUL}, RTF_OTBLRUL}, +{{OOO_STRING_SVTOOLS_RTF_PGNHN}, RTF_PGNHN}, +{{OOO_STRING_SVTOOLS_RTF_PGNHNSC}, RTF_PGNHNSC}, +{{OOO_STRING_SVTOOLS_RTF_PGNHNSH}, RTF_PGNHNSH}, +{{OOO_STRING_SVTOOLS_RTF_PGNHNSM}, RTF_PGNHNSM}, +{{OOO_STRING_SVTOOLS_RTF_PGNHNSN}, RTF_PGNHNSN}, +{{OOO_STRING_SVTOOLS_RTF_PGNHNSP}, RTF_PGNHNSP}, +{{OOO_STRING_SVTOOLS_RTF_PICBMP}, RTF_PICBMP}, +{{OOO_STRING_SVTOOLS_RTF_PICBPP}, RTF_PICBPP}, +{{OOO_STRING_SVTOOLS_RTF_PN}, RTF_PN}, +{{OOO_STRING_SVTOOLS_RTF_PNACROSS}, RTF_PNACROSS}, +{{OOO_STRING_SVTOOLS_RTF_PNB}, RTF_PNB}, +{{OOO_STRING_SVTOOLS_RTF_PNCAPS}, RTF_PNCAPS}, +{{OOO_STRING_SVTOOLS_RTF_PNCARD}, RTF_PNCARD}, +{{OOO_STRING_SVTOOLS_RTF_PNCF}, RTF_PNCF}, +{{OOO_STRING_SVTOOLS_RTF_PNDEC}, RTF_PNDEC}, +{{OOO_STRING_SVTOOLS_RTF_PNF}, RTF_PNF}, +{{OOO_STRING_SVTOOLS_RTF_PNFS}, RTF_PNFS}, +{{OOO_STRING_SVTOOLS_RTF_PNHANG}, RTF_PNHANG}, +{{OOO_STRING_SVTOOLS_RTF_PNI}, RTF_PNI}, +{{OOO_STRING_SVTOOLS_RTF_PNINDENT}, RTF_PNINDENT}, +{{OOO_STRING_SVTOOLS_RTF_PNLCLTR}, RTF_PNLCLTR}, +{{OOO_STRING_SVTOOLS_RTF_PNLCRM}, RTF_PNLCRM}, +{{OOO_STRING_SVTOOLS_RTF_PNLVL}, RTF_PNLVL}, +{{OOO_STRING_SVTOOLS_RTF_PNLVLBLT}, RTF_PNLVLBLT}, +{{OOO_STRING_SVTOOLS_RTF_PNLVLBODY}, RTF_PNLVLBODY}, +{{OOO_STRING_SVTOOLS_RTF_PNLVLCONT}, RTF_PNLVLCONT}, +{{OOO_STRING_SVTOOLS_RTF_PNNUMONCE}, RTF_PNNUMONCE}, +{{OOO_STRING_SVTOOLS_RTF_PNORD}, RTF_PNORD}, +{{OOO_STRING_SVTOOLS_RTF_PNORDT}, RTF_PNORDT}, +{{OOO_STRING_SVTOOLS_RTF_PNPREV}, RTF_PNPREV}, +{{OOO_STRING_SVTOOLS_RTF_PNQC}, RTF_PNQC}, +{{OOO_STRING_SVTOOLS_RTF_PNQL}, RTF_PNQL}, +{{OOO_STRING_SVTOOLS_RTF_PNQR}, RTF_PNQR}, +{{OOO_STRING_SVTOOLS_RTF_PNRESTART}, RTF_PNRESTART}, +{{OOO_STRING_SVTOOLS_RTF_PNSCAPS}, RTF_PNSCAPS}, +{{OOO_STRING_SVTOOLS_RTF_PNSECLVL}, RTF_PNSECLVL}, +{{OOO_STRING_SVTOOLS_RTF_PNSP}, RTF_PNSP}, +{{OOO_STRING_SVTOOLS_RTF_PNSTART}, RTF_PNSTART}, +{{OOO_STRING_SVTOOLS_RTF_PNSTRIKE}, RTF_PNSTRIKE}, +{{OOO_STRING_SVTOOLS_RTF_PNTEXT}, RTF_PNTEXT}, +{{OOO_STRING_SVTOOLS_RTF_PNTXTA}, RTF_PNTXTA}, +{{OOO_STRING_SVTOOLS_RTF_PNTXTB}, RTF_PNTXTB}, +{{OOO_STRING_SVTOOLS_RTF_PNUCLTR}, RTF_PNUCLTR}, +{{OOO_STRING_SVTOOLS_RTF_PNUCRM}, RTF_PNUCRM}, +{{OOO_STRING_SVTOOLS_RTF_PNUL}, RTF_PNUL}, +{{OOO_STRING_SVTOOLS_RTF_PNULD}, RTF_PNULD}, +{{OOO_STRING_SVTOOLS_RTF_PNULDB}, RTF_PNULDB}, +{{OOO_STRING_SVTOOLS_RTF_PNULNONE}, RTF_PNULNONE}, +{{OOO_STRING_SVTOOLS_RTF_PNULW}, RTF_PNULW}, +{{OOO_STRING_SVTOOLS_RTF_PRCOLBL}, RTF_PRCOLBL}, +{{OOO_STRING_SVTOOLS_RTF_PRINTDATA}, RTF_PRINTDATA}, +{{OOO_STRING_SVTOOLS_RTF_PSZ}, RTF_PSZ}, +{{OOO_STRING_SVTOOLS_RTF_PUBAUTO}, RTF_PUBAUTO}, +{{OOO_STRING_SVTOOLS_RTF_RESULT}, RTF_RESULT}, +{{OOO_STRING_SVTOOLS_RTF_REVAUTH}, RTF_REVAUTH}, +{{OOO_STRING_SVTOOLS_RTF_REVDTTM}, RTF_REVDTTM}, +{{OOO_STRING_SVTOOLS_RTF_REVPROT}, RTF_REVPROT}, +{{OOO_STRING_SVTOOLS_RTF_REVTBL}, RTF_REVTBL}, +{{OOO_STRING_SVTOOLS_RTF_RSLTBMP}, RTF_RSLTBMP}, +{{OOO_STRING_SVTOOLS_RTF_RSLTMERGE}, RTF_RSLTMERGE}, +{{OOO_STRING_SVTOOLS_RTF_RSLTPICT}, RTF_RSLTPICT}, +{{OOO_STRING_SVTOOLS_RTF_RSLTRTF}, RTF_RSLTRTF}, +{{OOO_STRING_SVTOOLS_RTF_RSLTTXT}, RTF_RSLTTXT}, +{{OOO_STRING_SVTOOLS_RTF_RTLCH}, RTF_RTLCH}, +{{OOO_STRING_SVTOOLS_RTF_RTLDOC}, RTF_RTLDOC}, +{{OOO_STRING_SVTOOLS_RTF_RTLMARK}, RTF_RTLMARK}, +{{OOO_STRING_SVTOOLS_RTF_RTLPAR}, RTF_RTLPAR}, +{{OOO_STRING_SVTOOLS_RTF_RTLROW}, RTF_RTLROW}, +{{OOO_STRING_SVTOOLS_RTF_RTLSECT}, RTF_RTLSECT}, +{{OOO_STRING_SVTOOLS_RTF_SEC}, RTF_SEC}, +{{OOO_STRING_SVTOOLS_RTF_SECTNUM}, RTF_SECTNUM}, +{{OOO_STRING_SVTOOLS_RTF_SECTUNLOCKED}, RTF_SECTUNLOCKED}, +{{OOO_STRING_SVTOOLS_RTF_SLMULT}, RTF_SLMULT}, +{{OOO_STRING_SVTOOLS_RTF_SOFTCOL}, RTF_SOFTCOL}, +{{OOO_STRING_SVTOOLS_RTF_SOFTLHEIGHT}, RTF_SOFTLHEIGHT}, +{{OOO_STRING_SVTOOLS_RTF_SOFTLINE}, RTF_SOFTLINE}, +{{OOO_STRING_SVTOOLS_RTF_SOFTPAGE}, RTF_SOFTPAGE}, +{{OOO_STRING_SVTOOLS_RTF_SPRSSPBF}, RTF_SPRSSPBF}, +{{OOO_STRING_SVTOOLS_RTF_SPRSTSP}, RTF_SPRSTSP}, +{{OOO_STRING_SVTOOLS_RTF_SUBDOCUMENT}, RTF_SUBDOCUMENT}, +{{OOO_STRING_SVTOOLS_RTF_SWPBDR}, RTF_SWPBDR}, +{{OOO_STRING_SVTOOLS_RTF_TCN}, RTF_TCN}, +{{OOO_STRING_SVTOOLS_RTF_TRANSMF}, RTF_TRANSMF}, +{{OOO_STRING_SVTOOLS_RTF_TRBRDRB}, RTF_TRBRDRB}, +{{OOO_STRING_SVTOOLS_RTF_TRBRDRH}, RTF_TRBRDRH}, +{{OOO_STRING_SVTOOLS_RTF_TRBRDRL}, RTF_TRBRDRL}, +{{OOO_STRING_SVTOOLS_RTF_TRBRDRR}, RTF_TRBRDRR}, +{{OOO_STRING_SVTOOLS_RTF_TRBRDRT}, RTF_TRBRDRT}, +{{OOO_STRING_SVTOOLS_RTF_TRBRDRV}, RTF_TRBRDRV}, +{{OOO_STRING_SVTOOLS_RTF_TRHDR}, RTF_TRHDR}, +{{OOO_STRING_SVTOOLS_RTF_TRKEEP}, RTF_TRKEEP}, {{OOO_STRING_SVTOOLS_RTF_TRPADDB}, RTF_TRPADDB}, {{OOO_STRING_SVTOOLS_RTF_TRPADDL}, RTF_TRPADDL}, {{OOO_STRING_SVTOOLS_RTF_TRPADDR}, RTF_TRPADDR}, @@ -742,315 +742,315 @@ static RTF_TokenEntry __FAR_DATA aRTFTokenTab[] = { {{OOO_STRING_SVTOOLS_RTF_TRPADDFT}, RTF_TRPADDFT}, -{{OOO_STRING_SVTOOLS_RTF_WRAPTRSP}, RTF_WRAPTRSP}, -{{OOO_STRING_SVTOOLS_RTF_XEF}, RTF_XEF}, -{{OOO_STRING_SVTOOLS_RTF_ZWJ}, RTF_ZWJ}, -{{OOO_STRING_SVTOOLS_RTF_ZWNJ}, RTF_ZWNJ}, +{{OOO_STRING_SVTOOLS_RTF_WRAPTRSP}, RTF_WRAPTRSP}, +{{OOO_STRING_SVTOOLS_RTF_XEF}, RTF_XEF}, +{{OOO_STRING_SVTOOLS_RTF_ZWJ}, RTF_ZWJ}, +{{OOO_STRING_SVTOOLS_RTF_ZWNJ}, RTF_ZWNJ}, -{{OOO_STRING_SVTOOLS_RTF_ABSLOCK}, RTF_ABSLOCK}, -{{OOO_STRING_SVTOOLS_RTF_ADJUSTRIGHT}, RTF_ADJUSTRIGHT}, -{{OOO_STRING_SVTOOLS_RTF_AFTNNCHOSUNG}, RTF_AFTNNCHOSUNG}, -{{OOO_STRING_SVTOOLS_RTF_AFTNNCNUM}, RTF_AFTNNCNUM}, -{{OOO_STRING_SVTOOLS_RTF_AFTNNDBAR}, RTF_AFTNNDBAR}, -{{OOO_STRING_SVTOOLS_RTF_AFTNNDBNUM}, RTF_AFTNNDBNUM}, -{{OOO_STRING_SVTOOLS_RTF_AFTNNDBNUMD}, RTF_AFTNNDBNUMD}, -{{OOO_STRING_SVTOOLS_RTF_AFTNNDBNUMK}, RTF_AFTNNDBNUMK}, -{{OOO_STRING_SVTOOLS_RTF_AFTNNDBNUMT}, RTF_AFTNNDBNUMT}, -{{OOO_STRING_SVTOOLS_RTF_AFTNNGANADA}, RTF_AFTNNGANADA}, -{{OOO_STRING_SVTOOLS_RTF_AFTNNGBNUM}, RTF_AFTNNGBNUM}, -{{OOO_STRING_SVTOOLS_RTF_AFTNNGBNUMD}, RTF_AFTNNGBNUMD}, -{{OOO_STRING_SVTOOLS_RTF_AFTNNGBNUMK}, RTF_AFTNNGBNUMK}, -{{OOO_STRING_SVTOOLS_RTF_AFTNNGBNUML}, RTF_AFTNNGBNUML}, -{{OOO_STRING_SVTOOLS_RTF_AFTNNZODIAC}, RTF_AFTNNZODIAC}, -{{OOO_STRING_SVTOOLS_RTF_AFTNNZODIACD}, RTF_AFTNNZODIACD}, -{{OOO_STRING_SVTOOLS_RTF_AFTNNZODIACL}, RTF_AFTNNZODIACL}, -{{OOO_STRING_SVTOOLS_RTF_ANIMTEXT}, RTF_ANIMTEXT}, -{{OOO_STRING_SVTOOLS_RTF_ANSICPG}, RTF_ANSICPG}, -{{OOO_STRING_SVTOOLS_RTF_BACKGROUND}, RTF_BACKGROUND}, -{{OOO_STRING_SVTOOLS_RTF_BDBFHDR}, RTF_BDBFHDR}, -{{OOO_STRING_SVTOOLS_RTF_BLIPTAG}, RTF_BLIPTAG}, -{{OOO_STRING_SVTOOLS_RTF_BLIPUID}, RTF_BLIPUID}, -{{OOO_STRING_SVTOOLS_RTF_BLIPUPI}, RTF_BLIPUPI}, -{{OOO_STRING_SVTOOLS_RTF_BRDRART}, RTF_BRDRART}, -{{OOO_STRING_SVTOOLS_RTF_BRDRDASHD}, RTF_BRDRDASHD}, -{{OOO_STRING_SVTOOLS_RTF_BRDRDASHDD}, RTF_BRDRDASHDD}, +{{OOO_STRING_SVTOOLS_RTF_ABSLOCK}, RTF_ABSLOCK}, +{{OOO_STRING_SVTOOLS_RTF_ADJUSTRIGHT}, RTF_ADJUSTRIGHT}, +{{OOO_STRING_SVTOOLS_RTF_AFTNNCHOSUNG}, RTF_AFTNNCHOSUNG}, +{{OOO_STRING_SVTOOLS_RTF_AFTNNCNUM}, RTF_AFTNNCNUM}, +{{OOO_STRING_SVTOOLS_RTF_AFTNNDBAR}, RTF_AFTNNDBAR}, +{{OOO_STRING_SVTOOLS_RTF_AFTNNDBNUM}, RTF_AFTNNDBNUM}, +{{OOO_STRING_SVTOOLS_RTF_AFTNNDBNUMD}, RTF_AFTNNDBNUMD}, +{{OOO_STRING_SVTOOLS_RTF_AFTNNDBNUMK}, RTF_AFTNNDBNUMK}, +{{OOO_STRING_SVTOOLS_RTF_AFTNNDBNUMT}, RTF_AFTNNDBNUMT}, +{{OOO_STRING_SVTOOLS_RTF_AFTNNGANADA}, RTF_AFTNNGANADA}, +{{OOO_STRING_SVTOOLS_RTF_AFTNNGBNUM}, RTF_AFTNNGBNUM}, +{{OOO_STRING_SVTOOLS_RTF_AFTNNGBNUMD}, RTF_AFTNNGBNUMD}, +{{OOO_STRING_SVTOOLS_RTF_AFTNNGBNUMK}, RTF_AFTNNGBNUMK}, +{{OOO_STRING_SVTOOLS_RTF_AFTNNGBNUML}, RTF_AFTNNGBNUML}, +{{OOO_STRING_SVTOOLS_RTF_AFTNNZODIAC}, RTF_AFTNNZODIAC}, +{{OOO_STRING_SVTOOLS_RTF_AFTNNZODIACD}, RTF_AFTNNZODIACD}, +{{OOO_STRING_SVTOOLS_RTF_AFTNNZODIACL}, RTF_AFTNNZODIACL}, +{{OOO_STRING_SVTOOLS_RTF_ANIMTEXT}, RTF_ANIMTEXT}, +{{OOO_STRING_SVTOOLS_RTF_ANSICPG}, RTF_ANSICPG}, +{{OOO_STRING_SVTOOLS_RTF_BACKGROUND}, RTF_BACKGROUND}, +{{OOO_STRING_SVTOOLS_RTF_BDBFHDR}, RTF_BDBFHDR}, +{{OOO_STRING_SVTOOLS_RTF_BLIPTAG}, RTF_BLIPTAG}, +{{OOO_STRING_SVTOOLS_RTF_BLIPUID}, RTF_BLIPUID}, +{{OOO_STRING_SVTOOLS_RTF_BLIPUPI}, RTF_BLIPUPI}, +{{OOO_STRING_SVTOOLS_RTF_BRDRART}, RTF_BRDRART}, +{{OOO_STRING_SVTOOLS_RTF_BRDRDASHD}, RTF_BRDRDASHD}, +{{OOO_STRING_SVTOOLS_RTF_BRDRDASHDD}, RTF_BRDRDASHDD}, {{OOO_STRING_SVTOOLS_RTF_BRDRDASHDOTSTR},RTF_BRDRDASHDOTSTR}, -{{OOO_STRING_SVTOOLS_RTF_BRDRDASHSM}, RTF_BRDRDASHSM}, -{{OOO_STRING_SVTOOLS_RTF_BRDREMBOSS}, RTF_BRDREMBOSS}, -{{OOO_STRING_SVTOOLS_RTF_BRDRENGRAVE}, RTF_BRDRENGRAVE}, -{{OOO_STRING_SVTOOLS_RTF_BRDRFRAME}, RTF_BRDRFRAME}, -{{OOO_STRING_SVTOOLS_RTF_BRDRTHTNLG}, RTF_BRDRTHTNLG}, -{{OOO_STRING_SVTOOLS_RTF_BRDRTHTNMG}, RTF_BRDRTHTNMG}, -{{OOO_STRING_SVTOOLS_RTF_BRDRTHTNSG}, RTF_BRDRTHTNSG}, -{{OOO_STRING_SVTOOLS_RTF_BRDRTNTHLG}, RTF_BRDRTNTHLG}, -{{OOO_STRING_SVTOOLS_RTF_BRDRTNTHMG}, RTF_BRDRTNTHMG}, -{{OOO_STRING_SVTOOLS_RTF_BRDRTNTHSG}, RTF_BRDRTNTHSG}, -{{OOO_STRING_SVTOOLS_RTF_BRDRTNTHTNLG}, RTF_BRDRTNTHTNLG}, -{{OOO_STRING_SVTOOLS_RTF_BRDRTNTHTNMG}, RTF_BRDRTNTHTNMG}, -{{OOO_STRING_SVTOOLS_RTF_BRDRTNTHTNSG}, RTF_BRDRTNTHTNSG}, -{{OOO_STRING_SVTOOLS_RTF_BRDRTRIPLE}, RTF_BRDRTRIPLE}, -{{OOO_STRING_SVTOOLS_RTF_BRDRWAVY}, RTF_BRDRWAVY}, -{{OOO_STRING_SVTOOLS_RTF_BRDRWAVYDB}, RTF_BRDRWAVYDB}, -{{OOO_STRING_SVTOOLS_RTF_CATEGORY}, RTF_CATEGORY}, -{{OOO_STRING_SVTOOLS_RTF_CGRID}, RTF_CGRID}, -{{OOO_STRING_SVTOOLS_RTF_CHARSCALEX}, RTF_CHARSCALEX}, -{{OOO_STRING_SVTOOLS_RTF_CHBGBDIAG}, RTF_CHBGBDIAG}, -{{OOO_STRING_SVTOOLS_RTF_CHBGCROSS}, RTF_CHBGCROSS}, -{{OOO_STRING_SVTOOLS_RTF_CHBGDCROSS}, RTF_CHBGDCROSS}, -{{OOO_STRING_SVTOOLS_RTF_CHBGDKBDIAG}, RTF_CHBGDKBDIAG}, -{{OOO_STRING_SVTOOLS_RTF_CHBGDKCROSS}, RTF_CHBGDKCROSS}, -{{OOO_STRING_SVTOOLS_RTF_CHBGDKDCROSS}, RTF_CHBGDKDCROSS}, -{{OOO_STRING_SVTOOLS_RTF_CHBGDKFDIAG}, RTF_CHBGDKFDIAG}, -{{OOO_STRING_SVTOOLS_RTF_CHBGDKHORIZ}, RTF_CHBGDKHORIZ}, -{{OOO_STRING_SVTOOLS_RTF_CHBGDKVERT}, RTF_CHBGDKVERT}, -{{OOO_STRING_SVTOOLS_RTF_CHBGFDIAG}, RTF_CHBGFDIAG}, -{{OOO_STRING_SVTOOLS_RTF_CHBGHORIZ}, RTF_CHBGHORIZ}, -{{OOO_STRING_SVTOOLS_RTF_CHBGVERT}, RTF_CHBGVERT}, -{{OOO_STRING_SVTOOLS_RTF_CHBRDR}, RTF_CHBRDR}, -{{OOO_STRING_SVTOOLS_RTF_CHCBPAT}, RTF_CHCBPAT}, -{{OOO_STRING_SVTOOLS_RTF_CHCFPAT}, RTF_CHCFPAT}, -{{OOO_STRING_SVTOOLS_RTF_CHSHDNG}, RTF_CHSHDNG}, -{{OOO_STRING_SVTOOLS_RTF_CLTXLRTB}, RTF_CLTXLRTB}, -{{OOO_STRING_SVTOOLS_RTF_CLTXTBRL}, RTF_CLTXTBRL}, -{{OOO_STRING_SVTOOLS_RTF_CLVERTALB}, RTF_CLVERTALB}, -{{OOO_STRING_SVTOOLS_RTF_CLVERTALC}, RTF_CLVERTALC}, -{{OOO_STRING_SVTOOLS_RTF_CLVERTALT}, RTF_CLVERTALT}, -{{OOO_STRING_SVTOOLS_RTF_CLVMGF}, RTF_CLVMGF}, -{{OOO_STRING_SVTOOLS_RTF_CLVMRG}, RTF_CLVMRG}, -{{OOO_STRING_SVTOOLS_RTF_CLTXTBRLV}, RTF_CLTXTBRLV}, -{{OOO_STRING_SVTOOLS_RTF_CLTXBTLR}, RTF_CLTXBTLR}, -{{OOO_STRING_SVTOOLS_RTF_CLTXLRTBV}, RTF_CLTXLRTBV}, -{{OOO_STRING_SVTOOLS_RTF_COMPANY}, RTF_COMPANY}, -{{OOO_STRING_SVTOOLS_RTF_CRAUTH}, RTF_CRAUTH}, -{{OOO_STRING_SVTOOLS_RTF_CRDATE}, RTF_CRDATE}, -{{OOO_STRING_SVTOOLS_RTF_DATE}, RTF_DATE}, -{{OOO_STRING_SVTOOLS_RTF_DEFLANGFE}, RTF_DEFLANGFE}, -{{OOO_STRING_SVTOOLS_RTF_DFRAUTH}, RTF_DFRAUTH}, -{{OOO_STRING_SVTOOLS_RTF_DFRDATE}, RTF_DFRDATE}, -{{OOO_STRING_SVTOOLS_RTF_DFRSTART}, RTF_DFRSTART}, -{{OOO_STRING_SVTOOLS_RTF_DFRSTOP}, RTF_DFRSTOP}, -{{OOO_STRING_SVTOOLS_RTF_DFRXST}, RTF_DFRXST}, -{{OOO_STRING_SVTOOLS_RTF_DGMARGIN}, RTF_DGMARGIN}, -{{OOO_STRING_SVTOOLS_RTF_DNTBLNSBDB}, RTF_DNTBLNSBDB}, -{{OOO_STRING_SVTOOLS_RTF_DOCTYPE}, RTF_DOCTYPE}, -{{OOO_STRING_SVTOOLS_RTF_DOCVAR}, RTF_DOCVAR}, -{{OOO_STRING_SVTOOLS_RTF_DPCODESCENT}, RTF_DPCODESCENT}, -{{OOO_STRING_SVTOOLS_RTF_EMBO}, RTF_EMBO}, -{{OOO_STRING_SVTOOLS_RTF_EMFBLIP}, RTF_EMFBLIP}, -{{OOO_STRING_SVTOOLS_RTF_EXPSHRTN}, RTF_EXPSHRTN}, -{{OOO_STRING_SVTOOLS_RTF_FAAUTO}, RTF_FAAUTO}, -{{OOO_STRING_SVTOOLS_RTF_FBIAS}, RTF_FBIAS}, -{{OOO_STRING_SVTOOLS_RTF_FFDEFRES}, RTF_FFDEFRES}, -{{OOO_STRING_SVTOOLS_RTF_FFDEFTEXT}, RTF_FFDEFTEXT}, -{{OOO_STRING_SVTOOLS_RTF_FFENTRYMCR}, RTF_FFENTRYMCR}, -{{OOO_STRING_SVTOOLS_RTF_FFEXITMCR}, RTF_FFEXITMCR}, -{{OOO_STRING_SVTOOLS_RTF_FFFORMAT}, RTF_FFFORMAT}, -{{OOO_STRING_SVTOOLS_RTF_FFHASLISTBOX}, RTF_FFHASLISTBOX}, -{{OOO_STRING_SVTOOLS_RTF_FFHELPTEXT}, RTF_FFHELPTEXT}, -{{OOO_STRING_SVTOOLS_RTF_FFHPS}, RTF_FFHPS}, -{{OOO_STRING_SVTOOLS_RTF_FFL}, RTF_FFL}, -{{OOO_STRING_SVTOOLS_RTF_FFMAXLEN}, RTF_FFMAXLEN}, -{{OOO_STRING_SVTOOLS_RTF_FFNAME}, RTF_FFNAME}, -{{OOO_STRING_SVTOOLS_RTF_FFOWNHELP}, RTF_FFOWNHELP}, -{{OOO_STRING_SVTOOLS_RTF_FFOWNSTAT}, RTF_FFOWNSTAT}, -{{OOO_STRING_SVTOOLS_RTF_FFPROT}, RTF_FFPROT}, -{{OOO_STRING_SVTOOLS_RTF_FFRECALC}, RTF_FFRECALC}, -{{OOO_STRING_SVTOOLS_RTF_FFRES}, RTF_FFRES}, -{{OOO_STRING_SVTOOLS_RTF_FFSIZE}, RTF_FFSIZE}, -{{OOO_STRING_SVTOOLS_RTF_FFSTATTEXT}, RTF_FFSTATTEXT}, -{{OOO_STRING_SVTOOLS_RTF_FFTYPE}, RTF_FFTYPE}, -{{OOO_STRING_SVTOOLS_RTF_FFTYPETXT}, RTF_FFTYPETXT}, -{{OOO_STRING_SVTOOLS_RTF_FLDTYPE}, RTF_FLDTYPE}, -{{OOO_STRING_SVTOOLS_RTF_FNAME}, RTF_FNAME}, -{{OOO_STRING_SVTOOLS_RTF_FORMFIELD}, RTF_FORMFIELD}, -{{OOO_STRING_SVTOOLS_RTF_FROMTEXT}, RTF_FROMTEXT}, -{{OOO_STRING_SVTOOLS_RTF_FTNNCHOSUNG}, RTF_FTNNCHOSUNG}, -{{OOO_STRING_SVTOOLS_RTF_FTNNCNUM}, RTF_FTNNCNUM}, -{{OOO_STRING_SVTOOLS_RTF_FTNNDBAR}, RTF_FTNNDBAR}, -{{OOO_STRING_SVTOOLS_RTF_FTNNDBNUM}, RTF_FTNNDBNUM}, -{{OOO_STRING_SVTOOLS_RTF_FTNNDBNUMD}, RTF_FTNNDBNUMD}, -{{OOO_STRING_SVTOOLS_RTF_FTNNDBNUMK}, RTF_FTNNDBNUMK}, -{{OOO_STRING_SVTOOLS_RTF_FTNNDBNUMT}, RTF_FTNNDBNUMT}, -{{OOO_STRING_SVTOOLS_RTF_FTNNGANADA}, RTF_FTNNGANADA}, -{{OOO_STRING_SVTOOLS_RTF_FTNNGBNUM}, RTF_FTNNGBNUM}, -{{OOO_STRING_SVTOOLS_RTF_FTNNGBNUMD}, RTF_FTNNGBNUMD}, -{{OOO_STRING_SVTOOLS_RTF_FTNNGBNUMK}, RTF_FTNNGBNUMK}, -{{OOO_STRING_SVTOOLS_RTF_FTNNGBNUML}, RTF_FTNNGBNUML}, -{{OOO_STRING_SVTOOLS_RTF_FTNNZODIAC}, RTF_FTNNZODIAC}, -{{OOO_STRING_SVTOOLS_RTF_FTNNZODIACD}, RTF_FTNNZODIACD}, -{{OOO_STRING_SVTOOLS_RTF_FTNNZODIACL}, RTF_FTNNZODIACL}, -{{OOO_STRING_SVTOOLS_RTF_G}, RTF_G}, -{{OOO_STRING_SVTOOLS_RTF_GCW}, RTF_GCW}, -{{OOO_STRING_SVTOOLS_RTF_GRIDTBL}, RTF_GRIDTBL}, -{{OOO_STRING_SVTOOLS_RTF_HIGHLIGHT}, RTF_HIGHLIGHT}, -{{OOO_STRING_SVTOOLS_RTF_HLFR}, RTF_HLFR}, -{{OOO_STRING_SVTOOLS_RTF_HLINKBASE}, RTF_HLINKBASE}, -{{OOO_STRING_SVTOOLS_RTF_HLLOC}, RTF_HLLOC}, -{{OOO_STRING_SVTOOLS_RTF_HLSRC}, RTF_HLSRC}, -{{OOO_STRING_SVTOOLS_RTF_ILVL}, RTF_ILVL}, -{{OOO_STRING_SVTOOLS_RTF_IMPR}, RTF_IMPR}, -{{OOO_STRING_SVTOOLS_RTF_JPEGBLIP}, RTF_JPEGBLIP}, -{{OOO_STRING_SVTOOLS_RTF_LEVELFOLLOW}, RTF_LEVELFOLLOW}, -{{OOO_STRING_SVTOOLS_RTF_LEVELINDENT}, RTF_LEVELINDENT}, -{{OOO_STRING_SVTOOLS_RTF_LEVELJC}, RTF_LEVELJC}, -{{OOO_STRING_SVTOOLS_RTF_LEVELLEGAL}, RTF_LEVELLEGAL}, -{{OOO_STRING_SVTOOLS_RTF_LEVELNFC}, RTF_LEVELNFC}, +{{OOO_STRING_SVTOOLS_RTF_BRDRDASHSM}, RTF_BRDRDASHSM}, +{{OOO_STRING_SVTOOLS_RTF_BRDREMBOSS}, RTF_BRDREMBOSS}, +{{OOO_STRING_SVTOOLS_RTF_BRDRENGRAVE}, RTF_BRDRENGRAVE}, +{{OOO_STRING_SVTOOLS_RTF_BRDRFRAME}, RTF_BRDRFRAME}, +{{OOO_STRING_SVTOOLS_RTF_BRDRTHTNLG}, RTF_BRDRTHTNLG}, +{{OOO_STRING_SVTOOLS_RTF_BRDRTHTNMG}, RTF_BRDRTHTNMG}, +{{OOO_STRING_SVTOOLS_RTF_BRDRTHTNSG}, RTF_BRDRTHTNSG}, +{{OOO_STRING_SVTOOLS_RTF_BRDRTNTHLG}, RTF_BRDRTNTHLG}, +{{OOO_STRING_SVTOOLS_RTF_BRDRTNTHMG}, RTF_BRDRTNTHMG}, +{{OOO_STRING_SVTOOLS_RTF_BRDRTNTHSG}, RTF_BRDRTNTHSG}, +{{OOO_STRING_SVTOOLS_RTF_BRDRTNTHTNLG}, RTF_BRDRTNTHTNLG}, +{{OOO_STRING_SVTOOLS_RTF_BRDRTNTHTNMG}, RTF_BRDRTNTHTNMG}, +{{OOO_STRING_SVTOOLS_RTF_BRDRTNTHTNSG}, RTF_BRDRTNTHTNSG}, +{{OOO_STRING_SVTOOLS_RTF_BRDRTRIPLE}, RTF_BRDRTRIPLE}, +{{OOO_STRING_SVTOOLS_RTF_BRDRWAVY}, RTF_BRDRWAVY}, +{{OOO_STRING_SVTOOLS_RTF_BRDRWAVYDB}, RTF_BRDRWAVYDB}, +{{OOO_STRING_SVTOOLS_RTF_CATEGORY}, RTF_CATEGORY}, +{{OOO_STRING_SVTOOLS_RTF_CGRID}, RTF_CGRID}, +{{OOO_STRING_SVTOOLS_RTF_CHARSCALEX}, RTF_CHARSCALEX}, +{{OOO_STRING_SVTOOLS_RTF_CHBGBDIAG}, RTF_CHBGBDIAG}, +{{OOO_STRING_SVTOOLS_RTF_CHBGCROSS}, RTF_CHBGCROSS}, +{{OOO_STRING_SVTOOLS_RTF_CHBGDCROSS}, RTF_CHBGDCROSS}, +{{OOO_STRING_SVTOOLS_RTF_CHBGDKBDIAG}, RTF_CHBGDKBDIAG}, +{{OOO_STRING_SVTOOLS_RTF_CHBGDKCROSS}, RTF_CHBGDKCROSS}, +{{OOO_STRING_SVTOOLS_RTF_CHBGDKDCROSS}, RTF_CHBGDKDCROSS}, +{{OOO_STRING_SVTOOLS_RTF_CHBGDKFDIAG}, RTF_CHBGDKFDIAG}, +{{OOO_STRING_SVTOOLS_RTF_CHBGDKHORIZ}, RTF_CHBGDKHORIZ}, +{{OOO_STRING_SVTOOLS_RTF_CHBGDKVERT}, RTF_CHBGDKVERT}, +{{OOO_STRING_SVTOOLS_RTF_CHBGFDIAG}, RTF_CHBGFDIAG}, +{{OOO_STRING_SVTOOLS_RTF_CHBGHORIZ}, RTF_CHBGHORIZ}, +{{OOO_STRING_SVTOOLS_RTF_CHBGVERT}, RTF_CHBGVERT}, +{{OOO_STRING_SVTOOLS_RTF_CHBRDR}, RTF_CHBRDR}, +{{OOO_STRING_SVTOOLS_RTF_CHCBPAT}, RTF_CHCBPAT}, +{{OOO_STRING_SVTOOLS_RTF_CHCFPAT}, RTF_CHCFPAT}, +{{OOO_STRING_SVTOOLS_RTF_CHSHDNG}, RTF_CHSHDNG}, +{{OOO_STRING_SVTOOLS_RTF_CLTXLRTB}, RTF_CLTXLRTB}, +{{OOO_STRING_SVTOOLS_RTF_CLTXTBRL}, RTF_CLTXTBRL}, +{{OOO_STRING_SVTOOLS_RTF_CLVERTALB}, RTF_CLVERTALB}, +{{OOO_STRING_SVTOOLS_RTF_CLVERTALC}, RTF_CLVERTALC}, +{{OOO_STRING_SVTOOLS_RTF_CLVERTALT}, RTF_CLVERTALT}, +{{OOO_STRING_SVTOOLS_RTF_CLVMGF}, RTF_CLVMGF}, +{{OOO_STRING_SVTOOLS_RTF_CLVMRG}, RTF_CLVMRG}, +{{OOO_STRING_SVTOOLS_RTF_CLTXTBRLV}, RTF_CLTXTBRLV}, +{{OOO_STRING_SVTOOLS_RTF_CLTXBTLR}, RTF_CLTXBTLR}, +{{OOO_STRING_SVTOOLS_RTF_CLTXLRTBV}, RTF_CLTXLRTBV}, +{{OOO_STRING_SVTOOLS_RTF_COMPANY}, RTF_COMPANY}, +{{OOO_STRING_SVTOOLS_RTF_CRAUTH}, RTF_CRAUTH}, +{{OOO_STRING_SVTOOLS_RTF_CRDATE}, RTF_CRDATE}, +{{OOO_STRING_SVTOOLS_RTF_DATE}, RTF_DATE}, +{{OOO_STRING_SVTOOLS_RTF_DEFLANGFE}, RTF_DEFLANGFE}, +{{OOO_STRING_SVTOOLS_RTF_DFRAUTH}, RTF_DFRAUTH}, +{{OOO_STRING_SVTOOLS_RTF_DFRDATE}, RTF_DFRDATE}, +{{OOO_STRING_SVTOOLS_RTF_DFRSTART}, RTF_DFRSTART}, +{{OOO_STRING_SVTOOLS_RTF_DFRSTOP}, RTF_DFRSTOP}, +{{OOO_STRING_SVTOOLS_RTF_DFRXST}, RTF_DFRXST}, +{{OOO_STRING_SVTOOLS_RTF_DGMARGIN}, RTF_DGMARGIN}, +{{OOO_STRING_SVTOOLS_RTF_DNTBLNSBDB}, RTF_DNTBLNSBDB}, +{{OOO_STRING_SVTOOLS_RTF_DOCTYPE}, RTF_DOCTYPE}, +{{OOO_STRING_SVTOOLS_RTF_DOCVAR}, RTF_DOCVAR}, +{{OOO_STRING_SVTOOLS_RTF_DPCODESCENT}, RTF_DPCODESCENT}, +{{OOO_STRING_SVTOOLS_RTF_EMBO}, RTF_EMBO}, +{{OOO_STRING_SVTOOLS_RTF_EMFBLIP}, RTF_EMFBLIP}, +{{OOO_STRING_SVTOOLS_RTF_EXPSHRTN}, RTF_EXPSHRTN}, +{{OOO_STRING_SVTOOLS_RTF_FAAUTO}, RTF_FAAUTO}, +{{OOO_STRING_SVTOOLS_RTF_FBIAS}, RTF_FBIAS}, +{{OOO_STRING_SVTOOLS_RTF_FFDEFRES}, RTF_FFDEFRES}, +{{OOO_STRING_SVTOOLS_RTF_FFDEFTEXT}, RTF_FFDEFTEXT}, +{{OOO_STRING_SVTOOLS_RTF_FFENTRYMCR}, RTF_FFENTRYMCR}, +{{OOO_STRING_SVTOOLS_RTF_FFEXITMCR}, RTF_FFEXITMCR}, +{{OOO_STRING_SVTOOLS_RTF_FFFORMAT}, RTF_FFFORMAT}, +{{OOO_STRING_SVTOOLS_RTF_FFHASLISTBOX}, RTF_FFHASLISTBOX}, +{{OOO_STRING_SVTOOLS_RTF_FFHELPTEXT}, RTF_FFHELPTEXT}, +{{OOO_STRING_SVTOOLS_RTF_FFHPS}, RTF_FFHPS}, +{{OOO_STRING_SVTOOLS_RTF_FFL}, RTF_FFL}, +{{OOO_STRING_SVTOOLS_RTF_FFMAXLEN}, RTF_FFMAXLEN}, +{{OOO_STRING_SVTOOLS_RTF_FFNAME}, RTF_FFNAME}, +{{OOO_STRING_SVTOOLS_RTF_FFOWNHELP}, RTF_FFOWNHELP}, +{{OOO_STRING_SVTOOLS_RTF_FFOWNSTAT}, RTF_FFOWNSTAT}, +{{OOO_STRING_SVTOOLS_RTF_FFPROT}, RTF_FFPROT}, +{{OOO_STRING_SVTOOLS_RTF_FFRECALC}, RTF_FFRECALC}, +{{OOO_STRING_SVTOOLS_RTF_FFRES}, RTF_FFRES}, +{{OOO_STRING_SVTOOLS_RTF_FFSIZE}, RTF_FFSIZE}, +{{OOO_STRING_SVTOOLS_RTF_FFSTATTEXT}, RTF_FFSTATTEXT}, +{{OOO_STRING_SVTOOLS_RTF_FFTYPE}, RTF_FFTYPE}, +{{OOO_STRING_SVTOOLS_RTF_FFTYPETXT}, RTF_FFTYPETXT}, +{{OOO_STRING_SVTOOLS_RTF_FLDTYPE}, RTF_FLDTYPE}, +{{OOO_STRING_SVTOOLS_RTF_FNAME}, RTF_FNAME}, +{{OOO_STRING_SVTOOLS_RTF_FORMFIELD}, RTF_FORMFIELD}, +{{OOO_STRING_SVTOOLS_RTF_FROMTEXT}, RTF_FROMTEXT}, +{{OOO_STRING_SVTOOLS_RTF_FTNNCHOSUNG}, RTF_FTNNCHOSUNG}, +{{OOO_STRING_SVTOOLS_RTF_FTNNCNUM}, RTF_FTNNCNUM}, +{{OOO_STRING_SVTOOLS_RTF_FTNNDBAR}, RTF_FTNNDBAR}, +{{OOO_STRING_SVTOOLS_RTF_FTNNDBNUM}, RTF_FTNNDBNUM}, +{{OOO_STRING_SVTOOLS_RTF_FTNNDBNUMD}, RTF_FTNNDBNUMD}, +{{OOO_STRING_SVTOOLS_RTF_FTNNDBNUMK}, RTF_FTNNDBNUMK}, +{{OOO_STRING_SVTOOLS_RTF_FTNNDBNUMT}, RTF_FTNNDBNUMT}, +{{OOO_STRING_SVTOOLS_RTF_FTNNGANADA}, RTF_FTNNGANADA}, +{{OOO_STRING_SVTOOLS_RTF_FTNNGBNUM}, RTF_FTNNGBNUM}, +{{OOO_STRING_SVTOOLS_RTF_FTNNGBNUMD}, RTF_FTNNGBNUMD}, +{{OOO_STRING_SVTOOLS_RTF_FTNNGBNUMK}, RTF_FTNNGBNUMK}, +{{OOO_STRING_SVTOOLS_RTF_FTNNGBNUML}, RTF_FTNNGBNUML}, +{{OOO_STRING_SVTOOLS_RTF_FTNNZODIAC}, RTF_FTNNZODIAC}, +{{OOO_STRING_SVTOOLS_RTF_FTNNZODIACD}, RTF_FTNNZODIACD}, +{{OOO_STRING_SVTOOLS_RTF_FTNNZODIACL}, RTF_FTNNZODIACL}, +{{OOO_STRING_SVTOOLS_RTF_G}, RTF_G}, +{{OOO_STRING_SVTOOLS_RTF_GCW}, RTF_GCW}, +{{OOO_STRING_SVTOOLS_RTF_GRIDTBL}, RTF_GRIDTBL}, +{{OOO_STRING_SVTOOLS_RTF_HIGHLIGHT}, RTF_HIGHLIGHT}, +{{OOO_STRING_SVTOOLS_RTF_HLFR}, RTF_HLFR}, +{{OOO_STRING_SVTOOLS_RTF_HLINKBASE}, RTF_HLINKBASE}, +{{OOO_STRING_SVTOOLS_RTF_HLLOC}, RTF_HLLOC}, +{{OOO_STRING_SVTOOLS_RTF_HLSRC}, RTF_HLSRC}, +{{OOO_STRING_SVTOOLS_RTF_ILVL}, RTF_ILVL}, +{{OOO_STRING_SVTOOLS_RTF_IMPR}, RTF_IMPR}, +{{OOO_STRING_SVTOOLS_RTF_JPEGBLIP}, RTF_JPEGBLIP}, +{{OOO_STRING_SVTOOLS_RTF_LEVELFOLLOW}, RTF_LEVELFOLLOW}, +{{OOO_STRING_SVTOOLS_RTF_LEVELINDENT}, RTF_LEVELINDENT}, +{{OOO_STRING_SVTOOLS_RTF_LEVELJC}, RTF_LEVELJC}, +{{OOO_STRING_SVTOOLS_RTF_LEVELLEGAL}, RTF_LEVELLEGAL}, +{{OOO_STRING_SVTOOLS_RTF_LEVELNFC}, RTF_LEVELNFC}, {{OOO_STRING_SVTOOLS_RTF_LEVELNORESTART},RTF_LEVELNORESTART}, -{{OOO_STRING_SVTOOLS_RTF_LEVELNUMBERS}, RTF_LEVELNUMBERS}, -{{OOO_STRING_SVTOOLS_RTF_LEVELOLD}, RTF_LEVELOLD}, -{{OOO_STRING_SVTOOLS_RTF_LEVELPREV}, RTF_LEVELPREV}, +{{OOO_STRING_SVTOOLS_RTF_LEVELNUMBERS}, RTF_LEVELNUMBERS}, +{{OOO_STRING_SVTOOLS_RTF_LEVELOLD}, RTF_LEVELOLD}, +{{OOO_STRING_SVTOOLS_RTF_LEVELPREV}, RTF_LEVELPREV}, {{OOO_STRING_SVTOOLS_RTF_LEVELPREVSPACE},RTF_LEVELPREVSPACE}, -{{OOO_STRING_SVTOOLS_RTF_LEVELSPACE}, RTF_LEVELSPACE}, -{{OOO_STRING_SVTOOLS_RTF_LEVELSTARTAT}, RTF_LEVELSTARTAT}, -{{OOO_STRING_SVTOOLS_RTF_LEVELTEXT}, RTF_LEVELTEXT}, -{{OOO_STRING_SVTOOLS_RTF_LINKVAL}, RTF_LINKVAL}, -{{OOO_STRING_SVTOOLS_RTF_LIST}, RTF_LIST}, -{{OOO_STRING_SVTOOLS_RTF_LISTID}, RTF_LISTID}, +{{OOO_STRING_SVTOOLS_RTF_LEVELSPACE}, RTF_LEVELSPACE}, +{{OOO_STRING_SVTOOLS_RTF_LEVELSTARTAT}, RTF_LEVELSTARTAT}, +{{OOO_STRING_SVTOOLS_RTF_LEVELTEXT}, RTF_LEVELTEXT}, +{{OOO_STRING_SVTOOLS_RTF_LINKVAL}, RTF_LINKVAL}, +{{OOO_STRING_SVTOOLS_RTF_LIST}, RTF_LIST}, +{{OOO_STRING_SVTOOLS_RTF_LISTID}, RTF_LISTID}, {{OOO_STRING_SVTOOLS_RTF_LISTLEVEL}, RTF_LISTLEVEL}, -{{OOO_STRING_SVTOOLS_RTF_LISTNAME}, RTF_LISTNAME}, -{{OOO_STRING_SVTOOLS_RTF_LISTOVERRIDE}, RTF_LISTOVERRIDE}, -{{OOO_STRING_SVTOOLS_RTF_LISTOVERRIDECOUNT}, RTF_LISTOVERRIDECOUNT}, -{{OOO_STRING_SVTOOLS_RTF_LISTOVERRIDEFORMAT}, RTF_LISTOVERRIDEFORMAT}, -{{OOO_STRING_SVTOOLS_RTF_LISTOVERRIDESTART}, RTF_LISTOVERRIDESTART}, -{{OOO_STRING_SVTOOLS_RTF_LISTOVERRIDETABLE}, RTF_LISTOVERRIDETABLE}, +{{OOO_STRING_SVTOOLS_RTF_LISTNAME}, RTF_LISTNAME}, +{{OOO_STRING_SVTOOLS_RTF_LISTOVERRIDE}, RTF_LISTOVERRIDE}, +{{OOO_STRING_SVTOOLS_RTF_LISTOVERRIDECOUNT}, RTF_LISTOVERRIDECOUNT}, +{{OOO_STRING_SVTOOLS_RTF_LISTOVERRIDEFORMAT}, RTF_LISTOVERRIDEFORMAT}, +{{OOO_STRING_SVTOOLS_RTF_LISTOVERRIDESTART}, RTF_LISTOVERRIDESTART}, +{{OOO_STRING_SVTOOLS_RTF_LISTOVERRIDETABLE}, RTF_LISTOVERRIDETABLE}, {{OOO_STRING_SVTOOLS_RTF_LISTRESTARTHDN},RTF_LISTRESTARTHDN}, -{{OOO_STRING_SVTOOLS_RTF_LISTSIMPLE}, RTF_LISTSIMPLE}, -{{OOO_STRING_SVTOOLS_RTF_LISTTABLE}, RTF_LISTTABLE}, +{{OOO_STRING_SVTOOLS_RTF_LISTSIMPLE}, RTF_LISTSIMPLE}, +{{OOO_STRING_SVTOOLS_RTF_LISTTABLE}, RTF_LISTTABLE}, {{OOO_STRING_SVTOOLS_RTF_LISTTEMPLATEID},RTF_LISTTEMPLATEID}, -{{OOO_STRING_SVTOOLS_RTF_LISTTEXT}, RTF_LISTTEXT}, -{{OOO_STRING_SVTOOLS_RTF_LS}, RTF_LS}, -{{OOO_STRING_SVTOOLS_RTF_LYTEXCTTP}, RTF_LYTEXCTTP}, -{{OOO_STRING_SVTOOLS_RTF_LYTPRTMET}, RTF_LYTPRTMET}, -{{OOO_STRING_SVTOOLS_RTF_MANAGER}, RTF_MANAGER}, -{{OOO_STRING_SVTOOLS_RTF_MSMCAP}, RTF_MSMCAP}, -{{OOO_STRING_SVTOOLS_RTF_NOFCHARSWS}, RTF_NOFCHARSWS}, -{{OOO_STRING_SVTOOLS_RTF_NOLEAD}, RTF_NOLEAD}, -{{OOO_STRING_SVTOOLS_RTF_NONSHPPICT}, RTF_NONSHPPICT}, -{{OOO_STRING_SVTOOLS_RTF_NOSECTEXPAND}, RTF_NOSECTEXPAND}, +{{OOO_STRING_SVTOOLS_RTF_LISTTEXT}, RTF_LISTTEXT}, +{{OOO_STRING_SVTOOLS_RTF_LS}, RTF_LS}, +{{OOO_STRING_SVTOOLS_RTF_LYTEXCTTP}, RTF_LYTEXCTTP}, +{{OOO_STRING_SVTOOLS_RTF_LYTPRTMET}, RTF_LYTPRTMET}, +{{OOO_STRING_SVTOOLS_RTF_MANAGER}, RTF_MANAGER}, +{{OOO_STRING_SVTOOLS_RTF_MSMCAP}, RTF_MSMCAP}, +{{OOO_STRING_SVTOOLS_RTF_NOFCHARSWS}, RTF_NOFCHARSWS}, +{{OOO_STRING_SVTOOLS_RTF_NOLEAD}, RTF_NOLEAD}, +{{OOO_STRING_SVTOOLS_RTF_NONSHPPICT}, RTF_NONSHPPICT}, +{{OOO_STRING_SVTOOLS_RTF_NOSECTEXPAND}, RTF_NOSECTEXPAND}, {{OOO_STRING_SVTOOLS_RTF_NOSNAPLINEGRID},RTF_NOSNAPLINEGRID}, -{{OOO_STRING_SVTOOLS_RTF_NOSPACEFORUL}, RTF_NOSPACEFORUL}, -{{OOO_STRING_SVTOOLS_RTF_NOULTRLSPC}, RTF_NOULTRLSPC}, -{{OOO_STRING_SVTOOLS_RTF_NOXLATTOYEN}, RTF_NOXLATTOYEN}, -{{OOO_STRING_SVTOOLS_RTF_OBJATTPH}, RTF_OBJATTPH}, -{{OOO_STRING_SVTOOLS_RTF_OBJHTML}, RTF_OBJHTML}, -{{OOO_STRING_SVTOOLS_RTF_OBJOCX}, RTF_OBJOCX}, -{{OOO_STRING_SVTOOLS_RTF_OLDLINEWRAP}, RTF_OLDLINEWRAP}, -{{OOO_STRING_SVTOOLS_RTF_OUTLINELEVEL}, RTF_OUTLINELEVEL}, -{{OOO_STRING_SVTOOLS_RTF_OVERLAY}, RTF_OVERLAY}, -{{OOO_STRING_SVTOOLS_RTF_PANOSE}, RTF_PANOSE}, -{{OOO_STRING_SVTOOLS_RTF_PGBRDRB}, RTF_PGBRDRB}, -{{OOO_STRING_SVTOOLS_RTF_PGBRDRFOOT}, RTF_PGBRDRFOOT}, -{{OOO_STRING_SVTOOLS_RTF_PGBRDRHEAD}, RTF_PGBRDRHEAD}, -{{OOO_STRING_SVTOOLS_RTF_PGBRDRL}, RTF_PGBRDRL}, -{{OOO_STRING_SVTOOLS_RTF_PGBRDROPT}, RTF_PGBRDROPT}, -{{OOO_STRING_SVTOOLS_RTF_PGBRDRR}, RTF_PGBRDRR}, -{{OOO_STRING_SVTOOLS_RTF_PGBRDRSNAP}, RTF_PGBRDRSNAP}, -{{OOO_STRING_SVTOOLS_RTF_PGBRDRT}, RTF_PGBRDRT}, -{{OOO_STRING_SVTOOLS_RTF_PGNCHOSUNG}, RTF_PGNCHOSUNG}, -{{OOO_STRING_SVTOOLS_RTF_PGNCNUM}, RTF_PGNCNUM}, -{{OOO_STRING_SVTOOLS_RTF_PGNDBNUMK}, RTF_PGNDBNUMK}, -{{OOO_STRING_SVTOOLS_RTF_PGNDBNUMT}, RTF_PGNDBNUMT}, -{{OOO_STRING_SVTOOLS_RTF_PGNGANADA}, RTF_PGNGANADA}, -{{OOO_STRING_SVTOOLS_RTF_PGNGBNUM}, RTF_PGNGBNUM}, -{{OOO_STRING_SVTOOLS_RTF_PGNGBNUMD}, RTF_PGNGBNUMD}, -{{OOO_STRING_SVTOOLS_RTF_PGNGBNUMK}, RTF_PGNGBNUMK}, -{{OOO_STRING_SVTOOLS_RTF_PGNGBNUML}, RTF_PGNGBNUML}, -{{OOO_STRING_SVTOOLS_RTF_PGNZODIAC}, RTF_PGNZODIAC}, -{{OOO_STRING_SVTOOLS_RTF_PGNZODIACD}, RTF_PGNZODIACD}, -{{OOO_STRING_SVTOOLS_RTF_PGNZODIACL}, RTF_PGNZODIACL}, -{{OOO_STRING_SVTOOLS_RTF_PICPROP}, RTF_PICPROP}, -{{OOO_STRING_SVTOOLS_RTF_PNAIUEO}, RTF_PNAIUEO}, -{{OOO_STRING_SVTOOLS_RTF_PNAIUEOD}, RTF_PNAIUEOD}, -{{OOO_STRING_SVTOOLS_RTF_PNCHOSUNG}, RTF_PNCHOSUNG}, -{{OOO_STRING_SVTOOLS_RTF_PNDBNUMD}, RTF_PNDBNUMD}, -{{OOO_STRING_SVTOOLS_RTF_PNDBNUMK}, RTF_PNDBNUMK}, -{{OOO_STRING_SVTOOLS_RTF_PNDBNUML}, RTF_PNDBNUML}, -{{OOO_STRING_SVTOOLS_RTF_PNDBNUMT}, RTF_PNDBNUMT}, -{{OOO_STRING_SVTOOLS_RTF_PNGANADA}, RTF_PNGANADA}, -{{OOO_STRING_SVTOOLS_RTF_PNGBLIP}, RTF_PNGBLIP}, -{{OOO_STRING_SVTOOLS_RTF_PNGBNUM}, RTF_PNGBNUM}, -{{OOO_STRING_SVTOOLS_RTF_PNGBNUMD}, RTF_PNGBNUMD}, -{{OOO_STRING_SVTOOLS_RTF_PNGBNUMK}, RTF_PNGBNUMK}, -{{OOO_STRING_SVTOOLS_RTF_PNGBNUML}, RTF_PNGBNUML}, -{{OOO_STRING_SVTOOLS_RTF_PNRAUTH}, RTF_PNRAUTH}, -{{OOO_STRING_SVTOOLS_RTF_PNRDATE}, RTF_PNRDATE}, -{{OOO_STRING_SVTOOLS_RTF_PNRNFC}, RTF_PNRNFC}, -{{OOO_STRING_SVTOOLS_RTF_PNRNOT}, RTF_PNRNOT}, -{{OOO_STRING_SVTOOLS_RTF_PNRPNBR}, RTF_PNRPNBR}, -{{OOO_STRING_SVTOOLS_RTF_PNRRGB}, RTF_PNRRGB}, -{{OOO_STRING_SVTOOLS_RTF_PNRSTART}, RTF_PNRSTART}, -{{OOO_STRING_SVTOOLS_RTF_PNRSTOP}, RTF_PNRSTOP}, -{{OOO_STRING_SVTOOLS_RTF_PNRXST}, RTF_PNRXST}, -{{OOO_STRING_SVTOOLS_RTF_PNZODIAC}, RTF_PNZODIAC}, -{{OOO_STRING_SVTOOLS_RTF_PNZODIACD}, RTF_PNZODIACD}, -{{OOO_STRING_SVTOOLS_RTF_PNZODIACL}, RTF_PNZODIACL}, -{{OOO_STRING_SVTOOLS_RTF_LFOLEVEL}, RTF_LFOLEVEL}, -{{OOO_STRING_SVTOOLS_RTF_POSYIN}, RTF_POSYIN}, -{{OOO_STRING_SVTOOLS_RTF_POSYOUT}, RTF_POSYOUT}, -{{OOO_STRING_SVTOOLS_RTF_PRIVATE}, RTF_PRIVATE}, -{{OOO_STRING_SVTOOLS_RTF_PROPNAME}, RTF_PROPNAME}, -{{OOO_STRING_SVTOOLS_RTF_PROPTYPE}, RTF_PROPTYPE}, -{{OOO_STRING_SVTOOLS_RTF_REVAUTHDEL}, RTF_REVAUTHDEL}, -{{OOO_STRING_SVTOOLS_RTF_REVDTTMDEL}, RTF_REVDTTMDEL}, -{{OOO_STRING_SVTOOLS_RTF_SAUTOUPD}, RTF_SAUTOUPD}, -{{OOO_STRING_SVTOOLS_RTF_SECTDEFAULTCL}, RTF_SECTDEFAULTCL}, -{{OOO_STRING_SVTOOLS_RTF_SECTEXPAND}, RTF_SECTEXPAND}, -{{OOO_STRING_SVTOOLS_RTF_SECTLINEGRID}, RTF_SECTLINEGRID}, -{{OOO_STRING_SVTOOLS_RTF_SECTSPECIFYCL}, RTF_SECTSPECIFYCL}, -{{OOO_STRING_SVTOOLS_RTF_SECTSPECIFYL}, RTF_SECTSPECIFYL}, -{{OOO_STRING_SVTOOLS_RTF_SHIDDEN}, RTF_SHIDDEN}, -{{OOO_STRING_SVTOOLS_RTF_SHPBOTTOM}, RTF_SHPBOTTOM}, -{{OOO_STRING_SVTOOLS_RTF_SHPBXCOLUMN}, RTF_SHPBXCOLUMN}, -{{OOO_STRING_SVTOOLS_RTF_SHPBXMARGIN}, RTF_SHPBXMARGIN}, -{{OOO_STRING_SVTOOLS_RTF_SHPBXPAGE}, RTF_SHPBXPAGE}, -{{OOO_STRING_SVTOOLS_RTF_SHPBYMARGIN}, RTF_SHPBYMARGIN}, -{{OOO_STRING_SVTOOLS_RTF_SHPBYPAGE}, RTF_SHPBYPAGE}, -{{OOO_STRING_SVTOOLS_RTF_SHPBYPARA}, RTF_SHPBYPARA}, -{{OOO_STRING_SVTOOLS_RTF_SHPFBLWTXT}, RTF_SHPFBLWTXT}, -{{OOO_STRING_SVTOOLS_RTF_SHPFHDR}, RTF_SHPFHDR}, -{{OOO_STRING_SVTOOLS_RTF_SHPGRP}, RTF_SHPGRP}, -{{OOO_STRING_SVTOOLS_RTF_SHPLEFT}, RTF_SHPLEFT}, -{{OOO_STRING_SVTOOLS_RTF_SHPLID}, RTF_SHPLID}, -{{OOO_STRING_SVTOOLS_RTF_SHPLOCKANCHOR}, RTF_SHPLOCKANCHOR}, -{{OOO_STRING_SVTOOLS_RTF_SHPPICT}, RTF_SHPPICT}, -{{OOO_STRING_SVTOOLS_RTF_SHPRIGHT}, RTF_SHPRIGHT}, -{{OOO_STRING_SVTOOLS_RTF_SHPRSLT}, RTF_SHPRSLT}, -{{OOO_STRING_SVTOOLS_RTF_SHPTOP}, RTF_SHPTOP}, -{{OOO_STRING_SVTOOLS_RTF_SHPTXT}, RTF_SHPTXT}, -{{OOO_STRING_SVTOOLS_RTF_SHPWRK}, RTF_SHPWRK}, -{{OOO_STRING_SVTOOLS_RTF_SHPWR}, RTF_SHPWR}, -{{OOO_STRING_SVTOOLS_RTF_SHPZ}, RTF_SHPZ}, -{{OOO_STRING_SVTOOLS_RTF_SPRSBSP}, RTF_SPRSBSP}, -{{OOO_STRING_SVTOOLS_RTF_SPRSLNSP}, RTF_SPRSLNSP}, -{{OOO_STRING_SVTOOLS_RTF_SPRSTSM}, RTF_SPRSTSM}, -{{OOO_STRING_SVTOOLS_RTF_STATICVAL}, RTF_STATICVAL}, -{{OOO_STRING_SVTOOLS_RTF_STEXTFLOW}, RTF_STEXTFLOW}, -{{OOO_STRING_SVTOOLS_RTF_STRIKED}, RTF_STRIKED}, -{{OOO_STRING_SVTOOLS_RTF_SUBFONTBYSIZE}, RTF_SUBFONTBYSIZE}, -{{OOO_STRING_SVTOOLS_RTF_TCELLD}, RTF_TCELLD}, -{{OOO_STRING_SVTOOLS_RTF_TIME}, RTF_TIME}, -{{OOO_STRING_SVTOOLS_RTF_TRUNCATEFONTHEIGHT}, RTF_TRUNCATEFONTHEIGHT}, -{{OOO_STRING_SVTOOLS_RTF_UC}, RTF_UC}, -{{OOO_STRING_SVTOOLS_RTF_UD}, RTF_UD}, -{{OOO_STRING_SVTOOLS_RTF_ULDASH}, RTF_ULDASH}, -{{OOO_STRING_SVTOOLS_RTF_ULDASHD}, RTF_ULDASHD}, -{{OOO_STRING_SVTOOLS_RTF_ULDASHDD}, RTF_ULDASHDD}, -{{OOO_STRING_SVTOOLS_RTF_ULTH}, RTF_ULTH}, -{{OOO_STRING_SVTOOLS_RTF_ULWAVE}, RTF_ULWAVE}, -{{OOO_STRING_SVTOOLS_RTF_ULC}, RTF_ULC}, -{{OOO_STRING_SVTOOLS_RTF_U}, RTF_U}, -{{OOO_STRING_SVTOOLS_RTF_UPR}, RTF_UPR}, -{{OOO_STRING_SVTOOLS_RTF_USERPROPS}, RTF_USERPROPS}, -{{OOO_STRING_SVTOOLS_RTF_VIEWKIND}, RTF_VIEWKIND}, -{{OOO_STRING_SVTOOLS_RTF_VIEWSCALE}, RTF_VIEWSCALE}, -{{OOO_STRING_SVTOOLS_RTF_VIEWZK}, RTF_VIEWZK}, -{{OOO_STRING_SVTOOLS_RTF_WIDCTLPAR}, RTF_WIDCTLPAR}, -{{OOO_STRING_SVTOOLS_RTF_WINDOWCAPTION}, RTF_WINDOWCAPTION}, -{{OOO_STRING_SVTOOLS_RTF_WPEQN}, RTF_WPEQN}, -{{OOO_STRING_SVTOOLS_RTF_WPJST}, RTF_WPJST}, -{{OOO_STRING_SVTOOLS_RTF_WPSP}, RTF_WPSP}, -{{OOO_STRING_SVTOOLS_RTF_YXE}, RTF_YXE}, +{{OOO_STRING_SVTOOLS_RTF_NOSPACEFORUL}, RTF_NOSPACEFORUL}, +{{OOO_STRING_SVTOOLS_RTF_NOULTRLSPC}, RTF_NOULTRLSPC}, +{{OOO_STRING_SVTOOLS_RTF_NOXLATTOYEN}, RTF_NOXLATTOYEN}, +{{OOO_STRING_SVTOOLS_RTF_OBJATTPH}, RTF_OBJATTPH}, +{{OOO_STRING_SVTOOLS_RTF_OBJHTML}, RTF_OBJHTML}, +{{OOO_STRING_SVTOOLS_RTF_OBJOCX}, RTF_OBJOCX}, +{{OOO_STRING_SVTOOLS_RTF_OLDLINEWRAP}, RTF_OLDLINEWRAP}, +{{OOO_STRING_SVTOOLS_RTF_OUTLINELEVEL}, RTF_OUTLINELEVEL}, +{{OOO_STRING_SVTOOLS_RTF_OVERLAY}, RTF_OVERLAY}, +{{OOO_STRING_SVTOOLS_RTF_PANOSE}, RTF_PANOSE}, +{{OOO_STRING_SVTOOLS_RTF_PGBRDRB}, RTF_PGBRDRB}, +{{OOO_STRING_SVTOOLS_RTF_PGBRDRFOOT}, RTF_PGBRDRFOOT}, +{{OOO_STRING_SVTOOLS_RTF_PGBRDRHEAD}, RTF_PGBRDRHEAD}, +{{OOO_STRING_SVTOOLS_RTF_PGBRDRL}, RTF_PGBRDRL}, +{{OOO_STRING_SVTOOLS_RTF_PGBRDROPT}, RTF_PGBRDROPT}, +{{OOO_STRING_SVTOOLS_RTF_PGBRDRR}, RTF_PGBRDRR}, +{{OOO_STRING_SVTOOLS_RTF_PGBRDRSNAP}, RTF_PGBRDRSNAP}, +{{OOO_STRING_SVTOOLS_RTF_PGBRDRT}, RTF_PGBRDRT}, +{{OOO_STRING_SVTOOLS_RTF_PGNCHOSUNG}, RTF_PGNCHOSUNG}, +{{OOO_STRING_SVTOOLS_RTF_PGNCNUM}, RTF_PGNCNUM}, +{{OOO_STRING_SVTOOLS_RTF_PGNDBNUMK}, RTF_PGNDBNUMK}, +{{OOO_STRING_SVTOOLS_RTF_PGNDBNUMT}, RTF_PGNDBNUMT}, +{{OOO_STRING_SVTOOLS_RTF_PGNGANADA}, RTF_PGNGANADA}, +{{OOO_STRING_SVTOOLS_RTF_PGNGBNUM}, RTF_PGNGBNUM}, +{{OOO_STRING_SVTOOLS_RTF_PGNGBNUMD}, RTF_PGNGBNUMD}, +{{OOO_STRING_SVTOOLS_RTF_PGNGBNUMK}, RTF_PGNGBNUMK}, +{{OOO_STRING_SVTOOLS_RTF_PGNGBNUML}, RTF_PGNGBNUML}, +{{OOO_STRING_SVTOOLS_RTF_PGNZODIAC}, RTF_PGNZODIAC}, +{{OOO_STRING_SVTOOLS_RTF_PGNZODIACD}, RTF_PGNZODIACD}, +{{OOO_STRING_SVTOOLS_RTF_PGNZODIACL}, RTF_PGNZODIACL}, +{{OOO_STRING_SVTOOLS_RTF_PICPROP}, RTF_PICPROP}, +{{OOO_STRING_SVTOOLS_RTF_PNAIUEO}, RTF_PNAIUEO}, +{{OOO_STRING_SVTOOLS_RTF_PNAIUEOD}, RTF_PNAIUEOD}, +{{OOO_STRING_SVTOOLS_RTF_PNCHOSUNG}, RTF_PNCHOSUNG}, +{{OOO_STRING_SVTOOLS_RTF_PNDBNUMD}, RTF_PNDBNUMD}, +{{OOO_STRING_SVTOOLS_RTF_PNDBNUMK}, RTF_PNDBNUMK}, +{{OOO_STRING_SVTOOLS_RTF_PNDBNUML}, RTF_PNDBNUML}, +{{OOO_STRING_SVTOOLS_RTF_PNDBNUMT}, RTF_PNDBNUMT}, +{{OOO_STRING_SVTOOLS_RTF_PNGANADA}, RTF_PNGANADA}, +{{OOO_STRING_SVTOOLS_RTF_PNGBLIP}, RTF_PNGBLIP}, +{{OOO_STRING_SVTOOLS_RTF_PNGBNUM}, RTF_PNGBNUM}, +{{OOO_STRING_SVTOOLS_RTF_PNGBNUMD}, RTF_PNGBNUMD}, +{{OOO_STRING_SVTOOLS_RTF_PNGBNUMK}, RTF_PNGBNUMK}, +{{OOO_STRING_SVTOOLS_RTF_PNGBNUML}, RTF_PNGBNUML}, +{{OOO_STRING_SVTOOLS_RTF_PNRAUTH}, RTF_PNRAUTH}, +{{OOO_STRING_SVTOOLS_RTF_PNRDATE}, RTF_PNRDATE}, +{{OOO_STRING_SVTOOLS_RTF_PNRNFC}, RTF_PNRNFC}, +{{OOO_STRING_SVTOOLS_RTF_PNRNOT}, RTF_PNRNOT}, +{{OOO_STRING_SVTOOLS_RTF_PNRPNBR}, RTF_PNRPNBR}, +{{OOO_STRING_SVTOOLS_RTF_PNRRGB}, RTF_PNRRGB}, +{{OOO_STRING_SVTOOLS_RTF_PNRSTART}, RTF_PNRSTART}, +{{OOO_STRING_SVTOOLS_RTF_PNRSTOP}, RTF_PNRSTOP}, +{{OOO_STRING_SVTOOLS_RTF_PNRXST}, RTF_PNRXST}, +{{OOO_STRING_SVTOOLS_RTF_PNZODIAC}, RTF_PNZODIAC}, +{{OOO_STRING_SVTOOLS_RTF_PNZODIACD}, RTF_PNZODIACD}, +{{OOO_STRING_SVTOOLS_RTF_PNZODIACL}, RTF_PNZODIACL}, +{{OOO_STRING_SVTOOLS_RTF_LFOLEVEL}, RTF_LFOLEVEL}, +{{OOO_STRING_SVTOOLS_RTF_POSYIN}, RTF_POSYIN}, +{{OOO_STRING_SVTOOLS_RTF_POSYOUT}, RTF_POSYOUT}, +{{OOO_STRING_SVTOOLS_RTF_PRIVATE}, RTF_PRIVATE}, +{{OOO_STRING_SVTOOLS_RTF_PROPNAME}, RTF_PROPNAME}, +{{OOO_STRING_SVTOOLS_RTF_PROPTYPE}, RTF_PROPTYPE}, +{{OOO_STRING_SVTOOLS_RTF_REVAUTHDEL}, RTF_REVAUTHDEL}, +{{OOO_STRING_SVTOOLS_RTF_REVDTTMDEL}, RTF_REVDTTMDEL}, +{{OOO_STRING_SVTOOLS_RTF_SAUTOUPD}, RTF_SAUTOUPD}, +{{OOO_STRING_SVTOOLS_RTF_SECTDEFAULTCL}, RTF_SECTDEFAULTCL}, +{{OOO_STRING_SVTOOLS_RTF_SECTEXPAND}, RTF_SECTEXPAND}, +{{OOO_STRING_SVTOOLS_RTF_SECTLINEGRID}, RTF_SECTLINEGRID}, +{{OOO_STRING_SVTOOLS_RTF_SECTSPECIFYCL}, RTF_SECTSPECIFYCL}, +{{OOO_STRING_SVTOOLS_RTF_SECTSPECIFYL}, RTF_SECTSPECIFYL}, +{{OOO_STRING_SVTOOLS_RTF_SHIDDEN}, RTF_SHIDDEN}, +{{OOO_STRING_SVTOOLS_RTF_SHPBOTTOM}, RTF_SHPBOTTOM}, +{{OOO_STRING_SVTOOLS_RTF_SHPBXCOLUMN}, RTF_SHPBXCOLUMN}, +{{OOO_STRING_SVTOOLS_RTF_SHPBXMARGIN}, RTF_SHPBXMARGIN}, +{{OOO_STRING_SVTOOLS_RTF_SHPBXPAGE}, RTF_SHPBXPAGE}, +{{OOO_STRING_SVTOOLS_RTF_SHPBYMARGIN}, RTF_SHPBYMARGIN}, +{{OOO_STRING_SVTOOLS_RTF_SHPBYPAGE}, RTF_SHPBYPAGE}, +{{OOO_STRING_SVTOOLS_RTF_SHPBYPARA}, RTF_SHPBYPARA}, +{{OOO_STRING_SVTOOLS_RTF_SHPFBLWTXT}, RTF_SHPFBLWTXT}, +{{OOO_STRING_SVTOOLS_RTF_SHPFHDR}, RTF_SHPFHDR}, +{{OOO_STRING_SVTOOLS_RTF_SHPGRP}, RTF_SHPGRP}, +{{OOO_STRING_SVTOOLS_RTF_SHPLEFT}, RTF_SHPLEFT}, +{{OOO_STRING_SVTOOLS_RTF_SHPLID}, RTF_SHPLID}, +{{OOO_STRING_SVTOOLS_RTF_SHPLOCKANCHOR}, RTF_SHPLOCKANCHOR}, +{{OOO_STRING_SVTOOLS_RTF_SHPPICT}, RTF_SHPPICT}, +{{OOO_STRING_SVTOOLS_RTF_SHPRIGHT}, RTF_SHPRIGHT}, +{{OOO_STRING_SVTOOLS_RTF_SHPRSLT}, RTF_SHPRSLT}, +{{OOO_STRING_SVTOOLS_RTF_SHPTOP}, RTF_SHPTOP}, +{{OOO_STRING_SVTOOLS_RTF_SHPTXT}, RTF_SHPTXT}, +{{OOO_STRING_SVTOOLS_RTF_SHPWRK}, RTF_SHPWRK}, +{{OOO_STRING_SVTOOLS_RTF_SHPWR}, RTF_SHPWR}, +{{OOO_STRING_SVTOOLS_RTF_SHPZ}, RTF_SHPZ}, +{{OOO_STRING_SVTOOLS_RTF_SPRSBSP}, RTF_SPRSBSP}, +{{OOO_STRING_SVTOOLS_RTF_SPRSLNSP}, RTF_SPRSLNSP}, +{{OOO_STRING_SVTOOLS_RTF_SPRSTSM}, RTF_SPRSTSM}, +{{OOO_STRING_SVTOOLS_RTF_STATICVAL}, RTF_STATICVAL}, +{{OOO_STRING_SVTOOLS_RTF_STEXTFLOW}, RTF_STEXTFLOW}, +{{OOO_STRING_SVTOOLS_RTF_STRIKED}, RTF_STRIKED}, +{{OOO_STRING_SVTOOLS_RTF_SUBFONTBYSIZE}, RTF_SUBFONTBYSIZE}, +{{OOO_STRING_SVTOOLS_RTF_TCELLD}, RTF_TCELLD}, +{{OOO_STRING_SVTOOLS_RTF_TIME}, RTF_TIME}, +{{OOO_STRING_SVTOOLS_RTF_TRUNCATEFONTHEIGHT}, RTF_TRUNCATEFONTHEIGHT}, +{{OOO_STRING_SVTOOLS_RTF_UC}, RTF_UC}, +{{OOO_STRING_SVTOOLS_RTF_UD}, RTF_UD}, +{{OOO_STRING_SVTOOLS_RTF_ULDASH}, RTF_ULDASH}, +{{OOO_STRING_SVTOOLS_RTF_ULDASHD}, RTF_ULDASHD}, +{{OOO_STRING_SVTOOLS_RTF_ULDASHDD}, RTF_ULDASHDD}, +{{OOO_STRING_SVTOOLS_RTF_ULTH}, RTF_ULTH}, +{{OOO_STRING_SVTOOLS_RTF_ULWAVE}, RTF_ULWAVE}, +{{OOO_STRING_SVTOOLS_RTF_ULC}, RTF_ULC}, +{{OOO_STRING_SVTOOLS_RTF_U}, RTF_U}, +{{OOO_STRING_SVTOOLS_RTF_UPR}, RTF_UPR}, +{{OOO_STRING_SVTOOLS_RTF_USERPROPS}, RTF_USERPROPS}, +{{OOO_STRING_SVTOOLS_RTF_VIEWKIND}, RTF_VIEWKIND}, +{{OOO_STRING_SVTOOLS_RTF_VIEWSCALE}, RTF_VIEWSCALE}, +{{OOO_STRING_SVTOOLS_RTF_VIEWZK}, RTF_VIEWZK}, +{{OOO_STRING_SVTOOLS_RTF_WIDCTLPAR}, RTF_WIDCTLPAR}, +{{OOO_STRING_SVTOOLS_RTF_WINDOWCAPTION}, RTF_WINDOWCAPTION}, +{{OOO_STRING_SVTOOLS_RTF_WPEQN}, RTF_WPEQN}, +{{OOO_STRING_SVTOOLS_RTF_WPJST}, RTF_WPJST}, +{{OOO_STRING_SVTOOLS_RTF_WPSP}, RTF_WPSP}, +{{OOO_STRING_SVTOOLS_RTF_YXE}, RTF_YXE}, {{OOO_STRING_SVTOOLS_RTF_FRMTXLRTB}, RTF_FRMTXLRTB}, {{OOO_STRING_SVTOOLS_RTF_FRMTXTBRL}, RTF_FRMTXTBRL}, {{OOO_STRING_SVTOOLS_RTF_FRMTXBTLR}, RTF_FRMTXBTLR}, @@ -1067,22 +1067,22 @@ static RTF_TokenEntry __FAR_DATA aRTFTokenTab[] = { {{OOO_STRING_SVTOOLS_RTF_ULHWAVE}, RTF_ULHWAVE}, {{OOO_STRING_SVTOOLS_RTF_ULULDBWAVE}, RTF_ULULDBWAVE}, - {{OOO_STRING_SVTOOLS_RTF_LOCH}, RTF_LOCH}, - {{OOO_STRING_SVTOOLS_RTF_HICH}, RTF_HICH}, - {{OOO_STRING_SVTOOLS_RTF_DBCH}, RTF_DBCH}, - {{OOO_STRING_SVTOOLS_RTF_LANGFE}, RTF_LANGFE}, - {{OOO_STRING_SVTOOLS_RTF_ADEFLANG}, RTF_ADEFLANG}, - {{OOO_STRING_SVTOOLS_RTF_ADEFF}, RTF_ADEFF}, - {{OOO_STRING_SVTOOLS_RTF_ACCNONE}, RTF_ACCNONE}, - {{OOO_STRING_SVTOOLS_RTF_ACCDOT}, RTF_ACCDOT}, - {{OOO_STRING_SVTOOLS_RTF_ACCCOMMA}, RTF_ACCCOMMA}, - {{OOO_STRING_SVTOOLS_RTF_TWOINONE}, RTF_TWOINONE}, - {{OOO_STRING_SVTOOLS_RTF_HORZVERT}, RTF_HORZVERT}, - {{OOO_STRING_SVTOOLS_RTF_FAHANG}, RTF_FAHANG}, - {{OOO_STRING_SVTOOLS_RTF_FAVAR}, RTF_FAVAR}, - {{OOO_STRING_SVTOOLS_RTF_FACENTER}, RTF_FACENTER}, - {{OOO_STRING_SVTOOLS_RTF_FAROMAN}, RTF_FAROMAN}, - {{OOO_STRING_SVTOOLS_RTF_FAFIXED}, RTF_FAFIXED}, + {{OOO_STRING_SVTOOLS_RTF_LOCH}, RTF_LOCH}, + {{OOO_STRING_SVTOOLS_RTF_HICH}, RTF_HICH}, + {{OOO_STRING_SVTOOLS_RTF_DBCH}, RTF_DBCH}, + {{OOO_STRING_SVTOOLS_RTF_LANGFE}, RTF_LANGFE}, + {{OOO_STRING_SVTOOLS_RTF_ADEFLANG}, RTF_ADEFLANG}, + {{OOO_STRING_SVTOOLS_RTF_ADEFF}, RTF_ADEFF}, + {{OOO_STRING_SVTOOLS_RTF_ACCNONE}, RTF_ACCNONE}, + {{OOO_STRING_SVTOOLS_RTF_ACCDOT}, RTF_ACCDOT}, + {{OOO_STRING_SVTOOLS_RTF_ACCCOMMA}, RTF_ACCCOMMA}, + {{OOO_STRING_SVTOOLS_RTF_TWOINONE}, RTF_TWOINONE}, + {{OOO_STRING_SVTOOLS_RTF_HORZVERT}, RTF_HORZVERT}, + {{OOO_STRING_SVTOOLS_RTF_FAHANG}, RTF_FAHANG}, + {{OOO_STRING_SVTOOLS_RTF_FAVAR}, RTF_FAVAR}, + {{OOO_STRING_SVTOOLS_RTF_FACENTER}, RTF_FACENTER}, + {{OOO_STRING_SVTOOLS_RTF_FAROMAN}, RTF_FAROMAN}, + {{OOO_STRING_SVTOOLS_RTF_FAFIXED}, RTF_FAFIXED}, {{OOO_STRING_SVTOOLS_RTF_NOCWRAP}, RTF_NOCWRAP}, {{OOO_STRING_SVTOOLS_RTF_NOOVERFLOW}, RTF_NOOVERFLOW}, {{OOO_STRING_SVTOOLS_RTF_ASPALPHA}, RTF_ASPALPHA}, @@ -1162,25 +1162,25 @@ static RTF_TokenEntry __FAR_DATA aRTFTokenTab[] = { {{OOO_STRING_SVTOOLS_RTF_SP}, RTF_SP}, // Support for overline attributes - {{OOO_STRING_SVTOOLS_RTF_OL}, RTF_OL}, - {{OOO_STRING_SVTOOLS_RTF_OLW}, RTF_OLW}, - {{OOO_STRING_SVTOOLS_RTF_OLD}, RTF_OLD}, - {{OOO_STRING_SVTOOLS_RTF_OLDB}, RTF_OLDB}, - {{OOO_STRING_SVTOOLS_RTF_OLNONE}, RTF_OLNONE}, - {{OOO_STRING_SVTOOLS_RTF_OLDASH}, RTF_OLDASH}, - {{OOO_STRING_SVTOOLS_RTF_OLDASHD}, RTF_OLDASHD}, - {{OOO_STRING_SVTOOLS_RTF_OLDASHDD}, RTF_OLDASHDD}, - {{OOO_STRING_SVTOOLS_RTF_OLTH}, RTF_OLTH}, - {{OOO_STRING_SVTOOLS_RTF_OLWAVE}, RTF_OLWAVE}, - {{OOO_STRING_SVTOOLS_RTF_OLC}, RTF_OLC}, - {{OOO_STRING_SVTOOLS_RTF_OLTHD}, RTF_OLTHD}, - {{OOO_STRING_SVTOOLS_RTF_OLTHDASH}, RTF_OLTHDASH}, - {{OOO_STRING_SVTOOLS_RTF_OLLDASH}, RTF_OLLDASH}, - {{OOO_STRING_SVTOOLS_RTF_OLTHLDASH}, RTF_OLTHLDASH}, - {{OOO_STRING_SVTOOLS_RTF_OLTHDASHD}, RTF_OLTHDASHD}, - {{OOO_STRING_SVTOOLS_RTF_OLTHDASHDD}, RTF_OLTHDASHDD}, - {{OOO_STRING_SVTOOLS_RTF_OLHWAVE}, RTF_OLHWAVE}, - {{OOO_STRING_SVTOOLS_RTF_OLOLDBWAVE}, RTF_OLOLDBWAVE} + {{OOO_STRING_SVTOOLS_RTF_OL}, RTF_OL}, + {{OOO_STRING_SVTOOLS_RTF_OLW}, RTF_OLW}, + {{OOO_STRING_SVTOOLS_RTF_OLD}, RTF_OLD}, + {{OOO_STRING_SVTOOLS_RTF_OLDB}, RTF_OLDB}, + {{OOO_STRING_SVTOOLS_RTF_OLNONE}, RTF_OLNONE}, + {{OOO_STRING_SVTOOLS_RTF_OLDASH}, RTF_OLDASH}, + {{OOO_STRING_SVTOOLS_RTF_OLDASHD}, RTF_OLDASHD}, + {{OOO_STRING_SVTOOLS_RTF_OLDASHDD}, RTF_OLDASHDD}, + {{OOO_STRING_SVTOOLS_RTF_OLTH}, RTF_OLTH}, + {{OOO_STRING_SVTOOLS_RTF_OLWAVE}, RTF_OLWAVE}, + {{OOO_STRING_SVTOOLS_RTF_OLC}, RTF_OLC}, + {{OOO_STRING_SVTOOLS_RTF_OLTHD}, RTF_OLTHD}, + {{OOO_STRING_SVTOOLS_RTF_OLTHDASH}, RTF_OLTHDASH}, + {{OOO_STRING_SVTOOLS_RTF_OLLDASH}, RTF_OLLDASH}, + {{OOO_STRING_SVTOOLS_RTF_OLTHLDASH}, RTF_OLTHLDASH}, + {{OOO_STRING_SVTOOLS_RTF_OLTHDASHD}, RTF_OLTHDASHD}, + {{OOO_STRING_SVTOOLS_RTF_OLTHDASHDD}, RTF_OLTHDASHDD}, + {{OOO_STRING_SVTOOLS_RTF_OLHWAVE}, RTF_OLHWAVE}, + {{OOO_STRING_SVTOOLS_RTF_OLOLDBWAVE}, RTF_OLOLDBWAVE} }; diff --git a/svtools/source/svrtf/rtfout.cxx b/svtools/source/svrtf/rtfout.cxx index 4a08806e7c1b..2bb4be1d8f3f 100644 --- a/svtools/source/svrtf/rtfout.cxx +++ b/svtools/source/svrtf/rtfout.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ SvStream& RTFOutFuncs::Out_Char(SvStream& rStream, sal_Unicode c, const sal_Char* pStr = 0; switch (c) { - case 0x1: - case 0x2: + case 0x1: + case 0x2: // this are control character of our textattributes and will never be // written break; @@ -126,7 +126,7 @@ SvStream& RTFOutFuncs::Out_Char(SvStream& rStream, sal_Unicode c, RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR | RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR; bool bWriteAsUnicode = !(sBuf.convertToString(&sConverted, - eDestEnc, nFlags)) + eDestEnc, nFlags)) || (RTL_TEXTENCODING_UTF8==eDestEnc); // #i43933# do not export UTF-8 chars in RTF; if (bWriteAsUnicode) { @@ -134,7 +134,7 @@ SvStream& RTFOutFuncs::Out_Char(SvStream& rStream, sal_Unicode c, eDestEnc, OUSTRING_TO_OSTRING_CVTFLAGS); } const sal_Int32 nLen = sConverted.getLength(); - + if (bWriteAsUnicode && pUCMode) { // then write as unicode - character diff --git a/svtools/source/svrtf/svparser.cxx b/svtools/source/svrtf/svparser.cxx index 227de97e3cb1..c276ffd8af4b 100644 --- a/svtools/source/svrtf/svparser.cxx +++ b/svtools/source/svrtf/svparser.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,25 +40,25 @@ #define SVPAR_CSM_ -#define SVPAR_CSM_ANSI 0x0001U -#define SVPAR_CSM_UTF8 0x0002U -#define SVPAR_CSM_UCS2B 0x0004U -#define SVPAR_CSM_UCS2L 0x0008U -#define SVPAR_CSM_SWITCH 0x8000U +#define SVPAR_CSM_ANSI 0x0001U +#define SVPAR_CSM_UTF8 0x0002U +#define SVPAR_CSM_UCS2B 0x0004U +#define SVPAR_CSM_UCS2L 0x0008U +#define SVPAR_CSM_SWITCH 0x8000U // Struktur, um sich die akt. Daten zumerken struct SvParser_Impl { - String aToken; // gescanntes Token - ULONG nFilePos; // akt. Position im Stream - ULONG nlLineNr; // akt. Zeilen Nummer - ULONG nlLinePos; // akt. Spalten Nummer - long nTokenValue; // zusaetzlicher Wert (RTF) - BOOL bTokenHasValue; // indicates whether nTokenValue is valid - int nToken; // akt. Token - sal_Unicode nNextCh; // akt. Zeichen + String aToken; // gescanntes Token + ULONG nFilePos; // akt. Position im Stream + ULONG nlLineNr; // akt. Zeilen Nummer + ULONG nlLinePos; // akt. Spalten Nummer + long nTokenValue; // zusaetzlicher Wert (RTF) + BOOL bTokenHasValue; // indicates whether nTokenValue is valid + int nToken; // akt. Token + sal_Unicode nNextCh; // akt. Zeichen - int nSaveToken; // das Token vom Continue + int nSaveToken; // das Token vom Continue rtl_TextToUnicodeConverter hConv; rtl_TextToUnicodeContext hContext; @@ -261,13 +261,13 @@ sal_Unicode SvParser::GetNextChar() sal_Size nChars = 0; do { - sal_Char c1; // signed, that's the text converter expects + sal_Char c1; // signed, that's the text converter expects rInput >> c1; bErr = rInput.IsEof() || rInput.GetError(); if( !bErr ) { if ( - RTL_TEXTENCODING_DONTKNOW == eSrcEnc || + RTL_TEXTENCODING_DONTKNOW == eSrcEnc || RTL_TEXTENCODING_SYMBOL == eSrcEnc ) { @@ -319,11 +319,11 @@ sal_Unicode SvParser::GetNextChar() } else if( 0 != nChars || 0 != nInfo ) { - DBG_ASSERT( (nInfo&RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL) == 0, + DBG_ASSERT( (nInfo&RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL) == 0, "source buffer is to small" ); DBG_ASSERT( (nInfo&~(RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL)) == 0, "there is a conversion error" ); - DBG_ASSERT( 0 == nChars, + DBG_ASSERT( 0 == nChars, "there is a converted character, but an error" ); // There are still errors, but nothing we can // do @@ -363,13 +363,13 @@ sal_Unicode SvParser::GetNextChar() } else { - DBG_ASSERT( (nInfo&RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL) == 0, + DBG_ASSERT( (nInfo&RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL) == 0, "source buffer is to small" ); DBG_ASSERT( (nInfo&~(RTL_TEXTTOUNICODE_INFO_SRCBUFFERTOSMALL)) == 0, "there is a conversion error" ); - DBG_ASSERT( 0 == nChars, + DBG_ASSERT( 0 == nChars, "there is a converted character, but an error" ); - + // There are still errors, so we use the first // character and restart after that. c = (sal_Unicode)sBuffer[0]; @@ -388,9 +388,9 @@ sal_Unicode SvParser::GetNextChar() } else if( 0 != nChars || 0 != nInfo ) { - DBG_ASSERT( 0 == nChars, + DBG_ASSERT( 0 == nChars, "there is a converted character, but an error" ); - DBG_ASSERT( 0 != nInfo, + DBG_ASSERT( 0 != nInfo, "there is no converted character and no error" ); // #73398#: If the character could not be converted, // because a conversion is not available, do no conversion at all. @@ -436,8 +436,8 @@ int SvParser::GetNextToken() if( !nTokenStackPos ) { - aToken.Erase(); // Token-Buffer loeschen - nTokenValue = -1; // Kennzeichen fuer kein Value gelesen + aToken.Erase(); // Token-Buffer loeschen + nTokenValue = -1; // Kennzeichen fuer kein Value gelesen bTokenHasValue = false; nRet = _GetNextToken(); @@ -467,12 +467,12 @@ int SvParser::GetNextToken() pTokenStackPos->nTokenId = nRet; } else if( SVPAR_ACCEPTED != eState && SVPAR_PENDING != eState ) - eState = SVPAR_ERROR; // irgend ein Fehler + eState = SVPAR_ERROR; // irgend ein Fehler return nRet; } -int SvParser::SkipToken( short nCnt ) // n Tokens zurueck "skippen" +int SvParser::SkipToken( short nCnt ) // n Tokens zurueck "skippen" { pTokenStackPos = GetStackPtr( nCnt ); short nTmp = nTokenStackPos - nCnt; @@ -644,7 +644,7 @@ IMPL_STATIC_LINK( SvParser, NewDataRead, void*, EMPTYARG ) pThis->rInput.ResetError(); if( SVPAR_PENDING != pThis->eState ) - pThis->ReleaseRef(); // ansonsten sind wir fertig! + pThis->ReleaseRef(); // ansonsten sind wir fertig! break; case SVPAR_WAITFORDATA: @@ -656,7 +656,7 @@ IMPL_STATIC_LINK( SvParser, NewDataRead, void*, EMPTYARG ) break; default: - pThis->ReleaseRef(); // ansonsten sind wir fertig! + pThis->ReleaseRef(); // ansonsten sind wir fertig! break; } diff --git a/svtools/source/table/defaultinputhandler.cxx b/svtools/source/table/defaultinputhandler.cxx index b0c4a8c1bf9b..4ae16d6ca7e9 100644 --- a/svtools/source/table/defaultinputhandler.cxx +++ b/svtools/source/table/defaultinputhandler.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER 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,7 +107,7 @@ namespace svt { namespace table bool bHandled = false; Point aPoint = _rMEvt.GetPosPixel(); if(_rControl.getCurrentRow(aPoint) >= 0) - { + { if(m_bResize) { m_bResize = _rControl.endResizeColumn(aPoint); diff --git a/svtools/source/table/gridtablerenderer.cxx b/svtools/source/table/gridtablerenderer.cxx index 1be46204a9d3..89b67d7ff593 100644 --- a/svtools/source/table/gridtablerenderer.cxx +++ b/svtools/source/table/gridtablerenderer.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER 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,13 +119,13 @@ namespace svt { namespace table if(m_pImpl->rModel.getVerticalAlign() == 1) nVerFlag = TEXT_DRAW_VCENTER; else if(m_pImpl->rModel.getVerticalAlign() == 2) - nVerFlag = TEXT_DRAW_BOTTOM; + nVerFlag = TEXT_DRAW_BOTTOM; if(m_pImpl->rModel.getColumnModel(_nCol)->getHorizontalAlign() == 1) nHorFlag = TEXT_DRAW_CENTER; else if(m_pImpl->rModel.getColumnModel(_nCol)->getHorizontalAlign() == 2) nHorFlag = TEXT_DRAW_RIGHT; Rectangle aRect(_rArea); - aRect.Left()+=4; aRect.Right()-=4; + aRect.Left()+=4; aRect.Right()-=4; aRect.Bottom()-=2; _rDevice.DrawText( aRect, sHeaderText, nHorFlag | nVerFlag | TEXT_DRAW_CLIP); _rDevice.DrawLine( _rArea.BottomLeft(), _rArea.BottomRight() ); @@ -155,10 +155,10 @@ namespace svt { namespace table aRowBackground = fieldColor; if(aRowBackground2 == 0xFFFFFF) aRowBackground2 = fieldColor; - //if row is selected background color becomes blue, and lines should be also blue + //if row is selected background color becomes blue, and lines should be also blue //if they aren't user defined if(_bSelected) - { + { Color aSelected(_rStyle.GetHighlightColor()); aRowBackground = aSelected; if(line == 0xFFFFFF) @@ -175,9 +175,9 @@ namespace svt { namespace table aRowBackground = aRowBackground2; if(line == 0xFFFFFF) _rDevice.SetLineColor(aRowBackground); - else + else _rDevice.SetLineColor(line); - } + } //fill the rows with alternating background colors if second background color is specified else if(aRowBackground != fieldColor && line == 0xFFFFFF) _rDevice.SetLineColor(aRowBackground); @@ -191,7 +191,7 @@ namespace svt { namespace table _rDevice.SetFillColor( aRowBackground ); _rDevice.DrawRect( _rRowArea ); - // TODO: active? + // TODO: active? _rDevice.Pop(); (void)_bActive; @@ -213,13 +213,13 @@ namespace svt { namespace table if(m_pImpl->rModel.getVerticalAlign() == 1) nVerFlag = TEXT_DRAW_VCENTER; else if(m_pImpl->rModel.getVerticalAlign() == 2) - nVerFlag = TEXT_DRAW_BOTTOM; + nVerFlag = TEXT_DRAW_BOTTOM; if(m_pImpl->rModel.getColumnModel(0)->getHorizontalAlign() == 1) nHorFlag = TEXT_DRAW_CENTER; else if(m_pImpl->rModel.getColumnModel(0)->getHorizontalAlign() == 2) nHorFlag = TEXT_DRAW_RIGHT; Rectangle aRect(_rArea); - aRect.Left()+=4; aRect.Right()-=4; + aRect.Left()+=4; aRect.Right()-=4; aRect.Bottom()-=2; _rDevice.DrawText( aRect, _rText, nHorFlag | nVerFlag | TEXT_DRAW_CLIP); // TODO: active? selected? @@ -249,7 +249,7 @@ namespace svt { namespace table else { if(background2 != 0xFFFFFF && m_pImpl->nCurrentRow%2) - { + { if(line == 0xFFFFFF) _rDevice.SetLineColor(background2); else @@ -278,14 +278,14 @@ namespace svt { namespace table else if(m_pImpl->rModel.getColumnModel(_nColumn)->getHorizontalAlign() == 2) imagePos.X() = aRect.Right() - imageSize.Width(); } - else + else imageSize.Width() = aRect.GetWidth(); if(aRect.GetHeight() > imageSize.Height()) { if(m_pImpl->rModel.getVerticalAlign() == 1) imagePos.Y() = aRect.Top()+((double)(aRect.GetHeight() - imageSize.Height()))/2; else if(m_pImpl->rModel.getVerticalAlign() == 2) - imagePos.Y() = aRect.Bottom() - imageSize.Height(); + imagePos.Y() = aRect.Bottom() - imageSize.Height(); } else imageSize.Height() = aRect.GetHeight()-1; @@ -338,23 +338,23 @@ namespace svt { namespace table ++aRect.Left(); --aRect.Right(); aRect.Top(); aRect.Bottom(); if(_bSelected) - _rDevice.SetTextColor(_rStyle.GetHighlightTextColor()); + _rDevice.SetTextColor(_rStyle.GetHighlightTextColor()); else if(m_pImpl->rModel.getTextColor() != 0x000000) _rDevice.SetTextColor(m_pImpl->rModel.getTextColor()); else - _rDevice.SetTextColor(_rStyle.GetFieldTextColor()); + _rDevice.SetTextColor(_rStyle.GetFieldTextColor()); ULONG nHorFlag = TEXT_DRAW_LEFT; ULONG nVerFlag = TEXT_DRAW_TOP; if(m_pImpl->rModel.getVerticalAlign() == 1) nVerFlag = TEXT_DRAW_VCENTER; else if(m_pImpl->rModel.getVerticalAlign() == 2) - nVerFlag = TEXT_DRAW_BOTTOM; + nVerFlag = TEXT_DRAW_BOTTOM; if(m_pImpl->rModel.getColumnModel(_nColumn)->getHorizontalAlign() == 1) nHorFlag = TEXT_DRAW_CENTER; else if(m_pImpl->rModel.getColumnModel(_nColumn)->getHorizontalAlign() == 2) nHorFlag = TEXT_DRAW_RIGHT; Rectangle textRect(_rArea); - textRect.Left()+=4; textRect.Right()-=4; + textRect.Left()+=4; textRect.Right()-=4; textRect.Bottom()-=2; _rDevice.DrawText( textRect, _rText, nHorFlag | nVerFlag | TEXT_DRAW_CLIP); @@ -374,7 +374,7 @@ namespace svt { namespace table { (void)_rCursorRect; _rView.HideFocus(); - + } //........................................................................ diff --git a/svtools/source/table/tablecontrol.cxx b/svtools/source/table/tablecontrol.cxx index 999bcbd84e61..8f7558e42116 100644 --- a/svtools/source/table/tablecontrol.cxx +++ b/svtools/source/table/tablecontrol.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -273,7 +273,7 @@ namespace svt { namespace table Reference< XAccessible > xAccParent = pParent->GetAccessible(); if( xAccParent.is() ) { - m_pAccessTable->m_pAccessible = getAccessibleFactory().createAccessibleTableControl( + m_pAccessTable->m_pAccessible = getAccessibleFactory().createAccessibleTableControl( xAccParent, *this ); } @@ -613,7 +613,7 @@ IMPL_LINK( TableControl, ImplMouseButtonDownHdl, MouseEvent*, pData ) { CallEventListeners( VCLEVENT_WINDOW_MOUSEBUTTONDOWN, pData ); return 1; -} +} IMPL_LINK( TableControl, ImplMouseButtonUpHdl, MouseEvent*, pData ) { CallEventListeners( VCLEVENT_WINDOW_MOUSEBUTTONUP, pData ); diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx index 97904f640b0f..bb02692fbb03 100644 --- a/svtools/source/table/tablecontrol_impl.cxx +++ b/svtools/source/table/tablecontrol_impl.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -159,7 +159,7 @@ namespace svt { namespace table { return 5 * 100; } - virtual void setRowHeight(TableMetrics _nRowHeight) + virtual void setRowHeight(TableMetrics _nRowHeight) { (void)_nRowHeight; } @@ -208,7 +208,7 @@ namespace svt { namespace table { return 0; } - virtual void setTextColor(::com::sun::star::util::Color ) + virtual void setTextColor(::com::sun::star::util::Color ) { } virtual ::com::sun::star::util::Color getOddRowBackgroundColor() @@ -232,14 +232,14 @@ namespace svt { namespace table virtual void setEvenRowBackgroundColor(::com::sun::star::util::Color ) { } - virtual std::vector<std::vector< ::com::sun::star::uno::Any > >& getCellContent() + virtual std::vector<std::vector< ::com::sun::star::uno::Any > >& getCellContent() { return m_aCellContent; } virtual void setRowHeaderName(const std::vector<rtl::OUString>& ) { } - virtual std::vector<rtl::OUString>& getRowHeaderName() + virtual std::vector<rtl::OUString>& getRowHeaderName() { aRowHeaderNames.clear(); aRowHeaderNames.push_back(rtl::OUString::createFromAscii("")); @@ -430,13 +430,13 @@ namespace svt { namespace table ,m_pVScroll ( NULL ) ,m_pHScroll ( NULL ) ,m_pScrollCorner ( NULL ) - ,m_pSelEngine ( ) - ,m_nRowSelected ( ) - ,m_pTableFunctionSet ( new TableFunctionSet(this ) ) - ,m_nAnchor (-1 ) - ,m_bResizing ( false ) - ,m_nResizingColumn ( 0 ) - ,m_bResizingGrid ( false ) + ,m_pSelEngine ( ) + ,m_nRowSelected ( ) + ,m_pTableFunctionSet ( new TableFunctionSet(this ) ) + ,m_nAnchor (-1 ) + ,m_bResizing ( false ) + ,m_nResizingColumn ( 0 ) + ,m_bResizingGrid ( false ) #if DBG_UTIL ,m_nRequiredInvariants ( INV_SCROLL_POSITION ) #endif @@ -526,7 +526,7 @@ namespace svt { namespace table --_rCellArea.Right(); // determine the last row which is at least partially visible - _rCellArea.Bottom() = + _rCellArea.Bottom() = m_nColHeaderHeightPixel + impl_getVisibleRows( true ) * m_nRowHeightPixel - 1; @@ -551,7 +551,7 @@ namespace svt { namespace table m_pInputHandler.reset(); m_nColumnCount = m_nRowCount = 0; - m_nRowHeightPixel = m_rAntiImpl.LogicToPixel( Size( 0, m_pModel->getRowHeight() ), MAP_APPFONT ).Height(); + m_nRowHeightPixel = m_rAntiImpl.LogicToPixel( Size( 0, m_pModel->getRowHeight() ), MAP_APPFONT ).Height(); if ( m_pModel->hasColumnHeaders() ) m_nColHeaderHeightPixel = m_rAntiImpl.LogicToPixel( Size( 0, m_pModel->getColumnHeaderHeight() ), MAP_APPFONT ).Height(); if ( m_pModel->hasRowHeaders() ) @@ -576,7 +576,7 @@ namespace svt { namespace table return; TableSize colCount = m_pModel->getColumnCount(); - + m_aColumnWidthsPixel.reserve( colCount ); m_aAccColumnWidthsPixel.reserve( colCount ); if(colCount>0) @@ -652,13 +652,13 @@ namespace svt { namespace table if(colWithoutFixedWidthsSum>0) scalingFactor = gridWidthWithoutFixed/colWithoutFixedWidthsSum; } - } + } for ( ColPos i = 0; i < colCount; ++i ) { PColumnModel pColumn = m_pModel->getColumnModel( i ); DBG_ASSERT( !!pColumn, "TableControl_Impl::impl_ni_updateColumnWidths: invalid column returned by the model!" ); if ( !pColumn ) - continue; + continue; if(pColumn->isResizable() && pColumn->getPreferredWidth() == 0) { aPrePixelWidths[i]*=scalingFactor; @@ -873,7 +873,7 @@ namespace svt { namespace table lcl_updateScrollbar( m_rAntiImpl, m_pHScroll, - m_pModel->getHorizontalScrollbarVisibility(aDataCellPlayground.GetWidth(), m_aAccColumnWidthsPixel[m_nColumnCount-1]), + m_pModel->getHorizontalScrollbarVisibility(aDataCellPlayground.GetWidth(), m_aAccColumnWidthsPixel[m_nColumnCount-1]), lcl_getColumnsVisibleWithin( aDataCellPlayground, m_nLeftColumn, *this, false ), // visible units m_nLeftColumn, // current position @@ -890,8 +890,8 @@ namespace svt { namespace table if( m_nLeftColumn + nVisibleUnits == nRange-1) { if(m_aAccColumnWidthsPixel[nRange-2] - m_aAccColumnWidthsPixel[m_nLeftColumn] + m_aColumnWidthsPixel[nRange-1]>aDataCellPlayground.GetWidth()) - { - m_pHScroll->SetVisibleSize( nVisibleUnits -1 ); + { + m_pHScroll->SetVisibleSize( nVisibleUnits -1 ); m_pHScroll->SetPageSize(nVisibleUnits -1); } } @@ -1078,7 +1078,7 @@ namespace svt { namespace table //to avoid double lines if( aRowIterator.getRow() != 0 ) --aRect.Top(); - if(m_nLeftColumn != 0) + if(m_nLeftColumn != 0) --aRect.Left(); else { @@ -1112,15 +1112,15 @@ namespace svt { namespace table { Image* pImage = new Image(xGraphic); if(pImage!=NULL) - pRenderer->PaintCellImage( aCell.getColumn(), isSelectedRow || isSelectedColumn, isActiveRow, + pRenderer->PaintCellImage( aCell.getColumn(), isSelectedRow || isSelectedColumn, isActiveRow, *m_pDataWindow, aCell.getRect(), rStyle, pImage ); } else { ::rtl::OUString sContent = convertToString(rCellData); - pRenderer->PaintCellString( aCell.getColumn(), isSelectedRow || isSelectedColumn, isActiveRow, + pRenderer->PaintCellString( aCell.getColumn(), isSelectedRow || isSelectedColumn, isActiveRow, *m_pDataWindow, aCell.getRect(), rStyle, sContent ); - } + } } } } @@ -1292,7 +1292,7 @@ namespace svt { namespace table } break; case cursorSelectRowUp: - { + { if(m_pSelEngine->GetSelectionMode() == NO_SELECTION) return bSuccess = false; else if(m_pSelEngine->GetSelectionMode() == SINGLE_SELECTION) @@ -1371,7 +1371,7 @@ namespace svt { namespace table m_nRowSelected.push_back(m_nCurRow); invalidateSelectedRegion(m_nCurRow, m_nCurRow, rCells); } - } + } m_pSelEngine->SetAnchor(TRUE); m_nAnchor = m_nCurRow; ensureVisible(m_nCurColumn, m_nCurRow, false); @@ -1498,12 +1498,12 @@ namespace svt { namespace table return bSuccess = false; else if(m_pSelEngine->GetSelectionMode() == SINGLE_SELECTION) return bSuccess = false; - //select the region between the current and the last row + //select the region between the current and the last row RowPos iter = m_nCurRow; invalidateSelectedRegion(m_nCurRow, m_nRowCount-1, rCells); //put the rows in the vector while(iter<=m_nRowCount) - { + { if(!isRowSelected(m_nRowSelected, iter)) m_nRowSelected.push_back(iter); ++iter; @@ -1535,7 +1535,7 @@ namespace svt { namespace table if ( _bShow ) pRenderer->ShowCellCursor( *m_pDataWindow, aCellRect); else - pRenderer->HideCellCursor( *m_pDataWindow, aCellRect); + pRenderer->HideCellCursor( *m_pDataWindow, aCellRect); } } @@ -2030,7 +2030,7 @@ namespace svt { namespace table int gridHeight = m_pDataWindow->GetOutputSizePixel().Height(); if(lineHeight >= gridHeight) lineHeight = gridHeight; - m_pDataWindow->ShowTracking(Rectangle(Point(rPoint.X(),0), Size(1, lineHeight )), + m_pDataWindow->ShowTracking(Rectangle(Point(rPoint.X(),0), Size(1, lineHeight )), SHOWTRACK_SPLIT | SHOWTRACK_WINDOW); } m_pDataWindow->SetPointer(aNewPointer); @@ -2058,7 +2058,7 @@ namespace svt { namespace table int maxWidth = m_rAntiImpl.LogicToPixel( Size( pColumn->getMaxWidth(), 0 ), MAP_APPFONT ).Width(); int minWidth = m_rAntiImpl.LogicToPixel( Size( pColumn->getMinWidth(), 0 ), MAP_APPFONT ).Width(); int resizeCol = m_nResizingColumn-m_nLeftColumn; - //new position of mouse + //new position of mouse int actX = rPoint.X(); //old position of right border int oldX = m_aVisibleColumnWidthsPixel[resizeCol]; @@ -2102,7 +2102,7 @@ namespace svt { namespace table m_bResizingGrid = true; } m_pDataWindow->ReleaseMouse(); - return m_bResizing; + return m_bResizing; } //------------------------------------------------------------------------------- void TableControl_Impl::impl_ni_getAccVisibleColWidths() @@ -2139,7 +2139,7 @@ namespace svt { namespace table widthsPixel+=headerRowWidth; } int col = m_nLeftColumn; - //add column width of the neighbour of the left column + //add column width of the neighbour of the left column widthsPixel+=m_aColumnWidthsPixel[col-1]; //compute the sum of the new column widths while(nVisCols) @@ -2153,7 +2153,7 @@ namespace svt { namespace table col++; nVisCols--; } - //when the sum of all visible columns and the next to the left column is smaller than + //when the sum of all visible columns and the next to the left column is smaller than //window width, then update m_nLeftColumn if(widthsPixel<m_pDataWindow->GetOutputSizePixel().Width()) m_nLeftColumn--; @@ -2168,7 +2168,7 @@ namespace svt { namespace table ::rtl::OUString sConvertString; if(value >>= sConvertString) sNewString = sConvertString; - else if(value >>= nInt) + else if(value >>= nInt) sNewString = sConvertString.valueOf(nInt); else if(value >>= bBool) sNewString = sConvertString.valueOf(bBool); @@ -2220,7 +2220,7 @@ namespace svt { namespace table } //------------------------------------------------------------------------------- void TableFunctionSet::BeginDrag() - { + { } //------------------------------------------------------------------------------- void TableFunctionSet::CreateAnchor() @@ -2230,7 +2230,7 @@ namespace svt { namespace table //------------------------------------------------------------------------------- void TableFunctionSet::DestroyAnchor() { - m_pTableControl->m_nAnchor = -1; + m_pTableControl->m_nAnchor = -1; } //------------------------------------------------------------------------------- BOOL TableFunctionSet::SetCursorAtPoint(const Point& rPoint, BOOL bDontSelectAtCursor) @@ -2249,8 +2249,8 @@ namespace svt { namespace table } else if(m_pTableControl->m_nAnchor == m_pTableControl->m_nCurRow) { - //selecting region, - int diff = m_pTableControl->m_nCurRow - curRow; + //selecting region, + int diff = m_pTableControl->m_nCurRow - curRow; //selected region lies above the last selection if( diff >= 0) { @@ -2268,7 +2268,7 @@ namespace svt { namespace table } //selected region lies beneath the last selected row else - { + { while(m_pTableControl->m_nAnchor<=curRow) { bool isAlreadySelected = m_pTableControl->isRowSelected(m_pTableControl->m_nRowSelected, m_pTableControl->m_nAnchor); @@ -2358,7 +2358,7 @@ namespace svt { namespace table m_pTableControl->m_nRowSelected.clear(); } } - + //........................................................................ } } // namespace svt::table //........................................................................ diff --git a/svtools/source/table/tablecontrol_impl.hxx b/svtools/source/table/tablecontrol_impl.hxx index 3f10f9ce2830..6e3b485674e9 100644 --- a/svtools/source/table/tablecontrol_impl.hxx +++ b/svtools/source/table/tablecontrol_impl.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER 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,66 +63,66 @@ namespace svt { namespace table friend class TableFunctionSet; private: /// the control whose impl-instance we implemnt - TableControl& m_rAntiImpl; + TableControl& m_rAntiImpl; /// the model of the table control - PTableModel m_pModel; + PTableModel m_pModel; /// the input handler to use, usually the input handler as provided by ->m_pModel - PTableInputHandler m_pInputHandler; + PTableInputHandler m_pInputHandler; /// the widths of the single columns, measured in pixel - ArrayOfLong m_aColumnWidthsPixel; + ArrayOfLong m_aColumnWidthsPixel; /** the accumulated widths of the single columns, i.e. their exclusive right borders, <strong<not</strong> counting the space for a possible row header column */ - ArrayOfLong m_aAccColumnWidthsPixel; + ArrayOfLong m_aAccColumnWidthsPixel; - ArrayOfLong m_aVisibleColumnWidthsPixel; + ArrayOfLong m_aVisibleColumnWidthsPixel; /// the height of a single row in the table, measured in pixels - long m_nRowHeightPixel; + long m_nRowHeightPixel; /// the height of the column header row in the table, measured in pixels - long m_nColHeaderHeightPixel; + long m_nColHeaderHeightPixel; /// the width of the row header column in the table, measured in pixels - long m_nRowHeaderWidthPixel; + long m_nRowHeaderWidthPixel; /// the number of columns in the table control. Cached model value. - TableSize m_nColumnCount; + TableSize m_nColumnCount; /// the number of rows in the table control. Cached model value. - TableSize m_nRowCount; + TableSize m_nRowCount; - ColPos m_nCurColumn; - RowPos m_nCurRow; - ColPos m_nLeftColumn; - RowPos m_nTopRow; + ColPos m_nCurColumn; + RowPos m_nCurRow; + ColPos m_nLeftColumn; + RowPos m_nTopRow; - sal_Int32 m_nCursorHidden; + sal_Int32 m_nCursorHidden; /** the window to contain all data content, including header bars The window's upper left corner is at position (0,0), relative to the table control, which is the direct parent of the data window. */ - TableDataWindow* m_pDataWindow; + TableDataWindow* m_pDataWindow; /// the vertical scrollbar, if any - ScrollBar* m_pVScroll; + ScrollBar* m_pVScroll; /// the horizontal scrollbar, if any - ScrollBar* m_pHScroll; - ScrollBarBox* m_pScrollCorner; + ScrollBar* m_pHScroll; + ScrollBarBox* m_pScrollCorner; //selection engine - for determining selection range, e.g. single, multiple - SelectionEngine* m_pSelEngine; + SelectionEngine* m_pSelEngine; //vector which contains the selected rows - std::vector<RowPos> m_nRowSelected; + std::vector<RowPos> m_nRowSelected; //part of selection engine - TableFunctionSet* m_pTableFunctionSet; + TableFunctionSet* m_pTableFunctionSet; //part of selection engine - RowPos m_nAnchor; - bool m_bResizing; - ColPos m_nResizingColumn; - bool m_bResizingGrid; - rtl::OUString m_aTooltipText; + RowPos m_nAnchor; + bool m_bResizing; + ColPos m_nResizingColumn; + bool m_bResizingGrid; + rtl::OUString m_aTooltipText; #if DBG_UTIL #define INV_SCROLL_POSITION 1 /** represents a bitmask of invariants to check - + Actually, impl_checkInvariants checks more invariants than denoted in this bit mask, but only those present here can be disabled temporarily. */ @@ -139,10 +139,10 @@ namespace svt { namespace table inline ColPos getCurColumn() const { return m_nCurColumn; } inline RowPos getCurRow() const { return m_nCurRow; } - inline void setCurRow(RowPos curRow){ m_nCurRow = curRow; } + inline void setCurRow(RowPos curRow){ m_nCurRow = curRow; } inline RowPos getTopRow() const { return m_nTopRow; } - inline long getRowCount() const { return m_nRowCount; } - inline long getColumnCount() const { return m_nColumnCount; } + inline long getRowCount() const { return m_nRowCount; } + inline long getColumnCount() const { return m_nColumnCount; } inline long getColHeaderHightPixel() const { return m_nColHeaderHeightPixel; } @@ -183,7 +183,7 @@ namespace svt { namespace table */ void ensureVisible( ColPos _nColumn, RowPos _nRow, bool _bAcceptPartialVisibility ); /** returns the row, which contains the input point*/ - virtual RowPos getCurrentRow (const Point& rPoint); + virtual RowPos getCurrentRow (const Point& rPoint); void setCursorAtCurrentCell(const Point& rPoint); /** checks whether the vector with the selected rows contains the current row*/ @@ -191,7 +191,7 @@ namespace svt { namespace table bool isRowSelected(RowPos current); /** returns the position of the current row in the selection vector */ - int getRowSelectedNumber(const ::std::vector<RowPos>& selectedRows, RowPos current); + int getRowSelectedNumber(const ::std::vector<RowPos>& selectedRows, RowPos current); /** _rCellRect contains the region, which should be invalidate after some action e.g. selecting row*/ void invalidateSelectedRegion(RowPos _nPrevRow, RowPos _nCurRow, Rectangle& _rCellRect ); /** to be called when a new row is added to the control*/ @@ -199,7 +199,7 @@ namespace svt { namespace table /** returns the vector, which contains the selected rows*/ std::vector<RowPos>& getSelectedRows(); /** updates the vector, which contains the selected rows after removing the row nRowPos*/ - void removeSelectedRow(RowPos _nRowPos); + void removeSelectedRow(RowPos _nRowPos); void invalidateRows(); void clearSelection(); // IAbstractTableControl @@ -325,7 +325,7 @@ namespace svt { namespace table void impl_ni_getAccVisibleColWidths(); void impl_updateLeftColumn(); - DECL_LINK( OnScroll, ScrollBar* ); + DECL_LINK( OnScroll, ScrollBar* ); }; //see seleng.hxx, seleng.cxx, FunctionSet overridables, part of selection engine class TableFunctionSet : public FunctionSet @@ -339,7 +339,7 @@ namespace svt { namespace table virtual ~TableFunctionSet(); virtual void BeginDrag(); - virtual void CreateAnchor(); + virtual void CreateAnchor(); virtual void DestroyAnchor(); virtual BOOL SetCursorAtPoint(const Point& rPoint, BOOL bDontSelectAtCursor); virtual BOOL IsSelectionAtPoint( const Point& rPoint ); diff --git a/svtools/source/table/tabledatawindow.cxx b/svtools/source/table/tabledatawindow.cxx index 9607ec93036c..b4d22cec1b5a 100644 --- a/svtools/source/table/tabledatawindow.cxx +++ b/svtools/source/table/tabledatawindow.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER 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 @@ namespace svt { namespace table //-------------------------------------------------------------------- TableDataWindow::TableDataWindow( TableControl_Impl& _rTableControl ) :Window( &_rTableControl.getAntiImpl() ) - ,m_rTableControl ( _rTableControl ) + ,m_rTableControl ( _rTableControl ) { // by default, use the background as determined by the style settings const Color aWindowColor( GetSettings().GetStyleSettings().GetFieldColor() ); @@ -85,14 +85,14 @@ namespace svt { namespace table if ( !m_rTableControl.getInputHandler()->MouseMove( m_rTableControl, rMEvt ) ) { if(m_rTableControl.getCurrentRow(aPoint)>=0 && m_rTableControl.isTooltipActive() ) - { + { SetPointer(POINTER_ARROW); rtl::OUString& rHelpText = m_rTableControl.setTooltip(aPoint); Help::EnableBalloonHelp(); Window::SetHelpText( rHelpText.getStr()); } else if(m_rTableControl.getCurrentRow(aPoint) == -1) - { + { if(Help::IsBalloonHelpEnabled()) Help::DisableBalloonHelp(); m_rTableControl.resizeColumn(aPoint); @@ -113,7 +113,7 @@ namespace svt { namespace table std::vector<RowPos> selectedRows(m_rTableControl.getSelectedRows()); if ( !m_rTableControl.getInputHandler()->MouseButtonDown( m_rTableControl, rMEvt ) ) Window::MouseButtonDown( rMEvt ); - else + else { if(nCurRow >= 0 && m_rTableControl.getSelEngine()->GetSelectionMode() != NO_SELECTION) { @@ -134,7 +134,7 @@ namespace svt { namespace table if ( !m_rTableControl.getInputHandler()->MouseButtonUp( m_rTableControl, rMEvt ) ) Window::MouseButtonUp( rMEvt ); m_aMouseButtonUpHdl.Call((MouseEvent*) &rMEvt); - m_rTableControl.getAntiImpl().GetFocus(); + m_rTableControl.getAntiImpl().GetFocus(); } //-------------------------------------------------------------------- void TableDataWindow::SetPointer( const Pointer& rPointer ) diff --git a/svtools/source/table/tablegeometry.cxx b/svtools/source/table/tablegeometry.cxx index edd2a73cd624..19ab4bb2db45 100644 --- a/svtools/source/table/tablegeometry.cxx +++ b/svtools/source/table/tablegeometry.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER 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/svtools/source/table/tablegeometry.hxx b/svtools/source/table/tablegeometry.hxx index 979a78d0a5a2..6667a6882ac2 100644 --- a/svtools/source/table/tablegeometry.hxx +++ b/svtools/source/table/tablegeometry.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER 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/svtools/source/toolpanel/drawerlayouter.cxx b/svtools/source/toolpanel/drawerlayouter.cxx index 8d91e65d7bab..df056d99c8ae 100644 --- a/svtools/source/toolpanel/drawerlayouter.cxx +++ b/svtools/source/toolpanel/drawerlayouter.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER 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/svtools/source/toolpanel/dummypanel.cxx b/svtools/source/toolpanel/dummypanel.cxx index a5f1a6907750..55dd33829ca9 100644 --- a/svtools/source/toolpanel/dummypanel.cxx +++ b/svtools/source/toolpanel/dummypanel.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER 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/svtools/source/toolpanel/dummypanel.hxx b/svtools/source/toolpanel/dummypanel.hxx index 7d71dfb68d8b..742c067e6f88 100644 --- a/svtools/source/toolpanel/dummypanel.hxx +++ b/svtools/source/toolpanel/dummypanel.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER 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/svtools/source/toolpanel/paneldecklisteners.cxx b/svtools/source/toolpanel/paneldecklisteners.cxx index 39a649e49de8..5f8202216f99 100644 --- a/svtools/source/toolpanel/paneldecklisteners.cxx +++ b/svtools/source/toolpanel/paneldecklisteners.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER 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/svtools/source/toolpanel/paneldecklisteners.hxx b/svtools/source/toolpanel/paneldecklisteners.hxx index 5e794d52a1c6..4061e1cbb332 100644 --- a/svtools/source/toolpanel/paneldecklisteners.hxx +++ b/svtools/source/toolpanel/paneldecklisteners.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER 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/svtools/source/toolpanel/paneltabbar.cxx b/svtools/source/toolpanel/paneltabbar.cxx index 168655c0fef7..6c3aeb1dabf2 100644 --- a/svtools/source/toolpanel/paneltabbar.cxx +++ b/svtools/source/toolpanel/paneltabbar.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER 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/svtools/source/toolpanel/paneltabbarpeer.cxx b/svtools/source/toolpanel/paneltabbarpeer.cxx index ce22d1b7c914..9da8cce94d43 100644 --- a/svtools/source/toolpanel/paneltabbarpeer.cxx +++ b/svtools/source/toolpanel/paneltabbarpeer.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER 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/svtools/source/toolpanel/paneltabbarpeer.hxx b/svtools/source/toolpanel/paneltabbarpeer.hxx index 9918756f9cc8..77e1a003863f 100644 --- a/svtools/source/toolpanel/paneltabbarpeer.hxx +++ b/svtools/source/toolpanel/paneltabbarpeer.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER 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/svtools/source/toolpanel/refbase.cxx b/svtools/source/toolpanel/refbase.cxx index 3c1b0c502235..a5f5e3894599 100644 --- a/svtools/source/toolpanel/refbase.cxx +++ b/svtools/source/toolpanel/refbase.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER 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/svtools/source/toolpanel/tabbargeometry.cxx b/svtools/source/toolpanel/tabbargeometry.cxx index 6dd90addd6a4..22999bf56263 100644 --- a/svtools/source/toolpanel/tabbargeometry.cxx +++ b/svtools/source/toolpanel/tabbargeometry.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER 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 @@ namespace svt } //-------------------------------------------------------------------------------------------------------------- - /** transforms the given, possible rotated playground, + /** transforms the given, possible rotated playground, */ void lcl_rotate( const Rectangle& i_rReference, Rectangle& io_rArea, const bool i_bRight ) { diff --git a/svtools/source/toolpanel/tabbargeometry.hxx b/svtools/source/toolpanel/tabbargeometry.hxx index 86fcc98e7947..67f37f7cb969 100644 --- a/svtools/source/toolpanel/tabbargeometry.hxx +++ b/svtools/source/toolpanel/tabbargeometry.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER 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/svtools/source/toolpanel/tabitemdescriptor.hxx b/svtools/source/toolpanel/tabitemdescriptor.hxx index f88b3a4a0f15..f025d97f5b89 100644 --- a/svtools/source/toolpanel/tabitemdescriptor.hxx +++ b/svtools/source/toolpanel/tabitemdescriptor.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER 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/svtools/source/toolpanel/tablayouter.cxx b/svtools/source/toolpanel/tablayouter.cxx index 6d79d64043e0..ddfa4a1a310e 100644 --- a/svtools/source/toolpanel/tablayouter.cxx +++ b/svtools/source/toolpanel/tablayouter.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER 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/svtools/source/toolpanel/toolpanel.cxx b/svtools/source/toolpanel/toolpanel.cxx index b340eb7f7d51..badb3e713e05 100644 --- a/svtools/source/toolpanel/toolpanel.cxx +++ b/svtools/source/toolpanel/toolpanel.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER 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/svtools/source/toolpanel/toolpanel.src b/svtools/source/toolpanel/toolpanel.src index 5908a8fbcf98..32594b8c8efe 100644 --- a/svtools/source/toolpanel/toolpanel.src +++ b/svtools/source/toolpanel/toolpanel.src @@ -1,6 +1,6 @@ /************************************************************************* * DO NOT ALTER 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/svtools/source/toolpanel/toolpanelcollection.cxx b/svtools/source/toolpanel/toolpanelcollection.cxx index 13f738f507a7..fe2b7cd1c18d 100644 --- a/svtools/source/toolpanel/toolpanelcollection.cxx +++ b/svtools/source/toolpanel/toolpanelcollection.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -140,7 +140,7 @@ namespace svt if ( m_pData->aActivePanel == i_nPosition ) { const ::boost::optional< size_t > aOldActive( m_pData->aActivePanel ); - + if ( i_nPosition + 1 < GetPanelCount() ) { ++*m_pData->aActivePanel; diff --git a/svtools/source/toolpanel/toolpanelcollection.hxx b/svtools/source/toolpanel/toolpanelcollection.hxx index 02100f33cf2a..5a25dbcc4c93 100644 --- a/svtools/source/toolpanel/toolpanelcollection.hxx +++ b/svtools/source/toolpanel/toolpanelcollection.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER 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/svtools/source/toolpanel/toolpaneldeck.cxx b/svtools/source/toolpanel/toolpaneldeck.cxx index dd053f67082e..75350d972e9e 100644 --- a/svtools/source/toolpanel/toolpaneldeck.cxx +++ b/svtools/source/toolpanel/toolpaneldeck.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER 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/svtools/source/toolpanel/toolpaneldeckpeer.cxx b/svtools/source/toolpanel/toolpaneldeckpeer.cxx index c0a6f041f06f..00b3034edc8c 100644 --- a/svtools/source/toolpanel/toolpaneldeckpeer.cxx +++ b/svtools/source/toolpanel/toolpaneldeckpeer.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER 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/svtools/source/toolpanel/toolpaneldeckpeer.hxx b/svtools/source/toolpanel/toolpaneldeckpeer.hxx index ce9bb65d1d28..7f2b7e042b47 100644 --- a/svtools/source/toolpanel/toolpaneldeckpeer.hxx +++ b/svtools/source/toolpanel/toolpaneldeckpeer.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER 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/svtools/source/toolpanel/toolpaneldrawer.cxx b/svtools/source/toolpanel/toolpaneldrawer.cxx index 076a99411e7d..ffc75be4bffd 100644 --- a/svtools/source/toolpanel/toolpaneldrawer.cxx +++ b/svtools/source/toolpanel/toolpaneldrawer.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -152,7 +152,7 @@ namespace svt i_rTextBox.Top() + ( GetTextHeight() - nHeight ) / 2 ); m_pPaintDevice->DrawImage( aPosition, aImage ); - + aExpansionIndicatorArea = Rectangle( aPosition, aImage.GetSizePixel() ); } @@ -279,7 +279,7 @@ namespace svt m_pPaintDevice.reset( new VirtualDevice( *this ) ); // fall through. - + case DATACHANGED_FONTS: case DATACHANGED_FONTSUBSTITUTION: { @@ -290,7 +290,7 @@ namespace svt if ( IsControlFont() ) aFont.Merge( GetControlFont() ); SetZoomedPointFont( aFont ); - + // Color. Color aColor; if ( IsControlForeground() ) @@ -331,7 +331,7 @@ namespace svt Rectangle aTextBox( Point(), Size( - nAvailableWidth, + nAvailableWidth, GetSettings().GetStyleSettings().GetTitleHeight() ) ); diff --git a/svtools/source/toolpanel/toolpaneldrawer.hxx b/svtools/source/toolpanel/toolpaneldrawer.hxx index 40a34b5b2431..e39df79a1542 100644 --- a/svtools/source/toolpanel/toolpaneldrawer.hxx +++ b/svtools/source/toolpanel/toolpaneldrawer.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER 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 svt /** serves a single purpose - let ZoomText read the drawers ... Strange enough, ZoomText does not read the drawers when they get the focus (in none of the combinations - of AccessibleRoles I tried), except when it does have an AccessibleChild with the role LABEL. To "inject" + of AccessibleRoles I tried), except when it does have an AccessibleChild with the role LABEL. To "inject" such a child into the A11Y hierarchy, we use this window here. (We could also inject the A11Y component on the A11Y level only, but this would mean additional code. With diff --git a/svtools/source/toolpanel/toolpaneldrawerpeer.cxx b/svtools/source/toolpanel/toolpaneldrawerpeer.cxx index e6282c530a00..5f08e3e6b1cc 100644 --- a/svtools/source/toolpanel/toolpaneldrawerpeer.cxx +++ b/svtools/source/toolpanel/toolpaneldrawerpeer.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER 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,8 +73,8 @@ namespace svt { } - virtual void ProcessWindowEvent( const VclWindowEvent& i_rVclWindowEvent ); - virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& i_rStateSet ); + virtual void ProcessWindowEvent( const VclWindowEvent& i_rVclWindowEvent ); + virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& i_rStateSet ); protected: ~ToolPanelDrawerContext() diff --git a/svtools/source/toolpanel/toolpaneldrawerpeer.hxx b/svtools/source/toolpanel/toolpaneldrawerpeer.hxx index f2a7336b7033..ef6249a534c8 100644 --- a/svtools/source/toolpanel/toolpaneldrawerpeer.hxx +++ b/svtools/source/toolpanel/toolpaneldrawerpeer.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER 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/svtools/source/uno/addrtempuno.cxx b/svtools/source/uno/addrtempuno.cxx index 072b54d3a3f6..1d47fdd5857d 100644 --- a/svtools/source/uno/addrtempuno.cxx +++ b/svtools/source/uno/addrtempuno.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ namespace svt { // ....................................................................... -#define UNODIALOG_PROPERTY_ID_ALIASES 100 -#define UNODIALOG_PROPERTY_ALIASES "FieldMapping" +#define UNODIALOG_PROPERTY_ID_ALIASES 100 +#define UNODIALOG_PROPERTY_ALIASES "FieldMapping" using namespace com::sun::star::uno; using namespace com::sun::star::lang; @@ -62,10 +62,10 @@ namespace svt ,public ::comphelper::OPropertyArrayUsageHelper< OAddressBookSourceDialogUno > { protected: - Sequence< AliasProgrammaticPair > m_aAliases; + Sequence< AliasProgrammaticPair > m_aAliases; Reference< XDataSource > m_xDataSource; ::rtl::OUString m_sDataSourceName; - ::rtl::OUString m_sTable; + ::rtl::OUString m_sTable; protected: OAddressBookSourceDialogUno(const Reference< XMultiServiceFactory >& _rxORB); @@ -93,7 +93,7 @@ namespace svt protected: // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent); + virtual Dialog* createDialog(Window* _pParent); virtual void implInitialize(const com::sun::star::uno::Any& _rValue); @@ -228,7 +228,7 @@ namespace svt } //------------------------------------------------------------------------------ - Dialog* OAddressBookSourceDialogUno::createDialog(Window* _pParent) + Dialog* OAddressBookSourceDialogUno::createDialog(Window* _pParent) { if ( m_xDataSource.is() && m_sTable.getLength() ) return new AddressBookSourceDialog(_pParent, m_aContext.getLegacyServiceFactory(), m_xDataSource, m_sDataSourceName, m_sTable, m_aAliases ); @@ -237,7 +237,7 @@ namespace svt } // ....................................................................... -} // namespace svt +} // namespace svt // ....................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/uno/contextmenuhelper.cxx b/svtools/source/uno/contextmenuhelper.cxx index 65834dd8b3cc..13391a698bf5 100644 --- a/svtools/source/uno/contextmenuhelper.cxx +++ b/svtools/source/uno/contextmenuhelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 <com/sun/star/ui/ImageType.hpp> #include <com/sun/star/beans/PropertyValue.hpp> -#include <osl/conditn.hxx> +#include <osl/conditn.hxx> #include <cppuhelper/weak.hxx> #include <comphelper/processfactory.hxx> #include <osl/mutex.hxx> @@ -53,7 +53,7 @@ #include <toolkit/unohlp.hxx> #include <toolkit/awt/vclxwindow.hxx> #include <toolkit/awt/vclxmenu.hxx> - + using namespace ::com::sun::star; namespace svt @@ -75,13 +75,13 @@ class StateEventHelper : public ::com::sun::star::frame::XStatusListener, virtual uno::Any SAL_CALL queryInterface( const uno::Type& aType ) throw ( uno::RuntimeException); virtual void SAL_CALL acquire() throw (); virtual void SAL_CALL release() throw (); - + // XEventListener virtual void SAL_CALL disposing(const lang::EventObject& Source) throw( uno::RuntimeException ); - + // XStatusListener virtual void SAL_CALL statusChanged(const frame::FeatureStateEvent& Event) throw( uno::RuntimeException ); - + private: StateEventHelper(); StateEventHelper( const StateEventHelper& ); @@ -91,7 +91,7 @@ class StateEventHelper : public ::com::sun::star::frame::XStatusListener, ::rtl::OUString m_aCommandURL; uno::Reference< frame::XDispatchProvider > m_xDispatchProvider; uno::Reference< util::XURLTransformer > m_xURLTransformer; - osl::Condition m_aCondition; + osl::Condition m_aCondition; }; StateEventHelper::StateEventHelper( @@ -113,13 +113,13 @@ uno::Any SAL_CALL StateEventHelper::queryInterface( const uno::Type& aType ) throw ( uno::RuntimeException ) { - uno::Any a = ::cppu::queryInterface( + uno::Any a = ::cppu::queryInterface( aType, SAL_STATIC_CAST( XStatusListener*, this )); - + if( a.hasValue() ) return a; - + return ::cppu::OWeakObject::queryInterface( aType ); } @@ -135,7 +135,7 @@ throw () ::cppu::OWeakObject::release(); } -void SAL_CALL StateEventHelper::disposing( +void SAL_CALL StateEventHelper::disposing( const lang::EventObject& ) throw ( uno::RuntimeException ) { @@ -145,7 +145,7 @@ throw ( uno::RuntimeException ) m_aCondition.set(); } -void SAL_CALL StateEventHelper::statusChanged( +void SAL_CALL StateEventHelper::statusChanged( const frame::FeatureStateEvent& Event ) throw ( uno::RuntimeException ) { @@ -157,9 +157,9 @@ throw ( uno::RuntimeException ) bool StateEventHelper::isCommandEnabled() { // Be sure that we cannot die during condition wait - uno::Reference< frame::XStatusListener > xSelf( + uno::Reference< frame::XStatusListener > xSelf( SAL_STATIC_CAST( frame::XStatusListener*, this )); - + uno::Reference< frame::XDispatch > xDispatch; util::URL aTargetURL; { @@ -167,7 +167,7 @@ bool StateEventHelper::isCommandEnabled() if ( m_xDispatchProvider.is() && m_xURLTransformer.is() ) { ::rtl::OUString aSelf( RTL_CONSTASCII_USTRINGPARAM( "_self" )); - + aTargetURL.Complete = m_aCommandURL; m_xURLTransformer->parseStrict( aTargetURL ); @@ -193,7 +193,7 @@ bool StateEventHelper::isCommandEnabled() // add/remove ourself to retrieve status by callback xDispatch->addStatusListener( xSelf, aTargetURL ); xDispatch->removeStatusListener( xSelf, aTargetURL ); - + // wait for anwser m_aCondition.wait(); } @@ -208,19 +208,19 @@ bool StateEventHelper::isCommandEnabled() SolarMutexGuard aSolarGuard; bResult = m_bCurrentCommandEnabled; } - + return bResult; } /*************************************************************************/ - + struct ExecuteInfo { uno::Reference< frame::XDispatch > xDispatch; util::URL aTargetURL; uno::Sequence< beans::PropertyValue > aArgs; }; - + static const PopupMenu* lcl_FindPopupFromItemId( const PopupMenu* pPopupMenu, sal_uInt16 nItemId ) { if ( pPopupMenu ) @@ -234,7 +234,7 @@ static const PopupMenu* lcl_FindPopupFromItemId( const PopupMenu* pPopupMenu, sa else { const PopupMenu* pResult( 0 ); - + const PopupMenu* pSubPopup = pPopupMenu->GetPopupMenu( i ); if ( pPopupMenu ) pResult = lcl_FindPopupFromItemId( pSubPopup, nItemId ); @@ -259,7 +259,7 @@ static ::rtl::OUString lcl_GetItemCommandRecursive( const PopupMenu* pPopupMenu, /*************************************************************************/ ContextMenuHelper::ContextMenuHelper( - const uno::Reference< frame::XFrame >& xFrame, + const uno::Reference< frame::XFrame >& xFrame, bool bAutoRefresh ) : m_xWeakFrame( xFrame ), m_aSelf( RTL_CONSTASCII_USTRINGPARAM( "_self" )), @@ -272,22 +272,22 @@ ContextMenuHelper::~ContextMenuHelper() { } -void -ContextMenuHelper::completeAndExecute( - const Point& aPos, +void +ContextMenuHelper::completeAndExecute( + const Point& aPos, PopupMenu& rPopupMenu ) { SolarMutexGuard aSolarGuard; - + associateUIConfigurationManagers(); completeMenuProperties( &rPopupMenu ); executePopupMenu( aPos, &rPopupMenu ); resetAssociations(); } -void -ContextMenuHelper::completeAndExecute( - const Point& aPos, +void +ContextMenuHelper::completeAndExecute( + const Point& aPos, const uno::Reference< awt::XPopupMenu >& xPopupMenu ) { SolarMutexGuard aSolarGuard; @@ -307,17 +307,17 @@ ContextMenuHelper::completeAndExecute( } } -uno::Reference< awt::XPopupMenu > -ContextMenuHelper::create( +uno::Reference< awt::XPopupMenu > +ContextMenuHelper::create( const ::rtl::OUString& /*aPopupMenuResourceId*/ ) { // NOT IMPLEMENTED YET! return uno::Reference< awt::XPopupMenu >(); } -bool -ContextMenuHelper::createAndExecute( - const Point& /*aPos*/, +bool +ContextMenuHelper::createAndExecute( + const Point& /*aPos*/, const ::rtl::OUString& /*aPopupMenuResourceId*/ ) { // NOT IMPLEMENTED YET! @@ -326,8 +326,8 @@ ContextMenuHelper::createAndExecute( // private member -void -ContextMenuHelper::executePopupMenu( +void +ContextMenuHelper::executePopupMenu( const Point& rPos, PopupMenu* pMenu ) { @@ -354,19 +354,19 @@ ContextMenuHelper::executePopupMenu( } bool -ContextMenuHelper::dispatchCommand( +ContextMenuHelper::dispatchCommand( const uno::Reference< ::frame::XFrame >& rFrame, const ::rtl::OUString& aCommandURL ) { if ( !m_xURLTransformer.is() ) { - m_xURLTransformer = uno::Reference< util::XURLTransformer >( + m_xURLTransformer = uno::Reference< util::XURLTransformer >( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), uno::UNO_QUERY ); } - + util::URL aTargetURL; uno::Reference< frame::XDispatch > xDispatch; if ( m_xURLTransformer.is() ) @@ -374,7 +374,7 @@ ContextMenuHelper::dispatchCommand( aTargetURL.Complete = aCommandURL; m_xURLTransformer->parseStrict( aTargetURL ); - uno::Reference< frame::XDispatchProvider > xDispatchProvider( + uno::Reference< frame::XDispatchProvider > xDispatchProvider( rFrame, uno::UNO_QUERY ); if ( xDispatchProvider.is() ) { @@ -434,9 +434,9 @@ ContextMenuHelper::associateUIConfigurationManagers() uno::Reference< ui::XUIConfigurationManagerSupplier > xSupplier( xModel, uno::UNO_QUERY ); if ( xSupplier.is() ) { - uno::Reference< ui::XUIConfigurationManager > xDocUICfgMgr( + uno::Reference< ui::XUIConfigurationManager > xDocUICfgMgr( xSupplier->getUIConfigurationManager(), uno::UNO_QUERY ); - m_xDocImageMgr = uno::Reference< ui::XImageManager >( + m_xDocImageMgr = uno::Reference< ui::XImageManager >( xDocUICfgMgr->getImageManager(), uno::UNO_QUERY ); } } @@ -446,7 +446,7 @@ ContextMenuHelper::associateUIConfigurationManagers() rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ModuleManager" ))), uno::UNO_QUERY ); - + uno::Reference< ui::XImageManager > xModuleImageManager; rtl::OUString aModuleId; if ( xModuleManager.is() ) @@ -461,11 +461,11 @@ ContextMenuHelper::associateUIConfigurationManagers() uno::UNO_QUERY ); if ( xModuleCfgMgrSupplier.is() ) { - uno::Reference< ui::XUIConfigurationManager > xUICfgMgr( + uno::Reference< ui::XUIConfigurationManager > xUICfgMgr( xModuleCfgMgrSupplier->getUIConfigurationManager( aModuleId )); if ( xUICfgMgr.is() ) { - m_xModuleImageMgr = uno::Reference< ui::XImageManager >( + m_xModuleImageMgr = uno::Reference< ui::XImageManager >( xUICfgMgr->getImageManager(), uno::UNO_QUERY ); } } @@ -503,8 +503,8 @@ ContextMenuHelper::associateUIConfigurationManagers() return true; } -Image -ContextMenuHelper::getImageFromCommandURL( +Image +ContextMenuHelper::getImageFromCommandURL( const ::rtl::OUString& aCmdURL, bool bHiContrast ) const { @@ -513,11 +513,11 @@ ContextMenuHelper::getImageFromCommandURL( ui::ImageType::SIZE_DEFAULT ); if ( bHiContrast ) nImageType |= ui::ImageType::COLOR_HIGHCONTRAST; - + uno::Sequence< uno::Reference< graphic::XGraphic > > aGraphicSeq; uno::Sequence< ::rtl::OUString > aImageCmdSeq( 1 ); aImageCmdSeq[0] = aCmdURL; - + if ( m_xDocImageMgr.is() ) { try @@ -537,7 +537,7 @@ ContextMenuHelper::getImageFromCommandURL( { } } - + if ( m_xModuleImageMgr.is() ) { try @@ -562,11 +562,11 @@ ContextMenuHelper::getImageFromCommandURL( } rtl::OUString -ContextMenuHelper::getLabelFromCommandURL( +ContextMenuHelper::getLabelFromCommandURL( const ::rtl::OUString& aCmdURL ) const { ::rtl::OUString aLabel; - + if ( m_xUICommandLabels.is() ) { try @@ -601,8 +601,8 @@ ContextMenuHelper::getLabelFromCommandURL( return aLabel; } -void -ContextMenuHelper::completeMenuProperties( +void +ContextMenuHelper::completeMenuProperties( Menu* pMenu ) { // Retrieve some settings necessary to display complete context @@ -610,21 +610,21 @@ ContextMenuHelper::completeMenuProperties( const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); bool bShowMenuImages( rSettings.GetUseImagesInMenus() ); bool bIsHiContrast( rSettings.GetHighContrastMode() ); - + if ( pMenu ) { uno::Reference< frame::XFrame > xFrame( m_xWeakFrame ); uno::Reference< frame::XDispatchProvider > xDispatchProvider( xFrame, uno::UNO_QUERY ); - + if ( !m_xURLTransformer.is() ) { - m_xURLTransformer = uno::Reference< util::XURLTransformer >( + m_xURLTransformer = uno::Reference< util::XURLTransformer >( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), uno::UNO_QUERY ); } - + for ( sal_uInt16 nPos = 0; nPos < pMenu->GetItemCount(); nPos++ ) { sal_uInt16 nId = pMenu->GetItemId( nPos ); @@ -634,7 +634,7 @@ ContextMenuHelper::completeMenuProperties( if ( pMenu->GetItemType( nPos ) != MENUITEM_SEPARATOR ) { ::rtl::OUString aCmdURL( pMenu->GetItemCommand( nId )); - + if ( bShowMenuImages ) { Image aImage; @@ -652,8 +652,8 @@ ContextMenuHelper::completeMenuProperties( } // Use helper to retrieve state of the command URL - StateEventHelper* pHelper = new StateEventHelper( - xDispatchProvider, + StateEventHelper* pHelper = new StateEventHelper( + xDispatchProvider, m_xURLTransformer, aCmdURL ); @@ -667,7 +667,7 @@ ContextMenuHelper::completeMenuProperties( IMPL_STATIC_LINK_NOINSTANCE( ContextMenuHelper, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo ) { - // Release solar mutex to prevent deadlocks with clipboard thread + // Release solar mutex to prevent deadlocks with clipboard thread const sal_uInt32 nRef = Application::ReleaseSolarMutex(); try { diff --git a/svtools/source/uno/framestatuslistener.cxx b/svtools/source/uno/framestatuslistener.cxx index 5f1bc0de3ac1..a68f655ed732 100644 --- a/svtools/source/uno/framestatuslistener.cxx +++ b/svtools/source/uno/framestatuslistener.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,7 +195,7 @@ void FrameStatusListener::addStatusListener( const rtl::OUString& aCommandURL ) { SolarMutexGuard aSolarMutexGuard; URLToDispatchMap::iterator pIter = m_aListenerMap.find( aCommandURL ); - + // Already in the list of status listener. Do nothing. if ( pIter != m_aListenerMap.end() ) return; @@ -214,13 +214,13 @@ void FrameStatusListener::addStatusListener( const rtl::OUString& aCommandURL ) Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY ); if ( m_xServiceManager.is() && xDispatchProvider.is() ) { - Reference< XURLTransformer > xURLTransformer( m_xServiceManager->createInstance( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), + Reference< XURLTransformer > xURLTransformer( m_xServiceManager->createInstance( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), UNO_QUERY ); aTargetURL.Complete = aCommandURL; xURLTransformer->parseStrict( aTargetURL ); xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 ); - + xStatusListener = Reference< XStatusListener >( static_cast< OWeakObject* >( this ), UNO_QUERY ); URLToDispatchMap::iterator aIter = m_aListenerMap.find( aCommandURL ); if ( aIter != m_aListenerMap.end() ) @@ -235,14 +235,14 @@ void FrameStatusListener::addStatusListener( const rtl::OUString& aCommandURL ) } catch ( Exception& ) { - } + } } else m_aListenerMap.insert( URLToDispatchMap::value_type( aCommandURL, xDispatch )); } } } - + // Call without locked mutex as we are called back from dispatch implementation try { @@ -257,7 +257,7 @@ void FrameStatusListener::addStatusListener( const rtl::OUString& aCommandURL ) void FrameStatusListener::removeStatusListener( const rtl::OUString& aCommandURL ) { SolarMutexGuard aSolarMutexGuard; - + URLToDispatchMap::iterator pIter = m_aListenerMap.find( aCommandURL ); if ( pIter != m_aListenerMap.end() ) { @@ -267,13 +267,13 @@ void FrameStatusListener::removeStatusListener( const rtl::OUString& aCommandURL try { - Reference< XURLTransformer > xURLTransformer( m_xServiceManager->createInstance( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), + Reference< XURLTransformer > xURLTransformer( m_xServiceManager->createInstance( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), UNO_QUERY ); com::sun::star::util::URL aTargetURL; aTargetURL.Complete = aCommandURL; xURLTransformer->parseStrict( aTargetURL ); - + if ( xDispatch.is() && xStatusListener.is() ) xDispatch->removeStatusListener( xStatusListener, aTargetURL ); } @@ -290,10 +290,10 @@ void FrameStatusListener::bindListener() { SolarMutexGuard aSolarMutexGuard; - + if ( !m_bInitialized ) return; - + // Collect all registered command URL's and store them temporary Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY ); if ( m_xServiceManager.is() && xDispatchProvider.is() ) @@ -302,13 +302,13 @@ void FrameStatusListener::bindListener() URLToDispatchMap::iterator pIter = m_aListenerMap.begin(); while ( pIter != m_aListenerMap.end() ) { - Reference< XURLTransformer > xURLTransformer( m_xServiceManager->createInstance( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), + Reference< XURLTransformer > xURLTransformer( m_xServiceManager->createInstance( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), UNO_QUERY ); com::sun::star::util::URL aTargetURL; aTargetURL.Complete = pIter->first; xURLTransformer->parseStrict( aTargetURL ); - + Reference< XDispatch > xDispatch( pIter->second ); if ( xDispatch.is() ) { @@ -322,7 +322,7 @@ void FrameStatusListener::bindListener() { } } - + // Query for dispatch object. Old dispatch will be released with this, too. try { @@ -332,14 +332,14 @@ void FrameStatusListener::bindListener() { } pIter->second = xDispatch; - + Listener aListener( aTargetURL, xDispatch ); aDispatchVector.push_back( aListener ); ++pIter; } } } - + // Call without locked mutex as we are called back from dispatch implementation if ( xStatusListener.is() ) { @@ -361,10 +361,10 @@ void FrameStatusListener::bindListener() void FrameStatusListener::unbindListener() { SolarMutexGuard aSolarMutexGuard; - + if ( !m_bInitialized ) return; - + // Collect all registered command URL's and store them temporary Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY ); if ( m_xServiceManager.is() && xDispatchProvider.is() ) @@ -373,13 +373,13 @@ void FrameStatusListener::unbindListener() URLToDispatchMap::iterator pIter = m_aListenerMap.begin(); while ( pIter != m_aListenerMap.end() ) { - Reference< XURLTransformer > xURLTransformer( m_xServiceManager->createInstance( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), + Reference< XURLTransformer > xURLTransformer( m_xServiceManager->createInstance( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), UNO_QUERY ); com::sun::star::util::URL aTargetURL; aTargetURL.Complete = pIter->first; xURLTransformer->parseStrict( aTargetURL ); - + Reference< XDispatch > xDispatch( pIter->second ); if ( xDispatch.is() ) { @@ -404,20 +404,20 @@ void FrameStatusListener::updateStatus( const rtl::OUString aCommandURL ) Reference< XDispatch > xDispatch; Reference< XStatusListener > xStatusListener; com::sun::star::util::URL aTargetURL; - + { SolarMutexGuard aSolarMutexGuard; - + if ( !m_bInitialized ) return; - + // Try to find a dispatch object for the requested command URL Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY ); xStatusListener = Reference< XStatusListener >( static_cast< OWeakObject* >( this ), UNO_QUERY ); if ( m_xServiceManager.is() && xDispatchProvider.is() ) { - Reference< XURLTransformer > xURLTransformer( m_xServiceManager->createInstance( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), + Reference< XURLTransformer > xURLTransformer( m_xServiceManager->createInstance( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))), UNO_QUERY ); aTargetURL.Complete = aCommandURL; xURLTransformer->parseStrict( aTargetURL ); @@ -427,9 +427,9 @@ void FrameStatusListener::updateStatus( const rtl::OUString aCommandURL ) if ( xDispatch.is() && xStatusListener.is() ) { - // Catch exception as we release our mutex, it is possible that someone else + // Catch exception as we release our mutex, it is possible that someone else // has already disposed this instance! - // Add/remove status listener to get a update status information from the + // Add/remove status listener to get a update status information from the // requested command. try { diff --git a/svtools/source/uno/generictoolboxcontroller.cxx b/svtools/source/uno/generictoolboxcontroller.cxx index 5d3a3bcdd53c..5457b35255dd 100644 --- a/svtools/source/uno/generictoolboxcontroller.cxx +++ b/svtools/source/uno/generictoolboxcontroller.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,11 +31,11 @@ #include <svtools/generictoolboxcontroller.hxx> //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> @@ -45,7 +45,7 @@ #include <com/sun/star/frame/status/ItemState.hpp> //_________________________________________________________________________________________________________________ -// other includes +// other includes //_________________________________________________________________________________________________________________ #include <osl/mutex.hxx> #include <vcl/svapp.hxx> diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx index b1c050fe3eff..155bd158e659 100644 --- a/svtools/source/uno/genericunodialog.cxx +++ b/svtools/source/uno/genericunodialog.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -369,7 +369,7 @@ IMPL_LINK( OGenericUnoDialog, OnDialogDying, VclWindowEvent*, _pEvent ) } //......................................................................... -} // namespace svt +} // namespace svt //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/uno/miscservices.cxx b/svtools/source/uno/miscservices.cxx index 7219155e62b4..7a3aeb675b9e 100644 --- a/svtools/source/uno/miscservices.cxx +++ b/svtools/source/uno/miscservices.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,8 +67,8 @@ extern sdecl::ServiceDecl const serviceDecl; // for CreateInstance functions implemented elsewhere, while the function is within a namespace #define DECLARE_CREATEINSTANCE_NAMESPACE( nmspe, ImplName ) \ - namespace nmspe { \ - Reference< XInterface > SAL_CALL ImplName##_CreateInstance( const Reference< XMultiServiceFactory >& ); \ + namespace nmspe { \ + Reference< XInterface > SAL_CALL ImplName##_CreateInstance( const Reference< XMultiServiceFactory >& ); \ } namespace @@ -79,7 +79,7 @@ namespace ::svt::uno::Wizard::Create, ::svt::uno::Wizard::getImplementationName_static, ::svt::uno::Wizard::getSupportedServiceNames_static, - ::cppu::createSingleComponentFactory, NULL, 0 + ::cppu::createSingleComponentFactory, NULL, 0 }, { 0, 0, 0, 0, 0, 0 } }; @@ -110,7 +110,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo ( Reference< XRegistryKey > xRegistryKey ( reinterpret_cast< XRegistryKey* >( _pRegistryKey )); Reference< XRegistryKey > xNewKey; - uno::Sequence< ::rtl::OUString > aServices; + uno::Sequence< ::rtl::OUString > aServices; xNewKey = xRegistryKey->createKey ( OUString::createFromAscii( "/com.sun.star.comp.svtools.OAddressBookSourceDialogUno/UNO/SERVICES" ) ); @@ -123,23 +123,23 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo ( OUString::createFromAscii( "com.sun.star.ui.dialogs.FilterOptionsDialog" ) ); // GraphicProvider - xNewKey = reinterpret_cast< registry::XRegistryKey * >( _pRegistryKey )->createKey( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + - GraphicProvider::getImplementationName_Static() + + xNewKey = reinterpret_cast< registry::XRegistryKey * >( _pRegistryKey )->createKey( + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + + GraphicProvider::getImplementationName_Static() + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) ); - aServices = GraphicProvider::getSupportedServiceNames_Static(); + aServices = GraphicProvider::getSupportedServiceNames_Static(); int i; for( i = 0; i < aServices.getLength(); i++ ) xNewKey->createKey( aServices.getConstArray()[ i ] ); - + // GraphicRendererVCL - xNewKey = reinterpret_cast< registry::XRegistryKey * >( _pRegistryKey )->createKey( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + - GraphicRendererVCL::getImplementationName_Static() + + xNewKey = reinterpret_cast< registry::XRegistryKey * >( _pRegistryKey )->createKey( + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + + GraphicRendererVCL::getImplementationName_Static() + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) ); - - aServices = ( GraphicRendererVCL::getSupportedServiceNames_Static() ); + + aServices = ( GraphicRendererVCL::getSupportedServiceNames_Static() ); for( i = 0; i < aServices.getLength(); i++ ) xNewKey->createKey( aServices.getConstArray()[ i ] ); @@ -186,7 +186,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory ( } else if( 0 == GraphicProvider::getImplementationName_Static().compareToAscii( pImplementationName ) ) { - xFactory = ::cppu::createOneInstanceFactory( + xFactory = ::cppu::createOneInstanceFactory( reinterpret_cast< lang::XMultiServiceFactory * >( _pServiceManager ), GraphicProvider::getImplementationName_Static(), GraphicProvider_CreateInstance, @@ -194,13 +194,13 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory ( } else if( 0 == GraphicRendererVCL::getImplementationName_Static().compareToAscii( pImplementationName ) ) { - xFactory = ::cppu::createOneInstanceFactory( + xFactory = ::cppu::createOneInstanceFactory( reinterpret_cast< lang::XMultiServiceFactory * >( _pServiceManager ), GraphicRendererVCL::getImplementationName_Static(), GraphicRendererVCL_CreateInstance, GraphicRendererVCL::getSupportedServiceNames_Static() ); } - else + else { pResult = component_getFactoryHelper( pImplementationName, reinterpret_cast< lang::XMultiServiceFactory * >( _pServiceManager ),reinterpret_cast< registry::XRegistryKey* >( pRegistryKey ), serviceDecl ); if ( !pResult ) @@ -216,6 +216,6 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory ( return pResult; } -} // "C" +} // "C" /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/uno/popupmenucontrollerbase.cxx b/svtools/source/uno/popupmenucontrollerbase.cxx index bf828175532f..3ec62db42cb0 100644 --- a/svtools/source/uno/popupmenucontrollerbase.cxx +++ b/svtools/source/uno/popupmenucontrollerbase.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,13 +30,13 @@ #include "precompiled_svtools.hxx" //_________________________________________________________________________________________________________________ -// my own includes +// my own includes //_________________________________________________________________________________________________________________ #include "svtools/popupmenucontrollerbase.hxx" //_________________________________________________________________________________________________________________ -// interface includes +// interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/awt/XDevice.hpp> #include <com/sun/star/beans/PropertyValue.hpp> @@ -46,7 +46,7 @@ #include <com/sun/star/awt/XMenuExtended.hpp> //_________________________________________________________________________________________________________________ -// includes of other projects +// includes of other projects //_________________________________________________________________________________________________________________ #include <vcl/menu.hxx> @@ -56,9 +56,9 @@ #include <osl/mutex.hxx> //_________________________________________________________________________________________________________________ -// Defines +// Defines //_________________________________________________________________________________________________________________ -// +// using ::rtl::OUString; @@ -113,14 +113,14 @@ void PopupMenuControllerBase::resetPopupMenu( com::sun::star::uno::Reference< co if ( pPopupMenu ) { SolarMutexGuard aSolarMutexGuard; - + PopupMenu* pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu(); pVCLPopupMenu->Clear(); } } } -void SAL_CALL PopupMenuControllerBase::disposing() +void SAL_CALL PopupMenuControllerBase::disposing() { // Reset our members and set disposed flag osl::MutexGuard aLock( m_aMutex ); @@ -160,7 +160,7 @@ void SAL_CALL PopupMenuControllerBase::highlight( const awt::MenuEvent& ) throw void PopupMenuControllerBase::impl_select(const Reference< XDispatch >& _xDispatch,const URL& aURL) { - Sequence<PropertyValue> aArgs; + Sequence<PropertyValue> aArgs; OSL_ENSURE(_xDispatch.is(),"PopupMenuControllerBase::impl_select: No dispatch"); if ( _xDispatch.is() ) _xDispatch->dispatch( aURL, aArgs ); @@ -189,7 +189,7 @@ void PopupMenuControllerBase::dispatchCommand( const ::rtl::OUString& sCommandUR try { Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY_THROW ); - URL aURL; + URL aURL; aURL.Complete = sCommandURL; m_xURLTransformer->parseStrict( aURL ); @@ -220,8 +220,8 @@ void SAL_CALL PopupMenuControllerBase::deactivate( const awt::MenuEvent& ) throw } void SAL_CALL PopupMenuControllerBase::updatePopupMenu() throw ( ::com::sun::star::uno::RuntimeException ) -{ - osl::ClearableMutexGuard aLock( m_aMutex ); +{ + osl::ClearableMutexGuard aLock( m_aMutex ); throwIfDisposed(); aLock.clear(); @@ -230,7 +230,7 @@ void SAL_CALL PopupMenuControllerBase::updatePopupMenu() throw ( ::com::sun::sta void SAL_CALL PopupMenuControllerBase::updateCommand( const rtl::OUString& rCommandURL ) { - osl::ClearableMutexGuard aLock( m_aMutex ); + osl::ClearableMutexGuard aLock( m_aMutex ); Reference< XStatusListener > xStatusListener( static_cast< OWeakObject* >( this ), UNO_QUERY ); Reference< XDispatch > xDispatch( m_xDispatch ); URL aTargetURL; @@ -248,17 +248,17 @@ void SAL_CALL PopupMenuControllerBase::updateCommand( const rtl::OUString& rComm // XDispatchProvider -Reference< XDispatch > SAL_CALL -PopupMenuControllerBase::queryDispatch( - const URL& /*aURL*/, - const rtl::OUString& /*sTarget*/, - sal_Int32 /*nFlags*/ ) +Reference< XDispatch > SAL_CALL +PopupMenuControllerBase::queryDispatch( + const URL& /*aURL*/, + const rtl::OUString& /*sTarget*/, + sal_Int32 /*nFlags*/ ) throw( RuntimeException ) { // must be implemented by subclass osl::MutexGuard aLock( m_aMutex ); throwIfDisposed(); - + return Reference< XDispatch >(); } @@ -269,7 +269,7 @@ Sequence< Reference< XDispatch > > SAL_CALL PopupMenuControllerBase::queryDispat osl::ClearableMutexGuard aLock( m_aMutex ); throwIfDisposed(); aLock.clear(); - + sal_Int32 nCount = lDescriptor.getLength(); uno::Sequence< uno::Reference< frame::XDispatch > > lDispatcher( nCount ); @@ -285,10 +285,10 @@ Sequence< Reference< XDispatch > > SAL_CALL PopupMenuControllerBase::queryDispat } // XDispatch -void SAL_CALL +void SAL_CALL PopupMenuControllerBase::dispatch( - const URL& /*aURL*/, - const Sequence< PropertyValue >& /*seqProperties*/ ) + const URL& /*aURL*/, + const Sequence< PropertyValue >& /*seqProperties*/ ) throw( ::com::sun::star::uno::RuntimeException ) { // must be implemented by subclass @@ -296,16 +296,16 @@ throw( ::com::sun::star::uno::RuntimeException ) throwIfDisposed(); } -void SAL_CALL -PopupMenuControllerBase::addStatusListener( +void SAL_CALL +PopupMenuControllerBase::addStatusListener( const Reference< XStatusListener >& xControl, - const URL& aURL ) + const URL& aURL ) throw( ::com::sun::star::uno::RuntimeException ) { osl::ResettableMutexGuard aLock( m_aMutex ); throwIfDisposed(); aLock.clear(); - + bool bStatusUpdate( false ); rBHelper.addListener( ::getCppuType( &xControl ), xControl ); @@ -313,7 +313,7 @@ throw( ::com::sun::star::uno::RuntimeException ) if ( aURL.Complete.indexOf( m_aBaseURL ) == 0 ) bStatusUpdate = true; aLock.clear(); - + if ( bStatusUpdate ) { // Dummy update for popup menu controllers @@ -326,9 +326,9 @@ throw( ::com::sun::star::uno::RuntimeException ) } } -void SAL_CALL PopupMenuControllerBase::removeStatusListener( - const Reference< XStatusListener >& xControl, - const URL& /*aURL*/ ) +void SAL_CALL PopupMenuControllerBase::removeStatusListener( + const Reference< XStatusListener >& xControl, + const URL& /*aURL*/ ) throw( ::com::sun::star::uno::RuntimeException ) { rBHelper.removeListener( ::getCppuType( &xControl ), xControl ); @@ -340,18 +340,18 @@ throw( ::com::sun::star::uno::RuntimeException ) sal_Int32 nQueryPart( 0 ); sal_Int32 nSchemePart( 0 ); rtl::OUString aMainURL( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.popup:" )); - + nSchemePart = aURL.indexOf( ':' ); - if (( nSchemePart > 0 ) && + if (( nSchemePart > 0 ) && ( aURL.getLength() > ( nSchemePart+1 ))) { nQueryPart = aURL.indexOf( '?', nSchemePart ); if ( nQueryPart > 0 ) aMainURL += aURL.copy( nSchemePart, nQueryPart-nSchemePart ); else if ( nQueryPart == -1 ) - aMainURL += aURL.copy( nSchemePart+1 ); + aMainURL += aURL.copy( nSchemePart+1 ); } - + return aMainURL; } @@ -359,14 +359,14 @@ throw( ::com::sun::star::uno::RuntimeException ) void SAL_CALL PopupMenuControllerBase::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException ) { osl::MutexGuard aLock( m_aMutex ); - + sal_Bool bInitalized( m_bInitialized ); if ( !bInitalized ) { PropertyValue aPropValue; rtl::OUString aCommandURL; Reference< XFrame > xFrame; - + for ( int i = 0; i < aArguments.getLength(); i++ ) { if ( aArguments[i] >>= aPropValue ) @@ -392,17 +392,17 @@ void SAL_CALL PopupMenuControllerBase::setPopupMenu( const Reference< awt::XPopu { osl::MutexGuard aLock( m_aMutex ); throwIfDisposed(); - + if ( m_xFrame.is() && !m_xPopupMenu.is() ) { // Create popup menu on demand SolarMutexGuard aSolarMutexGuard; - + m_xPopupMenu = xPopupMenu; m_xPopupMenu->addMenuListener( Reference< awt::XMenuListener >( (OWeakObject*)this, UNO_QUERY )); - + Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY ); - + URL aTargetURL; aTargetURL.Complete = m_aCommandURL; m_xURLTransformer->parseStrict( aTargetURL ); @@ -411,7 +411,7 @@ void SAL_CALL PopupMenuControllerBase::setPopupMenu( const Reference< awt::XPopu impl_setPopupMenu(); updatePopupMenu(); - } + } } void PopupMenuControllerBase::impl_setPopupMenu() { diff --git a/svtools/source/uno/popupwindowcontroller.cxx b/svtools/source/uno/popupwindowcontroller.cxx index 03368204401b..989007269bd0 100644 --- a/svtools/source/uno/popupwindowcontroller.cxx +++ b/svtools/source/uno/popupwindowcontroller.cxx @@ -158,13 +158,13 @@ PopupWindowController::~PopupWindowController() } // XInterface -Any SAL_CALL PopupWindowController::queryInterface( const Type& aType ) +Any SAL_CALL PopupWindowController::queryInterface( const Type& aType ) throw (RuntimeException) { Any a( ToolboxController::queryInterface( aType ) ); if ( a.hasValue() ) return a; - + return ::cppu::queryInterface( aType, static_cast< lang::XServiceInfo* >( this )); } @@ -243,13 +243,13 @@ Reference< awt::XWindow > SAL_CALL PopupWindowController::createPopupWindow() th { pWin->EnableDocking(true); mpImpl->SetPopupWindow(pWin,pToolBox); - ::Window::GetDockingManager()->StartPopupMode( pToolBox, pWin, FLOATWIN_POPUPMODE_NOFOCUSCLOSE|FLOATWIN_POPUPMODE_ALLMOUSEBUTTONCLOSE |FLOATWIN_POPUPMODE_NOMOUSEUPCLOSE ); + ::Window::GetDockingManager()->StartPopupMode( pToolBox, pWin, FLOATWIN_POPUPMODE_NOFOCUSCLOSE|FLOATWIN_POPUPMODE_ALLMOUSEBUTTONCLOSE |FLOATWIN_POPUPMODE_NOMOUSEUPCLOSE ); } } return Reference< awt::XWindow >(); } -Reference< awt::XWindow > SAL_CALL PopupWindowController::createItemWindow( const Reference< awt::XWindow >& /*Parent*/ ) +Reference< awt::XWindow > SAL_CALL PopupWindowController::createItemWindow( const Reference< awt::XWindow >& /*Parent*/ ) throw (RuntimeException) { return Reference< awt::XWindow >(); diff --git a/svtools/source/uno/statusbarcontroller.cxx b/svtools/source/uno/statusbarcontroller.cxx index 936853be6d10..c23be17f77b5 100644 --- a/svtools/source/uno/statusbarcontroller.cxx +++ b/svtools/source/uno/statusbarcontroller.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -674,10 +674,10 @@ void StatusbarController::updateStatus( const rtl::OUString aCommandURL ) ::Rectangle StatusbarController::getControlRect() const { ::Rectangle aRect; - + { SolarMutexGuard aSolarMutexGuard; - + if ( m_bDisposed ) throw DisposedException(); diff --git a/svtools/source/uno/svtxgridcontrol.cxx b/svtools/source/uno/svtxgridcontrol.cxx index 1e82f2f729ef..bf3ec2209bae 100644 --- a/svtools/source/uno/svtxgridcontrol.cxx +++ b/svtools/source/uno/svtxgridcontrol.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ SVTXGridControl::SVTXGridControl() m_xDataModel(0), m_xColumnModel(0), m_bHasColumnHeaders(false), - m_bHasRowHeaders(false), + m_bHasRowHeaders(false), m_bVScroll(false), m_bHScroll(false), m_bUpdate(false), @@ -149,11 +149,11 @@ void SVTXGridControl::setProperty( const ::rtl::OUString& PropertyName, const An SelectionMode eSelMode; switch( eSelectionType ) { - case SelectionType_SINGLE: eSelMode = SINGLE_SELECTION; break; - case SelectionType_RANGE: eSelMode = RANGE_SELECTION; break; - case SelectionType_MULTI: eSelMode = MULTIPLE_SELECTION; break; - // case SelectionType_NONE: - default: eSelMode = NO_SELECTION; break; + case SelectionType_SINGLE: eSelMode = SINGLE_SELECTION; break; + case SelectionType_RANGE: eSelMode = RANGE_SELECTION; break; + case SelectionType_MULTI: eSelMode = MULTIPLE_SELECTION; break; + // case SelectionType_NONE: + default: eSelMode = NO_SELECTION; break; } if( pTable->getSelEngine()->GetSelectionMode() != eSelMode ) pTable->getSelEngine()->SetSelectionMode( eSelMode ); @@ -242,16 +242,16 @@ void SVTXGridControl::setProperty( const ::rtl::OUString& PropertyName, const An { switch( vAlign ) { - case com::sun::star::style::VerticalAlignment_TOP: m_pTableModel->setVerticalAlign(com::sun::star::style::VerticalAlignment(0)); break; - case com::sun::star::style::VerticalAlignment_MIDDLE: m_pTableModel->setVerticalAlign(com::sun::star::style::VerticalAlignment(1)); break; - case com::sun::star::style::VerticalAlignment_BOTTOM: m_pTableModel->setVerticalAlign(com::sun::star::style::VerticalAlignment(2)); break; + case com::sun::star::style::VerticalAlignment_TOP: m_pTableModel->setVerticalAlign(com::sun::star::style::VerticalAlignment(0)); break; + case com::sun::star::style::VerticalAlignment_MIDDLE: m_pTableModel->setVerticalAlign(com::sun::star::style::VerticalAlignment(1)); break; + case com::sun::star::style::VerticalAlignment_BOTTOM: m_pTableModel->setVerticalAlign(com::sun::star::style::VerticalAlignment(2)); break; default: m_pTableModel->setVerticalAlign(com::sun::star::style::VerticalAlignment(0)); break; } } break; } - case BASEPROPERTY_GRID_SHOWCOLUMNHEADER: + case BASEPROPERTY_GRID_SHOWCOLUMNHEADER: { sal_Bool colHeader = true; if( aValue >>= colHeader ) @@ -293,12 +293,12 @@ void SVTXGridControl::setProperty( const ::rtl::OUString& PropertyName, const An } m_pTableModel->getCellContent().push_back(newRow); } - + Sequence< ::rtl::OUString > rowHeaders = m_xDataModel->getRowHeaders(); std::vector< rtl::OUString > newRow( comphelper::sequenceToContainer< std::vector<rtl::OUString > >(rowHeaders)); m_pTableModel->setRowCount(m_xDataModel->getRowCount()); - m_pTableModel->setRowHeaderName(newRow); + m_pTableModel->setRowHeaderName(newRow); } } else @@ -312,7 +312,7 @@ void SVTXGridControl::setProperty( const ::rtl::OUString& PropertyName, const An else m_pTableModel->setRowHeight(m_xDataModel->getRowHeight()); m_pTableModel->setRowHeaderWidth(m_xDataModel->getRowHeaderWidth()); - } + } break; } case BASEPROPERTY_GRID_COLUMNMODEL: @@ -378,11 +378,11 @@ Any SVTXGridControl::getProperty( const ::rtl::OUString& PropertyName ) throw(Ru SelectionMode eSelMode = pTable->getSelEngine()->GetSelectionMode(); switch( eSelMode ) { - case SINGLE_SELECTION: eSelectionType = SelectionType_SINGLE; break; - case RANGE_SELECTION: eSelectionType = SelectionType_RANGE; break; + case SINGLE_SELECTION: eSelectionType = SelectionType_SINGLE; break; + case RANGE_SELECTION: eSelectionType = SelectionType_RANGE; break; case MULTIPLE_SELECTION:eSelectionType = SelectionType_MULTI; break; -// case NO_SELECTION: - default: eSelectionType = SelectionType_NONE; break; +// case NO_SELECTION: + default: eSelectionType = SelectionType_NONE; break; } return Any( eSelectionType ); } @@ -399,7 +399,7 @@ Any SVTXGridControl::getProperty( const ::rtl::OUString& PropertyName ) throw(Ru case BASEPROPERTY_HSCROLL: return Any ( m_bHScroll); case BASEPROPERTY_VSCROLL: - return Any ( m_bVScroll); + return Any ( m_bVScroll); } } return VCLXWindow::getProperty( PropertyName ); @@ -451,15 +451,15 @@ void SAL_CALL SVTXGridControl::rowAdded(const ::com::sun::star::awt::grid::GridD { UnoControlTableColumn* tableColumn = new UnoControlTableColumn(); m_pTableModel->getColumnModel().push_back((PColumnModel)tableColumn); - m_xColumnModel->getColumn(col)->addColumnListener(listener); + m_xColumnModel->getColumn(col)->addColumnListener(listener); } - + } else if((unsigned int)rawRowData.getLength()!=(unsigned)colCount) throw GridInvalidDataException(rtl::OUString::createFromAscii("The column count doesn't match with the length of row data"), m_xDataModel); - for ( int k = 0; k < rawRowData.getLength(); k++) - newRow.push_back(rawRowData[k]); + for ( int k = 0; k < rawRowData.getLength(); k++) + newRow.push_back(rawRowData[k]); m_pTableModel->getCellContent().push_back(newRow); if(m_pTableModel->hasRowHeaders()) m_pTableModel->getRowHeaderName().push_back(Event.headerName); @@ -663,7 +663,7 @@ void SAL_CALL SVTXGridControl::disposing( const ::com::sun::star::lang::EventObj } void SAL_CALL SVTXGridControl::selectRows(const ::com::sun::star::uno::Sequence< ::sal_Int32 >& rangeOfRows) throw (::com::sun::star::uno::RuntimeException) -{ +{ TableControl* pTable = (TableControl*)GetWindow(); SelectionMode eSelMode = pTable->getSelEngine()->GetSelectionMode(); if(eSelMode != NO_SELECTION) @@ -680,7 +680,7 @@ void SAL_CALL SVTXGridControl::selectRows(const ::com::sun::star::uno::Sequence< selectedRows.clear(); if(rangeOfRows.getLength() == 1) selectedRows.push_back(start); - else + else return; } else @@ -719,7 +719,7 @@ void SAL_CALL SVTXGridControl::selectAllRows() throw (::com::sun::star::uno::Run } void SAL_CALL SVTXGridControl::deselectRows(const ::com::sun::star::uno::Sequence< ::sal_Int32 >& rangeOfRows) throw (::com::sun::star::uno::RuntimeException) -{ +{ TableControl* pTable = (TableControl*)GetWindow(); std::vector<RowPos>& selectedRows = pTable->GetSelectedRows(); std::vector<RowPos>::iterator itStart = selectedRows.begin(); @@ -795,7 +795,7 @@ void SAL_CALL SVTXGridControl::selectRow(::sal_Int32 index) throw (::com::sun::s return; } else if(eSelMode == SINGLE_SELECTION) - { + { if(!selectedRows.empty()) { if(!isSelectedIndex(index)) diff --git a/svtools/source/uno/svtxgridcontrol.hxx b/svtools/source/uno/svtxgridcontrol.hxx index ef94979d79eb..4cf2009f535e 100644 --- a/svtools/source/uno/svtxgridcontrol.hxx +++ b/svtools/source/uno/svtxgridcontrol.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ using namespace ::svt::table; -class SVTXGridControl : public ::cppu::ImplInheritanceHelper3< VCLXWindow, ::com::sun::star::awt::grid::XGridControl, +class SVTXGridControl : public ::cppu::ImplInheritanceHelper3< VCLXWindow, ::com::sun::star::awt::grid::XGridControl, ::com::sun::star::awt::grid::XGridDataListener, ::com::sun::star::awt::grid::XGridColumnListener> { private: @@ -64,9 +64,9 @@ private: SelectionListenerMultiplexer m_aSelectionListeners; protected: - virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); + virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); void ImplCallItemListeners(); - + public: SVTXGridControl(); ~SVTXGridControl(); @@ -77,16 +77,16 @@ public: //XGridColumnListener overridables virtual void SAL_CALL columnChanged(const ::com::sun::star::awt::grid::GridColumnEvent & Event) throw (::com::sun::star::uno::RuntimeException); - + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { VCLXWindow::acquire(); } - void SAL_CALL release() throw() { VCLXWindow::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { VCLXWindow::acquire(); } + void SAL_CALL release() throw() { VCLXWindow::release(); } // ::com::sun::star::lang::XTypeProvider - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); //::com::sun::star::awt::grid::XGridControl virtual ::sal_Int32 SAL_CALL getMinSelectionIndex() throw (::com::sun::star::uno::RuntimeException); @@ -103,8 +103,8 @@ public: virtual void SAL_CALL selectColumn(::sal_Int32 x) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addSelectionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridSelectionListener > & listener) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeSelectionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridSelectionListener > & listener) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Int32 SAL_CALL getItemIndexAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setToolTip(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& text, const ::com::sun::star::uno::Sequence< sal_Int32 >& columns) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getItemIndexAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setToolTip(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& text, const ::com::sun::star::uno::Sequence< sal_Int32 >& columns) throw (::com::sun::star::uno::RuntimeException); void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx index 2981959bf035..285b2aef1c34 100644 --- a/svtools/source/uno/toolboxcontroller.cxx +++ b/svtools/source/uno/toolboxcontroller.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 <toolkit/unohlp.hxx> #include <vcl/toolbox.hxx> -//shizhobo +//shizhobo #include <com/sun/star/beans/PropertyAttribute.hpp> const int TOOLBARCONTROLLER_PROPHANDLE_SUPPORTSVISIABLE = 1; const int TOOLBARCONTROLLER_PROPCOUNT = 1; @@ -87,15 +87,15 @@ struct ToolboxController_Impl }; ToolboxController::ToolboxController( - + const Reference< XMultiServiceFactory >& rServiceManager, const Reference< XFrame >& xFrame, const ::rtl::OUString& aCommandURL ) : OPropertyContainer(GetBroadcastHelper()) - , OWeakObject() + , OWeakObject() , m_bInitialized( sal_False ) , m_bDisposed( sal_False ) - , m_xFrame(xFrame) + , m_xFrame(xFrame) , m_xServiceManager( rServiceManager ) , m_aCommandURL( aCommandURL ) , m_aListenerContainer( m_aMutex ) @@ -119,7 +119,7 @@ ToolboxController::ToolboxController( ToolboxController::ToolboxController() : OPropertyContainer(GetBroadcastHelper()) - , OWeakObject() + , OWeakObject() , m_bInitialized( sal_False ) , m_bDisposed( sal_False ) , m_aListenerContainer( m_aMutex ) @@ -190,7 +190,7 @@ throw ( RuntimeException ) ,static_cast<XMultiPropertySet*>(this) ,static_cast<XFastPropertySet*>(this)); if (!a.hasValue()) - return OWeakObject::queryInterface( rType ); + return OWeakObject::queryInterface( rType ); } return a; } @@ -209,7 +209,7 @@ void SAL_CALL ToolboxController::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException ) { bool bInitialized( true ); - + { SolarMutexGuard aSolarMutexGuard; @@ -223,7 +223,7 @@ throw ( Exception, RuntimeException ) { SolarMutexGuard aSolarMutexGuard; m_bInitialized = sal_True; - //shizhoubo add + //shizhoubo add m_bSupportVisiable = sal_False; PropertyValue aPropValue; for ( int i = 0; i < aArguments.getLength(); i++ ) @@ -261,13 +261,13 @@ throw ( Exception, RuntimeException ) void SAL_CALL ToolboxController::update() throw ( RuntimeException ) -{ +{ { SolarMutexGuard aSolarMutexGuard; if ( m_bDisposed ) throw DisposedException(); } - + // Bind all registered listeners to their dispatch objects bindListener(); } @@ -755,7 +755,7 @@ void ToolboxController::dispatchCommand( const OUString& sCommandURL, const Sequ try { Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY_THROW ); - URL aURL; + URL aURL; aURL.Complete = sCommandURL; getURLTransformer()->parseStrict( aURL ); @@ -826,7 +826,7 @@ throw( com::sun::star::uno::Exception) { OPropertyContainer::setFastPropertyValue_NoBroadcast(nHandle, aValue); if (TOOLBARCONTROLLER_PROPHANDLE_SUPPORTSVISIABLE == nHandle) - { + { sal_Bool rValue(sal_False); if (( aValue >>= rValue ) && m_bInitialized) this->setSupportVisiableProperty( rValue ); diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx index 5ec1f1cc40cd..96a5e0a685cf 100644 --- a/svtools/source/uno/treecontrolpeer.cxx +++ b/svtools/source/uno/treecontrolpeer.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,10 +109,10 @@ public: sal_uInt32 insert( SvLBoxEntry* pEntry,SvLBoxEntry* pParent,ULONG nPos=LIST_APPEND ); - virtual void RequestingChilds( SvLBoxEntry* pParent ); + virtual void RequestingChilds( SvLBoxEntry* pParent ); - virtual BOOL EditingEntry( SvLBoxEntry* pEntry, Selection& ); - virtual BOOL EditedEntry( SvLBoxEntry* pEntry, const XubString& rNewText ); + virtual BOOL EditingEntry( SvLBoxEntry* pEntry, Selection& ); + virtual BOOL EditedEntry( SvLBoxEntry* pEntry, const XubString& rNewText ); DECL_LINK( OnSelectionChangeHdl, UnoTreeListBoxImpl* ); DECL_LINK( OnExpandingHdl, UnoTreeListBoxImpl* ); @@ -129,23 +129,23 @@ class SVT_DLLPUBLIC UnoTreeListItem : public SvLBoxItem public: UnoTreeListItem( SvLBoxEntry* ); UnoTreeListItem(); - virtual ~UnoTreeListItem(); - virtual USHORT IsA(); - void InitViewData( SvLBox*,SvLBoxEntry*,SvViewDataItem* ); - OUString GetText() const; - void SetText( const OUString& rText ); - Image GetImage() const; - void SetImage( const Image& rImage ); - OUString GetGraphicURL() const; - void SetGraphicURL( const OUString& rGraphicURL ); - void Paint( const Point&, SvLBox& rDev, USHORT nFlags,SvLBoxEntry* ); - SvLBoxItem* Create() const; - void Clone( SvLBoxItem* pSource ); + virtual ~UnoTreeListItem(); + virtual USHORT IsA(); + void InitViewData( SvLBox*,SvLBoxEntry*,SvViewDataItem* ); + OUString GetText() const; + void SetText( const OUString& rText ); + Image GetImage() const; + void SetImage( const Image& rImage ); + OUString GetGraphicURL() const; + void SetGraphicURL( const OUString& rGraphicURL ); + void Paint( const Point&, SvLBox& rDev, USHORT nFlags,SvLBoxEntry* ); + SvLBoxItem* Create() const; + void Clone( SvLBoxItem* pSource ); private: - OUString maText; - OUString maGraphicURL; - Image maImage; + OUString maText; + OUString maGraphicURL; + Image maImage; }; // -------------------------------------------------------------------- @@ -339,7 +339,7 @@ bool TreeControlPeer::updateEntry( UnoTreeListEntry* pEntry ) if( pContextGraphicItem->msExpandedGraphicURL != pEntry->mxNode->getExpandedGraphicURL() ) { Image aImage; - if( loadImage( pEntry->mxNode->getExpandedGraphicURL(), aImage ) ) + if( loadImage( pEntry->mxNode->getExpandedGraphicURL(), aImage ) ) { pContextGraphicItem->msExpandedGraphicURL = pEntry->mxNode->getExpandedGraphicURL(); mpTreeImpl->SetExpandedEntryBmp( pEntry, aImage ); @@ -349,7 +349,7 @@ bool TreeControlPeer::updateEntry( UnoTreeListEntry* pEntry ) if( pContextGraphicItem->msCollapsedGraphicURL != pEntry->mxNode->getCollapsedGraphicURL() ) { Image aImage; - if( loadImage( pEntry->mxNode->getCollapsedGraphicURL(), aImage ) ) + if( loadImage( pEntry->mxNode->getCollapsedGraphicURL(), aImage ) ) { pContextGraphicItem->msCollapsedGraphicURL = pEntry->mxNode->getCollapsedGraphicURL(); mpTreeImpl->SetCollapsedEntryBmp( pEntry, aImage ); @@ -682,7 +682,7 @@ Reference< XEnumeration > SAL_CALL TreeControlPeer::createSelectionEnumeration() ::osl::SolarGuard aGuard( GetMutex() ); UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow(); - + sal_uInt32 nSelectionCount = rTree.GetSelectionCount(); std::list< Any > aSelection( nSelectionCount ); @@ -706,7 +706,7 @@ Reference< XEnumeration > SAL_CALL TreeControlPeer::createReverseSelectionEnumer ::osl::SolarGuard aGuard( GetMutex() ); UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow(); - + sal_uInt32 nSelectionCount = rTree.GetSelectionCount(); std::list< Any > aSelection; @@ -1106,7 +1106,7 @@ void TreeControlPeer::updateNode( UnoTreeListBoxImpl& rTree, const Reference< XT Reference< XTreeNode > xParentNode( xNode->getParent() ); UnoTreeListEntry* pParentEntry = 0; ULONG nChild = LIST_APPEND; - + if( xParentNode.is() ) { pParentEntry = getEntry( xParentNode ); @@ -1346,11 +1346,11 @@ void TreeControlPeer::setProperty( const ::rtl::OUString& PropertyName, const An SelectionMode eSelMode; switch( eSelectionType ) { - case SelectionType_SINGLE: eSelMode = SINGLE_SELECTION; break; - case SelectionType_RANGE: eSelMode = RANGE_SELECTION; break; - case SelectionType_MULTI: eSelMode = MULTIPLE_SELECTION; break; - // case SelectionType_NONE: - default: eSelMode = NO_SELECTION; break; + case SelectionType_SINGLE: eSelMode = SINGLE_SELECTION; break; + case SelectionType_RANGE: eSelMode = RANGE_SELECTION; break; + case SelectionType_MULTI: eSelMode = MULTIPLE_SELECTION; break; + // case SelectionType_NONE: + default: eSelMode = NO_SELECTION; break; } if( rTree.GetSelectionMode() != eSelMode ) rTree.SetSelectionMode( eSelMode ); @@ -1358,7 +1358,7 @@ void TreeControlPeer::setProperty( const ::rtl::OUString& PropertyName, const An break; } - case BASEPROPERTY_TREE_DATAMODEL: + case BASEPROPERTY_TREE_DATAMODEL: onChangeDataModel( rTree, Reference< XTreeDataModel >( aValue, UNO_QUERY ) ); break; case BASEPROPERTY_TREE_ROWHEIGHT: @@ -1438,11 +1438,11 @@ Any TreeControlPeer::getProperty( const ::rtl::OUString& PropertyName ) throw(Ru SelectionMode eSelMode = rTree.GetSelectionMode(); switch( eSelMode ) { - case SINGLE_SELECTION: eSelectionType = SelectionType_SINGLE; break; - case RANGE_SELECTION: eSelectionType = SelectionType_RANGE; break; + case SINGLE_SELECTION: eSelectionType = SelectionType_SINGLE; break; + case RANGE_SELECTION: eSelectionType = SelectionType_RANGE; break; case MULTIPLE_SELECTION:eSelectionType = SelectionType_MULTI; break; -// case NO_SELECTION: - default: eSelectionType = SelectionType_NONE; break; +// case NO_SELECTION: + default: eSelectionType = SelectionType_NONE; break; } return Any( eSelectionType ); } diff --git a/svtools/source/uno/treecontrolpeer.hxx b/svtools/source/uno/treecontrolpeer.hxx index 5e3a9a1668ef..1749b6fb25bc 100644 --- a/svtools/source/uno/treecontrolpeer.hxx +++ b/svtools/source/uno/treecontrolpeer.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ class TreeControlPeer; class UnoTreeListBoxImpl; class TreeNodeMap; -// ---------------------------------------------------- -// class TreeControlPeer -// ---------------------------------------------------- -class TreeControlPeer : public ::cppu::ImplInheritanceHelper2< VCLXWindow, ::com::sun::star::awt::tree::XTreeControl, ::com::sun::star::awt::tree::XTreeDataModelListener > +// ---------------------------------------------------- +// class TreeControlPeer +// ---------------------------------------------------- +class TreeControlPeer : public ::cppu::ImplInheritanceHelper2< VCLXWindow, ::com::sun::star::awt::tree::XTreeControl, ::com::sun::star::awt::tree::XTreeDataModelListener > { friend class UnoTreeListBoxImpl; friend class UnoTreeListEntry; diff --git a/svtools/source/uno/unocontroltablemodel.cxx b/svtools/source/uno/unocontroltablemodel.cxx index 6be5a1962d96..8275d56658a0 100644 --- a/svtools/source/uno/unocontroltablemodel.cxx +++ b/svtools/source/uno/unocontroltablemodel.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ using namespace ::com::sun::star::uno; :m_nID( 0 ) ,m_sName() ,m_bIsResizable( true ) - ,m_nWidth( 4 ) - ,m_nMinWidth( 0 ) + ,m_nWidth( 4 ) + ,m_nMinWidth( 0 ) ,m_nMaxWidth( 0 ) ,m_nPrefWidth ( 0 ) ,m_xHorizontalAlign(com::sun::star::style::HorizontalAlignment(0)) @@ -63,9 +63,9 @@ using namespace ::com::sun::star::uno; :m_nID( 0 ) ,m_sName() ,m_bIsResizable( true ) - ,m_nWidth( 4 ) + ,m_nWidth( 4 ) ,m_nMinWidth( 0 ) - ,m_nMaxWidth( 0 ) + ,m_nMaxWidth( 0 ) ,m_nPrefWidth ( 0 ) ,m_xHorizontalAlign(com::sun::star::style::HorizontalAlignment(0)) { @@ -76,67 +76,67 @@ using namespace ::com::sun::star::uno; { return m_nID; } - + //-------------------------------------------------------------------- bool UnoControlTableColumn::setID( const ColumnID _nID ) { m_nID = _nID; return true; } - + //-------------------------------------------------------------------- String UnoControlTableColumn::getName() const { return m_sName; } - + //-------------------------------------------------------------------- void UnoControlTableColumn::setName( const String& _rName ) { m_sName = _rName; - } + } //-------------------------------------------------------------------- bool UnoControlTableColumn::isResizable() const { return m_bIsResizable; } - + //-------------------------------------------------------------------- void UnoControlTableColumn::setResizable( bool _bResizable ) { m_bIsResizable = _bResizable; } - + //-------------------------------------------------------------------- TableMetrics UnoControlTableColumn::getWidth() const { return m_nWidth; } - + //-------------------------------------------------------------------- void UnoControlTableColumn::setWidth( TableMetrics _nWidth ) { m_nWidth = _nWidth; } - + //-------------------------------------------------------------------- TableMetrics UnoControlTableColumn::getMinWidth() const { return m_nMinWidth; } - + //-------------------------------------------------------------------- void UnoControlTableColumn::setMinWidth( TableMetrics _nMinWidth ) { m_nMinWidth = _nMinWidth; } - + //-------------------------------------------------------------------- TableMetrics UnoControlTableColumn::getMaxWidth() const { return m_nMaxWidth; } - + //-------------------------------------------------------------------- void UnoControlTableColumn::setMaxWidth( TableMetrics _nMaxWidth ) { @@ -147,7 +147,7 @@ using namespace ::com::sun::star::uno; { return m_nPrefWidth; } - + //-------------------------------------------------------------------- void UnoControlTableColumn::setPreferredWidth( TableMetrics _nPrefWidth ) { @@ -158,7 +158,7 @@ using namespace ::com::sun::star::uno; { return m_xHorizontalAlign; } - + //-------------------------------------------------------------------- void UnoControlTableColumn::setHorizontalAlign( com::sun::star::style::HorizontalAlignment _align ) { @@ -174,15 +174,15 @@ using namespace ::com::sun::star::uno; TableSize nRowCount; bool bHasColumnHeaders; bool bHasRowHeaders; - bool bVScroll; - bool bHScroll; + bool bVScroll; + bool bHScroll; PTableRenderer pRenderer; PTableInputHandler pInputHandler; TableMetrics nRowHeight; TableMetrics nColumnHeaderHeight; TableMetrics nRowHeaderWidth; - std::vector<rtl::OUString> aRowHeadersTitle; - std::vector<std::vector< Any > > aCellContent; + std::vector<rtl::OUString> aRowHeadersTitle; + std::vector<std::vector< Any > > aCellContent; ::com::sun::star::util::Color m_xLineColor; ::com::sun::star::util::Color m_xHeaderColor; ::com::sun::star::util::Color m_xTextColor; @@ -191,25 +191,25 @@ using namespace ::com::sun::star::uno; ::com::sun::star::style::VerticalAlignment m_xVerticalAlign; UnoControlTableModel_Impl() - :aColumns ( ) + :aColumns ( ) ,nRowCount ( 0 ) ,bHasColumnHeaders ( false ) ,bHasRowHeaders ( false ) - ,bVScroll ( false ) - ,bHScroll ( false ) + ,bVScroll ( false ) + ,bHScroll ( false ) ,pRenderer ( ) ,pInputHandler ( ) - ,nRowHeight ( 0 ) - ,nColumnHeaderHeight( 0 ) - ,nRowHeaderWidth ( 10 ) + ,nRowHeight ( 0 ) + ,nColumnHeaderHeight( 0 ) + ,nRowHeaderWidth ( 10 ) ,aRowHeadersTitle ( ) - ,aCellContent ( ) - ,m_xLineColor ( 0xFFFFFF ) - ,m_xHeaderColor ( 0xFFFFFF ) - ,m_xTextColor ( 0 )//black as default - ,m_xRowColor1 ( 0xFFFFFF ) - ,m_xRowColor2 ( 0xFFFFFF ) - ,m_xVerticalAlign (com::sun::star::style::VerticalAlignment(0)) + ,aCellContent ( ) + ,m_xLineColor ( 0xFFFFFF ) + ,m_xHeaderColor ( 0xFFFFFF ) + ,m_xTextColor ( 0 )//black as default + ,m_xRowColor1 ( 0xFFFFFF ) + ,m_xRowColor2 ( 0xFFFFFF ) + ,m_xVerticalAlign (com::sun::star::style::VerticalAlignment(0)) { } }; @@ -235,7 +235,7 @@ using namespace ::com::sun::star::uno; //-------------------------------------------------------------------- TableSize UnoControlTableModel::getColumnCount() const - { + { return (TableSize)m_pImpl->aColumns.size(); } @@ -256,7 +256,7 @@ using namespace ::com::sun::star::uno; { return m_pImpl->bHasRowHeaders; } - + //-------------------------------------------------------------------- void UnoControlTableModel::setRowHeaders(bool _bRowHeaders) { @@ -267,7 +267,7 @@ using namespace ::com::sun::star::uno; { m_pImpl->bHasColumnHeaders = _bColumnHeaders; } - + void UnoControlTableModel::setColumnCount(TableSize _nColCount) { m_pImpl->aColumns.resize( _nColCount); @@ -450,7 +450,7 @@ using namespace ::com::sun::star::uno; { return m_pImpl->m_xLineColor; } - + //-------------------------------------------------------------------- void UnoControlTableModel::setLineColor( ::com::sun::star::util::Color _rColor ) { @@ -461,7 +461,7 @@ using namespace ::com::sun::star::uno; { return m_pImpl->m_xHeaderColor; } - + //-------------------------------------------------------------------- void UnoControlTableModel::setHeaderBackgroundColor( ::com::sun::star::util::Color _rColor ) { @@ -472,7 +472,7 @@ using namespace ::com::sun::star::uno; { return m_pImpl->m_xTextColor; } - + //-------------------------------------------------------------------- void UnoControlTableModel::setTextColor( ::com::sun::star::util::Color _rColor ) { @@ -483,7 +483,7 @@ using namespace ::com::sun::star::uno; { return m_pImpl->m_xRowColor1; } - + //-------------------------------------------------------------------- void UnoControlTableModel::setOddRowBackgroundColor( ::com::sun::star::util::Color _rColor ) { @@ -494,7 +494,7 @@ using namespace ::com::sun::star::uno; { return m_pImpl->m_xRowColor2; } - + //-------------------------------------------------------------------- void UnoControlTableModel::setEvenRowBackgroundColor( ::com::sun::star::util::Color _rColor ) { @@ -505,7 +505,7 @@ using namespace ::com::sun::star::uno; { return m_pImpl->m_xVerticalAlign; } - + //-------------------------------------------------------------------- void UnoControlTableModel::setVerticalAlign( com::sun::star::style::VerticalAlignment _xAlign ) { diff --git a/svtools/source/uno/unocontroltablemodel.hxx b/svtools/source/uno/unocontroltablemodel.hxx index b17911b8ab85..993c6a7658a4 100644 --- a/svtools/source/uno/unocontroltablemodel.hxx +++ b/svtools/source/uno/unocontroltablemodel.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -125,8 +125,8 @@ class UnoControlTableModel : public ITableModel // ITableModel overridables virtual TableSize getColumnCount() const; virtual TableSize getRowCount() const; - virtual void setColumnCount(TableSize _nColCount); - virtual void setRowCount(TableSize _nRowCount); + virtual void setColumnCount(TableSize _nColCount); + virtual void setRowCount(TableSize _nRowCount); virtual bool hasColumnHeaders() const; virtual bool hasRowHeaders() const; virtual void setRowHeaders(bool _bRowHeaders); @@ -144,26 +144,26 @@ class UnoControlTableModel : public ITableModel virtual TableMetrics getRowHeaderWidth() const; virtual ScrollbarVisibility getVerticalScrollbarVisibility(int overAllHeight, int actHeight) const; virtual ScrollbarVisibility getHorizontalScrollbarVisibility(int overAllWidth, int actWidth) const; - virtual void setVerticalScrollbarVisibility(bool _bVScroll) const; - virtual void setHorizontalScrollbarVisibility(bool _bHScroll) const; - virtual void setCellContent(const std::vector<std::vector< Any > >& cellContent); - virtual std::vector<std::vector< Any > >& getCellContent(); - virtual void setRowHeaderName(const std::vector<rtl::OUString>& cellColumnContent); - virtual std::vector<rtl::OUString>& getRowHeaderName(); + virtual void setVerticalScrollbarVisibility(bool _bVScroll) const; + virtual void setHorizontalScrollbarVisibility(bool _bHScroll) const; + virtual void setCellContent(const std::vector<std::vector< Any > >& cellContent); + virtual std::vector<std::vector< Any > >& getCellContent(); + virtual void setRowHeaderName(const std::vector<rtl::OUString>& cellColumnContent); + virtual std::vector<rtl::OUString>& getRowHeaderName(); virtual ::com::sun::star::util::Color getLineColor(); - virtual void setLineColor(::com::sun::star::util::Color _rColor); + virtual void setLineColor(::com::sun::star::util::Color _rColor); virtual ::com::sun::star::util::Color getHeaderBackgroundColor(); - virtual void setHeaderBackgroundColor(::com::sun::star::util::Color _rColor); + virtual void setHeaderBackgroundColor(::com::sun::star::util::Color _rColor); virtual ::com::sun::star::util::Color getTextColor(); - virtual void setTextColor(::com::sun::star::util::Color _rColor); + virtual void setTextColor(::com::sun::star::util::Color _rColor); virtual ::com::sun::star::util::Color getOddRowBackgroundColor(); - virtual void setOddRowBackgroundColor(::com::sun::star::util::Color _rColor); + virtual void setOddRowBackgroundColor(::com::sun::star::util::Color _rColor); virtual ::com::sun::star::util::Color getEvenRowBackgroundColor(); - virtual void setEvenRowBackgroundColor(::com::sun::star::util::Color _rColor); + virtual void setEvenRowBackgroundColor(::com::sun::star::util::Color _rColor); virtual ::com::sun::star::style::VerticalAlignment getVerticalAlign(); - virtual void setVerticalAlign(::com::sun::star::style::VerticalAlignment _rAlign); - virtual bool hasVerticalScrollbar(); - virtual bool hasHorizontalScrollbar(); + virtual void setVerticalAlign(::com::sun::star::style::VerticalAlignment _rAlign); + virtual bool hasVerticalScrollbar(); + virtual bool hasHorizontalScrollbar(); }; inline void UnoControlTableModel::SetColumnWidth( ColPos _nColumn, TableMetrics _nWidth100thMM ) diff --git a/svtools/source/uno/unoevent.cxx b/svtools/source/uno/unoevent.cxx index a990acf11fbd..ffd5793ea288 100644 --- a/svtools/source/uno/unoevent.cxx +++ b/svtools/source/uno/unoevent.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -216,7 +216,7 @@ sal_uInt16 SvBaseEventDescriptor::getMacroID(const OUString& rName) const void SvBaseEventDescriptor::getAnyFromMacro(Any& rAny, const SvxMacro& rMacro) { - sal_Bool bRetValueOK = sal_False; // do we have a ret value? + sal_Bool bRetValueOK = sal_False; // do we have a ret value? if (rMacro.HasMacro()) { @@ -256,7 +256,7 @@ void SvBaseEventDescriptor::getAnyFromMacro(Any& rAny, break; } case EXTENDED_STYPE: - { + { // create sequence Sequence<PropertyValue> aSequence(2); Any aTmp; @@ -317,7 +317,7 @@ void SvBaseEventDescriptor::getMacroFromAny( // process ... sal_Bool bTypeOK = sal_False; - sal_Bool bNone = sal_False; // true if EventType=="None" + sal_Bool bNone = sal_False; // true if EventType=="None" enum ScriptType eType = EXTENDED_STYPE; OUString sScriptVal; OUString sMacroVal; @@ -382,7 +382,7 @@ void SvBaseEventDescriptor::getMacroFromAny( SvxMacro aMacro(sMacroVal, sLibVal, eType); rMacro = aMacro; } - else if (eType == EXTENDED_STYPE) + else if (eType == EXTENDED_STYPE) { SvxMacro aMacro(sScriptVal, sScript); rMacro = aMacro; @@ -424,13 +424,13 @@ SvEventDescriptor::~SvEventDescriptor() // automatically release xParentRef ! } -void SvEventDescriptor::replaceByName( +void SvEventDescriptor::replaceByName( const sal_uInt16 nEvent, const SvxMacro& rMacro) throw( - IllegalArgumentException, - NoSuchElementException, - WrappedTargetException, + IllegalArgumentException, + NoSuchElementException, + WrappedTargetException, RuntimeException) { SvxMacroItem aItem(getMacroItemWhich()); @@ -439,12 +439,12 @@ void SvEventDescriptor::replaceByName( setMacroItem(aItem); } -void SvEventDescriptor::getByName( +void SvEventDescriptor::getByName( SvxMacro& rMacro, const sal_uInt16 nEvent ) throw( - NoSuchElementException, - WrappedTargetException, + NoSuchElementException, + WrappedTargetException, RuntimeException) { const SvxMacroItem& rItem = getMacroItem(); @@ -465,7 +465,7 @@ void SvEventDescriptor::getByName( // SvDetachedEventDescriptor::SvDetachedEventDescriptor( - const SvEventDescription* pSupportedMacroItems) : + const SvEventDescription* pSupportedMacroItems) : SvBaseEventDescriptor(pSupportedMacroItems), sImplName(RTL_CONSTASCII_USTRINGPARAM(sAPI_SvDetachedEventDescriptor)) { @@ -495,7 +495,7 @@ sal_Int16 SvDetachedEventDescriptor::getIndex(const sal_uInt16 nID) const { // iterate over supported events sal_Int16 nIndex = 0; - while ( (mpSupportedMacroItems[nIndex].mnEvent != nID) && + while ( (mpSupportedMacroItems[nIndex].mnEvent != nID) && (mpSupportedMacroItems[nIndex].mnEvent != 0) ) { nIndex++; @@ -503,20 +503,20 @@ sal_Int16 SvDetachedEventDescriptor::getIndex(const sal_uInt16 nID) const return (mpSupportedMacroItems[nIndex].mnEvent == nID) ? nIndex : -1; } -OUString SvDetachedEventDescriptor::getImplementationName() +OUString SvDetachedEventDescriptor::getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) { return sImplName; } -void SvDetachedEventDescriptor::replaceByName( +void SvDetachedEventDescriptor::replaceByName( const sal_uInt16 nEvent, const SvxMacro& rMacro) throw( - IllegalArgumentException, - NoSuchElementException, - WrappedTargetException, + IllegalArgumentException, + NoSuchElementException, + WrappedTargetException, RuntimeException) { sal_Int16 nIndex = getIndex(nEvent); @@ -528,12 +528,12 @@ void SvDetachedEventDescriptor::replaceByName( } -void SvDetachedEventDescriptor::getByName( +void SvDetachedEventDescriptor::getByName( SvxMacro& rMacro, const sal_uInt16 nEvent ) throw( - NoSuchElementException, - WrappedTargetException, + NoSuchElementException, + WrappedTargetException, RuntimeException) { sal_Int16 nIndex = getIndex(nEvent); @@ -544,8 +544,8 @@ void SvDetachedEventDescriptor::getByName( rMacro = (*aMacros[nIndex]); } -sal_Bool SvDetachedEventDescriptor::hasByName( - const sal_uInt16 nEvent ) const /// item ID of event +sal_Bool SvDetachedEventDescriptor::hasByName( + const sal_uInt16 nEvent ) const /// item ID of event throw(IllegalArgumentException) { sal_Int16 nIndex = getIndex(nEvent); diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx index cc40453f2d72..74a391216207 100644 --- a/svtools/source/uno/unoiface.cxx +++ b/svtools/source/uno/unoiface.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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,9 +68,9 @@ namespace } } -// ---------------------------------------------------- -// help function for the toolkit... -// ---------------------------------------------------- +// ---------------------------------------------------- +// help function for the toolkit... +// ---------------------------------------------------- extern "C" { @@ -168,7 +168,7 @@ SAL_DLLPUBLIC_EXPORT Window* CreateWindow( VCLXWindow** ppNewComp, const ::com:: else if ( aServiceName.EqualsIgnoreCaseAscii( "Grid" ) ) { if ( pParent ) - { + { pWindow = new ::svt::table::TableControl(pParent, nWinBits); *ppNewComp = new SVTXGridControl; } @@ -181,11 +181,11 @@ SAL_DLLPUBLIC_EXPORT Window* CreateWindow( VCLXWindow** ppNewComp, const ::com:: return pWindow; } -} // extern "C" +} // extern "C" -// ---------------------------------------------------- -// class VCLXMultiLineEdit -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXMultiLineEdit +// ---------------------------------------------------- VCLXMultiLineEdit::VCLXMultiLineEdit() :maTextListeners( *this ) ,meLineEndType( LINEEND_LF ) // default behavior before introducing this property: LF (unix-like) @@ -546,9 +546,9 @@ void VCLXMultiLineEdit::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) VCLXWindow::ImplGetPropertyIds( rIds, true ); } -// ---------------------------------------------------- -// class VCLXFileControl -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXFileControl +// ---------------------------------------------------- VCLXFileControl::VCLXFileControl() : maTextListeners( *this ) { } @@ -815,9 +815,9 @@ void VCLXFileControl::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) } -// ---------------------------------------------------- -// class SVTXFormattedField -// ---------------------------------------------------- +// ---------------------------------------------------- +// class SVTXFormattedField +// ---------------------------------------------------- // -------------------------------------------------------------------------------------- SVTXFormattedField::SVTXFormattedField() :m_pCurrentSupplier(NULL) @@ -915,7 +915,7 @@ void SVTXFormattedField::setProperty( const ::rtl::OUString& PropertyName, const if (rTC != ::com::sun::star::uno::TypeClass_DOUBLE) // no double if (Value.hasValue()) - { // but a value + { // but a value // try if it is something converitble sal_Int32 nValue = 0; if (!(Value >>= nValue)) @@ -960,7 +960,7 @@ void SVTXFormattedField::setProperty( const ::rtl::OUString& PropertyName, const } if (BASEPROPERTY_TEXTCOLOR == nPropType) - { // after setting a new text color, think again about the AutoColor flag of the control + { // after setting a new text color, think again about the AutoColor flag of the control // 17.05.2001 - 86859 - frank.schoenheit@germany.sun.com pField->SetAutoColor(!Value.hasValue()); } @@ -1016,7 +1016,7 @@ void SVTXFormattedField::setProperty( const ::rtl::OUString& PropertyName, const case BASEPROPERTY_FORMATSSUPPLIER: { if (!bIsStandardSupplier) - { // ansonsten void + { // ansonsten void ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > xSupplier = getFormatsSupplier(); aReturn <<= xSupplier; } @@ -1260,7 +1260,7 @@ void SVTXFormattedField::SetTreatAsNumber(sal_Bool bSet) } else { - if (pField->GetText().Len()) // empty wird erst mal standardmaessig als void nach draussen gereicht + if (pField->GetText().Len()) // empty wird erst mal standardmaessig als void nach draussen gereicht aReturn <<= pField->GetValue(); } @@ -1299,7 +1299,7 @@ void SVTXFormattedField::SetValue(const ::com::sun::star::uno::Any& rValue) pField->SetTextValue(aStr); } } -// NotifyTextListeners(); +// NotifyTextListeners(); } // -------------------------------------------------------------------------------------- @@ -1329,7 +1329,7 @@ void SVTXFormattedField::setFormatsSupplier(const ::com::sun::star::uno::Referen } if (!pNew) - return; // TODO : wie das behandeln ? + return; // TODO : wie das behandeln ? if (m_pCurrentSupplier) m_pCurrentSupplier->release(); @@ -1366,7 +1366,7 @@ void SVTXFormattedField::setFormatKey(sal_Int32 nKey) if (pField->GetFormatter()) pField->SetFormatKey(nKey); else - { // Wahrscheinlich bin ich gerade in einem Block, in dem erst der Key und dann der Formatter gesetzt + { // Wahrscheinlich bin ich gerade in einem Block, in dem erst der Key und dann der Formatter gesetzt // wird, das passiert initial mit ziemlicher Sicherheit, da die Properties in alphabetischer Reihenfolge // gesetzt werden, und der FormatsSupplier nun mal vor dem FormatKey kommt nKeyToSetDelayed = nKey; @@ -1411,9 +1411,9 @@ void SVTXFormattedField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) } -// ---------------------------------------------------- -// class SVTXRoadmap -// ---------------------------------------------------- +// ---------------------------------------------------- +// class SVTXRoadmap +// ---------------------------------------------------- using namespace svt; @@ -1668,9 +1668,9 @@ void SVTXRoadmap::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) VCLXGraphicControl::ImplGetPropertyIds( rIds ); } -// ---------------------------------------------------- -// class SVTXNumericField -// ---------------------------------------------------- +// ---------------------------------------------------- +// class SVTXNumericField +// ---------------------------------------------------- SVTXNumericField::SVTXNumericField() { } @@ -1835,9 +1835,9 @@ void SVTXNumericField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) SVTXFormattedField::ImplGetPropertyIds( rIds ); } -// ---------------------------------------------------- -// class SVTXCurrencyField -// ---------------------------------------------------- +// ---------------------------------------------------- +// class SVTXCurrencyField +// ---------------------------------------------------- SVTXCurrencyField::SVTXCurrencyField() { } @@ -2075,9 +2075,9 @@ void SVTXCurrencyField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) } -// ---------------------------------------------------- -// class VCLXProgressBar -// ---------------------------------------------------- +// ---------------------------------------------------- +// class VCLXProgressBar +// ---------------------------------------------------- VCLXProgressBar::VCLXProgressBar() :m_nValue(0) @@ -2323,9 +2323,9 @@ void VCLXProgressBar::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) } -// ---------------------------------------------------- -// class SVTXDateField -// ---------------------------------------------------- +// ---------------------------------------------------- +// class SVTXDateField +// ---------------------------------------------------- SVTXDateField::SVTXDateField() :VCLXDateField() { diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx index 924654907fdc..3a61bc66a4e8 100644 --- a/svtools/source/uno/unoimap.cxx +++ b/svtools/source/uno/unoimap.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -162,8 +162,8 @@ PropertySetInfo* SvUnoImageMapObject::createPropertySetInfo( UINT16 nType ) { MAP_LEN( "Description" ), HANDLE_DESCRIPTION, &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, { MAP_LEN( "Target" ), HANDLE_TARGET, &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, { MAP_LEN( "Name" ), HANDLE_NAME, &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, - { MAP_LEN( "IsActive" ), HANDLE_ISACTIVE, &::getBooleanCppuType(), 0, 0 }, - { MAP_LEN( "Polygon" ), HANDLE_POLYGON, SEQTYPE(::getCppuType((const PointSequence*)0)), 0, 0 }, + { MAP_LEN( "IsActive" ), HANDLE_ISACTIVE, &::getBooleanCppuType(), 0, 0 }, + { MAP_LEN( "Polygon" ), HANDLE_POLYGON, SEQTYPE(::getCppuType((const PointSequence*)0)), 0, 0 }, {0,0,0,0,0,0} }; @@ -178,9 +178,9 @@ PropertySetInfo* SvUnoImageMapObject::createPropertySetInfo( UINT16 nType ) { MAP_LEN( "Description" ), HANDLE_DESCRIPTION, &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, { MAP_LEN( "Target" ), HANDLE_TARGET, &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, { MAP_LEN( "Name" ), HANDLE_NAME, &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, - { MAP_LEN( "IsActive" ), HANDLE_ISACTIVE, &::getBooleanCppuType(), 0, 0 }, - { MAP_LEN( "Center" ), HANDLE_CENTER, &::getCppuType((const awt::Point*)0), 0, 0 }, - { MAP_LEN( "Radius" ), HANDLE_RADIUS, &::getCppuType((const sal_Int32*)0), 0, 0 }, + { MAP_LEN( "IsActive" ), HANDLE_ISACTIVE, &::getBooleanCppuType(), 0, 0 }, + { MAP_LEN( "Center" ), HANDLE_CENTER, &::getCppuType((const awt::Point*)0), 0, 0 }, + { MAP_LEN( "Radius" ), HANDLE_RADIUS, &::getCppuType((const sal_Int32*)0), 0, 0 }, {0,0,0,0,0,0} }; @@ -196,8 +196,8 @@ PropertySetInfo* SvUnoImageMapObject::createPropertySetInfo( UINT16 nType ) { MAP_LEN( "Description" ), HANDLE_DESCRIPTION, &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, { MAP_LEN( "Target" ), HANDLE_TARGET, &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, { MAP_LEN( "Name" ), HANDLE_NAME, &::getCppuType((const ::rtl::OUString*)0), 0, 0 }, - { MAP_LEN( "IsActive" ), HANDLE_ISACTIVE, &::getBooleanCppuType(), 0, 0 }, - { MAP_LEN( "Boundary" ), HANDLE_BOUNDARY, &::getCppuType((const awt::Rectangle*)0), 0, 0 }, + { MAP_LEN( "IsActive" ), HANDLE_ISACTIVE, &::getBooleanCppuType(), 0, 0 }, + { MAP_LEN( "Boundary" ), HANDLE_BOUNDARY, &::getCppuType((const awt::Rectangle*)0), 0, 0 }, {0,0,0,0,0,0} }; @@ -207,7 +207,7 @@ PropertySetInfo* SvUnoImageMapObject::createPropertySetInfo( UINT16 nType ) } SvUnoImageMapObject::SvUnoImageMapObject( UINT16 nType, const SvEventDescription* pSupportedMacroItems ) -: PropertySetHelper( createPropertySetInfo( nType ) ), +: PropertySetHelper( createPropertySetInfo( nType ) ), mnType( nType ) , mbIsActive( true ) , mnRadius( 0 ) @@ -217,7 +217,7 @@ SvUnoImageMapObject::SvUnoImageMapObject( UINT16 nType, const SvEventDescription } SvUnoImageMapObject::SvUnoImageMapObject( const IMapObject& rMapObject, const SvEventDescription* pSupportedMacroItems ) -: PropertySetHelper( createPropertySetInfo( rMapObject.GetType() ) ), +: PropertySetHelper( createPropertySetInfo( rMapObject.GetType() ) ), mnType( rMapObject.GetType() ) , mbIsActive( true ) , mnRadius( 0 ) diff --git a/svtools/source/uno/unowizard.hxx b/svtools/source/uno/unowizard.hxx index f56a23024f5c..c58ea2078f34 100644 --- a/svtools/source/uno/unowizard.hxx +++ b/svtools/source/uno/unowizard.hxx @@ -101,7 +101,7 @@ namespace svt { namespace uno ~Wizard(); protected: - virtual Dialog* createDialog( Window* _pParent ); + virtual Dialog* createDialog( Window* _pParent ); virtual void destroyDialog(); private: diff --git a/svtools/source/uno/wizard/unowizard.cxx b/svtools/source/uno/wizard/unowizard.cxx index fdca8b1919a6..53a4aca0728b 100644 --- a/svtools/source/uno/wizard/unowizard.cxx +++ b/svtools/source/uno/wizard/unowizard.cxx @@ -208,7 +208,7 @@ namespace svt { namespace uno } //-------------------------------------------------------------------- - Dialog* Wizard::createDialog( Window* i_pParent ) + Dialog* Wizard::createDialog( Window* i_pParent ) { WizardShell* pDialog( new WizardShell( i_pParent, this, m_xController, m_aWizardSteps ) ); pDialog->SetSmartHelpId( SmartId( m_sHelpURL ) ); @@ -230,7 +230,7 @@ namespace svt { namespace uno { return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svtools.uno.Wizard" ) ); } - + //-------------------------------------------------------------------- Sequence< ::rtl::OUString > SAL_CALL Wizard::getSupportedServiceNames_static() throw(RuntimeException) { @@ -244,7 +244,7 @@ namespace svt { namespace uno { return getImplementationName_static(); } - + //-------------------------------------------------------------------- Sequence< ::rtl::OUString > SAL_CALL Wizard::getSupportedServiceNames() throw(RuntimeException) { @@ -317,7 +317,7 @@ namespace svt { namespace uno pWizardImpl->enableButtons( lcl_convertWizardButtonToWZB( i_WizardButton ), i_Enable ); } - + //------------------------------------------------------------------------------------------------------------------ void SAL_CALL Wizard::setDefaultButton( ::sal_Int16 i_WizardButton ) throw (RuntimeException) { @@ -329,7 +329,7 @@ namespace svt { namespace uno pWizardImpl->defaultButton( lcl_convertWizardButtonToWZB( i_WizardButton ) ); } - + //------------------------------------------------------------------------------------------------------------------ sal_Bool SAL_CALL Wizard::travelNext( ) throw (RuntimeException) { @@ -341,7 +341,7 @@ namespace svt { namespace uno return pWizardImpl->travelNext(); } - + //------------------------------------------------------------------------------------------------------------------ sal_Bool SAL_CALL Wizard::travelPrevious( ) throw (RuntimeException) { @@ -353,7 +353,7 @@ namespace svt { namespace uno return pWizardImpl->travelPrevious(); } - + //------------------------------------------------------------------------------------------------------------------ void SAL_CALL Wizard::enablePage( ::sal_Int16 i_PageID, ::sal_Bool i_Enable ) throw (NoSuchElementException, InvalidStateException, RuntimeException) { @@ -395,7 +395,7 @@ namespace svt { namespace uno return pWizardImpl->advanceTo( i_PageId ); } - + //------------------------------------------------------------------------------------------------------------------ ::sal_Bool SAL_CALL Wizard::goBackTo( ::sal_Int16 i_PageId ) throw (RuntimeException) { @@ -407,7 +407,7 @@ namespace svt { namespace uno return pWizardImpl->goBackTo( i_PageId ); } - + //------------------------------------------------------------------------------------------------------------------ Reference< XWizardPage > SAL_CALL Wizard::getCurrentPage( ) throw (RuntimeException) { @@ -441,7 +441,7 @@ namespace svt { namespace uno // simply disambiguate Wizard_Base::OGenericUnoDialog::setTitle( i_Title ); } - + //------------------------------------------------------------------------------------------------------------------ ::sal_Int16 SAL_CALL Wizard::execute( ) throw (RuntimeException) { diff --git a/svtools/source/uno/wizard/wizardpagecontroller.hxx b/svtools/source/uno/wizard/wizardpagecontroller.hxx index 7b8273ce43a9..664852f54608 100644 --- a/svtools/source/uno/wizard/wizardpagecontroller.hxx +++ b/svtools/source/uno/wizard/wizardpagecontroller.hxx @@ -55,8 +55,8 @@ namespace svt { namespace uno ~WizardPageController(); // IWizardPageController overridables - virtual void initializePage(); - virtual sal_Bool commitPage( WizardTypes::CommitPageReason _eReason ); + virtual void initializePage(); + virtual sal_Bool commitPage( WizardTypes::CommitPageReason _eReason ); virtual bool canAdvance() const; const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XWizardPage >& diff --git a/svtools/source/uno/wizard/wizardshell.cxx b/svtools/source/uno/wizard/wizardshell.cxx index 66b4dfce164d..9a58d3c9343c 100644 --- a/svtools/source/uno/wizard/wizardshell.cxx +++ b/svtools/source/uno/wizard/wizardshell.cxx @@ -189,7 +189,7 @@ namespace svt { namespace uno Reference< XWizardPage > WizardShell::getCurrentWizardPage() const { const WizardState eState = getCurrentState(); - + PWizardPageController pController( impl_getController( GetPage( eState ) ) ); ENSURE_OR_RETURN( pController, "WizardShell::getCurrentWizardPage: invalid page/controller!", NULL ); diff --git a/svtools/source/uno/wizard/wizardshell.hxx b/svtools/source/uno/wizard/wizardshell.hxx index 9697b71b36d2..44523d74e67c 100644 --- a/svtools/source/uno/wizard/wizardshell.hxx +++ b/svtools/source/uno/wizard/wizardshell.hxx @@ -62,12 +62,12 @@ namespace svt { namespace uno virtual ~WizardShell(); // Dialog overridables - virtual short Execute(); + virtual short Execute(); // OWizardMachine overridables - virtual TabPage* createPage( WizardState i_nState ); + virtual TabPage* createPage( WizardState i_nState ); virtual void enterState( WizardState i_nState ); - virtual sal_Bool leaveState( WizardState i_nState ); + virtual sal_Bool leaveState( WizardState i_nState ); virtual String getStateDisplayName( WizardState i_nState ) const; virtual bool canAdvance() const; virtual sal_Bool onFinish(); diff --git a/svtools/source/urlobj/inetimg.cxx b/svtools/source/urlobj/inetimg.cxx index cf6f211a739c..155f7fcc66ef 100644 --- a/svtools/source/urlobj/inetimg.cxx +++ b/svtools/source/urlobj/inetimg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER 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 @@ sal_Bool INetImage::Read( SvStream& rIStm, ULONG nFormat ) int iAltOffset; // (alternate text?) int iAnchorOffset; // HREF in image int iExtraHTML_Offset; // Extra HTML (stored in CImageElement) - sal_Char pImageURL[1]; // Append all variable-length strings starting here + sal_Char pImageURL[1]; // Append all variable-length strings starting here */ rtl_TextEncoding eSysCSet = gsl_getSystemTextEncoding(); sal_Int32 nVal, nAnchorOffset, nAltOffset, nFilePos; @@ -112,8 +112,8 @@ sal_Bool INetImage::Read( SvStream& rIStm, ULONG nFormat ) nFilePos = rIStm.Tell(); // skip over iSize (int), bIsMao ( BOOL ) alignment of 4 !!!! rIStm.SeekRel( 8 ); - rIStm >> nVal; aSizePixel.Width() = nVal; - rIStm >> nVal; aSizePixel.Height() = nVal; + rIStm >> nVal; aSizePixel.Width() = nVal; + rIStm >> nVal; aSizePixel.Height() = nVal; // skip over iHSpace, iVSpace, iBorder, iLowResOffset rIStm.SeekRel( 3 * sizeof( INT32 ) + sizeof( int ) ); rIStm >> nAltOffset; |