From 69c363daff7def74bb91b72bc778ace0e698f0e3 Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Fri, 19 Mar 2010 16:19:31 +0100 Subject: gozer1: #161853# add default border depending on App font --- vcl/inc/vcl/arrange.hxx | 17 ++++-- vcl/inc/vcl/svdata.hxx | 2 + vcl/source/app/svdata.cxx | 3 + vcl/source/window/arrange.cxx | 129 ++++++++++++++++++++++++++--------------- vcl/source/window/printdlg.cxx | 38 +++++------- vcl/source/window/window.cxx | 2 + 6 files changed, 114 insertions(+), 77 deletions(-) diff --git a/vcl/inc/vcl/arrange.hxx b/vcl/inc/vcl/arrange.hxx index 309d0bf930ea..cd4a513987aa 100644 --- a/vcl/inc/vcl/arrange.hxx +++ b/vcl/inc/vcl/arrange.hxx @@ -110,6 +110,11 @@ namespace vcl public: + static long getDefaultBorder(); + + static long getBorderValue( long nBorder ) + { return nBorder >= 0 ? nBorder : getDefaultBorder(); } + WindowArranger( WindowArranger* i_pParent = NULL ) : m_pParentWindow( i_pParent ? i_pParent->m_pParentWindow : NULL ) , m_pParentArranger( i_pParent ) @@ -207,7 +212,7 @@ namespace vcl public: RowOrColumn( WindowArranger* i_pParent = NULL, - bool bColumn = true, long i_nBorderWidth = 5 ) + bool bColumn = true, long i_nBorderWidth = -1 ) : WindowArranger( i_pParent ) , m_nBorderWidth( i_nBorderWidth ) , m_bColumn( bColumn ) @@ -251,7 +256,7 @@ namespace vcl } public: - LabeledElement( WindowArranger* i_pParent = NULL, int i_nLabelStyle = 0, long i_nDistance = 5 ) + LabeledElement( WindowArranger* i_pParent = NULL, int i_nLabelStyle = 0, long i_nDistance = -1 ) : WindowArranger( i_pParent ) , m_nDistance( i_nDistance ) , m_nLabelColumnWidth( 0 ) @@ -281,7 +286,7 @@ namespace vcl { long getLabelWidth() const; public: - LabelColumn( WindowArranger* i_pParent = NULL, long i_nBorderWidth = 5 ) + LabelColumn( WindowArranger* i_pParent = NULL, long i_nBorderWidth = -1 ) : RowOrColumn( i_pParent, true, i_nBorderWidth ) {} virtual ~LabelColumn(); @@ -304,7 +309,7 @@ namespace vcl { return i_nIndex == 0 ? &m_aElement : NULL; } public: - Indenter( WindowArranger* i_pParent = NULL, long i_nIndent = 15 ) + Indenter( WindowArranger* i_pParent = NULL, long i_nIndent = 3*getDefaultBorder() ) : WindowArranger( i_pParent ) , m_nIndent( i_nIndent ) {} @@ -395,8 +400,8 @@ namespace vcl public: MatrixArranger( WindowArranger* i_pParent = NULL, - long i_nBorderX = 5, - long i_nBorderY = 5 ) + long i_nBorderX = -1, + long i_nBorderY = -1 ) : WindowArranger( i_pParent ) , m_nBorderX( i_nBorderX ) , m_nBorderY( i_nBorderY ) diff --git a/vcl/inc/vcl/svdata.hxx b/vcl/inc/vcl/svdata.hxx index 081b2fffca0b..69ba1a5c3013 100644 --- a/vcl/inc/vcl/svdata.hxx +++ b/vcl/inc/vcl/svdata.hxx @@ -171,6 +171,8 @@ struct ImplSVAppData BOOL mbDialogCancel; // TRUE: Alle Dialog::Execute()-Aufrufe werden mit return FALSE sofort beendet BOOL mbNoYield; // Application::Yield will not wait for events if the queue is empty // essentially that makes it the same as Application::Reschedule + long mnDefaultLayoutBorder; // default value in pixel for layout distances used + // in window arrangers /** Controls whether showing any IME status window is toggled on or off. diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx index e8e56c6ee5a8..0600d081d04b 100644 --- a/vcl/source/app/svdata.cxx +++ b/vcl/source/app/svdata.cxx @@ -131,6 +131,9 @@ void ImplInitSVData() break; } } + + // mark default layout border as unitialized + pImplSVData->maAppData.mnDefaultLayoutBorder = -1; } // ----------------------------------------------------------------------- diff --git a/vcl/source/window/arrange.cxx b/vcl/source/window/arrange.cxx index 0199af7ed50d..76e2d3f28747 100644 --- a/vcl/source/window/arrange.cxx +++ b/vcl/source/window/arrange.cxx @@ -32,6 +32,8 @@ #include "vcl/arrange.hxx" #include "vcl/edit.hxx" +#include "vcl/svdata.hxx" +#include "vcl/svapp.hxx" #include "osl/diagnose.h" @@ -41,6 +43,22 @@ using namespace vcl; // vcl::WindowArranger //----------------------------------------- +long WindowArranger::getDefaultBorder() +{ + ImplSVData* pSVData = ImplGetSVData(); + long nResult = pSVData->maAppData.mnDefaultLayoutBorder; + if( nResult < 0 ) + { + OutputDevice* pDefDev = Application::GetDefaultDevice(); + if( pDefDev ) + { + Size aBorder( pDefDev->LogicToPixel( Size( 5, 5 ), MapMode( MAP_APPFONT ) ) ); + nResult = pSVData->maAppData.mnDefaultLayoutBorder = aBorder.Height(); + } + } + return nResult > 0 ? nResult : 0; +} + WindowArranger::~WindowArranger() {} @@ -167,8 +185,8 @@ Size WindowArranger::Element::getOptimalSize( WindowSizeType i_eType ) const aResult.Width() = m_aMinSize.Width(); if( aResult.Height() < m_aMinSize.Height() ) aResult.Height() = m_aMinSize.Height(); - aResult.Width() += m_nLeftBorder + m_nRightBorder; - aResult.Height() += m_nTopBorder + m_nBottomBorder; + aResult.Width() += getBorderValue( m_nLeftBorder ) + getBorderValue( m_nRightBorder ); + aResult.Height() += getBorderValue( m_nTopBorder ) + getBorderValue( m_nBottomBorder ); } return aResult; @@ -178,10 +196,10 @@ void WindowArranger::Element::setPosSize( const Point& i_rPos, const Size& i_rSi { Point aPoint( i_rPos ); Size aSize( i_rSize ); - aPoint.X() += m_nLeftBorder; - aPoint.Y() += m_nTopBorder; - aSize.Width() -= m_nLeftBorder + m_nRightBorder; - aSize.Height() -= m_nTopBorder + m_nBottomBorder; + aPoint.X() += getBorderValue( m_nLeftBorder ); + aPoint.Y() += getBorderValue( m_nTopBorder ); + aSize.Width() -= getBorderValue( m_nLeftBorder ) + getBorderValue( m_nRightBorder ); + aSize.Height() -= getBorderValue( m_nTopBorder ) + getBorderValue( m_nBottomBorder ); if( m_pElement ) m_pElement->SetPosSizePixel( aPoint, aSize ); else if( m_pChild ) @@ -204,6 +222,7 @@ RowOrColumn::~RowOrColumn() Size RowOrColumn::getOptimalSize( WindowSizeType i_eType ) const { Size aRet( 0, 0 ); + long nDistance = getBorderValue( m_nBorderWidth ); for( std::vector< WindowArranger::Element >::const_iterator it = m_aElements.begin(); it != m_aElements.end(); ++it ) { @@ -214,7 +233,7 @@ Size RowOrColumn::getOptimalSize( WindowSizeType i_eType ) const if( m_bColumn ) { // add the distance between elements - aRet.Height() += m_nBorderWidth; + aRet.Height() += nDistance; // check if the width needs adjustment if( aRet.Width() < aElementSize.Width() ) aRet.Width() = aElementSize.Width(); @@ -223,7 +242,7 @@ Size RowOrColumn::getOptimalSize( WindowSizeType i_eType ) const else { // add the distance between elements - aRet.Width() += m_nBorderWidth; + aRet.Width() += nDistance; // check if the height needs adjustment if( aRet.Height() < aElementSize.Height() ) aRet.Height() = aElementSize.Height(); @@ -236,13 +255,14 @@ Size RowOrColumn::getOptimalSize( WindowSizeType i_eType ) const { // subtract the border for the first element if( m_bColumn ) - aRet.Height() -= m_nBorderWidth; + aRet.Height() -= nDistance; else - aRet.Width() -= m_nBorderWidth; + aRet.Width() -= nDistance; // add the outer border - aRet.Width() += 2*m_nOuterBorder; - aRet.Height() += 2*m_nOuterBorder; + long nOuterBorder = getBorderValue( m_nOuterBorder ); + aRet.Width() += 2*nOuterBorder; + aRet.Height() += 2*nOuterBorder; } return aRet; @@ -347,7 +367,9 @@ void RowOrColumn::resize() size_t nElements = m_aElements.size(); // get all element sizes for sizing std::vector aElementSizes( nElements ); - long nUsedWidth = 2*m_nOuterBorder - (nElements ? m_nBorderWidth : 0); + long nDistance = getBorderValue( m_nBorderWidth ); + long nOuterBorder = getBorderValue( m_nOuterBorder ); + long nUsedWidth = 2*nOuterBorder - (nElements ? nDistance : 0); for( size_t i = 0; i < nElements; i++ ) { if( m_aElements[i].isVisible() ) @@ -355,13 +377,13 @@ void RowOrColumn::resize() aElementSizes[i] = m_aElements[i].getOptimalSize( eType ); if( m_bColumn ) { - aElementSizes[i].Width() = m_aManagedArea.GetWidth() - 2* m_nOuterBorder; - nUsedWidth += aElementSizes[i].Height() + m_nBorderWidth; + aElementSizes[i].Width() = m_aManagedArea.GetWidth() - 2 * nOuterBorder; + nUsedWidth += aElementSizes[i].Height() + nDistance; } else { - aElementSizes[i].Height() = m_aManagedArea.GetHeight() - 2* m_nOuterBorder; - nUsedWidth += aElementSizes[i].Width() + m_nBorderWidth; + aElementSizes[i].Height() = m_aManagedArea.GetHeight() - 2 * nOuterBorder; + nUsedWidth += aElementSizes[i].Width() + nDistance; } } } @@ -378,8 +400,8 @@ void RowOrColumn::resize() // get starting position Point aElementPos( m_aManagedArea.TopLeft() ); // outer border - aElementPos.X() += m_nOuterBorder; - aElementPos.Y() += m_nOuterBorder; + aElementPos.X() += nOuterBorder; + aElementPos.Y() += nOuterBorder; // position managed windows for( size_t i = 0; i < nElements; i++ ) @@ -389,9 +411,9 @@ void RowOrColumn::resize() { m_aElements[i].setPosSize( aElementPos, aElementSizes[i] ); if( m_bColumn ) - aElementPos.Y() += m_nBorderWidth + aElementSizes[i].Height(); + aElementPos.Y() += nDistance + aElementSizes[i].Height(); else - aElementPos.X() += m_nBorderWidth + aElementSizes[i].Width(); + aElementPos.X() += nDistance + aElementSizes[i].Width(); } } } @@ -482,14 +504,14 @@ Size LabeledElement::getOptimalSize( WindowSizeType i_eType ) const if( m_nLabelColumnWidth != 0 ) aRet.Width() = m_nLabelColumnWidth; else - aRet.Width() += m_nDistance; + aRet.Width() += getBorderValue( m_nDistance ); } Size aElementSize( m_aElement.getOptimalSize( i_eType ) ); aRet.Width() += aElementSize.Width(); if( aElementSize.Height() > aRet.Height() ) aRet.Height() = aElementSize.Height(); if( aRet.Height() != 0 ) - aRet.Height() += 2*m_nOuterBorder; + aRet.Height() += 2 * getBorderValue( m_nOuterBorder ); return aRet; } @@ -498,23 +520,25 @@ void LabeledElement::resize() { Size aLabelSize( m_aLabel.getOptimalSize( WINDOWSIZE_MINIMUM ) ); Size aElementSize( m_aElement.getOptimalSize( WINDOWSIZE_PREFERRED ) ); - if( m_nDistance + aLabelSize.Width() + aElementSize.Width() > m_aManagedArea.GetWidth() ) + long nDistance = getBorderValue( m_nDistance ); + long nOuterBorder = getBorderValue( m_nOuterBorder ); + if( nDistance + aLabelSize.Width() + aElementSize.Width() > m_aManagedArea.GetWidth() ) aElementSize = m_aElement.getOptimalSize( WINDOWSIZE_MINIMUM ); // align label and element vertically in LabeledElement - long nYOff = (m_aManagedArea.GetHeight() - 2*m_nOuterBorder - aLabelSize.Height()) / 2; + long nYOff = (m_aManagedArea.GetHeight() - 2*nOuterBorder - aLabelSize.Height()) / 2; Point aPos( m_aManagedArea.Left(), - m_aManagedArea.Top() + m_nOuterBorder + nYOff ); + m_aManagedArea.Top() + nOuterBorder + nYOff ); Size aSize( aLabelSize ); if( m_nLabelColumnWidth != 0 ) aSize.Width() = m_nLabelColumnWidth; m_aLabel.setPosSize( aPos, aSize ); - aPos.X() += aSize.Width() + m_nDistance; - nYOff = (m_aManagedArea.GetHeight() - 2*m_nOuterBorder - aElementSize.Height()) / 2; - aPos.Y() = m_aManagedArea.Top() + m_nOuterBorder + nYOff; + aPos.X() += aSize.Width() + nDistance; + nYOff = (m_aManagedArea.GetHeight() - 2*nOuterBorder - aElementSize.Height()) / 2; + aPos.Y() = m_aManagedArea.Top() + nOuterBorder + nYOff; aSize.Width() = aElementSize.Width(); - aSize.Height() = m_aManagedArea.GetHeight() - 2*m_nOuterBorder; + aSize.Height() = m_aManagedArea.GetHeight() - 2*nOuterBorder; // label style // 0: position left and right @@ -593,6 +617,7 @@ long LabelColumn::getLabelWidth() const Size LabelColumn::getOptimalSize( WindowSizeType i_eType ) const { long nWidth = getLabelWidth(); + long nOuterBorder = getBorderValue( m_nOuterBorder ); Size aColumnSize; // every child is a LabeledElement @@ -625,7 +650,7 @@ Size LabelColumn::getOptimalSize( WindowSizeType i_eType ) const } if( aElementSize.Width() ) { - aElementSize.Width() += 2*m_nOuterBorder; + aElementSize.Width() += 2*nOuterBorder; if( aElementSize.Width() > aColumnSize.Width() ) aColumnSize.Width() = aElementSize.Width(); } @@ -637,7 +662,7 @@ Size LabelColumn::getOptimalSize( WindowSizeType i_eType ) const if( nEle > 0 && aColumnSize.Height() ) { aColumnSize.Height() -= getBorderWidth(); // for the first element - aColumnSize.Height() += 2*m_nOuterBorder; + aColumnSize.Height() += 2*nOuterBorder; } return aColumnSize; } @@ -693,19 +718,23 @@ Indenter::~Indenter() Size Indenter::getOptimalSize( WindowSizeType i_eType ) const { Size aSize( m_aElement.getOptimalSize( i_eType ) ); - aSize.Width() += 2*m_nOuterBorder + m_nIndent; - aSize.Height() += 2*m_nOuterBorder; + long nOuterBorder = getBorderValue( m_nOuterBorder ); + long nIndent = getBorderValue( m_nIndent ); + aSize.Width() += 2*nOuterBorder + nIndent; + aSize.Height() += 2*nOuterBorder; return aSize; } void Indenter::resize() { + long nOuterBorder = getBorderValue( m_nOuterBorder ); + long nIndent = getBorderValue( m_nIndent ); Point aPt( m_aManagedArea.TopLeft() ); - aPt.X() += m_nOuterBorder + m_nIndent; - aPt.Y() += m_nOuterBorder; + aPt.X() += nOuterBorder + m_nIndent; + aPt.Y() += nOuterBorder; Size aSz( m_aManagedArea.GetSize() ); - aSz.Width() -= 2*m_nOuterBorder + m_nIndent; - aSz.Height() -= 2*m_nOuterBorder; + aSz.Width() -= 2*nOuterBorder + nIndent; + aSz.Height() -= 2*nOuterBorder; m_aElement.setPosSize( aPt, aSz ); } @@ -733,7 +762,8 @@ MatrixArranger::~MatrixArranger() Size MatrixArranger::getOptimalSize( WindowSizeType i_eType, std::vector& o_rColumnWidths, std::vector& o_rRowHeights ) const { - Size aMatrixSize( 2*m_nOuterBorder, 2*m_nOuterBorder ); + long nOuterBorder = getBorderValue( m_nOuterBorder ); + Size aMatrixSize( 2*nOuterBorder, 2*nOuterBorder ); // first find out the current number of rows and columns sal_uInt32 nRows = 0, nColumns = 0; @@ -762,15 +792,17 @@ Size MatrixArranger::getOptimalSize( WindowSizeType i_eType, std::vector& } // add up sizes + long nDistanceX = getBorderValue( m_nBorderX ); + long nDistanceY = getBorderValue( m_nBorderY ); for( sal_uInt32 i = 0; i < nColumns; i++ ) - aMatrixSize.Width() += o_rColumnWidths[i] + m_nBorderX; + aMatrixSize.Width() += o_rColumnWidths[i] + nDistanceX; if( nColumns > 0 ) - aMatrixSize.Width() -= m_nBorderX; + aMatrixSize.Width() -= nDistanceX; for( sal_uInt32 i = 0; i < nRows; i++ ) - aMatrixSize.Height() += o_rRowHeights[i] + m_nBorderY; + aMatrixSize.Height() += o_rRowHeights[i] + nDistanceY; if( nRows > 0 ) - aMatrixSize.Height() -= m_nBorderY; + aMatrixSize.Height() -= nDistanceY; return aMatrixSize; } @@ -804,15 +836,18 @@ void MatrixArranger::resize() // FIXME: distribute extra space available // prepare offsets + long nDistanceX = getBorderValue( m_nBorderX ); + long nDistanceY = getBorderValue( m_nBorderY ); + long nOuterBorder = getBorderValue( m_nOuterBorder ); std::vector aColumnX( aColumnWidths.size() ); - aColumnX[0] = m_aManagedArea.Left() + m_nOuterBorder; + aColumnX[0] = m_aManagedArea.Left() + nOuterBorder; for( size_t i = 1; i < aColumnX.size(); i++ ) - aColumnX[i] = aColumnX[i-1] + aColumnWidths[i-1] + m_nBorderX; + aColumnX[i] = aColumnX[i-1] + aColumnWidths[i-1] + nDistanceX; std::vector aRowY( aRowHeights.size() ); - aRowY[0] = m_aManagedArea.Top() + m_nOuterBorder; + aRowY[0] = m_aManagedArea.Top() + nOuterBorder; for( size_t i = 1; i < aRowY.size(); i++ ) - aRowY[i] = aRowY[i-1] + aRowHeights[i-1] + m_nBorderY; + aRowY[i] = aRowY[i-1] + aRowHeights[i-1] + nDistanceY; // now iterate over the elements and assign their positions for( std::vector< MatrixElement >::iterator it = m_aElements.begin(); diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index 649ca21a32b8..9d7e714ede11 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -411,11 +411,9 @@ void PrintDialog::NUpTabPage::showAdvancedControls( bool i_bShow ) void PrintDialog::NUpTabPage::setupLayout() { - Size aBorder( LogicToPixel( Size( 5, 5 ), MapMode( MAP_APPFONT ) ) ); - long nIndent = 3*aBorder.Width(); - maLayout.setParentWindow( this ); - maLayout.setOuterBorder( aBorder.Width() ); + maLayout.setOuterBorder( -1 ); + long nIndent = 3*WindowArranger::getDefaultBorder(); maLayout.addWindow( &maNupLine ); boost::shared_ptr< vcl::RowOrColumn > xRow( new vcl::RowOrColumn( &maLayout, false ) ); @@ -455,7 +453,7 @@ void PrintDialog::NUpTabPage::setupLayout() xMainCol->addRow( &maNupOrderTxt, &maNupOrderBox, nIndent ); xMainCol->setBorders( xMainCol->addWindow( &maBorderCB ), nIndent, 0, 0, 0 ); - xSpacer.reset( new vcl::Spacer( xMainCol.get(), 0, Size( 10, aBorder.Width() ) ) ); + xSpacer.reset( new vcl::Spacer( xMainCol.get(), 0, Size( 10, WindowArranger::getDefaultBorder() ) ) ); xMainCol->addChild( xSpacer ); xRow.reset( new vcl::RowOrColumn( xMainCol.get(), false ) ); @@ -552,10 +550,8 @@ void PrintDialog::JobTabPage::setupLayout() // sets the results of GetOptimalSize in a normal ListBox maPrinters.SetDropDownLineCount( 4 ); - Size aBorder( LogicToPixel( Size( 5, 5 ), MapMode( MAP_APPFONT ) ) ); - maLayout.setParentWindow( this ); - maLayout.setOuterBorder( aBorder.Width() ); + maLayout.setOuterBorder( -1 ); // add printer fixed line maLayout.addWindow( &maPrinterFL ); @@ -575,7 +571,7 @@ void PrintDialog::JobTabPage::setupLayout() // remember details controls mxDetails = xIndent; // create a column for the details - boost::shared_ptr< vcl::LabelColumn > xLabelCol( new vcl::LabelColumn( xIndent.get(), aBorder.Height() ) ); + boost::shared_ptr< vcl::LabelColumn > xLabelCol( new vcl::LabelColumn( xIndent.get() ) ); xIndent->setChild( xLabelCol ); xLabelCol->addRow( &maStatusLabel, &maStatusTxt ); xLabelCol->addRow( &maLocationLabel, &maLocationTxt ); @@ -583,7 +579,7 @@ void PrintDialog::JobTabPage::setupLayout() // add print range and copies columns maLayout.addWindow( &maCopies ); - boost::shared_ptr< vcl::RowOrColumn > xRangeRow( new vcl::RowOrColumn( &maLayout, false, aBorder.Width() ) ); + boost::shared_ptr< vcl::RowOrColumn > xRangeRow( new vcl::RowOrColumn( &maLayout, false ) ); maLayout.addChild( xRangeRow ); // create print range and add to range row @@ -679,15 +675,13 @@ PrintDialog::OutputOptPage::~OutputOptPage() void PrintDialog::OutputOptPage::setupLayout() { - Size aBorder( LogicToPixel( Size( 5, 5 ), MapMode( MAP_APPFONT ) ) ); - maLayout.setParentWindow( this ); - maLayout.setOuterBorder( aBorder.Width() ); + maLayout.setOuterBorder( -1 ); maLayout.addWindow( &maOptionsLine ); - boost::shared_ptr xIndent( new vcl::Indenter( &maLayout, aBorder.Width() ) ); + boost::shared_ptr xIndent( new vcl::Indenter( &maLayout, -1 ) ); maLayout.addChild( xIndent ); - boost::shared_ptr xCol( new vcl::RowOrColumn( xIndent.get(), aBorder.Height() ) ); + boost::shared_ptr xCol( new vcl::RowOrColumn( xIndent.get() ) ); xIndent->setChild( xCol ); mxOptGroup = xCol; xCol->addWindow( &maToFileBox ); @@ -927,13 +921,11 @@ PrintDialog::~PrintDialog() void PrintDialog::setupLayout() { - Size aBorder( LogicToPixel( Size( 5, 5 ), MapMode( MAP_APPFONT ) ) ); - maLayout.setParentWindow( this ); boost::shared_ptr< vcl::RowOrColumn > xPreviewAndTab( new vcl::RowOrColumn( &maLayout, false ) ); size_t nIndex = maLayout.addChild( xPreviewAndTab, 5 ); - maLayout.setBorders( nIndex, aBorder.Width(), aBorder.Width(), aBorder.Width(), 0 ); + maLayout.setBorders( nIndex, -1, -1, -1, 0 ); // setup column for preview and sub controls boost::shared_ptr< vcl::RowOrColumn > xPreview( new vcl::RowOrColumn( xPreviewAndTab.get() ) ); @@ -962,7 +954,7 @@ void PrintDialog::setupLayout() // add the row for the buttons boost::shared_ptr< vcl::RowOrColumn > xButtons( new vcl::RowOrColumn( &maLayout, false ) ); nIndex = maLayout.addChild( xButtons ); - maLayout.setBorders( nIndex, aBorder.Width(), 0, aBorder.Width(), aBorder.Width() ); + maLayout.setBorders( nIndex, -1, 0, -1, -1 ); Size aMinSize( maCancelButton.GetSizePixel() ); // insert help button @@ -1068,8 +1060,6 @@ void updateMaxSize( const Size& i_rCheckSize, Size& o_rMaxSize ) void PrintDialog::setupOptionalUI() { - Size aBorder( LogicToPixel( Size( 5, 5 ), MapMode( MAP_APPFONT ) ) ); - std::vector aDynamicColumns; vcl::RowOrColumn* pCurColumn = 0; @@ -1239,10 +1229,10 @@ void PrintDialog::setupOptionalUI() // reset subgroup counter nCurSubGroup = 0; - aDynamicColumns.push_back( new vcl::RowOrColumn( NULL, true, aBorder.Width() ) ); + aDynamicColumns.push_back( new vcl::RowOrColumn( NULL, true ) ); pCurColumn = aDynamicColumns.back(); pCurColumn->setParentWindow( pNewGroup ); - pCurColumn->setOuterBorder( aBorder.Width() ); + pCurColumn->setOuterBorder( -1 ); bSubgroupOnStaticPage = false; bOnStaticPage = false; } @@ -1272,7 +1262,7 @@ void PrintDialog::setupOptionalUI() } // add an indent to the current column - vcl::Indenter* pIndent = new vcl::Indenter( pCurColumn, aBorder.Width() ); + vcl::Indenter* pIndent = new vcl::Indenter( pCurColumn, -1 ); pCurColumn->addChild( pIndent ); // and create a column inside the indent pCurColumn = new vcl::RowOrColumn( pIndent ); diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 5689972e69d6..3c9767639538 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -298,6 +298,8 @@ void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, BOOL bCallHdl ) aTmpSt.SetHighContrastMode( FALSE ); rSettings.SetStyleSettings( aTmpSt ); ImplGetFrame()->UpdateSettings( rSettings ); + // reset default border width for layouters + ImplGetSVData()->maAppData.mnDefaultLayoutBorder = -1; // Verify availability of the configured UI font, otherwise choose "Andale Sans UI" String aUserInterfaceFont; -- cgit From d345375cfcda1022aeb867e32f0eef24436e2dfa Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Mon, 22 Mar 2010 19:53:06 +0100 Subject: gozer1: #161853# put an on demand WindowArranger on Window --- vcl/inc/vcl/arrange.hxx | 2 +- vcl/inc/vcl/prndlg.hxx | 10 +-- vcl/inc/vcl/window.h | 6 +- vcl/inc/vcl/window.hxx | 16 +++- vcl/source/window/arrange.cxx | 10 +-- vcl/source/window/makefile.mk | 1 + vcl/source/window/printdlg.cxx | 178 ++++++++++++++++++----------------------- vcl/source/window/window.cxx | 5 ++ vcl/source/window/window4.cxx | 94 ++++++++++++++++++++++ 9 files changed, 206 insertions(+), 116 deletions(-) create mode 100644 vcl/source/window/window4.cxx diff --git a/vcl/inc/vcl/arrange.hxx b/vcl/inc/vcl/arrange.hxx index cd4a513987aa..5b9a1d296513 100644 --- a/vcl/inc/vcl/arrange.hxx +++ b/vcl/inc/vcl/arrange.hxx @@ -113,7 +113,7 @@ namespace vcl static long getDefaultBorder(); static long getBorderValue( long nBorder ) - { return nBorder >= 0 ? nBorder : getDefaultBorder(); } + { return nBorder >= 0 ? nBorder : -nBorder * getDefaultBorder(); } WindowArranger( WindowArranger* i_pParent = NULL ) : m_pParentWindow( i_pParent ? i_pParent->m_pParentWindow : NULL ) diff --git a/vcl/inc/vcl/prndlg.hxx b/vcl/inc/vcl/prndlg.hxx index 6ac22e0708db..c2876ca0040f 100644 --- a/vcl/inc/vcl/prndlg.hxx +++ b/vcl/inc/vcl/prndlg.hxx @@ -129,7 +129,6 @@ namespace vcl // border around each page CheckBox maBorderCB; - vcl::RowOrColumn maLayout; boost::shared_ptr< vcl::RowOrColumn > mxBrochureDep; boost::shared_ptr< vcl::LabeledElement >mxPagesBtnLabel; @@ -145,7 +144,7 @@ namespace vcl void showAdvancedControls( bool ); - virtual void Resize(); + // virtual void Resize(); }; class JobTabPage : public TabPage @@ -177,7 +176,6 @@ namespace vcl long mnCollateUIMode; - vcl::RowOrColumn maLayout; boost::shared_ptr mxPrintRange; boost::shared_ptr mxDetails; @@ -187,7 +185,7 @@ namespace vcl void readFromSettings(); void storeToSettings(); - virtual void Resize(); + // virtual void Resize(); void setupLayout(); }; @@ -200,7 +198,6 @@ namespace vcl CheckBox maCollateSingleJobsBox; CheckBox maReverseOrderBox; - vcl::RowOrColumn maLayout; boost::shared_ptr mxOptGroup; OutputOptPage( Window*, const ResId& ); @@ -209,7 +206,7 @@ namespace vcl void readFromSettings(); void storeToSettings(); - virtual void Resize(); + // virtual void Resize(); void setupLayout(); }; @@ -254,7 +251,6 @@ namespace vcl rtl::OUString maPrintText; rtl::OUString maDefPrtText; - vcl::RowOrColumn maLayout; boost::shared_ptr mxPreviewCtrls; Size maDetailsCollapsedSize; diff --git a/vcl/inc/vcl/window.h b/vcl/inc/vcl/window.h index 0fec51e2e702..2fc11f84026c 100644 --- a/vcl/inc/vcl/window.h +++ b/vcl/inc/vcl/window.h @@ -103,7 +103,10 @@ namespace dnd { class XDropTarget; } } } } } -namespace vcl { struct ControlLayoutData; } +namespace vcl { + struct ControlLayoutData; + struct ExtWindowImpl; +} @@ -244,6 +247,7 @@ public: ImplDelData* mpFirstDel; void* mpUserData; + vcl::ExtWindowImpl* mpExtImpl; Cursor* mpCursor; Pointer maPointer; Fraction maZoom; diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx index c14ee7add4fb..8fa63633eeef 100644 --- a/vcl/inc/vcl/window.hxx +++ b/vcl/inc/vcl/window.hxx @@ -54,6 +54,7 @@ #include #include #include +#include class VirtualDevice; struct ImplDelData; @@ -125,7 +126,11 @@ namespace dnd { class XDropTarget; } } } } } -namespace vcl { struct ControlLayoutData; } +namespace vcl { + struct ControlLayoutData; + class WindowArranger; + struct ExtWindowImpl; +} // --------------- // - WindowTypes - @@ -475,6 +480,9 @@ public: SAL_DLLPRIVATE BOOL ImplUpdatePos(); SAL_DLLPRIVATE void ImplUpdateSysObjPos(); SAL_DLLPRIVATE WindowImpl* ImplGetWindowImpl() const { return mpWindowImpl; } + SAL_DLLPRIVATE void ImplFreeExtWindowImpl(); + // creates ExtWindowImpl on demand, but may return NULL (e.g. if mbInDtor) + SAL_DLLPRIVATE vcl::ExtWindowImpl* ImplGetExtWindowImpl() const; /** check whether a font is suitable for UI The font to be tested will be checked whether it could display a @@ -540,6 +548,7 @@ public: SAL_DLLPRIVATE BOOL ImplRegisterAccessibleNativeFrame(); SAL_DLLPRIVATE void ImplRevokeAccessibleNativeFrame(); SAL_DLLPRIVATE void ImplCallResize(); + SAL_DLLPRIVATE void ImplExtResize(); SAL_DLLPRIVATE void ImplCallMove(); SAL_DLLPRIVATE Rectangle ImplOutputToUnmirroredAbsoluteScreenPixel( const Rectangle& rRect ) const; SAL_DLLPRIVATE void ImplMirrorFramePos( Point &pt ) const; @@ -1142,6 +1151,11 @@ public: virtual XubString GetSurroundingText() const; virtual Selection GetSurroundingTextSelection() const; + + // ExtImpl + + // layouting + boost::shared_ptr< vcl::WindowArranger > getLayout(); }; diff --git a/vcl/source/window/arrange.cxx b/vcl/source/window/arrange.cxx index 76e2d3f28747..64db5426dc5b 100644 --- a/vcl/source/window/arrange.cxx +++ b/vcl/source/window/arrange.cxx @@ -52,7 +52,7 @@ long WindowArranger::getDefaultBorder() OutputDevice* pDefDev = Application::GetDefaultDevice(); if( pDefDev ) { - Size aBorder( pDefDev->LogicToPixel( Size( 5, 5 ), MapMode( MAP_APPFONT ) ) ); + Size aBorder( pDefDev->LogicToPixel( Size( 3, 3 ), MapMode( MAP_APPFONT ) ) ); nResult = pSVData->maAppData.mnDefaultLayoutBorder = aBorder.Height(); } } @@ -611,7 +611,7 @@ long LabelColumn::getLabelWidth() const } } } - return nWidth + getBorderWidth(); + return nWidth + getBorderValue( getBorderWidth() ); } Size LabelColumn::getOptimalSize( WindowSizeType i_eType ) const @@ -656,12 +656,12 @@ Size LabelColumn::getOptimalSize( WindowSizeType i_eType ) const } if( aElementSize.Height() ) { - aColumnSize.Height() += getBorderWidth() + aElementSize.Height(); + aColumnSize.Height() += getBorderValue( getBorderWidth() ) + aElementSize.Height(); } } if( nEle > 0 && aColumnSize.Height() ) { - aColumnSize.Height() -= getBorderWidth(); // for the first element + aColumnSize.Height() -= getBorderValue( getBorderWidth() ); // for the first element aColumnSize.Height() += 2*nOuterBorder; } return aColumnSize; @@ -730,7 +730,7 @@ void Indenter::resize() long nOuterBorder = getBorderValue( m_nOuterBorder ); long nIndent = getBorderValue( m_nIndent ); Point aPt( m_aManagedArea.TopLeft() ); - aPt.X() += nOuterBorder + m_nIndent; + aPt.X() += nOuterBorder + nIndent; aPt.Y() += nOuterBorder; Size aSz( m_aManagedArea.GetSize() ); aSz.Width() -= 2*nOuterBorder + nIndent; diff --git a/vcl/source/window/makefile.mk b/vcl/source/window/makefile.mk index 8b3c01f5721e..e74623ad0a03 100644 --- a/vcl/source/window/makefile.mk +++ b/vcl/source/window/makefile.mk @@ -89,6 +89,7 @@ SLOFILES= \ $(SLO)$/winproc.obj \ $(SLO)$/window2.obj \ $(SLO)$/window3.obj \ + $(SLO)$/window4.obj \ $(SLO)$/wrkwin.obj # --- Targets ------------------------------------------------------ diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index 1fcdce0fdad5..88461f109fdb 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -496,18 +496,18 @@ void PrintDialog::NUpTabPage::showAdvancedControls( bool i_bShow ) maSheetMarginTxt2.Show( i_bShow ); maNupOrientationTxt.Show( i_bShow ); maNupOrientationBox.Show( i_bShow ); - maLayout.resize(); + getLayout()->resize(); } void PrintDialog::NUpTabPage::setupLayout() { - maLayout.setParentWindow( this ); - maLayout.setOuterBorder( -1 ); + boost::shared_ptr xLayout = + boost::dynamic_pointer_cast( getLayout() ); long nIndent = 3*WindowArranger::getDefaultBorder(); - maLayout.addWindow( &maNupLine ); - boost::shared_ptr< vcl::RowOrColumn > xRow( new vcl::RowOrColumn( &maLayout, false ) ); - maLayout.addChild( xRow ); + xLayout->addWindow( &maNupLine ); + boost::shared_ptr< vcl::RowOrColumn > xRow( new vcl::RowOrColumn( xLayout.get(), false ) ); + xLayout->addChild( xRow ); boost::shared_ptr< vcl::Indenter > xIndent( new vcl::Indenter( xRow.get() ) ); xRow->addChild( xIndent ); @@ -555,11 +555,6 @@ void PrintDialog::NUpTabPage::setupLayout() showAdvancedControls( false ); } -void PrintDialog::NUpTabPage::Resize() -{ - maLayout.setManagedArea( Rectangle( Point( 0, 0 ), GetOutputSizePixel() ) ); -} - void PrintDialog::NUpTabPage::initFromMultiPageSetup( const vcl::PrinterController::MultiPageSetup& i_rMPS ) { maSheetMarginEdt.SetValue( maSheetMarginEdt.Normalize( i_rMPS.nLeftMargin ), FUNIT_100TH_MM ); @@ -600,7 +595,6 @@ PrintDialog::JobTabPage::JobTabPage( Window* i_pParent, const ResId& rResId ) , maNoCollateImg( VclResId( SV_PRINT_NOCOLLATE_IMG ) ) , maNoCollateHCImg( VclResId( SV_PRINT_NOCOLLATE_HC_IMG ) ) , mnCollateUIMode( 0 ) - , maLayout( NULL, true ) { FreeResource(); @@ -640,24 +634,24 @@ void PrintDialog::JobTabPage::setupLayout() // sets the results of GetOptimalSize in a normal ListBox maPrinters.SetDropDownLineCount( 4 ); - maLayout.setParentWindow( this ); - maLayout.setOuterBorder( -1 ); + boost::shared_ptr xLayout = + boost::dynamic_pointer_cast( getLayout() ); // add printer fixed line - maLayout.addWindow( &maPrinterFL ); + xLayout->addWindow( &maPrinterFL ); // add print LB - maLayout.addWindow( &maPrinters ); + xLayout->addWindow( &maPrinters ); // create a row for details button/text and properties button - boost::shared_ptr< vcl::RowOrColumn > xDetRow( new vcl::RowOrColumn( &maLayout, false ) ); - maLayout.addChild( xDetRow ); + boost::shared_ptr< vcl::RowOrColumn > xDetRow( new vcl::RowOrColumn( xLayout.get(), false ) ); + xLayout->addChild( xDetRow ); xDetRow->addWindow( &maDetailsBtn ); xDetRow->addChild( new vcl::Spacer( xDetRow.get(), 2 ) ); xDetRow->addWindow( &maSetupButton ); // create an indent for details - boost::shared_ptr< vcl::Indenter > xIndent( new vcl::Indenter( &maLayout ) ); - maLayout.addChild( xIndent ); + boost::shared_ptr< vcl::Indenter > xIndent( new vcl::Indenter( xLayout.get() ) ); + xLayout->addChild( xIndent ); // remember details controls mxDetails = xIndent; // create a column for the details @@ -668,9 +662,9 @@ void PrintDialog::JobTabPage::setupLayout() xLabelCol->addRow( &maCommentLabel, &maCommentTxt ); // add print range and copies columns - maLayout.addWindow( &maCopies ); - boost::shared_ptr< vcl::RowOrColumn > xRangeRow( new vcl::RowOrColumn( &maLayout, false ) ); - maLayout.addChild( xRangeRow ); + xLayout->addWindow( &maCopies ); + boost::shared_ptr< vcl::RowOrColumn > xRangeRow( new vcl::RowOrColumn( xLayout.get(), false ) ); + xLayout->addChild( xRangeRow ); // create print range and add to range row mxPrintRange.reset( new vcl::RowOrColumn( xRangeRow.get() ) ); @@ -737,11 +731,6 @@ void PrintDialog::JobTabPage::storeToSettings() rtl::OUString::createFromAscii( maCollateBox.IsChecked() ? "true" : "false" ) ); } -void PrintDialog::JobTabPage::Resize() -{ - maLayout.setManagedArea( Rectangle( Point( 0, 0 ), GetSizePixel() ) ); -} - PrintDialog::OutputOptPage::OutputOptPage( Window* i_pParent, const ResId& i_rResId ) : TabPage( i_pParent, i_rResId ) , maOptionsLine( this, VclResId( SV_PRINT_OPT_PRINT_FL ) ) @@ -765,12 +754,12 @@ PrintDialog::OutputOptPage::~OutputOptPage() void PrintDialog::OutputOptPage::setupLayout() { - maLayout.setParentWindow( this ); - maLayout.setOuterBorder( -1 ); + boost::shared_ptr xLayout = + boost::dynamic_pointer_cast( getLayout() ); - maLayout.addWindow( &maOptionsLine ); - boost::shared_ptr xIndent( new vcl::Indenter( &maLayout, -1 ) ); - maLayout.addChild( xIndent ); + xLayout->addWindow( &maOptionsLine ); + boost::shared_ptr xIndent( new vcl::Indenter( xLayout.get(), -1 ) ); + xLayout->addChild( xIndent ); boost::shared_ptr xCol( new vcl::RowOrColumn( xIndent.get() ) ); xIndent->setChild( xCol ); mxOptGroup = xCol; @@ -799,12 +788,6 @@ void PrintDialog::OutputOptPage::storeToSettings() rtl::OUString::createFromAscii( maToFileBox.IsChecked() ? "true" : "false" ) ); } -void PrintDialog::OutputOptPage::Resize() -{ - maLayout.setManagedArea( Rectangle( Point( 0, 0 ), GetSizePixel() ) ); -} - - PrintDialog::PrintDialog( Window* i_pParent, const boost::shared_ptr& i_rController ) : ModalDialog( i_pParent, VclResId( SV_DLG_PRINT ) ) , maOKButton( this, VclResId( SV_PRINT_OK ) ) @@ -1012,11 +995,14 @@ PrintDialog::~PrintDialog() void PrintDialog::setupLayout() { - maLayout.setParentWindow( this ); + boost::shared_ptr xLayout = + boost::dynamic_pointer_cast( getLayout() ); + xLayout->setOuterBorder( 0 ); - boost::shared_ptr< vcl::RowOrColumn > xPreviewAndTab( new vcl::RowOrColumn( &maLayout, false ) ); - size_t nIndex = maLayout.addChild( xPreviewAndTab, 5 ); - maLayout.setBorders( nIndex, -1, -1, -1, 0 ); + + boost::shared_ptr< vcl::RowOrColumn > xPreviewAndTab( new vcl::RowOrColumn( xLayout.get(), false ) ); + size_t nIndex = xLayout->addChild( xPreviewAndTab, 5 ); + xLayout->setBorders( nIndex, -1, -1, -1, 0 ); // setup column for preview and sub controls boost::shared_ptr< vcl::RowOrColumn > xPreview( new vcl::RowOrColumn( xPreviewAndTab.get() ) ); @@ -1040,12 +1026,12 @@ void PrintDialog::setupLayout() xPreviewAndTab->addWindow( &maTabCtrl ); // add the button line - maLayout.addWindow( &maButtonLine ); + xLayout->addWindow( &maButtonLine ); // add the row for the buttons - boost::shared_ptr< vcl::RowOrColumn > xButtons( new vcl::RowOrColumn( &maLayout, false ) ); - nIndex = maLayout.addChild( xButtons ); - maLayout.setBorders( nIndex, -1, 0, -1, -1 ); + boost::shared_ptr< vcl::RowOrColumn > xButtons( new vcl::RowOrColumn( xLayout.get(), false ) ); + nIndex = xLayout->addChild( xButtons ); + xLayout->setBorders( nIndex, -1, 0, -1, -1 ); Size aMinSize( maCancelButton.GetSizePixel() ); // insert help button @@ -1163,15 +1149,15 @@ void updateMaxSize( const Size& i_rCheckSize, Size& o_rMaxSize ) void PrintDialog::setupOptionalUI() { - std::vector aDynamicColumns; - vcl::RowOrColumn* pCurColumn = 0; + std::vector< boost::shared_ptr > aDynamicColumns; + boost::shared_ptr< vcl::RowOrColumn > pCurColumn; Window* pCurParent = 0, *pDynamicPageParent = 0; USHORT nOptPageId = 9, nCurSubGroup = 0; bool bOnStaticPage = false; bool bSubgroupOnStaticPage = false; - std::multimap< rtl::OUString, vcl::RowOrColumn* > aPropertyToDependencyRowMap; + std::multimap< rtl::OUString, boost::shared_ptr > aPropertyToDependencyRowMap; const Sequence< PropertyValue >& rOptions( maPController->getUIOptions() ); for( int i = 0; i < rOptions.getLength(); i++ ) @@ -1277,37 +1263,40 @@ void PrintDialog::setupOptionalUI() { // restore to dynamic pCurParent = pDynamicPageParent; - pCurColumn = aDynamicColumns.empty() ? NULL : aDynamicColumns.back(); + if( ! aDynamicColumns.empty() ) + pCurColumn = aDynamicColumns.back(); + else + pCurColumn.reset(); bOnStaticPage = false; bSubgroupOnStaticPage = false; if( aGroupingHint.equalsAscii( "PrintRange" ) ) { - pCurColumn = maJobPage.mxPrintRange.get(); + pCurColumn = maJobPage.mxPrintRange; pCurParent = &maJobPage; // set job page as current parent bOnStaticPage = true; } else if( aGroupingHint.equalsAscii( "OptionsPage" ) ) { - pCurColumn = &maOptionsPage.maLayout; + pCurColumn = boost::dynamic_pointer_cast(maOptionsPage.getLayout()); pCurParent = &maOptionsPage; // set options page as current parent bOnStaticPage = true; } else if( aGroupingHint.equalsAscii( "OptionsPageOptGroup" ) ) { - pCurColumn = maOptionsPage.mxOptGroup.get(); + pCurColumn = maOptionsPage.mxOptGroup; pCurParent = &maOptionsPage; // set options page as current parent bOnStaticPage = true; } else if( aGroupingHint.equalsAscii( "LayoutPage" ) ) { - pCurColumn = &maNUpPage.maLayout; + pCurColumn = boost::dynamic_pointer_cast(maNUpPage.getLayout()); pCurParent = &maNUpPage; // set layout page as current parent bOnStaticPage = true; } else if( aGroupingHint.getLength() ) { - pCurColumn = &maJobPage.maLayout; + pCurColumn = boost::dynamic_pointer_cast(maJobPage.getLayout()); pCurParent = &maJobPage; // set job page as current parent bOnStaticPage = true; } @@ -1332,10 +1321,9 @@ void PrintDialog::setupOptionalUI() // reset subgroup counter nCurSubGroup = 0; - aDynamicColumns.push_back( new vcl::RowOrColumn( NULL, true ) ); + aDynamicColumns.push_back( boost::dynamic_pointer_cast(pNewGroup->getLayout()) ); pCurColumn = aDynamicColumns.back(); pCurColumn->setParentWindow( pNewGroup ); - pCurColumn->setOuterBorder( -1 ); bSubgroupOnStaticPage = false; bOnStaticPage = false; } @@ -1365,10 +1353,10 @@ void PrintDialog::setupOptionalUI() } // add an indent to the current column - vcl::Indenter* pIndent = new vcl::Indenter( pCurColumn, -1 ); + vcl::Indenter* pIndent = new vcl::Indenter( pCurColumn.get(), -1 ); pCurColumn->addChild( pIndent ); // and create a column inside the indent - pCurColumn = new vcl::RowOrColumn( pIndent ); + pCurColumn.reset( new vcl::RowOrColumn( pIndent ) ); pIndent->setChild( pCurColumn ); } // EVIL @@ -1392,17 +1380,17 @@ void PrintDialog::setupOptionalUI() maPropertyToWindowMap[ aPropertyName ].push_back( &maNUpPage.maBrochureBtn ); maControlToPropertyMap[&maNUpPage.maBrochureBtn] = aPropertyName; - aPropertyToDependencyRowMap.insert( std::pair< rtl::OUString, vcl::RowOrColumn* >( aPropertyName, maNUpPage.mxBrochureDep.get() ) ); + aPropertyToDependencyRowMap.insert( std::pair< rtl::OUString, boost::shared_ptr >( aPropertyName, maNUpPage.mxBrochureDep ) ); } else { - vcl::RowOrColumn* pSaveCurColumn = pCurColumn; + boost::shared_ptr pSaveCurColumn( pCurColumn ); if( bUseDependencyRow ) { // find the correct dependency row (if any) - std::pair< std::multimap< rtl::OUString, vcl::RowOrColumn* >::iterator, - std::multimap< rtl::OUString, vcl::RowOrColumn* >::iterator > aDepRange; + std::pair< std::multimap< rtl::OUString, boost::shared_ptr >::iterator, + std::multimap< rtl::OUString, boost::shared_ptr >::iterator > aDepRange; aDepRange = aPropertyToDependencyRowMap.equal_range( aDependsOnName ); if( aDepRange.first != aDepRange.second ) { @@ -1441,16 +1429,16 @@ void PrintDialog::setupOptionalUI() // set help text setHelpText( pNewBox, aHelpTexts, 0 ); - vcl::RowOrColumn* pDependencyRow = new vcl::RowOrColumn( pCurColumn, false ); + boost::shared_ptr pDependencyRow( new vcl::RowOrColumn( pCurColumn.get(), false ) ); pCurColumn->addChild( pDependencyRow ); - aPropertyToDependencyRowMap.insert( std::pair< rtl::OUString, vcl::RowOrColumn* >( aPropertyName, pDependencyRow ) ); + aPropertyToDependencyRowMap.insert( std::pair< rtl::OUString, boost::shared_ptr >( aPropertyName, pDependencyRow ) ); // add checkbox to current column pDependencyRow->addWindow( pNewBox ); } else if( aCtrlType.equalsAscii( "Radio" ) && pCurParent ) { - vcl::RowOrColumn* pRadioColumn = pCurColumn; + boost::shared_ptr pRadioColumn( pCurColumn ); if( aText.getLength() ) { // add a FixedText: @@ -1466,10 +1454,10 @@ void PrintDialog::setupOptionalUI() // add fixed text to current column pCurColumn->addWindow( pHeading ); // add an indent to the current column - vcl::Indenter* pIndent = new vcl::Indenter( pCurColumn, 15 ); + vcl::Indenter* pIndent = new vcl::Indenter( pCurColumn.get(), 15 ); pCurColumn->addChild( pIndent ); // and create a column inside the indent - pRadioColumn = new vcl::RowOrColumn( pIndent ); + pRadioColumn.reset( new vcl::RowOrColumn( pIndent ) ); pIndent->setChild( pRadioColumn ); } // iterate options @@ -1479,11 +1467,11 @@ void PrintDialog::setupOptionalUI() pVal->Value >>= nSelectVal; for( sal_Int32 m = 0; m < aChoices.getLength(); m++ ) { - boost::shared_ptr pLabel( new vcl::LabeledElement( pRadioColumn, 1 ) ); + boost::shared_ptr pLabel( new vcl::LabeledElement( pRadioColumn.get(), 1 ) ); pRadioColumn->addChild( pLabel ); boost::shared_ptr pDependencyRow( new vcl::RowOrColumn( pLabel.get(), false ) ); pLabel->setElement( pDependencyRow ); - aPropertyToDependencyRowMap.insert( std::pair< rtl::OUString, vcl::RowOrColumn* >( aPropertyName, pDependencyRow.get() ) ); + aPropertyToDependencyRowMap.insert( std::pair< rtl::OUString, boost::shared_ptr >( aPropertyName, pDependencyRow ) ); RadioButton* pBtn = new RadioButton( pCurParent, m == 0 ? WB_GROUP : 0 ); maControls.push_front( pBtn ); @@ -1509,9 +1497,9 @@ void PrintDialog::setupOptionalUI() ) && pCurParent ) { // create a row in the current column - vcl::RowOrColumn* pFieldColumn = new vcl::RowOrColumn( pCurColumn, false ); + boost::shared_ptr pFieldColumn( new vcl::RowOrColumn( pCurColumn.get(), false ) ); pCurColumn->addChild( pFieldColumn ); - aPropertyToDependencyRowMap.insert( std::pair< rtl::OUString, vcl::RowOrColumn* >( aPropertyName, pFieldColumn ) ); + aPropertyToDependencyRowMap.insert( std::pair< rtl::OUString, boost::shared_ptr >( aPropertyName, pFieldColumn ) ); vcl::LabeledElement* pLabel = NULL; if( aText.getLength() ) @@ -1526,7 +1514,7 @@ void PrintDialog::setupOptionalUI() setSmartId( pHeading, "FixedText", -1, aPropertyName ); // add to row - pLabel = new vcl::LabeledElement( pFieldColumn, 2 ); + pLabel = new vcl::LabeledElement( pFieldColumn.get(), 2 ); pFieldColumn->addChild( pLabel ); pLabel->setLabel( pHeading ); } @@ -1661,11 +1649,11 @@ void PrintDialog::setupOptionalUI() // FIXME: the GetNativeControlRegion call on Windows has some issues // (which skew the results of GetOptimalSize()) // however fixing this thoroughly needs to take interaction with paint into - // acoount, making the right fix less simple. Fix this the right way + // account, making the right fix less simple. Fix this the right way // at some point. For now simply add some space at the lowest element - size_t nIndex = maJobPage.maLayout.countElements(); + size_t nIndex = maJobPage.getLayout()->countElements(); if( nIndex > 0 ) // sanity check - maJobPage.maLayout.setBorders( nIndex-1, 0, 0, 0, aBorder.Width() ); + maJobPage.getLayout()->setBorders( nIndex-1, 0, 0, 0, -1 ); #endif // create auto mnemomnics now so they can be calculated in layout @@ -1675,13 +1663,13 @@ void PrintDialog::setupOptionalUI() ImplWindowAutoMnemonic( this ); // calculate job page - Size aMaxSize = maJobPage.maLayout.getOptimalSize( WINDOWSIZE_PREFERRED ); + Size aMaxSize = maJobPage.getLayout()->getOptimalSize( WINDOWSIZE_PREFERRED ); // and layout page - updateMaxSize( maNUpPage.maLayout.getOptimalSize( WINDOWSIZE_PREFERRED ), aMaxSize ); + updateMaxSize( maNUpPage.getLayout()->getOptimalSize( WINDOWSIZE_PREFERRED ), aMaxSize ); // and options page - updateMaxSize( maOptionsPage.maLayout.getOptimalSize( WINDOWSIZE_PREFERRED ), aMaxSize ); + updateMaxSize( maOptionsPage.getLayout()->getOptimalSize( WINDOWSIZE_PREFERRED ), aMaxSize ); - for( std::vector< vcl::RowOrColumn* >::iterator it = aDynamicColumns.begin(); + for( std::vector< boost::shared_ptr >::iterator it = aDynamicColumns.begin(); it != aDynamicColumns.end(); ++it ) { Size aPageSize( (*it)->getOptimalSize( WINDOWSIZE_PREFERRED ) ); @@ -1709,19 +1697,7 @@ void PrintDialog::setupOptionalUI() maTabCtrl.SetMinimumSizePixel( maTabCtrl.GetSizePixel() ); } - // and finally arrange controls - for( std::vector< vcl::RowOrColumn* >::iterator it = aDynamicColumns.begin(); - it != aDynamicColumns.end(); ++it ) - { - (*it)->setManagedArea( Rectangle( Point(), aTabSize ) ); - delete *it; - *it = NULL; - } - maJobPage.Resize(); - maNUpPage.Resize(); - maOptionsPage.Resize(); - - Size aSz = maLayout.getOptimalSize( WINDOWSIZE_PREFERRED ); + Size aSz = getLayout()->getOptimalSize( WINDOWSIZE_PREFERRED ); SetOutputSizePixel( aSz ); } @@ -1756,7 +1732,7 @@ void PrintDialog::checkControlDependencies() maJobPage.maCollateImage.SetSizePixel( aImgSize ); maJobPage.maCollateImage.SetImage( bHC ? aHCImg : aImg ); maJobPage.maCollateImage.SetModeImage( aHCImg, BMP_COLOR_HIGHCONTRAST ); - maJobPage.maLayout.resize(); + maJobPage.getLayout()->resize(); // enable setup button only for printers that can be setup bool bHaveSetup = maPController->getPrinter()->HasSupport( SUPPORT_SETUPDIALOG ); @@ -1771,7 +1747,7 @@ void PrintDialog::checkControlDependencies() aPrinterSize.Width() = aSetupPos.X() - aPrinterPos.X() - LogicToPixel( Size( 5, 5 ), MapMode( MAP_APPFONT ) ).Width(); maJobPage.maPrinters.SetSizePixel( aPrinterSize ); maJobPage.maSetupButton.Show(); - maLayout.resize(); + getLayout()->resize(); } } else @@ -1785,7 +1761,7 @@ void PrintDialog::checkControlDependencies() aPrinterSize.Width() = aSetupPos.X() + aSetupSize.Width() - aPrinterPos.X(); maJobPage.maPrinters.SetSizePixel( aPrinterSize ); maJobPage.maSetupButton.Hide(); - maLayout.resize(); + getLayout()->resize(); } } } @@ -2016,7 +1992,7 @@ void PrintDialog::updateNupFromPages() if( bCustom ) { // see if we have to enlarge the dialog to make the tab page fit - Size aCurSize( maNUpPage.maLayout.getOptimalSize( WINDOWSIZE_PREFERRED ) ); + Size aCurSize( maNUpPage.getLayout()->getOptimalSize( WINDOWSIZE_PREFERRED ) ); Size aTabSize( maTabCtrl.GetTabPageSizePixel() ); if( aTabSize.Height() < aCurSize.Height() ) { @@ -2135,7 +2111,7 @@ IMPL_LINK( PrintDialog, ClickHdl, Button*, pButton ) else if( pButton == &maOptionsPage.maToFileBox ) { maOKButton.SetText( maOptionsPage.maToFileBox.IsChecked() ? maPrintToFileText : maPrintText ); - maLayout.resize(); + getLayout()->resize(); } else if( pButton == &maNUpPage.maBrochureBtn ) { @@ -2171,7 +2147,7 @@ IMPL_LINK( PrintDialog, ClickHdl, Button*, pButton ) { maDetailsCollapsedSize = GetOutputSizePixel(); // enlarge dialog if necessary - Size aMinSize( maJobPage.maLayout.getOptimalSize( WINDOWSIZE_MINIMUM ) ); + Size aMinSize( maJobPage.getLayout()->getOptimalSize( WINDOWSIZE_MINIMUM ) ); Size aCurSize( maJobPage.GetSizePixel() ); if( aCurSize.Height() < aMinSize.Height() ) { @@ -2445,7 +2421,7 @@ void PrintDialog::Command( const CommandEvent& rEvt ) void PrintDialog::Resize() { - maLayout.setManagedArea( Rectangle( Point( 0, 0 ), GetSizePixel() ) ); + // maLayout.setManagedArea( Rectangle( Point( 0, 0 ), GetSizePixel() ) ); // and do the preview; however the metafile does not need to be gotten anew preparePreview( false ); diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 7fea5ef78757..e69a086f91d3 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -597,6 +597,7 @@ void Window::ImplInitWindowData( WindowType nType ) mpWindowImpl->mpDlgCtrlDownWindow = NULL; // window for dialog control mpWindowImpl->mpFirstDel = NULL; // Dtor notification list mpWindowImpl->mpUserData = NULL; // user data + mpWindowImpl->mpExtImpl = NULL; // extended implementation data mpWindowImpl->mpCursor = NULL; // cursor mpWindowImpl->mpControlFont = NULL; // font propertie mpWindowImpl->mpVCLXWindow = NULL; @@ -1129,6 +1130,8 @@ void Window::ImplCallResize() // #88419# Most classes don't call the base class in Resize() and Move(), // => Call ImpleResize/Move instead of Resize/Move directly... ImplCallEventListeners( VCLEVENT_WINDOW_RESIZE ); + + ImplExtResize(); } // ----------------------------------------------------------------------- @@ -4329,6 +4332,8 @@ Window::Window( Window* pParent, const ResId& rResId ) Window::~Window() { + ImplFreeExtWindowImpl(); + vcl::LazyDeletor::Undelete( this ); DBG_DTOR( Window, ImplDbgCheckWindow ); diff --git a/vcl/source/window/window4.cxx b/vcl/source/window/window4.cxx new file mode 100644 index 000000000000..79476e9f59c3 --- /dev/null +++ b/vcl/source/window/window4.cxx @@ -0,0 +1,94 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#include "precompiled_vcl.hxx" + +#include "vcl/window.hxx" +#include "vcl/window.h" +#include "vcl/arrange.hxx" + +namespace vcl +{ + struct ExtWindowImpl + { + ExtWindowImpl() + {} + ~ExtWindowImpl() + {} + + boost::shared_ptr< WindowArranger > mxLayout; + }; +} + + +void Window::ImplFreeExtWindowImpl() +{ + if( mpWindowImpl ) + { + delete mpWindowImpl->mpExtImpl; + mpWindowImpl->mpExtImpl = NULL; + } +} + +vcl::ExtWindowImpl* Window::ImplGetExtWindowImpl() const +{ + vcl::ExtWindowImpl* pImpl = NULL; + if( mpWindowImpl ) + { + if( ! mpWindowImpl->mpExtImpl ) + mpWindowImpl->mpExtImpl = new vcl::ExtWindowImpl(); + pImpl = mpWindowImpl->mpExtImpl; + } + return pImpl; +} + +void Window::ImplExtResize() +{ + if( mpWindowImpl && mpWindowImpl->mpExtImpl ) + { + if( mpWindowImpl->mpExtImpl->mxLayout.get() ) + mpWindowImpl->mpExtImpl->mxLayout->setManagedArea( Rectangle( Point( 0, 0 ), GetSizePixel() ) ); + } +} + +boost::shared_ptr< vcl::WindowArranger > Window::getLayout() +{ + boost::shared_ptr< vcl::WindowArranger > xRet; + vcl::ExtWindowImpl* pImpl = ImplGetExtWindowImpl(); + if( pImpl ) + { + if( ! pImpl->mxLayout.get() ) + { + pImpl->mxLayout.reset( new vcl::LabelColumn() ); + pImpl->mxLayout->setParentWindow( this ); + pImpl->mxLayout->setOuterBorder( -1 ); + } + xRet = pImpl->mxLayout; + } + + return xRet; +} -- cgit From 96c1ee636435baf4ea84e7bffd9acb0bc0e9b787 Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Wed, 24 Mar 2010 19:41:38 +0100 Subject: gozer1: #161853# add hierarchichal named children --- vcl/inc/vcl/arrange.hxx | 14 ++-- vcl/inc/vcl/window.hxx | 39 +++++++++++ vcl/source/window/window4.cxx | 156 +++++++++++++++++++++++++++++++++++++++++- 3 files changed, 200 insertions(+), 9 deletions(-) diff --git a/vcl/inc/vcl/arrange.hxx b/vcl/inc/vcl/arrange.hxx index 5b9a1d296513..72e33f3c4bf8 100644 --- a/vcl/inc/vcl/arrange.hxx +++ b/vcl/inc/vcl/arrange.hxx @@ -51,7 +51,7 @@ namespace vcl or a child WindowArranger (a node in the hierarchy), but never both */ - class WindowArranger + class VCL_DLLPUBLIC WindowArranger { protected: struct Element @@ -197,7 +197,7 @@ namespace vcl } }; - class RowOrColumn : public WindowArranger + class VCL_DLLPUBLIC RowOrColumn : public WindowArranger { long m_nBorderWidth; bool m_bColumn; @@ -238,7 +238,7 @@ namespace vcl long getBorderWidth() const { return m_nBorderWidth; } }; - class LabeledElement : public WindowArranger + class VCL_DLLPUBLIC LabeledElement : public WindowArranger { WindowArranger::Element m_aLabel; WindowArranger::Element m_aElement; @@ -282,7 +282,7 @@ namespace vcl { return m_aElement.getOptimalSize( i_eType ); } }; - class LabelColumn : public RowOrColumn + class VCL_DLLPUBLIC LabelColumn : public RowOrColumn { long getLabelWidth() const; public: @@ -299,7 +299,7 @@ namespace vcl size_t addRow( Window* i_pLabel, Window* i_pElement, long i_nIndent = 0 ); }; - class Indenter : public WindowArranger + class VCL_DLLPUBLIC Indenter : public WindowArranger { long m_nIndent; WindowArranger::Element m_aElement; @@ -333,7 +333,7 @@ namespace vcl { setChild( boost::shared_ptr( i_pChild ), i_nExpandPrio ); } }; - class Spacer : public WindowArranger + class VCL_DLLPUBLIC Spacer : public WindowArranger { WindowArranger::Element m_aElement; Size m_aSize; @@ -359,7 +359,7 @@ namespace vcl virtual bool isVisible() const { return true; } }; - class MatrixArranger : public WindowArranger + class VCL_DLLPUBLIC MatrixArranger : public WindowArranger { long m_nBorderX; long m_nBorderY; diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx index 8fa63633eeef..c757a20aece9 100644 --- a/vcl/inc/vcl/window.hxx +++ b/vcl/inc/vcl/window.hxx @@ -483,6 +483,7 @@ public: SAL_DLLPRIVATE void ImplFreeExtWindowImpl(); // creates ExtWindowImpl on demand, but may return NULL (e.g. if mbInDtor) SAL_DLLPRIVATE vcl::ExtWindowImpl* ImplGetExtWindowImpl() const; + SAL_DLLPRIVATE void ImplDeleteOwnedChildren(); /** check whether a font is suitable for UI The font to be tested will be checked whether it could display a @@ -1156,6 +1157,44 @@ public: // layouting boost::shared_ptr< vcl::WindowArranger > getLayout(); + + /* add a child Window + addWindow will do the following things + - insert the passed window into the child list (equivalent to i_pWin->SetParent( this )) + - assign a name to the passed window for identification purposes + the name is basically free style, only the '/' character must not be used as it is + used for concatenation to form hierarchical names + caution: the last non empty token repsctive to '/' will be the actual name used + - mark the window as "owned", meaning that the added Window will be destroyed by + the parent's desctructor. + This means: do not pass in member windows or stack objects here. Do not cause + the destructor of the added window to be called in any way. + + to avoid ownership pass i_bTakeOwnership as "false" + */ + void addWindow( Window* i_pWin, const rtl::OUString& i_rName, bool i_bTakeOwnership = true ); + + /* remove a child Window + the remove window functions will + - reparent the searched window (equivalent to i_pWin->SetParent( i_pNewParent )) + - return a pointer to the removed window or NULL if i_pWin was not found + caution: ownership passes to the new parent or the caller, if the new parent was NULL + */ + Window* removeWindow( Window* i_pWin, Window* i_pNewParent = NULL ); + /* removeWindow by name will only work for direct children. if i_rName + is a hierachical name, the last non empty token will be used to get the child window + */ + Window* removeWindow( const rtl::OUString& i_rName, Window* i_pNewParent = NULL ); + + /* find a child window by name + the name passed here can be hierarchical to find descendants in any depth + path delimiter is '/' + */ + Window* findWindow( const rtl::OUString& i_rName ) const; + + /* return the name of this window + */ + const rtl::OUString& getName() const; }; diff --git a/vcl/source/window/window4.cxx b/vcl/source/window/window4.cxx index 79476e9f59c3..587a99376943 100644 --- a/vcl/source/window/window4.cxx +++ b/vcl/source/window/window4.cxx @@ -31,22 +31,92 @@ #include "vcl/window.h" #include "vcl/arrange.hxx" +#include + namespace vcl { struct ExtWindowImpl { ExtWindowImpl() + : mbOwnedByParent( false ) {} ~ExtWindowImpl() {} - boost::shared_ptr< WindowArranger > mxLayout; + boost::shared_ptr< WindowArranger > mxLayout; + bool mbOwnedByParent; + rtl::OUString maName; + std::map< rtl::OUString, Window* > maNameToWindow; + std::map< Window*, rtl::OUString > maWindowToName; + + void insertName( const rtl::OUString& i_rName, Window* i_pWin ); + void removeWindow( Window* ); + Window* findName( const rtl::OUString& ) const; }; + + void ExtWindowImpl::insertName( const rtl::OUString& i_rName, Window* i_pWin ) + { + OSL_ENSURE( maNameToWindow.find( i_rName ) == maNameToWindow.end(), "duplicate named window inserted" ); + maNameToWindow[ i_rName ] = i_pWin; + maWindowToName[ i_pWin ] = i_rName; + } + + void ExtWindowImpl::removeWindow( Window* i_pWin ) + { + std::map< Window*, rtl::OUString >::iterator it = maWindowToName.find( i_pWin ); + if( it != maWindowToName.end() ) + { + maNameToWindow.erase( it->second ); + maWindowToName.erase( it ); + } + } + + Window* ExtWindowImpl::findName( const rtl::OUString& i_rName ) const + { + std::map< rtl::OUString, Window* >::const_iterator it = maNameToWindow.find( i_rName ); + return it != maNameToWindow.end() ? it->second : NULL; + } } +static rtl::OUString getLastNameToken( const rtl::OUString& i_rName ) +{ + sal_Int32 nIndex = i_rName.lastIndexOf( sal_Unicode('/') ); + if( nIndex != -1 ) + { + // if this is not an empty token, that is the name + if( nIndex < i_rName.getLength()-1 ) + return i_rName.copy( nIndex+1 ); + // we need to search backward + const sal_Unicode* pStr = i_rName.getStr(); + while( nIndex >= 0 && pStr[nIndex] == '/' ) + nIndex--; + if( nIndex < 0 ) // give up + return rtl::OUString(); + // search backward to next '/' or beginning + sal_Int32 nBeginIndex = nIndex-1; + while( nBeginIndex >= 0 && pStr[nBeginIndex] != '/' ) + nBeginIndex--; + return i_rName.copy( nBeginIndex+1, nIndex-nBeginIndex ); + } + return rtl::OUString( i_rName ); +} + +void Window::ImplDeleteOwnedChildren() +{ + Window* pChild = mpWindowImpl->mpFirstChild; + while ( pChild ) + { + Window* pDeleteCandidate = pChild; + pChild = pChild->mpWindowImpl->mpNext; + vcl::ExtWindowImpl* pDelImpl = pDeleteCandidate->ImplGetExtWindowImpl(); + if( pDelImpl && pDelImpl->mbOwnedByParent ) + delete pDeleteCandidate; + } +} void Window::ImplFreeExtWindowImpl() { + ImplDeleteOwnedChildren(); if( mpWindowImpl ) { delete mpWindowImpl->mpExtImpl; @@ -59,7 +129,7 @@ vcl::ExtWindowImpl* Window::ImplGetExtWindowImpl() const vcl::ExtWindowImpl* pImpl = NULL; if( mpWindowImpl ) { - if( ! mpWindowImpl->mpExtImpl ) + if( ! mpWindowImpl->mpExtImpl && ! mpWindowImpl->mbInDtor ) mpWindowImpl->mpExtImpl = new vcl::ExtWindowImpl(); pImpl = mpWindowImpl->mpExtImpl; } @@ -92,3 +162,85 @@ boost::shared_ptr< vcl::WindowArranger > Window::getLayout() return xRet; } + +void Window::addWindow( Window* i_pWin, const rtl::OUString& i_rName, bool i_bTakeOwnership ) +{ + vcl::ExtWindowImpl* pImpl = ImplGetExtWindowImpl(); + if( pImpl && i_pWin ) + { + vcl::ExtWindowImpl* pChildImpl = i_pWin->ImplGetExtWindowImpl(); + if( pChildImpl ) + { + i_pWin->SetParent( this ); + pChildImpl->mbOwnedByParent = i_bTakeOwnership; + rtl::OUString aName( getLastNameToken( i_rName ) ); + if( aName.getLength() ) + { + pImpl->insertName( aName, i_pWin ); + } + } + } +} + +Window* Window::removeWindow( Window* i_pWin, Window* i_pNewParent ) +{ + Window* pRet = NULL; + if( i_pWin ) + { + vcl::ExtWindowImpl* pImpl = ImplGetExtWindowImpl(); + if( pImpl ) + { + vcl::ExtWindowImpl* pChildImpl = i_pWin->ImplGetExtWindowImpl(); + if( pChildImpl ) + { + if( ! i_pNewParent ) + pChildImpl->mbOwnedByParent = false; + pImpl->removeWindow( i_pWin ); + i_pWin->SetParent( i_pNewParent ); + pRet = i_pWin; + } + } + } + return pRet; +} + +Window* Window::removeWindow( const rtl::OUString& i_rName, Window* i_pNewParent ) +{ + Window* pRet = NULL; + vcl::ExtWindowImpl* pImpl = ImplGetExtWindowImpl(); + if( pImpl ) + { + rtl::OUString aName( getLastNameToken( i_rName ) ); + pRet = pImpl->findName( aName ); + pRet = removeWindow( pRet, i_pNewParent ); + } + return pRet; +} + +Window* Window::findWindow( const rtl::OUString& i_rName ) const +{ + vcl::ExtWindowImpl* pImpl = ImplGetExtWindowImpl(); + Window* pSearch = const_cast(this); + if( pImpl ) + { + sal_Int32 nIndex = 0; + while( nIndex && pSearch ) + { + rtl::OUString aName( i_rName.getToken( 0, '/', nIndex ) ); + if( aName.getLength() ) + { + pSearch = pImpl->findName( aName ); + if( pSearch ) + { + pImpl = pSearch->ImplGetExtWindowImpl(); + if( ! pImpl ) + pSearch = NULL; + } + } + } + } + else + pSearch = NULL; + return pSearch != this ? pSearch : NULL; +} + -- cgit From ff9196d0581845f8e7cb686bf93930676ba301fe Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Thu, 1 Apr 2010 16:51:09 +0200 Subject: gozer1: #161853# provide access to Window class and WindowArranger through XPropertySet --- vcl/inc/vcl/arrange.hxx | 11 ++ vcl/inc/vcl/window.hxx | 44 ++++-- vcl/inc/vcl/wpropset.hxx | 66 ++++++++ vcl/prj/d.lst | 4 +- vcl/source/window/arrange.cxx | 62 ++++++++ vcl/source/window/makefile.mk | 1 + vcl/source/window/window4.cxx | 150 ++++++++---------- vcl/source/window/wpropset.cxx | 345 +++++++++++++++++++++++++++++++++++++++++ 8 files changed, 581 insertions(+), 102 deletions(-) create mode 100644 vcl/inc/vcl/wpropset.hxx create mode 100644 vcl/source/window/wpropset.cxx diff --git a/vcl/inc/vcl/arrange.hxx b/vcl/inc/vcl/arrange.hxx index 72e33f3c4bf8..24775995b013 100644 --- a/vcl/inc/vcl/arrange.hxx +++ b/vcl/inc/vcl/arrange.hxx @@ -104,6 +104,8 @@ namespace vcl Rectangle m_aManagedArea; long m_nOuterBorder; + rtl::OUString m_aIdentifier; + virtual Element* getElement( size_t i_nIndex ) = 0; const Element* getConstElement( size_t i_nIndex ) const { return const_cast(this)->getElement( i_nIndex ); } @@ -149,6 +151,9 @@ namespace vcl virtual bool isVisible() const; // true if any element is visible + virtual com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > getProperties() const; + virtual void setProperties( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& ); + sal_Int32 getExpandPriority( size_t i_nIndex ) const { const Element* pEle = getConstElement( i_nIndex ); @@ -195,6 +200,12 @@ namespace vcl m_nOuterBorder = i_nBorder; resize(); } + + const rtl::OUString getIdentifier() const + { return m_aIdentifier; } + + void setIdentifier( const rtl::OUString& i_rId ) + { m_aIdentifier = i_rId; } }; class VCL_DLLPUBLIC RowOrColumn : public WindowArranger diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx index c757a20aece9..9516350527df 100644 --- a/vcl/inc/vcl/window.hxx +++ b/vcl/inc/vcl/window.hxx @@ -96,6 +96,13 @@ namespace accessibility { class XAccessible; }}}} +namespace com { +namespace sun { +namespace star { +namespace beans { + class PropertyValue; +}}}} + namespace com { namespace sun { namespace star { @@ -1156,15 +1163,11 @@ public: // ExtImpl // layouting - boost::shared_ptr< vcl::WindowArranger > getLayout(); + boost::shared_ptr< vcl::WindowArranger > getLayout(); /* add a child Window addWindow will do the following things - insert the passed window into the child list (equivalent to i_pWin->SetParent( this )) - - assign a name to the passed window for identification purposes - the name is basically free style, only the '/' character must not be used as it is - used for concatenation to form hierarchical names - caution: the last non empty token repsctive to '/' will be the actual name used - mark the window as "owned", meaning that the added Window will be destroyed by the parent's desctructor. This means: do not pass in member windows or stack objects here. Do not cause @@ -1172,7 +1175,7 @@ public: to avoid ownership pass i_bTakeOwnership as "false" */ - void addWindow( Window* i_pWin, const rtl::OUString& i_rName, bool i_bTakeOwnership = true ); + void addWindow( Window* i_pWin, bool i_bTakeOwnership = true ); /* remove a child Window the remove window functions will @@ -1181,20 +1184,31 @@ public: caution: ownership passes to the new parent or the caller, if the new parent was NULL */ Window* removeWindow( Window* i_pWin, Window* i_pNewParent = NULL ); - /* removeWindow by name will only work for direct children. if i_rName - is a hierachical name, the last non empty token will be used to get the child window + + /* return the identifier of this window + */ + const rtl::OUString& getIdentifier() const; + /* set an identifier + identifiers have only loosely defined rules per se + in context of Window they must be unique over the window + hierarchy you'd like to find them again using the findWindow method */ - Window* removeWindow( const rtl::OUString& i_rName, Window* i_pNewParent = NULL ); + void setIdentifier( const rtl::OUString& ); - /* find a child window by name - the name passed here can be hierarchical to find descendants in any depth - path delimiter is '/' + /* returns the first found descendant that matches + the passed identifier or NULL */ - Window* findWindow( const rtl::OUString& i_rName ) const; + Window* findWindow( const rtl::OUString& ) const; - /* return the name of this window + /* get/set properties + this will contain window properties (like visible, enabled) + as well as properties of derived classes (e.g. text of Edit fields) */ - const rtl::OUString& getName() const; + virtual com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > getProperties() const; + /* + */ + virtual void setProperties( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& ); + }; diff --git a/vcl/inc/vcl/wpropset.hxx b/vcl/inc/vcl/wpropset.hxx new file mode 100644 index 000000000000..409b629496e6 --- /dev/null +++ b/vcl/inc/vcl/wpropset.hxx @@ -0,0 +1,66 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef VCL_WPROPSET_HXX +#define VCL_WPROPSET_HXX + +#include "vcl/dllapi.h" + +#include "tools/link.hxx" +#include "vcl/arrange.hxx" + +#include "com/sun/star/beans/XPropertySet.hpp" + +class VclWindowEvent; + +namespace vcl +{ + class WindowPropertySetData; + class WindowPropertySetListener; + + class VCL_DLLPUBLIC WindowPropertySet + { + WindowPropertySetData* mpImpl; + + void addWindowToSet( Window* ); + void addLayoutToSet( const boost::shared_ptr& ); + void setupProperties(); + + DECL_LINK( ChildEventListener, VclWindowEvent* ); + + void propertyChange( const com::sun::star::beans::PropertyChangeEvent& ); + friend class vcl::WindowPropertySetListener; + + public: + WindowPropertySet( Window* i_pTopWindow, bool i_bTakeOwnership ); + ~WindowPropertySet(); + + com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > getPropertySet() const; + }; +} + +#endif diff --git a/vcl/prj/d.lst b/vcl/prj/d.lst index 8345b155ce58..0f429d0f5ec6 100644 --- a/vcl/prj/d.lst +++ b/vcl/prj/d.lst @@ -153,4 +153,6 @@ mkdir: %_DEST%\inc%_EXT%\vcl ..\inc\vcl\ppdparser.hxx %_DEST%\inc%_EXT%\vcl\ppdparser.hxx ..\inc\vcl\helper.hxx %_DEST%\inc%_EXT%\vcl\helper.hxx ..\inc\vcl\strhelper.hxx %_DEST%\inc%_EXT%\vcl\strhelper.hxx -..\inc\vcl\lazydelete.hxx %_DEST%\inc%_EXT%\vcl\lazydelete.hxx \ No newline at end of file +..\inc\vcl\lazydelete.hxx %_DEST%\inc%_EXT%\vcl\lazydelete.hxx +..\inc\vcl\arrange.hxx %_DEST%\inc%_EXT%\vcl\arrange.hxx +..\inc\vcl\wpropset.hxx %_DEST%\inc%_EXT%\vcl\wpropset.hxx \ No newline at end of file diff --git a/vcl/source/window/arrange.cxx b/vcl/source/window/arrange.cxx index 64db5426dc5b..2a01758220ed 100644 --- a/vcl/source/window/arrange.cxx +++ b/vcl/source/window/arrange.cxx @@ -35,9 +35,13 @@ #include "vcl/svdata.hxx" #include "vcl/svapp.hxx" +#include "com/sun/star/beans/PropertyValue.hpp" +#include "com/sun/star/awt/Rectangle.hpp" + #include "osl/diagnose.h" using namespace vcl; +using namespace com::sun::star; // ---------------------------------------- // vcl::WindowArranger @@ -206,6 +210,64 @@ void WindowArranger::Element::setPosSize( const Point& i_rPos, const Size& i_rSi m_pChild->setManagedArea( Rectangle( aPoint, aSize ) ); } +uno::Sequence< beans::PropertyValue > WindowArranger::getProperties() const +{ + uno::Sequence< beans::PropertyValue > aRet( 3 ); + aRet[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OuterBorder" ) ); + aRet[0].Value = uno::makeAny( sal_Int32( getBorderValue( m_nOuterBorder ) ) ); + aRet[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ManagedArea" ) ); + awt::Rectangle aArea( m_aManagedArea.getX(), m_aManagedArea.getY(), m_aManagedArea.getWidth(), m_aManagedArea.getHeight() ); + aRet[1].Value = uno::makeAny( aArea ); + aRet[2].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Visible" ) ); + aRet[2].Value = uno::makeAny( sal_Bool( isVisible() ) ); + return aRet; +} + +void WindowArranger::setProperties( const uno::Sequence< beans::PropertyValue >& i_rProps ) +{ + const beans::PropertyValue* pProps = i_rProps.getConstArray(); + bool bResize = false; + for( sal_Int32 i = 0; i < i_rProps.getLength(); i++ ) + { + if( pProps[i].Name.equalsAscii( "OuterBorder" ) ) + { + sal_Int32 nVal = 0; + if( pProps[i].Value >>= nVal ) + { + if( getBorderValue( m_nOuterBorder ) != nVal ) + { + m_nOuterBorder = nVal; + bResize = true; + } + } + } + else if( pProps[i].Name.equalsAscii( "ManagedArea" ) ) + { + awt::Rectangle aArea( 0, 0, 0, 0 ); + if( pProps[i].Value >>= aArea ) + { + m_aManagedArea.setX( aArea.X ); + m_aManagedArea.setY( aArea.Y ); + m_aManagedArea.setWidth( aArea.Width ); + m_aManagedArea.setHeight( aArea.Height ); + bResize = true; + } + } + else if( pProps[i].Name.equalsAscii( "Visible" ) ) + { + sal_Bool bVal = sal_False; + if( pProps[i].Value >>= bVal ) + { + show( bVal, false ); + bResize = true; + } + } + } + if( bResize ) + resize(); +} + + // ---------------------------------------- // vcl::RowOrColumn //----------------------------------------- diff --git a/vcl/source/window/makefile.mk b/vcl/source/window/makefile.mk index e74623ad0a03..3614e166537c 100644 --- a/vcl/source/window/makefile.mk +++ b/vcl/source/window/makefile.mk @@ -90,6 +90,7 @@ SLOFILES= \ $(SLO)$/window2.obj \ $(SLO)$/window3.obj \ $(SLO)$/window4.obj \ + $(SLO)$/wpropset.obj \ $(SLO)$/wrkwin.obj # --- Targets ------------------------------------------------------ diff --git a/vcl/source/window/window4.cxx b/vcl/source/window/window4.cxx index 587a99376943..577a573c2015 100644 --- a/vcl/source/window/window4.cxx +++ b/vcl/source/window/window4.cxx @@ -29,9 +29,15 @@ #include "vcl/window.hxx" #include "vcl/window.h" +#include "vcl/svdata.hxx" #include "vcl/arrange.hxx" +#include "com/sun/star/beans/PropertyValue.hpp" + #include +#include + +using namespace com::sun::star; namespace vcl { @@ -45,60 +51,8 @@ namespace vcl boost::shared_ptr< WindowArranger > mxLayout; bool mbOwnedByParent; - rtl::OUString maName; - std::map< rtl::OUString, Window* > maNameToWindow; - std::map< Window*, rtl::OUString > maWindowToName; - - void insertName( const rtl::OUString& i_rName, Window* i_pWin ); - void removeWindow( Window* ); - Window* findName( const rtl::OUString& ) const; + rtl::OUString maIdentifier; }; - - void ExtWindowImpl::insertName( const rtl::OUString& i_rName, Window* i_pWin ) - { - OSL_ENSURE( maNameToWindow.find( i_rName ) == maNameToWindow.end(), "duplicate named window inserted" ); - maNameToWindow[ i_rName ] = i_pWin; - maWindowToName[ i_pWin ] = i_rName; - } - - void ExtWindowImpl::removeWindow( Window* i_pWin ) - { - std::map< Window*, rtl::OUString >::iterator it = maWindowToName.find( i_pWin ); - if( it != maWindowToName.end() ) - { - maNameToWindow.erase( it->second ); - maWindowToName.erase( it ); - } - } - - Window* ExtWindowImpl::findName( const rtl::OUString& i_rName ) const - { - std::map< rtl::OUString, Window* >::const_iterator it = maNameToWindow.find( i_rName ); - return it != maNameToWindow.end() ? it->second : NULL; - } -} - -static rtl::OUString getLastNameToken( const rtl::OUString& i_rName ) -{ - sal_Int32 nIndex = i_rName.lastIndexOf( sal_Unicode('/') ); - if( nIndex != -1 ) - { - // if this is not an empty token, that is the name - if( nIndex < i_rName.getLength()-1 ) - return i_rName.copy( nIndex+1 ); - // we need to search backward - const sal_Unicode* pStr = i_rName.getStr(); - while( nIndex >= 0 && pStr[nIndex] == '/' ) - nIndex--; - if( nIndex < 0 ) // give up - return rtl::OUString(); - // search backward to next '/' or beginning - sal_Int32 nBeginIndex = nIndex-1; - while( nBeginIndex >= 0 && pStr[nBeginIndex] != '/' ) - nBeginIndex--; - return i_rName.copy( nBeginIndex+1, nIndex-nBeginIndex ); - } - return rtl::OUString( i_rName ); } void Window::ImplDeleteOwnedChildren() @@ -163,7 +117,7 @@ boost::shared_ptr< vcl::WindowArranger > Window::getLayout() return xRet; } -void Window::addWindow( Window* i_pWin, const rtl::OUString& i_rName, bool i_bTakeOwnership ) +void Window::addWindow( Window* i_pWin, bool i_bTakeOwnership ) { vcl::ExtWindowImpl* pImpl = ImplGetExtWindowImpl(); if( pImpl && i_pWin ) @@ -173,11 +127,6 @@ void Window::addWindow( Window* i_pWin, const rtl::OUString& i_rName, bool i_bTa { i_pWin->SetParent( this ); pChildImpl->mbOwnedByParent = i_bTakeOwnership; - rtl::OUString aName( getLastNameToken( i_rName ) ); - if( aName.getLength() ) - { - pImpl->insertName( aName, i_pWin ); - } } } } @@ -195,7 +144,6 @@ Window* Window::removeWindow( Window* i_pWin, Window* i_pNewParent ) { if( ! i_pNewParent ) pChildImpl->mbOwnedByParent = false; - pImpl->removeWindow( i_pWin ); i_pWin->SetParent( i_pNewParent ); pRet = i_pWin; } @@ -204,43 +152,73 @@ Window* Window::removeWindow( Window* i_pWin, Window* i_pNewParent ) return pRet; } -Window* Window::removeWindow( const rtl::OUString& i_rName, Window* i_pNewParent ) +Window* Window::findWindow( const rtl::OUString& i_rIdentifier ) const { - Window* pRet = NULL; - vcl::ExtWindowImpl* pImpl = ImplGetExtWindowImpl(); - if( pImpl ) + if( getIdentifier() == i_rIdentifier ) + return const_cast(this); + + Window* pChild = mpWindowImpl->mpFirstChild; + while ( pChild ) { - rtl::OUString aName( getLastNameToken( i_rName ) ); - pRet = pImpl->findName( aName ); - pRet = removeWindow( pRet, i_pNewParent ); + Window* pResult = pChild->findWindow( i_rIdentifier ); + if( pResult ) + return pResult; + pChild = pChild->mpWindowImpl->mpNext; } - return pRet; + + return NULL; +} + +const rtl::OUString& Window::getIdentifier() const +{ + static rtl::OUString aEmptyStr; + + return (mpWindowImpl && mpWindowImpl->mpExtImpl) ? mpWindowImpl->mpExtImpl->maIdentifier : aEmptyStr; } -Window* Window::findWindow( const rtl::OUString& i_rName ) const +void Window::setIdentifier( const rtl::OUString& i_rIdentifier ) { vcl::ExtWindowImpl* pImpl = ImplGetExtWindowImpl(); - Window* pSearch = const_cast(this); if( pImpl ) + pImpl->maIdentifier = i_rIdentifier; +} + +void Window::setProperties( const uno::Sequence< beans::PropertyValue >& i_rProps ) +{ + const beans::PropertyValue* pVals = i_rProps.getConstArray(); + for( sal_Int32 i = 0; i < i_rProps.getLength(); i++ ) { - sal_Int32 nIndex = 0; - while( nIndex && pSearch ) + if( pVals[i].Name.equalsAscii( "Enabled" ) ) { - rtl::OUString aName( i_rName.getToken( 0, '/', nIndex ) ); - if( aName.getLength() ) - { - pSearch = pImpl->findName( aName ); - if( pSearch ) - { - pImpl = pSearch->ImplGetExtWindowImpl(); - if( ! pImpl ) - pSearch = NULL; - } - } + sal_Bool bVal = sal_True; + if( pVals[i].Value >>= bVal ) + Enable( bVal ); + } + else if( pVals[i].Name.equalsAscii( "Visible" ) ) + { + sal_Bool bVal = sal_True; + if( pVals[i].Value >>= bVal ) + Show( bVal ); + } + else if( pVals[i].Name.equalsAscii( "Text" ) ) + { + rtl::OUString aText; + if( pVals[i].Value >>= aText ) + SetText( aText ); } } - else - pSearch = NULL; - return pSearch != this ? pSearch : NULL; +} + +uno::Sequence< beans::PropertyValue > Window::getProperties() const +{ + uno::Sequence< beans::PropertyValue > aProps( 3 ); + aProps[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Enabled" ) ); + aProps[0].Value = uno::makeAny( sal_Bool( IsEnabled() ) ); + aProps[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Visible" ) ); + aProps[1].Value = uno::makeAny( sal_Bool( IsVisible() ) ); + aProps[2].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Text" ) ); + aProps[2].Value = uno::makeAny( rtl::OUString( GetText() ) ); + + return aProps; } diff --git a/vcl/source/window/wpropset.cxx b/vcl/source/window/wpropset.cxx new file mode 100644 index 000000000000..98c8a5b1dcfb --- /dev/null +++ b/vcl/source/window/wpropset.cxx @@ -0,0 +1,345 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#include "precompiled_vcl.hxx" + +#include "vcl/wpropset.hxx" +#include "vcl/window.hxx" +#include "vcl/vclevent.hxx" +#include "vcl/svdata.hxx" + +#include "com/sun/star/lang/XMultiServiceFactory.hpp" +#include "com/sun/star/beans/PropertyValue.hpp" +#include "com/sun/star/beans/PropertyAttribute.hpp" +#include "com/sun/star/beans/XPropertySet.hpp" +#include "com/sun/star/beans/XPropertyContainer.hpp" +#include "com/sun/star/beans/XPropertyAccess.hpp" + +#include "cppuhelper/basemutex.hxx" +#include "cppuhelper/compbase1.hxx" + +#include + +using namespace vcl; +using namespace com::sun::star; + +/* + +TODO: +- release solarmutex during outside UNO calls +- in ChildEventListener protect against reentry by using PostUserEvent + +*/ + +class vcl::WindowPropertySetListener : + public cppu::BaseMutex, + public cppu::WeakComponentImplHelper1< com::sun::star::beans::XPropertyChangeListener >, + private boost::noncopyable +{ + WindowPropertySet* mpParent; + bool mbSuspended; +public: + WindowPropertySetListener( WindowPropertySet* pParent ) + : cppu::WeakComponentImplHelper1< com::sun::star::beans::XPropertyChangeListener >( m_aMutex ) + , mpParent( pParent ) + , mbSuspended( false ) + {} + + virtual ~WindowPropertySetListener() + { + } + + virtual void SAL_CALL disposing( const lang::EventObject& ) throw() + { + } + + virtual void SAL_CALL propertyChange( const beans::PropertyChangeEvent& i_rEvent ) throw() + { + if( ! mbSuspended ) + mpParent->propertyChange( i_rEvent ); + } + + void suspend( bool i_bSuspended ) + { + mbSuspended = i_bSuspended; + } +}; + +class vcl::WindowPropertySetData +{ +public: + + struct PropertyMapEntry + { + Window* mpWindow; + boost::shared_ptr mpLayout; + uno::Sequence< beans::PropertyValue > maSavedValues; + + PropertyMapEntry( Window* i_pWindow = NULL, + const boost::shared_ptr& i_pLayout = boost::shared_ptr() ) + : mpWindow( i_pWindow ) + , mpLayout( i_pLayout ) + {} + + uno::Sequence< beans::PropertyValue > getProperties() const + { + if( mpWindow ) + return mpWindow->getProperties(); + else if( mpLayout.get() ) + return mpLayout->getProperties(); + return uno::Sequence< beans::PropertyValue >(); + } + + void setProperties( const uno::Sequence< beans::PropertyValue >& i_rProps ) const + { + if( mpWindow ) + mpWindow->setProperties( i_rProps ); + else if( mpLayout.get() ) + mpLayout->setProperties( i_rProps ); + } + }; + + Window* mpTopWindow; + bool mbOwner; + std::map< rtl::OUString, PropertyMapEntry > maProperties; + uno::Reference< beans::XPropertySet > mxPropSet; + uno::Reference< beans::XPropertyAccess > mxPropSetAccess; + uno::Reference< beans::XPropertyChangeListener > mxListener; + vcl::WindowPropertySetListener* mpListener; + + WindowPropertySetData() + : mpTopWindow( NULL ) + , mbOwner( false ) + , mpListener( NULL ) + {} + + ~WindowPropertySetData() + { + // release layouters, possibly interface properties before destroying + // the involved parent to be on the safe side + maProperties.clear(); + if( mbOwner ) + delete mpTopWindow; + } +}; + +static rtl::OUString getIdentifiedPropertyName( const rtl::OUString& i_rIdentifier, const rtl::OUString& i_rName ) +{ + rtl::OUStringBuffer aBuf( i_rIdentifier.getLength() + 1 + i_rName.getLength() ); + aBuf.append( i_rIdentifier ); + aBuf.append( sal_Unicode( '#' ) ); + aBuf.append( i_rName ); + return aBuf.makeStringAndClear(); +} + +static void spliceIdentifiedPropertyName( const rtl::OUString& i_rIdentifiedPropName, + rtl::OUString& o_rIdentifier, + rtl::OUString& o_rPropName ) +{ + sal_Int32 nIndex = 0; + o_rIdentifier = i_rIdentifiedPropName.getToken( 0, sal_Unicode( '#' ), nIndex ); + if( nIndex != -1 ) + o_rPropName = i_rIdentifiedPropName.copy( nIndex ); + else + o_rPropName = rtl::OUString(); +} + +WindowPropertySet::WindowPropertySet( Window* i_pTopWindow, bool i_bTakeOwnership ) +: mpImpl( new vcl::WindowPropertySetData ) +{ + mpImpl->mpTopWindow = i_pTopWindow; + mpImpl->mbOwner = i_bTakeOwnership; + + mpImpl->mpTopWindow->AddChildEventListener( LINK( this, WindowPropertySet, ChildEventListener ) ); + + mpImpl->mxPropSet = uno::Reference< beans::XPropertySet >( + ImplGetSVData()->maAppData.mxMSF->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.beans.PropertyBag" ) ) ), + uno::UNO_QUERY ); + OSL_ENSURE( mpImpl->mxPropSet.is(), "could not create instance of com.sun.star.beans.PropertyBag" ); + mpImpl->mxPropSetAccess = uno::Reference< beans::XPropertyAccess >( mpImpl->mxPropSet, uno::UNO_QUERY ); + OSL_ENSURE( mpImpl->mxPropSet.is(), "could not query XPropertyAccess interface" ); + if( ! mpImpl->mxPropSetAccess.is() ) + mpImpl->mxPropSet.clear(); + + addWindowToSet( i_pTopWindow ); + + setupProperties(); + + if( mpImpl->mxPropSet.is() ) + { + mpImpl->mxListener.set( mpImpl->mpListener = new WindowPropertySetListener( this ) ); + } +} + +WindowPropertySet::~WindowPropertySet() +{ + mpImpl->mpTopWindow->RemoveChildEventListener( LINK( this, WindowPropertySet, ChildEventListener ) ); + + delete mpImpl; + mpImpl = NULL; +} + +uno::Reference< beans::XPropertySet > WindowPropertySet::getPropertySet() const +{ + return mpImpl->mxPropSet; +} + +void WindowPropertySet::addLayoutToSet( const boost::shared_ptr< WindowArranger >& i_pLayout ) +{ + if( i_pLayout.get() ) + { + if( i_pLayout->getIdentifier().getLength() ) + { + WindowPropertySetData::PropertyMapEntry& rEntry = mpImpl->maProperties[ i_pLayout->getIdentifier() ]; + OSL_ENSURE( rEntry.mpWindow == 0 && rEntry.mpLayout.get() == 0, "inserted layout has duplicate name" ); + rEntry.mpWindow = NULL; + rEntry.mpLayout = i_pLayout; + rEntry.maSavedValues = i_pLayout->getProperties(); + } + // insert child layouts + size_t nChildren = i_pLayout->countElements(); + for( size_t i = 0; i < nChildren; i++ ) + addLayoutToSet( i_pLayout->getChild( i ) ); + } +} + +void WindowPropertySet::addWindowToSet( Window* i_pWindow ) +{ + if( i_pWindow->getIdentifier().getLength() ) // no name, no properties + { + WindowPropertySetData::PropertyMapEntry& rEntry = mpImpl->maProperties[ i_pWindow->getIdentifier() ]; + OSL_ENSURE( rEntry.mpWindow == 0 && rEntry.mpLayout.get() == 0, "inserted window has duplicate name" ); + rEntry.mpWindow = i_pWindow; + rEntry.mpLayout.reset(); + rEntry.maSavedValues = i_pWindow->getProperties(); + } + addLayoutToSet( i_pWindow->getLayout() ); + + Window* pWin = i_pWindow->GetWindow( WINDOW_FIRSTCHILD ); + while( pWin ) + { + addWindowToSet( pWin ); + pWin = pWin->GetWindow( WINDOW_NEXT ); + } +} + +void WindowPropertySet::setupProperties() +{ + uno::Reference< beans::XPropertyContainer > xCont( mpImpl->mxPropSet, uno::UNO_QUERY ); + OSL_ENSURE( xCont.is(), "could not get XPropertyContainer interface" ); + if( ! xCont.is() ) + return; + + for( std::map< rtl::OUString, WindowPropertySetData::PropertyMapEntry >::iterator it + = mpImpl->maProperties.begin(); it != mpImpl->maProperties.end(); ++it ) + { + uno::Sequence< beans::PropertyValue > aOutsideValues( it->second.maSavedValues ); + beans::PropertyValue* pVal = aOutsideValues.getArray(); + for( sal_Int32 i = 0; i < aOutsideValues.getLength(); i++ ) + { + pVal[i].Name = getIdentifiedPropertyName( it->first, pVal[i].Name ); + xCont->addProperty( pVal[i].Name, + beans::PropertyAttribute::BOUND | beans:: PropertyAttribute::CONSTRAINED, + pVal[i].Value + ); + } + } +} + +void WindowPropertySet::propertyChange( const beans::PropertyChangeEvent& i_rEvent ) +{ + rtl::OUString aIdentifier, aProperty; + spliceIdentifiedPropertyName( i_rEvent.PropertyName, aIdentifier, aProperty ); + std::map< rtl::OUString, WindowPropertySetData::PropertyMapEntry >::iterator it = + mpImpl->maProperties.find( aIdentifier ); + if( it != mpImpl->maProperties.end() ) + { + uno::Sequence< beans::PropertyValue > aSet( 1 ); + aSet[0].Name = aProperty; + aSet[0].Value = i_rEvent.NewValue; + it->second.setProperties( aSet ); + } +} + +IMPL_LINK( vcl::WindowPropertySet, ChildEventListener, VclWindowEvent*, pEvent ) +{ + // find window in our properties + std::map< rtl::OUString, WindowPropertySetData::PropertyMapEntry >::iterator it + = mpImpl->maProperties.find( pEvent->GetWindow()->getIdentifier() ); + if( it != mpImpl->maProperties.end() ) // this is valid, some unnamed child may have sent an event + { + ULONG nId = pEvent->GetId(); + // check if anything interesting happened + if( + // general windowy things + nId == VCLEVENT_WINDOW_SHOW || + nId == VCLEVENT_WINDOW_HIDE || + nId == VCLEVENT_WINDOW_ENABLED || + nId == VCLEVENT_WINDOW_DISABLED || + // button thingies + nId == VCLEVENT_BUTTON_CLICK || + nId == VCLEVENT_PUSHBUTTON_TOGGLE || + nId == VCLEVENT_RADIOBUTTON_TOGGLE || + nId == VCLEVENT_CHECKBOX_TOGGLE || + // listbox + nId == VCLEVENT_LISTBOX_SELECT || + // edit + nId == VCLEVENT_EDIT_MODIFY + ) + { + WindowPropertySetData::PropertyMapEntry& rEntry = it->second; + // collect changes + uno::Sequence< beans::PropertyValue > aNewProps( rEntry.getProperties() ); + uno::Sequence< beans::PropertyValue > aNewPropsOut( aNewProps ); + + // translate to identified properties + beans::PropertyValue* pValues = aNewPropsOut.getArray(); + for( sal_Int32 i = 0; i < aNewPropsOut.getLength(); i++ ) + pValues[i].Name = getIdentifiedPropertyName( it->first, pValues[i].Name ); + + // broadcast changes + bool bWasVeto = false; + mpImpl->mpListener->suspend( true ); + try + { + mpImpl->mxPropSetAccess->setPropertyValues( aNewPropsOut ); + } + catch( beans::PropertyVetoException& ) + { + bWasVeto = true; + } + mpImpl->mpListener->suspend( false ); + + if( ! bWasVeto ) // changes accepted ? + rEntry.maSavedValues = rEntry.getProperties(); + else // no, reset + rEntry.setProperties( rEntry.maSavedValues ); + } + } + + return 0; +} -- cgit From 449cd590b6d1bafba18cbdb39398bd98aa72e73f Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 16 Apr 2010 22:57:56 +0200 Subject: CWS gnumake2: move delivered header files in from svl/inc to svl/inc/svl; remove ununsed files; rename svs.res to svl.res --- svl/inc/PasswordHelper.hxx | 57 - svl/inc/adrparse.hxx | 110 -- svl/inc/broadcast.hxx | 70 - svl/inc/cntnrsrt.hxx | 177 -- svl/inc/cntwids.hrc | 509 ------ svl/inc/converter.hxx | 46 - svl/inc/filenotation.hxx | 74 - svl/inc/folderrestriction.hxx | 59 - svl/inc/fstathelper.hxx | 68 - svl/inc/inetdef.hxx | 32 - svl/inc/inetmsg.hxx | 32 - svl/inc/inetstrm.hxx | 32 - svl/inc/instrm.hxx | 83 - svl/inc/listener.hxx | 68 - svl/inc/listeneriter.hxx | 82 - svl/inc/lngmisc.hxx | 76 - svl/inc/memberid.hrc | 47 - svl/inc/nfsymbol.hxx | 72 - svl/inc/numuno.hxx | 102 -- svl/inc/outstrm.hxx | 69 - svl/inc/pickerhelper.hxx | 72 - svl/inc/pickerhistory.hxx | 54 - svl/inc/pickerhistoryaccess.hxx | 57 - svl/inc/poolcach.hxx | 61 - svl/inc/strmadpt.hxx | 138 -- svl/inc/stylepool.hxx | 103 -- svl/inc/svl/PasswordHelper.hxx | 57 + svl/inc/svl/adrparse.hxx | 110 ++ svl/inc/svl/broadcast.hxx | 70 + svl/inc/svl/cntnrsrt.hxx | 177 ++ svl/inc/svl/cntwids.hrc | 509 ++++++ svl/inc/svl/converter.hxx | 46 + svl/inc/svl/filenotation.hxx | 74 + svl/inc/svl/folderrestriction.hxx | 59 + svl/inc/svl/fstathelper.hxx | 68 + svl/inc/svl/inetdef.hxx | 32 + svl/inc/svl/inetmsg.hxx | 32 + svl/inc/svl/inetstrm.hxx | 32 + svl/inc/svl/instrm.hxx | 83 + svl/inc/svl/listener.hxx | 68 + svl/inc/svl/listeneriter.hxx | 82 + svl/inc/svl/lngmisc.hxx | 76 + svl/inc/svl/memberid.hrc | 47 + svl/inc/svl/nfsymbol.hxx | 72 + svl/inc/svl/numuno.hxx | 102 ++ svl/inc/svl/outstrm.hxx | 69 + svl/inc/svl/pickerhelper.hxx | 72 + svl/inc/svl/pickerhistory.hxx | 54 + svl/inc/svl/pickerhistoryaccess.hxx | 57 + svl/inc/svl/poolcach.hxx | 61 + svl/inc/svl/strmadpt.hxx | 138 ++ svl/inc/svl/stylepool.hxx | 103 ++ svl/inc/svl/urihelper.hxx | 238 +++ svl/inc/svl/urlbmk.hxx | 72 + svl/inc/svl/whiter.hxx | 63 + svl/inc/svl/xmlement.hxx | 46 + svl/inc/urihelper.hxx | 238 --- svl/inc/urlbmk.hxx | 72 - svl/inc/whiter.hxx | 63 - svl/inc/xmlement.hxx | 46 - svl/source/filepicker/pickerhelper.cxx | 2 +- svl/source/filepicker/pickerhistory.cxx | 4 +- svl/source/items/itemset.cxx | 5 +- svl/source/items/poolcach.cxx | 2 +- svl/source/items/ptitem.cxx | 2 +- svl/source/items/rectitem.cxx | 2 +- svl/source/items/stylepool.cxx | 2 +- svl/source/items/szitem.cxx | 2 +- svl/source/items/whiter.cxx | 4 +- svl/source/misc/PasswordHelper.cxx | 5 +- svl/source/misc/adrparse.cxx | 2 +- svl/source/misc/filenotation.cxx | 2 +- svl/source/misc/folderrestriction.cxx | 2 +- svl/source/misc/fstathelper.cxx | 3 +- svl/source/misc/lngmisc.cxx | 2 +- svl/source/misc/strmadpt.cxx | 6 +- svl/source/misc/svldata.cxx | 2 +- svl/source/misc/urihelper.cxx | 2 +- svl/source/notify/broadcast.cxx | 6 +- svl/source/notify/listener.cxx | 11 +- svl/source/notify/listenerbase.cxx | 11 +- svl/source/notify/listeneriter.cxx | 8 +- svl/source/numbers/numfmuno.cxx | 2 +- svl/source/numbers/numuno.cxx | 2 +- svl/source/numbers/supservs.cxx | 4 +- svl/source/numbers/supservs.hxx | 2 +- svl/source/numbers/zformat.cxx | 4 +- svl/source/numbers/zforscan.cxx | 2 +- svl/source/numbers/zforscan.hxx | 2 +- svl/source/svdde/ddedll.cxx | 67 - svl/source/svdde/ddeml1.cxx | 2661 ------------------------------- svl/source/svdde/ddeml2.cxx | 1014 ------------ svl/source/svdde/ddemldeb.cxx | 283 ---- svl/source/svdde/ddemldeb.hxx | 69 - svl/source/svdde/ddemlimp.hxx | 436 ----- svl/source/svdde/ddemlos2.h | 377 ----- svl/source/svsql/converter.cxx | 2 +- svl/util/makefile.mk | 2 +- 98 files changed, 2813 insertions(+), 7741 deletions(-) delete mode 100644 svl/inc/PasswordHelper.hxx delete mode 100644 svl/inc/adrparse.hxx delete mode 100644 svl/inc/broadcast.hxx delete mode 100644 svl/inc/cntnrsrt.hxx delete mode 100644 svl/inc/cntwids.hrc delete mode 100644 svl/inc/converter.hxx delete mode 100644 svl/inc/filenotation.hxx delete mode 100644 svl/inc/folderrestriction.hxx delete mode 100644 svl/inc/fstathelper.hxx delete mode 100644 svl/inc/inetdef.hxx delete mode 100644 svl/inc/inetmsg.hxx delete mode 100644 svl/inc/inetstrm.hxx delete mode 100644 svl/inc/instrm.hxx delete mode 100644 svl/inc/listener.hxx delete mode 100644 svl/inc/listeneriter.hxx delete mode 100644 svl/inc/lngmisc.hxx delete mode 100644 svl/inc/memberid.hrc delete mode 100644 svl/inc/nfsymbol.hxx delete mode 100644 svl/inc/numuno.hxx delete mode 100644 svl/inc/outstrm.hxx delete mode 100644 svl/inc/pickerhelper.hxx delete mode 100644 svl/inc/pickerhistory.hxx delete mode 100644 svl/inc/pickerhistoryaccess.hxx delete mode 100644 svl/inc/poolcach.hxx delete mode 100644 svl/inc/strmadpt.hxx delete mode 100644 svl/inc/stylepool.hxx create mode 100644 svl/inc/svl/PasswordHelper.hxx create mode 100644 svl/inc/svl/adrparse.hxx create mode 100644 svl/inc/svl/broadcast.hxx create mode 100644 svl/inc/svl/cntnrsrt.hxx create mode 100644 svl/inc/svl/cntwids.hrc create mode 100644 svl/inc/svl/converter.hxx create mode 100644 svl/inc/svl/filenotation.hxx create mode 100644 svl/inc/svl/folderrestriction.hxx create mode 100644 svl/inc/svl/fstathelper.hxx create mode 100644 svl/inc/svl/inetdef.hxx create mode 100644 svl/inc/svl/inetmsg.hxx create mode 100644 svl/inc/svl/inetstrm.hxx create mode 100644 svl/inc/svl/instrm.hxx create mode 100644 svl/inc/svl/listener.hxx create mode 100644 svl/inc/svl/listeneriter.hxx create mode 100644 svl/inc/svl/lngmisc.hxx create mode 100644 svl/inc/svl/memberid.hrc create mode 100644 svl/inc/svl/nfsymbol.hxx create mode 100644 svl/inc/svl/numuno.hxx create mode 100644 svl/inc/svl/outstrm.hxx create mode 100644 svl/inc/svl/pickerhelper.hxx create mode 100644 svl/inc/svl/pickerhistory.hxx create mode 100644 svl/inc/svl/pickerhistoryaccess.hxx create mode 100644 svl/inc/svl/poolcach.hxx create mode 100644 svl/inc/svl/strmadpt.hxx create mode 100644 svl/inc/svl/stylepool.hxx create mode 100644 svl/inc/svl/urihelper.hxx create mode 100644 svl/inc/svl/urlbmk.hxx create mode 100644 svl/inc/svl/whiter.hxx create mode 100644 svl/inc/svl/xmlement.hxx delete mode 100644 svl/inc/urihelper.hxx delete mode 100644 svl/inc/urlbmk.hxx delete mode 100644 svl/inc/whiter.hxx delete mode 100644 svl/inc/xmlement.hxx delete mode 100644 svl/source/svdde/ddedll.cxx delete mode 100644 svl/source/svdde/ddeml1.cxx delete mode 100644 svl/source/svdde/ddeml2.cxx delete mode 100644 svl/source/svdde/ddemldeb.cxx delete mode 100644 svl/source/svdde/ddemldeb.hxx delete mode 100644 svl/source/svdde/ddemlimp.hxx delete mode 100644 svl/source/svdde/ddemlos2.h diff --git a/svl/inc/PasswordHelper.hxx b/svl/inc/PasswordHelper.hxx deleted file mode 100644 index c915ebe3854a..000000000000 --- a/svl/inc/PasswordHelper.hxx +++ /dev/null @@ -1,57 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: PasswordHelper.hxx,v $ - * $Revision: 1.6 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVTOOLS_PASSWORDHELPER_HXX -#define _SVTOOLS_PASSWORDHELPER_HXX - -#include "svl/svldllapi.h" -#include "sal/types.h" -#include "com/sun/star/uno/Sequence.hxx" - -class String; - -class SvPasswordHelper -{ - static void GetHashPassword(com::sun::star::uno::Sequence & rPassHash, const sal_Char* pPass, sal_uInt32 nLen); - static void GetHashPasswordLittleEndian(com::sun::star::uno::Sequence& rPassHash, const String& sPass); - static void GetHashPasswordBigEndian(com::sun::star::uno::Sequence& rPassHash, const String& sPass); - -public: - SVL_DLLPUBLIC static void GetHashPassword(com::sun::star::uno::Sequence& rPassHash, const String& sPass); - /** - Use this method to compare a given string with another given Hash value. - This is necessary, because in older versions exists different hashs of the same string. They were endian dependent. - We need this to handle old files. This method will compare against big and little endian. See #101326# - */ - SVL_DLLPUBLIC static bool CompareHashPassword(const com::sun::star::uno::Sequence& rOldPassHash, const String& sNewPass); -}; - -#endif - diff --git a/svl/inc/adrparse.hxx b/svl/inc/adrparse.hxx deleted file mode 100644 index a317e27b2779..000000000000 --- a/svl/inc/adrparse.hxx +++ /dev/null @@ -1,110 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: adrparse.hxx,v $ - * $Revision: 1.5 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _ADRPARSE_HXX -#define _ADRPARSE_HXX - -#include "svl/svldllapi.h" -#include -#include - -//============================================================================ -struct SvAddressEntry_Impl -{ - UniString m_aAddrSpec; - UniString m_aRealName; - - SvAddressEntry_Impl() {}; - SvAddressEntry_Impl(UniString const & rTheAddrSpec, - UniString const & rTheRealName): - m_aAddrSpec(rTheAddrSpec), m_aRealName(rTheRealName) {} -}; - -//============================================================================ -DECLARE_LIST(SvAddressList_Impl, SvAddressEntry_Impl *) - -//============================================================================ -class SVL_DLLPUBLIC SvAddressParser -{ - friend class SvAddressParser_Impl; - - SvAddressEntry_Impl m_aFirst; - SvAddressList_Impl m_aRest; - bool m_bHasFirst; - -public: - SvAddressParser(UniString const & rInput); - - ~SvAddressParser(); - - sal_Int32 Count() const { return m_bHasFirst ? m_aRest.Count() + 1 : 0; } - - inline UniString const & GetEmailAddress(sal_Int32 nIndex) const; - - inline UniString const &GetRealName(sal_Int32 nIndex) const; - - /** Create an RFC 822 (i.e., 'e-mail address'). - - @param rPhrase Either an empty string (the will have no - an will be of the form ), or some text that will - become the part of a form . Non - US-ASCII characters within the text are put into a - verbatim, so the result may actually not be a valid RFC 822 , - but a more human-readable representation. - - @param rAddrSpec A valid RFC 822 . (An RFC 822 - including a cannot be created by this method.) - - @param rMailbox If this method returns true, this parameter returns - the created RFC 822 (rather, a more human-readable - representation thereof). Otherwise, this parameter is not modified. - - @return True, if rAddrSpec is a valid RFC 822 . - */ - static bool createRFC822Mailbox(String const & rPhrase, - String const & rAddrSpec, - String & rMailbox); -}; - -inline UniString const & SvAddressParser::GetEmailAddress(sal_Int32 nIndex) - const -{ - return nIndex == 0 ? m_aFirst.m_aAddrSpec : - m_aRest.GetObject(nIndex - 1)->m_aAddrSpec; -} - -inline UniString const & SvAddressParser::GetRealName(sal_Int32 nIndex) const -{ - return nIndex == 0 ? m_aFirst.m_aRealName : - m_aRest.GetObject(nIndex - 1)->m_aRealName; -} - -#endif // _ADRPARSE_HXX - diff --git a/svl/inc/broadcast.hxx b/svl/inc/broadcast.hxx deleted file mode 100644 index e80a2e446ebf..000000000000 --- a/svl/inc/broadcast.hxx +++ /dev/null @@ -1,70 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: broadcast.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVT_BROADCAST_HXX -#define _SVT_BROADCAST_HXX - -#include "svl/svldllapi.h" -#include - -class SvtListener; -class SfxHint; -class SvtListenerBase; - -//------------------------------------------------------------------------- - -class SVL_DLLPUBLIC SvtBroadcaster -{ -friend class SvtListener; -friend class SvtListenerBase; -friend class SvtListenerIter; - SvtListenerBase* pRoot; - - const SvtBroadcaster& operator=(const SvtBroadcaster &); // verboten - -protected: - void Forward( SvtBroadcaster& rBC, - const SfxHint& rHint ); - virtual void ListenersGone(); - -public: - TYPEINFO(); - - SvtBroadcaster(); - SvtBroadcaster( const SvtBroadcaster &rBC ); - virtual ~SvtBroadcaster(); - - void Broadcast( const SfxHint &rHint ); - - BOOL HasListeners() const { return 0 != pRoot; } -}; - - -#endif - diff --git a/svl/inc/cntnrsrt.hxx b/svl/inc/cntnrsrt.hxx deleted file mode 100644 index 13553f7f16fd..000000000000 --- a/svl/inc/cntnrsrt.hxx +++ /dev/null @@ -1,177 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: cntnrsrt.hxx,v $ - * $Revision: 1.5 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _CNTRSRT_HXX -#define _CNTRSRT_HXX - -#if 0 -*********************************************************************** -* -* Hier folgt die Beschreibung fuer die exportierten Makros: -* -* DECLARE_CONTAINER_SORT( ClassName, Type ) -* IMPL_CONTAINER_SORT( ClassName, Type, SortFunc ) -* -* Definiert eine von Container abgeleitete Klasse "ClassName", -* in der die Elemente des Typs "Type" sortiert enthalten sind. -* Dazu muss einer Funktion "SortFunc" definiert sein, die als -* Paramter zwei "const Type&" erwartet und 0 zurueckgibt, wenn -* beide gleich sind, -1 wenn der erste Paramter kleiner ist als -* der zweite und +1 wenn der erste Paramter groesser ist als -* der zweite. -* -* Die Zugriffs-Methoden entsprechen in etwa denen der Container- -* Klasse, mit Ausnahme von Insert, DeleteAndDestroy und Seek_Entry, -* der den SV-Pointer-Arrays entsprechen. -* -* DECLARE_CONTAINER_SORT_DEL( ClassName, Type ) -* IMPL_CONTAINER_SORT( ClassName, Type, SortFunc ) -* -* Wie DECLARE_CONTAINER_SORT, nur dass beim Aufruf des Destruktors -* alle im Conatiner vorhandenen Objekte geloescht werden. -* -#endif - -#include - -#define DECLARE_CONTAINER_SORT_COMMON( ClassName, Type ) \ - ClassName( const ClassName& ); \ - ClassName& operator =( const ClassName& ); \ -public: \ - using Container::Count; \ - \ - ClassName( USHORT InitSize, USHORT ReSize ) : \ - Container( CONTAINER_MAXBLOCKSIZE, InitSize, ReSize ) {} \ - \ - BOOL Insert( Type* pObj ); \ - \ - Type *Remove( ULONG nPos ) \ - { return (Type *)Container::Remove( nPos ); } \ - \ - Type *Remove( Type* pObj ); \ - \ - void DeleteAndDestroy( ULONG nPos ) \ - { \ - Type *pObj = Remove( nPos ); \ - if( pObj ) \ - delete pObj; \ - } \ - \ - void DeleteAndDestroy() \ - { while( Count() ) DeleteAndDestroy( 0 ); } \ - \ - Type* GetObject( ULONG nPos ) const \ - { return (Type *)Container::GetObject( nPos ); } \ - \ - Type* operator[]( ULONG nPos ) const \ - { return GetObject(nPos); } \ - \ - BOOL Seek_Entry( const Type *pObj, ULONG* pPos ) const; \ - \ - ULONG GetPos( const Type* pObj ) const; \ - - -#define DECLARE_CONTAINER_SORT( ClassName, Type ) \ -class ClassName : private Container \ -{ \ - DECLARE_CONTAINER_SORT_COMMON( ClassName, Type ) \ - ~ClassName() {} \ -}; \ - - -#define DECLARE_CONTAINER_SORT_DEL( ClassName, Type ) \ -class ClassName : private Container \ -{ \ - DECLARE_CONTAINER_SORT_COMMON( ClassName, Type ) \ - ~ClassName() { DeleteAndDestroy(); } \ -}; \ - - -#define IMPL_CONTAINER_SORT( ClassName, Type, SortFunc ) \ -BOOL ClassName::Insert( Type *pObj ) \ -{ \ - ULONG nPos; \ - BOOL bExist = Seek_Entry( pObj, &nPos ); \ - if( !bExist ) \ - Container::Insert( pObj, nPos ); \ - return !bExist; \ -} \ - \ -Type *ClassName::Remove( Type* pObj ) \ -{ \ - ULONG nPos; \ - if( Seek_Entry( pObj, &nPos ) ) \ - return Remove( nPos ); \ - else \ - return 0; \ -} \ - \ -ULONG ClassName::GetPos( const Type* pObj ) const \ -{ \ - ULONG nPos; \ - if( Seek_Entry( pObj, &nPos ) ) \ - return nPos; \ - else \ - return CONTAINER_ENTRY_NOTFOUND; \ -} \ - \ -BOOL ClassName::Seek_Entry( const Type* pObj, ULONG* pPos ) const \ -{ \ - register ULONG nO = Count(), \ - nM, \ - nU = 0; \ - if( nO > 0 ) \ - { \ - nO--; \ - while( nU <= nO ) \ - { \ - nM = nU + ( nO - nU ) / 2; \ - int nCmp = SortFunc( *GetObject(nM), *pObj ); \ - \ - if( 0 == nCmp ) \ - { \ - if( pPos ) *pPos = nM; \ - return TRUE; \ - } \ - else if( nCmp < 0 ) \ - nU = nM + 1; \ - else if( nM == 0 ) \ - { \ - if( pPos ) *pPos = nU; \ - return FALSE; \ - } \ - else \ - nO = nM - 1; \ - } \ - } \ - if( pPos ) *pPos = nU; \ - return FALSE; \ -} \ - -#endif diff --git a/svl/inc/cntwids.hrc b/svl/inc/cntwids.hrc deleted file mode 100644 index fcb9f855453b..000000000000 --- a/svl/inc/cntwids.hrc +++ /dev/null @@ -1,509 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: cntwids.hrc,v $ - * $Revision: 1.3 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _CNTWIDS_HRC -#define _CNTWIDS_HRC - -#ifndef OLD_CHAOS -#define TF_NEW_TABPAGES -#define CNT_COOL_ABO -#endif - -//========================================================================= -// ARGS, MSG, ALL, FOLDER, BOXALL, BOXEXT -//========================================================================= - -#define WID_CHAOS_START 500 - -//FUNC MSG -#define WID_MARK_THREAD_MARKED (499) -#define WID_MARK_THREAD_UNMARKED (498) - -// ARGS -#define WID_DUMMY_ARG1 (WID_CHAOS_START + 0) -#define WID_FACTORY_NO (WID_CHAOS_START + 1) -#define WID_FACTORY_NAME (WID_CHAOS_START + 2) -#define WID_NEWS_XREF (WID_CHAOS_START + 3) -#define WID_CREATION_FLAGS (WID_CHAOS_START + 4) -#define WID_FACTORY_HELP_ID (WID_CHAOS_START + 5) - -//FUNC MSG -#define WID_MSG_START (WID_CHAOS_START + 6) -#define WID_MAIL_REPLY (WID_CHAOS_START + 6) -#define WID_POST_REPLY (WID_CHAOS_START + 7) -#define WID_FORWARD (WID_CHAOS_START + 8) -#define WID_MARK_THREAD_READ (WID_CHAOS_START + 9) -#define WID_HIDE_THREAD (WID_CHAOS_START + 10) -#define WID_HIDE_AUTHOR (WID_CHAOS_START + 11) -#define WID_HIDE_SUBJECT (WID_CHAOS_START + 12) -#define WID_RESEND_MSG (WID_CHAOS_START + 13) -#define WID_MARK_THREAD_UNREAD (WID_CHAOS_START + 14) - -//PROP MSG -#define WID_PRIORITY (WID_CHAOS_START + 15) -#define WID_RULE_APPLIED (WID_CHAOS_START + 16) -#define WID_MSG_LOCK (WID_CHAOS_START + 17) -#define WID_SEEN_STATUS (WID_CHAOS_START + 18) -#define WID_REPLY_TO (WID_CHAOS_START + 19) -#define WID_IN_REPLY_TO (WID_CHAOS_START + 20) - -#define WID_MESSAGE_ID (WID_CHAOS_START + 21) -#define WID_BCC (WID_CHAOS_START + 22) -#define WID_CC (WID_CHAOS_START + 23) -#define WID_TO (WID_CHAOS_START + 24) -#define WID_FROM (WID_CHAOS_START + 25) -#define WID_TITLE (WID_CHAOS_START + 26) -#define WID_SUBJECT WID_TITLE // only here to prevent panic, should be removed -#define WID_MESSAGEBODY (WID_CHAOS_START + 27) - -#define WID_REFERENCES (WID_CHAOS_START + 28) -#define WID_NEWSGROUPS (WID_CHAOS_START + 29) -#define WID_NEWS_XREFLIST (WID_CHAOS_START + 30) - -#define WID_OUTMSGINTERNALSTATE (WID_CHAOS_START + 31) -#define WID_RECIPIENTLIST (WID_CHAOS_START + 32) -#define WID_MSG_END (WID_CHAOS_START + 32) - -//FUNC ALL -#define WID_ALL_START (WID_CHAOS_START + 33) -#define WID_DEFAULT (WID_CHAOS_START + 33) -#define WID_OPEN (WID_CHAOS_START + 34) -#define WID_DELETE (WID_CHAOS_START + 35) -#define WID_CUT (WID_CHAOS_START + 36) -#define WID_COPY (WID_CHAOS_START + 37) -#define WID_PASTE (WID_CHAOS_START + 38) -#define WID_RENAME (WID_CHAOS_START + 39) - -#define WID_HAS_DATA (WID_CHAOS_START + 40) -#define WID_GETDATA (WID_CHAOS_START + 41) -#define WID_PUTDATA (WID_CHAOS_START + 42) - -//PROP ALL -#define WID_INTERIM_URL (WID_CHAOS_START + 43) -#define WID_CONTENT_TYPE (WID_CHAOS_START + 44) - -#define WID_OWN_URL (WID_CHAOS_START + 45) -#define WID_REAL_URL (WID_CHAOS_START + 46) -#define WID_OBSOLETE_TITLE (WID_CHAOS_START + 47) -#define WID_FLAG_READONLY (WID_CHAOS_START + 48) - -#define WID_REFERED_URL (WID_CHAOS_START + 49) -#define WID_REFERER_COUNT (WID_CHAOS_START + 50) -#define WID_FLAG_IS_FOLDER (WID_CHAOS_START + 51) -#define WID_FLAG_HAS_FOLDER (WID_CHAOS_START + 52) -#define WID_FLAG_IS_MESSAGE (WID_CHAOS_START + 53) -#define WID_FLAG_IS_DOCUMENT (WID_FLAG_IS_MESSAGE) -#define WID_FLAG_HAS_MESSAGES (WID_CHAOS_START + 54) - -#define WID_DATE_CREATED (WID_CHAOS_START + 55) -#define WID_DATE_MODIFIED (WID_CHAOS_START + 56) -#define WID_VIEW_DESCRIPTION (WID_CHAOS_START + 57) -#define WID_IS_READ (WID_CHAOS_START + 58) -#define WID_IS_MARKED (WID_CHAOS_START + 59) -#define WID_ALL_END (WID_CHAOS_START + 59) - -//FUNC FOLDER -#define WID_FOLDER_START (WID_CHAOS_START + 60) -#define WID_SYNCHRONIZE (WID_CHAOS_START + 60) -#define WID_CREATE_NEW (WID_CHAOS_START + 61) -#define WID_INSERT (WID_CHAOS_START + 62) -#define WID_UPDATE (WID_CHAOS_START + 63) -#define WID_IMPORT (WID_CHAOS_START + 64) - -//PROP FOLDER VIEW -#define WID_DUMMY_PROPFOLDERVIEW1 (WID_CHAOS_START + 65) -#define WID_THREADING (WID_CHAOS_START + 66) -#define WID_MSG_COLUMN_INFO /* obsolete */ (WID_CHAOS_START + 67) -#define WID_FLD_COLUMN_INFO /* obsolete */ (WID_CHAOS_START + 68) -#define WID_FOLDERVIEW_MODE (WID_CHAOS_START + 69) -#define WID_MESSAGEVIEW_MODE (WID_CHAOS_START + 70) -#define WID_SENTMESSAGEVIEW_MODE (WID_CHAOS_START + 71) -#define WID_SORTING (WID_CHAOS_START + 72) -#define WID_THREADED (WID_CHAOS_START + 73) -#define WID_FILTERED (WID_CHAOS_START + 74) -#define WID_RULES (WID_CHAOS_START + 75) -#define WID_SUBSCRNEWSGROUPCOUNT (WID_CHAOS_START + 76) -#define WID_FLAG_SUBSCRIBED (WID_CHAOS_START + 77) -#define WID_FLAG_SUPPORTMODE (WID_CHAOS_START + 78) - -//PROP FOLDER DIR -#define WID_DUMMY_FOLDERDIR1 (WID_CHAOS_START + 79) -#define WID_TOTALCONTENTCOUNT (WID_CHAOS_START + 80) -#define WID_NEWSGROUPCOUNT /* ??? */ (WID_CHAOS_START + 81) -#define WID_ARTICLECOUNT /* ??? */ (WID_CHAOS_START + 82) -#define WID_KNOWN_RANGES (WID_CHAOS_START + 83) -#define WID_IMAPFOLDERINFO (WID_CHAOS_START + 84) - -//PROP FOLDER USER -#define WID_DUMMY_FOLDERUSER1 (WID_CHAOS_START + 85) -#define WID_SEENCONTENTCOUNT (WID_CHAOS_START + 86) -#define WID_UNREAD_ARTICLECOUNT (WID_SEENCONTENTCOUNT) -#define WID_SENTCONTENTCOUNT (WID_SEENCONTENTCOUNT) -#define WID_READ_RANGES (WID_CHAOS_START + 87) -#define WID_MARK_RANGES (WID_CHAOS_START + 88) -#define WID_FOLDER_END (WID_CHAOS_START + 88) - -//PROP BOXALL -#define WID_BOXALL_START (WID_CHAOS_START + 89) -// Used for d&d of View Storages... -#define WID_PREPARE_MOVE (WID_CHAOS_START + 89) -#define WID_OUTTRAY_WANTED (WID_CHAOS_START + 90) -#define WID_USERNAME (WID_CHAOS_START + 91) -#define WID_PASSWORD (WID_CHAOS_START + 92) -#define WID_SERVERNAME (WID_CHAOS_START + 93) -#define WID_SERVERPORT (WID_CHAOS_START + 94) -// obsolete -#define WID_MAILSEND_USERNAME (WID_CHAOS_START + 95) -#define WID_MAILSEND_PASSWORD (WID_CHAOS_START + 96) -#define WID_MAILSEND_SERVERNAME (WID_CHAOS_START + 97) -#define WID_NEWSSEND_USERNAME (WID_CHAOS_START + 98) -#define WID_NEWSSEND_PASSWORD (WID_CHAOS_START + 99) -#define WID_NEWSSEND_SERVERNAME (WID_CHAOS_START + 100) -// end obsolete -#define WID_SERVERBASE (WID_CHAOS_START + 101) -// not used -#define WID_SMTP_GATEWAY (WID_CHAOS_START + 102) - -// -> ..._DEFAULT -// obsolete -#define WID_FROM_DEFAULT (WID_CHAOS_START + 103) -// obsolete -#define WID_REPLY_TO_DEFAULT (WID_CHAOS_START + 104) - -#define WID_AUTOUPDATE_INTERVAL (WID_CHAOS_START + 105) -#define WID_UPDATE_ENABLED (WID_CHAOS_START + 106) -#define WID_BOXALL_END (WID_CHAOS_START + 106) - -//PROP BOX RNMGR -#define WID_BOXEXT_START (WID_CHAOS_START + 107) -#define WID_CONNECTION_MODE (WID_CHAOS_START + 107) -#define WID_NEWS_GROUPLIST (WID_CHAOS_START + 108) -#ifdef OLD_CHAOS -#define WID_BOX_CONNECTION_PROP (WID_CHAOS_START + 109) -#else -#define WID_MESSAGE_STOREMODE (WID_CHAOS_START + 109) -#endif -#define WID_DELETE_ON_SERVER (WID_CHAOS_START + 110) - -//PROP BOX USER - -//PROP BOX OUT DIR -#define WID_OUTMSGEXTERNALSTATE (WID_CHAOS_START + 111) - -//PROP RNM -#define WID_RNM_UPDATETIMER_LIST (WID_CHAOS_START + 112) -#define WID_BOXEXT_END (WID_CHAOS_START + 112) - -////////////////////////////////////////////////////////////////////////// -// MISC - Added after initial pool version -////////////////////////////////////////////////////////////////////////// - -// PROP BOX -#define WID_SERVER_RANGES (WID_CHAOS_START + 113) -#define WID_LAST_UPDATE (WID_CHAOS_START + 114) -#define WID_LAST_MSGID (WID_CHAOS_START + 115) -#define WID_LAST_UID (WID_CHAOS_START + 116) - -// FUNC ALL -#define WID_UNDELETE (WID_CHAOS_START + 117) -#define WID_CLOSE (WID_CHAOS_START + 118) -#define WID_REOPEN (WID_CHAOS_START + 119) - -// PROP RNM -#define WID_RNM_FILECONVERSION_LIST (WID_CHAOS_START + 120) - -// PROP FOLDER -#define WID_SHOW_MSGS_HAS_TIMELIMIT (WID_CHAOS_START + 121) -#define WID_SHOW_MSGS_TIMELIMIT (WID_CHAOS_START + 122) -#define WID_STORE_MSGS_HAS_TIMELIMIT (WID_CHAOS_START + 123) -#define WID_STORE_MSGS_TIMELIMIT (WID_CHAOS_START + 124) - -// PROP BOX -#define WID_MSG_COLUMN_WIDTHS /* obsolete */(WID_CHAOS_START + 125) - -#ifdef OLD_CHAOS - -#define WID_CHAOS_END (WID_CHAOS_START + 125) - -#else - -////////////////////////////////////////////////////////////////////////// -// WID's added after SO 4.0 release ( SUPD > 364 ) -////////////////////////////////////////////////////////////////////////// - -// PROP ALL -#define WID_PROPERTYLIST (WID_CHAOS_START + 126) - -// PROP BOXALL -#define WID_BOXALL_START2 (WID_CHAOS_START + 127) -#define WID_SEND_PUBLIC_PROT_ID (WID_CHAOS_START + 127) -#define WID_SEND_PRIVATE_PROT_ID (WID_CHAOS_START + 128) -#define WID_SEND_PUBLIC_OUTBOXPROPS (WID_CHAOS_START + 129) -#define WID_SEND_PRIVATE_OUTBOXPROPS (WID_CHAOS_START + 130) -#define WID_SEND_SERVERNAME (WID_CHAOS_START + 131) -#define WID_SEND_USERNAME (WID_CHAOS_START + 132) -#define WID_SEND_PASSWORD (WID_CHAOS_START + 133) -#define WID_SEND_REPLY_TO_DEFAULT (WID_CHAOS_START + 134) -#define WID_SEND_FROM_DEFAULT (WID_CHAOS_START + 135) -#define WID_VIM_POPATH (WID_CHAOS_START + 136) -#define WID_SEND_VIM_POPATH (WID_CHAOS_START + 137) -#define WID_PURGE (WID_CHAOS_START + 138) -#define WID_CLEAN_CACHE (WID_CHAOS_START + 139) -#define WID_SEARCH (WID_CHAOS_START + 140) -#define WID_JOURNAL (WID_CHAOS_START + 141) -#define WID_LOCALBASE (WID_CHAOS_START + 142) -#define WID_BOXALL_END2 (WID_CHAOS_START + 142) - -// PROP DOCUMENT -#define WID_DOCUMENT_HEADER (WID_CHAOS_START + 143) -#define WID_DOCUMENT_BODY (WID_CHAOS_START + 144) -#define WID_DOCUMENT_SIZE (WID_CHAOS_START + 145) - -// PROP ALL -#define WID_SIZE WID_DOCUMENT_SIZE - -// PROP PROJECT -#define WID_PRJ_MEDIUM (WID_CHAOS_START + 146) -#define WID_PRJ_FILENAMECONVENTION (WID_CHAOS_START + 147) - -// PROP FSYS -#define WID_FSYS_DISKSPACE_LEFT (WID_CHAOS_START + 148) -#define WID_TRANSFER (WID_CHAOS_START + 149) - -// PROP ALL -#define WID_KEYWORDS (WID_CHAOS_START + 150) -#define WID_IS_PROTECTED (WID_CHAOS_START + 151) - -// PROP SEARCH -#define WID_SEARCH_CRITERIA (WID_CHAOS_START + 152) -#define WID_SEARCH_LOCATIONS (WID_CHAOS_START + 153) -#define WID_SEARCH_RECURSIVE (WID_CHAOS_START + 154) -#define WID_SEARCH_FOLDER_VIEW (WID_CHAOS_START + 155) -#define WID_SEARCH_DOCUMENT_VIEW (WID_CHAOS_START + 156) - -// PROP Channel -#define WID_SCHEDULE_RANGE (WID_CHAOS_START + 157) -#define WID_ALLOWED_SCHEDULE_RANGE (WID_CHAOS_START + 158) -#define WID_TARGET_URL (WID_CHAOS_START + 159) -#define WID_FREQUENCY (WID_CHAOS_START + 160) - -// PROP HTTP -#define WID_HTTP_CONNECTION_LIMIT (WID_CHAOS_START + 161) -#define WID_HTTP_COOKIE_MANAGER (WID_CHAOS_START + 162) - -// PROP Channel -#define WID_COLUMN_NEXT_UPD (WID_CHAOS_START + 163) -#define WID_CRAWL_STATUS (WID_CHAOS_START + 164) -#define WID_CRAWL_LEVEL (WID_CHAOS_START + 165) -#define WID_CRAWL_MODE (WID_CHAOS_START + 166) -// WID_CRAWL_MAX_VOLUME shall be removed in the future! -// --> WID_SIZE_LIMIT -#define WID_CRAWL_MAX_VOLUME (WID_CHAOS_START + 167) -#define WID_CRAWL_IMAGE (WID_CHAOS_START + 168) -#define WID_CRAWL_LINK_OUT (WID_CHAOS_START + 169) -#define WID_NOTIFICATION_MODE (WID_CHAOS_START + 170) -#define WID_NOTIFICATION_ADDRESS (WID_CHAOS_START + 171) - -// PROP BOXALL -#define WID_ACCOUNT (WID_CHAOS_START + 172) - -// PROP FSYS -#define WID_FSYS_KIND (WID_CHAOS_START + 173) -#define WID_FSYS_FLAGS (WID_CHAOS_START + 174) - -// PROP FOLDER -#define WID_VIEWDATA /* obsolete */ (WID_CHAOS_START + 175) - -// PROP FSYS -#define WID_WHO_IS_MASTER (WID_CHAOS_START + 176) - -// FUNC HTTP -#define WID_HTTP_POST (WID_CHAOS_START + 177) - -// PROP ALL -#define WID_SUPPORTED_FUNCS (WID_CHAOS_START + 178) -#define WID_SIZE_LIMIT (WID_CHAOS_START + 179) - -// PROP FOLDER -#define WID_MARKED_DOCUMENT_COUNT (WID_CHAOS_START + 180) -#define WID_FOLDER_COUNT (WID_CHAOS_START + 181) - -// PROP FSYS -#define WID_FSYS_SHOW_HIDDEN (WID_CHAOS_START + 182) - -// TRASHCAN -#define WID_TRASHCAN_START (WID_CHAOS_START + 183) -#define WID_TRASHCAN_EMPTY_TRASH (WID_CHAOS_START + 183) -#define WID_TRASHCAN_FLAG_AUTODELETE (WID_CHAOS_START + 184) -#define WID_TRASHCAN_FLAG_CONFIRMEMPTY (WID_CHAOS_START + 185) -#define WID_TRASHCAN_DUMMY1 (WID_CHAOS_START + 186) -#define WID_TRASHCAN_DUMMY2 (WID_CHAOS_START + 187) -#define WID_TRASHCAN_END (WID_CHAOS_START + 187) - -// TRASH -#define WID_TRASH_START (WID_CHAOS_START + 188) -#define WID_TRASH_RESTORE (WID_CHAOS_START + 188) -#define WID_TRASH_ORIGIN (WID_CHAOS_START + 189) -#define WID_TRASH_DUMMY2 (WID_CHAOS_START + 190) -#define WID_TRASH_END (WID_CHAOS_START + 190) - -// PROP ALL -#define WID_TARGET_FRAMES (WID_CHAOS_START + 191) - -// FUNC FOLDER -#define WID_EXPORT (WID_CHAOS_START + 192) - -// COMPONENT -#define WID_COMPONENT_COMMAND (WID_CHAOS_START + 193) -#define WID_COMPONENT_MENU (WID_CHAOS_START + 194) - -// PROP Channel -#define WID_HREF (WID_CHAOS_START + 195) - -// PROP FOLDER (VIEW) -#define WID_VIEW_START (WID_CHAOS_START + 196) -#define WID_VIEW_COLS_BEAMER (WID_CHAOS_START + 196) -#define WID_VIEW_COLS_FILEDLG (WID_CHAOS_START + 197) -#define WID_VIEW_COLS_FLDWIN (WID_CHAOS_START + 198) -#define WID_VIEW_MODE_FLDWIN (WID_CHAOS_START + 199) -#define WID_VIEW_LAYOUT_FLDWIN (WID_CHAOS_START + 200) -#define WID_VIEW_ICON_POS_FLDWIN (WID_CHAOS_START + 201) -#define WID_VIEW_SORT_BEAMER (WID_CHAOS_START + 202) -#define WID_VIEW_SORT_FILEDLG (WID_CHAOS_START + 203) -#define WID_VIEW_SORT_FLDWIN_DETAILS (WID_CHAOS_START + 204) -#define WID_VIEW_SORT_FLDWIN_ICON (WID_CHAOS_START + 205) -#define WID_VIEW_WINDOW_POS_FLDWIN (WID_CHAOS_START + 206) -#define WID_VIEW_END (WID_CHAOS_START + 206) - -// PROP ALL -#define WID_IS_INVALID (WID_CHAOS_START + 207) - -// PROP Channel -#define WID_VIEW_TIPHELP (WID_CHAOS_START + 208) -#define WID_PUBLISHER_SCHEDULE (WID_CHAOS_START + 209) -#define WID_GETMODE (WID_CHAOS_START + 210) -#define WID_READ_OFFLINE (WID_CHAOS_START + 211) - -// PROP ALL -#define WID_ALL_START2 (WID_CHAOS_START + 212) -#define WID_REAL_NAME (WID_CHAOS_START + 212) -#define WID_FLAG_UPDATE_ON_OPEN (WID_CHAOS_START + 213) -#define WID_ACTION_LIST (WID_CHAOS_START + 214) -#define WID_EDIT_STRING (WID_CHAOS_START + 215) -#define WID_SET_AS_DEFAULT (WID_CHAOS_START + 216) -#define WID_ALL_END2 (WID_CHAOS_START + 216) - -// PROP FOLDER (VIEW) -#define WID_VIEW2_START (WID_CHAOS_START + 217) -#define WID_VIEW2_FLD_PIC (WID_CHAOS_START + 217) -#define WID_FLAG_EXPANDED (WID_CHAOS_START + 218) -#define WID_CHILD_DEFAULTS (WID_CHAOS_START + 219) -#define WID_VIEW2_END (WID_CHAOS_START + 219) - -// PROP HTTP -#define WID_HTTP_KEEP_EXPIRED (WID_CHAOS_START + 220) -#define WID_HTTP_VERIFY_MODE (WID_CHAOS_START + 221) -#define WID_HTTP_NOCACHE_LIST (WID_CHAOS_START + 222) -#define WID_HTTP_REFERER (WID_CHAOS_START + 223) - -// PROP FSYS -#define WID_FSYS_START (WID_CHAOS_START + 224) -#define WID_FSYS_VALUE_FOLDER (WID_CHAOS_START + 224) -#define WID_FSYS_SHOW_EXTENSION (WID_CHAOS_START + 225) -#define WID_VALUE_ADDED_MODE (WID_CHAOS_START + 226) -#define WID_FSYS_DUMMY3 (WID_CHAOS_START + 227) -#define WID_FSYS_DUMMY4 (WID_CHAOS_START + 228) -#define WID_FSYS_END (WID_CHAOS_START + 228) - -// FUNC HTTP -#define WID_HTTP_GET_COOKIE (WID_CHAOS_START + 229) -#define WID_HTTP_SET_COOKIE (WID_CHAOS_START + 230) - -// PROP HTTP -#define WID_HTTP_COOKIE (WID_CHAOS_START + 231) -#define WID_HTTP_DUMMY_1 (WID_CHAOS_START + 232) - -////////////////////////////////////////////////////////////////////////// -// WID's added after SO 5.0 release ( SUPD > 505 ) -////////////////////////////////////////////////////////////////////////// - -// PROP FOLDER -#define WID_FOLDER_START2 (WID_CHAOS_START + 233) -#define WID_USER_SORT_CRITERIUM (WID_CHAOS_START + 233) -#define WID_HEADER_CONFIG (WID_CHAOS_START + 234) -#define WID_GROUPVIEW_CONFIG (WID_CHAOS_START + 235) -#define WID_FLD_WEBVIEW_TEMPLATE (WID_CHAOS_START + 236) -// eigene Iconpositionen fuer den Explorer, da er noch -// keinen eigenen View-Storage hat -#define WID_VIEW_ICON_POS_GRPWIN (WID_CHAOS_START + 237) -#define WID_FOLDER_END2 (WID_CHAOS_START + 237) - -// PROP ALL -#define WID_SHOW_IN_EXPLORER (WID_CHAOS_START + 238) - -// PROP FOLDER (VIEW) -#define WID_VIEW3_START (WID_CHAOS_START + 239) -#define WID_FLD_FONT (WID_CHAOS_START + 239) -#define WID_FLD_WEBVIEW_USE_GLOBAL (WID_CHAOS_START + 240) -#define WID_VIEW3_DUMMY2 (WID_CHAOS_START + 241) -#define WID_VIEW3_DUMMY3 (WID_CHAOS_START + 242) -#define WID_VIEW3_END (WID_CHAOS_START + 242) - -// PROP FTP -#define WID_FTP_ACCOUNT (WID_CHAOS_START + 243) - -// PROP FOLDER -#define WID_STORE_MARKED (WID_CHAOS_START + 244) - -// REPLICATION ( Currently only here to have file compatibility between -// SO51 Client and SO51 Server, for which the functionality -// first shall be implemented ). -#define WID_REPLICATION_1 (WID_CHAOS_START + 245) -#define WID_REPLICATION_2 (WID_CHAOS_START + 246) -#define WID_REPLICATION_3 (WID_CHAOS_START + 247) -#define WID_REPLICATION_4 (WID_CHAOS_START + 248) -#define WID_REPLICATION_5 (WID_CHAOS_START + 249) - -// PROP SEARCH -#define WID_SEARCH_INDIRECTIONS (WID_CHAOS_START + 250) - -// PROP ALL -#define WID_SEND_FORMATS (WID_CHAOS_START + 251) -#define WID_SEND_COPY_TARGET (WID_CHAOS_START + 252) - -// FUNC ALL -#define WID_TRANSFER_RESULT (WID_CHAOS_START + 253) - -// END -#define WID_CHAOS_END (WID_CHAOS_START + 253) - -#endif /* OLD_CHAOS */ - -#endif /* !_CNTWIDS_HRC */ diff --git a/svl/inc/converter.hxx b/svl/inc/converter.hxx deleted file mode 100644 index d012a56e7416..000000000000 --- a/svl/inc/converter.hxx +++ /dev/null @@ -1,46 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: converter.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SV_CONVERTER_HXX_ -#define _SV_CONVERTER_HXX_ - -#include "svl/svldllapi.h" -#include - -class SvDbaseConverter -{ -public: - SVL_DLLPUBLIC static INT32 ConvertPrecisionToDbase(INT32 _nLen, INT32 _nScale); - SVL_DLLPUBLIC static INT32 ConvertPrecisionToOdbc(INT32 _nLen, INT32 _nScale); -}; - -#endif //_CONVERTER_HXX_ - - - diff --git a/svl/inc/filenotation.hxx b/svl/inc/filenotation.hxx deleted file mode 100644 index c74c6c39c803..000000000000 --- a/svl/inc/filenotation.hxx +++ /dev/null @@ -1,74 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: filenotation.hxx,v $ - * $Revision: 1.5 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef SVTOOLS_FILENOTATION_HXX -#define SVTOOLS_FILENOTATION_HXX - -#include "svl/svldllapi.h" -#include - -//......................................................................... -namespace svt -{ -//......................................................................... - - //===================================================================== - //= OFileNotation - //===================================================================== - class SVL_DLLPUBLIC OFileNotation - { - protected: - ::rtl::OUString m_sSystem; - ::rtl::OUString m_sFileURL; - - public: - enum NOTATION - { - N_SYSTEM, - N_URL - }; - - OFileNotation( const ::rtl::OUString& _rUrlOrPath ); - OFileNotation( const ::rtl::OUString& _rUrlOrPath, NOTATION _eInputNotation ); - - ::rtl::OUString get(NOTATION _eOutputNotation); - - private: - SVL_DLLPRIVATE void construct( const ::rtl::OUString& _rUrlOrPath ); - SVL_DLLPRIVATE bool implInitWithSystemNotation( const ::rtl::OUString& _rSystemPath ); - SVL_DLLPRIVATE bool implInitWithURLNotation( const ::rtl::OUString& _rURL ); - }; - -//......................................................................... -} // namespace svt -//......................................................................... - -#endif // SVTOOLS_FILENOTATION_HXX - diff --git a/svl/inc/folderrestriction.hxx b/svl/inc/folderrestriction.hxx deleted file mode 100644 index 82fb4e1efef5..000000000000 --- a/svl/inc/folderrestriction.hxx +++ /dev/null @@ -1,59 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: folderrestriction.hxx,v $ - * $Revision: 1.5 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef SVTOOLS_FOLDER_RESTRICTION_HXX -#define SVTOOLS_FOLDER_RESTRICTION_HXX - -#include "svl/svldllapi.h" -#include - -#ifndef INCLUDED_VECTOR -#include -#define INCLUDED_VECTOR -#endif - -//........................................................................ -namespace svt -{ -//........................................................................ - - /** retrieves a list of folders which's access is not restricted. - -

Note that this is not meant as security feature, but only as - method to restrict some UI presentation, such as browsing - in the file open dialog.

- */ - SVL_DLLPUBLIC void getUnrestrictedFolders( ::std::vector< String >& _rFolders ); - -//........................................................................ -} // namespace svt -//........................................................................ - -#endif // SVTOOLS_FOLDER_RESTRICTION_HXX diff --git a/svl/inc/fstathelper.hxx b/svl/inc/fstathelper.hxx deleted file mode 100644 index 1e613782b4e6..000000000000 --- a/svl/inc/fstathelper.hxx +++ /dev/null @@ -1,68 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: fstathelper.hxx,v $ - * $Revision: 1.6 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVTOOLS_FSTATHELPER_HXX -#define _SVTOOLS_FSTATHELPER_HXX - -#include "svl/svldllapi.h" -#include - -class UniString; -class Date; -class Time; - -namespace FStatHelper { - -/** Return the modified time and date stamp for this URL. - - @param URL the asking URL - - @param pDate if unequal 0, the function set the date stamp - - @param pTime if unequal 0, the function set the time stamp - - @return it was be able to get the date/time stamp -*/ -SVL_DLLPUBLIC sal_Bool GetModifiedDateTimeOfFile( const UniString& rURL, - Date* pDate, Time* pTime ); - -/** Return if under the URL a document exist. This is only a wrapper for the - UCB.IsContent. -*/ -SVL_DLLPUBLIC sal_Bool IsDocument( const UniString& rURL ); - -/** Return if under the URL a folder exist. This is only a wrapper for the - UCB.isFolder. -*/ -SVL_DLLPUBLIC sal_Bool IsFolder( const UniString& rURL ); - -} - -#endif diff --git a/svl/inc/inetdef.hxx b/svl/inc/inetdef.hxx deleted file mode 100644 index 6ea380529147..000000000000 --- a/svl/inc/inetdef.hxx +++ /dev/null @@ -1,32 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: inetdef.hxx,v $ - * $Revision: 1.3 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include - diff --git a/svl/inc/inetmsg.hxx b/svl/inc/inetmsg.hxx deleted file mode 100644 index f011102a79e2..000000000000 --- a/svl/inc/inetmsg.hxx +++ /dev/null @@ -1,32 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: inetmsg.hxx,v $ - * $Revision: 1.3 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include - diff --git a/svl/inc/inetstrm.hxx b/svl/inc/inetstrm.hxx deleted file mode 100644 index 46e15d5e4cf4..000000000000 --- a/svl/inc/inetstrm.hxx +++ /dev/null @@ -1,32 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: inetstrm.hxx,v $ - * $Revision: 1.3 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include - diff --git a/svl/inc/instrm.hxx b/svl/inc/instrm.hxx deleted file mode 100644 index add43d4cc380..000000000000 --- a/svl/inc/instrm.hxx +++ /dev/null @@ -1,83 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: instrm.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef SVTOOLS_INSTRM_HXX -#define SVTOOLS_INSTRM_HXX - -#include "svl/svldllapi.h" -#include -#include - -namespace com { namespace sun { namespace star { namespace io { - class XInputStream; - class XSeekable; -} } } } - -class SvDataPipe_Impl; - -//============================================================================ -class SVL_DLLPUBLIC SvInputStream: public SvStream -{ - com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - m_xStream; - com::sun::star::uno::Reference< com::sun::star::io::XSeekable > - m_xSeekable; - SvDataPipe_Impl * m_pPipe; - ULONG m_nSeekedFrom; - - SVL_DLLPRIVATE bool open(); - - SVL_DLLPRIVATE virtual ULONG GetData(void * pData, ULONG nSize); - - SVL_DLLPRIVATE virtual ULONG PutData(void const *, ULONG); - - SVL_DLLPRIVATE virtual ULONG SeekPos(ULONG nPos); - - SVL_DLLPRIVATE virtual void FlushData(); - - SVL_DLLPRIVATE virtual void SetSize(ULONG); - -public: - SvInputStream( - com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - const & - rTheStream); - - virtual ~SvInputStream(); - - virtual USHORT IsA() const; - - virtual void AddMark(ULONG nPos); - - virtual void RemoveMark(ULONG nPos); -}; - -#endif // SVTOOLS_INSTRM_HXX - diff --git a/svl/inc/listener.hxx b/svl/inc/listener.hxx deleted file mode 100644 index a121197b1dd0..000000000000 --- a/svl/inc/listener.hxx +++ /dev/null @@ -1,68 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: listener.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVT_LISTENER_HXX -#define _SVT_LISTENER_HXX - -#include "svl/svldllapi.h" -#include - -class SvtBroadcaster; -class SfxHint; -class SvtListenerBase; - -//------------------------------------------------------------------------- - -class SVL_DLLPUBLIC SvtListener -{ - friend class SvtListenerBase; - SvtListenerBase *pBrdCastLst; - - const SvtListener& operator=(const SvtListener &); // n.i., ist verboten - -public: - TYPEINFO(); - - SvtListener(); - SvtListener( const SvtListener &rCopy ); - virtual ~SvtListener(); - - BOOL StartListening( SvtBroadcaster& rBroadcaster ); - BOOL EndListening( SvtBroadcaster& rBroadcaster ); - void EndListeningAll(); - BOOL IsListening( SvtBroadcaster& rBroadcaster ) const; - - BOOL HasBroadcaster() const { return 0 != pBrdCastLst; } - - virtual void Notify( SvtBroadcaster& rBC, const SfxHint& rHint ); -}; - - -#endif - diff --git a/svl/inc/listeneriter.hxx b/svl/inc/listeneriter.hxx deleted file mode 100644 index a2ac5693f741..000000000000 --- a/svl/inc/listeneriter.hxx +++ /dev/null @@ -1,82 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: listeneriter.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVT_LISTENERITER_HXX -#define _SVT_LISTENERITER_HXX - -#include "svl/svldllapi.h" -#include - -class SvtListener; -class SvtListenerBase; -class SvtBroadcaster; - -//------------------------------------------------------------------------- - -class SVL_DLLPUBLIC SvtListenerIter -{ - friend class SvtListenerBase; - - SvtBroadcaster& rRoot; - SvtListenerBase *pAkt, *pDelNext; - - // for the update of all iterator's, if a listener is added or removed - // at the same time. - static SvtListenerIter *pListenerIters; - SvtListenerIter *pNxtIter; - TypeId aSrchId; // fuer First/Next - suche diesen Type - - SVL_DLLPRIVATE static void RemoveListener( SvtListenerBase& rDel, - SvtListenerBase* pNext ); - -public: - SvtListenerIter( SvtBroadcaster& ); - ~SvtListenerIter(); - - const SvtBroadcaster& GetBroadcaster() const { return rRoot; } - SvtBroadcaster& GetBroadcaster() { return rRoot; } - - SvtListener* GoNext(); // to the next - SvtListener* GoPrev(); // to the previous - - SvtListener* GoStart(); // to the start of the list - SvtListener* GoEnd(); // to the end of the list - - SvtListener* GoRoot(); // to the root - SvtListener* GetCurr() const; // returns the current - - int IsChanged() const { return pDelNext != pAkt; } - - SvtListener* First( TypeId nType ); - SvtListener* Next(); -}; - - -#endif - diff --git a/svl/inc/lngmisc.hxx b/svl/inc/lngmisc.hxx deleted file mode 100644 index 55322246f773..000000000000 --- a/svl/inc/lngmisc.hxx +++ /dev/null @@ -1,76 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: lngmisc.hxx,v $ - * $Revision: 1.6 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVTOOLS_LNGMISC_HXX_ -#define _SVTOOLS_LNGMISC_HXX_ - -#include "svl/svldllapi.h" -#include -#include -#include - -/////////////////////////////////////////////////////////////////////////// - -#define SVT_SOFT_HYPHEN ((sal_Unicode) 0x00AD) -#define SVT_HARD_HYPHEN ((sal_Unicode) 0x2011) - -// the non-breaking space -#define SVT_HARD_SPACE ((sal_Unicode) 0x00A0) - -namespace linguistic -{ - -inline BOOL IsHyphen( sal_Unicode cChar ) -{ - return cChar == SVT_SOFT_HYPHEN || cChar == SVT_HARD_HYPHEN; -} - - -inline BOOL IsControlChar( sal_Unicode cChar ) -{ - return cChar < (sal_Unicode) ' '; -} - - -inline BOOL HasHyphens( const rtl::OUString &rTxt ) -{ - return rTxt.indexOf( SVT_SOFT_HYPHEN ) != -1 || - rTxt.indexOf( SVT_HARD_HYPHEN ) != -1; -} - -SVL_DLLPUBLIC INT32 GetNumControlChars( const rtl::OUString &rTxt ); -SVL_DLLPUBLIC BOOL RemoveHyphens( rtl::OUString &rTxt ); -SVL_DLLPUBLIC BOOL RemoveControlChars( rtl::OUString &rTxt ); - -SVL_DLLPUBLIC BOOL ReplaceControlChars( rtl::OUString &rTxt, sal_Char aRplcChar = ' ' ); - -} // namespace linguistic - -#endif diff --git a/svl/inc/memberid.hrc b/svl/inc/memberid.hrc deleted file mode 100644 index c917bd993e97..000000000000 --- a/svl/inc/memberid.hrc +++ /dev/null @@ -1,47 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: memberid.hrc,v $ - * $Revision: 1.5 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _MEMBERID_HRC -#define _MEMBERID_HRC - -#define SFX_MEMBERID(nUserData) ( ( (nUserData) >> 20 ) & 0xFF ) -#define SFX_SLOTID(nUserData) ( (nUserData) & 0xFFFF ) - -#define MID_X 1 -#define MID_Y 2 -#define MID_RECT_LEFT 3 -#define MID_RECT_TOP 4 -#define MID_WIDTH 5 -#define MID_HEIGHT 6 -#define MID_RECT_RIGHT 7 - - -#endif - diff --git a/svl/inc/nfsymbol.hxx b/svl/inc/nfsymbol.hxx deleted file mode 100644 index 46fe47599359..000000000000 --- a/svl/inc/nfsymbol.hxx +++ /dev/null @@ -1,72 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: nfsymbol.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef INCLUDED_SVTOOLS_NFSYMBOL_HXX -#define INCLUDED_SVTOOLS_NFSYMBOL_HXX - -/* ATTENTION! If new types arrive that had its content previously handled as - * SYMBOLTYPE_STRING, they have to be added at several places in zforscan.cxx - * and/or zformat.cxx, and in xmloff/source/style/xmlnumfe.cxx. Mostly these - * are places where already NF_SYMBOLTYPE_STRING together with - * NF_SYMBOLTYPE_CURRENCY or NF_SYMBOLTYPE_DATESEP are used in the same case of - * a switch respectively an if-condition. - */ - -namespace svt { - -/// Number formatter's symbol types of a token, if not key words, which are >0 -enum NfSymbolType -{ - NF_SYMBOLTYPE_STRING = -1, // literal string in output - NF_SYMBOLTYPE_DEL = -2, // special character - NF_SYMBOLTYPE_BLANK = -3, // blank for '_' - NF_SYMBOLTYPE_STAR = -4, // *-character - NF_SYMBOLTYPE_DIGIT = -5, // digit place holder - NF_SYMBOLTYPE_DECSEP = -6, // decimal separator - NF_SYMBOLTYPE_THSEP = -7, // group AKA thousand separator - NF_SYMBOLTYPE_EXP = -8, // exponent E - NF_SYMBOLTYPE_FRAC = -9, // fraction / - NF_SYMBOLTYPE_EMPTY = -10, // deleted symbols - NF_SYMBOLTYPE_FRACBLANK = -11, // delimiter between integer and fraction - NF_SYMBOLTYPE_COMMENT = -12, // comment is following - NF_SYMBOLTYPE_CURRENCY = -13, // currency symbol - NF_SYMBOLTYPE_CURRDEL = -14, // currency symbol delimiter [$] - NF_SYMBOLTYPE_CURREXT = -15, // currency symbol extension -xxx - NF_SYMBOLTYPE_CALENDAR = -16, // calendar ID - NF_SYMBOLTYPE_CALDEL = -17, // calendar delimiter [~] - NF_SYMBOLTYPE_DATESEP = -18, // date separator - NF_SYMBOLTYPE_TIMESEP = -19, // time separator - NF_SYMBOLTYPE_TIME100SECSEP = -20, // time 100th seconds separator - NF_SYMBOLTYPE_PERCENT = -21 // percent % -}; - -} // namespace svt - -#endif // INCLUDED_SVTOOLS_NFSYMBOL_HXX diff --git a/svl/inc/numuno.hxx b/svl/inc/numuno.hxx deleted file mode 100644 index d243c49a3113..000000000000 --- a/svl/inc/numuno.hxx +++ /dev/null @@ -1,102 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: numuno.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _NUMUNO_HXX -#define _NUMUNO_HXX - -#include "svl/svldllapi.h" -#include -#include -#include - -class SvNumberFormatter; -class SvNumFmtSuppl_Impl; - -namespace comphelper -{ - class SharedMutex; -} - -//------------------------------------------------------------------ - -// SvNumberFormatterServiceObj must be registered as service somewhere - -com::sun::star::uno::Reference SAL_CALL - SvNumberFormatterServiceObj_NewInstance( - const com::sun::star::uno::Reference< - com::sun::star::lang::XMultiServiceFactory>& rSMgr ); - -//------------------------------------------------------------------ - -// SvNumberFormatsSupplierObj: aggregate to document, -// construct with SvNumberFormatter - -class SVL_DLLPUBLIC SvNumberFormatsSupplierObj : public cppu::WeakAggImplHelper2< - com::sun::star::util::XNumberFormatsSupplier, - com::sun::star::lang::XUnoTunnel> -{ -private: - SvNumFmtSuppl_Impl* pImpl; - -public: - SvNumberFormatsSupplierObj(); - SvNumberFormatsSupplierObj(SvNumberFormatter* pForm); - virtual ~SvNumberFormatsSupplierObj(); - - void SetNumberFormatter(SvNumberFormatter* pNew); - SvNumberFormatter* GetNumberFormatter() const; - - // ueberladen, um Attribute im Dokument anzupassen - virtual void NumberFormatDeleted(sal_uInt32 nKey); - // ueberladen, um evtl. neu zu formatieren - virtual void SettingsChanged(); - - // XNumberFormatsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL - getNumberFormatSettings() - throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats > SAL_CALL - getNumberFormats() - throw(::com::sun::star::uno::RuntimeException); - - // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< - sal_Int8 >& aIdentifier ) - throw(::com::sun::star::uno::RuntimeException); - - static const com::sun::star::uno::Sequence& getUnoTunnelId(); - static SvNumberFormatsSupplierObj* getImplementation( const com::sun::star::uno::Reference< - com::sun::star::util::XNumberFormatsSupplier> xObj ); - - ::comphelper::SharedMutex& getSharedMutex() const; -}; - -#endif // #ifndef _NUMUNO_HXX - - diff --git a/svl/inc/outstrm.hxx b/svl/inc/outstrm.hxx deleted file mode 100644 index c01d8f460c58..000000000000 --- a/svl/inc/outstrm.hxx +++ /dev/null @@ -1,69 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: outstrm.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef SVTOOLS_OUTSTRM_HXX -#define SVTOOLS_OUTSTRM_HXX - -#include "svl/svldllapi.h" -#include -#include - -namespace com { namespace sun { namespace star { namespace io { - class XOutputStream; -} } } } - -//============================================================================ -class SVL_DLLPUBLIC SvOutputStream: public SvStream -{ - com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > - m_xStream; - - SVL_DLLPRIVATE virtual ULONG GetData(void *, ULONG); - - SVL_DLLPRIVATE virtual ULONG PutData(void const * pData, ULONG nSize); - - SVL_DLLPRIVATE virtual ULONG SeekPos(ULONG); - - SVL_DLLPRIVATE virtual void FlushData(); - - SVL_DLLPRIVATE virtual void SetSize(ULONG); - -public: - SvOutputStream(com::sun::star::uno::Reference< - com::sun::star::io::XOutputStream > const & - rTheStream); - - virtual ~SvOutputStream(); - - virtual USHORT IsA() const; -}; - -#endif // SVTOOLS_OUTSTRM_HXX - diff --git a/svl/inc/pickerhelper.hxx b/svl/inc/pickerhelper.hxx deleted file mode 100644 index e8ef23e145d4..000000000000 --- a/svl/inc/pickerhelper.hxx +++ /dev/null @@ -1,72 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: pickerhelper.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _PICKERHELPER_HXX -#define _PICKERHELPER_HXX - -#include "svl/svldllapi.h" -#include "sal/types.h" -#include "com/sun/star/uno/Reference.hxx" - -namespace com -{ - namespace sun - { - namespace star - { - namespace ui - { - namespace dialogs - { - class XFilePicker; - class XFolderPicker; - } - } - } - } -} - - -namespace svt -{ - - SVL_DLLPUBLIC void SetDialogHelpId( - ::com::sun::star::uno::Reference < ::com::sun::star::ui::dialogs::XFilePicker > _mxFileDlg, - sal_Int32 _nHelpId ); - - SVL_DLLPUBLIC void SetDialogHelpId( - ::com::sun::star::uno::Reference < ::com::sun::star::ui::dialogs::XFolderPicker > _mxFileDlg, - sal_Int32 _nHelpId ); - -} - -//----------------------------------------------------------------------------- - -#endif diff --git a/svl/inc/pickerhistory.hxx b/svl/inc/pickerhistory.hxx deleted file mode 100644 index e67729a1bbd8..000000000000 --- a/svl/inc/pickerhistory.hxx +++ /dev/null @@ -1,54 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: pickerhistory.hxx,v $ - * $Revision: 1.5 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef SVTOOLS_PICKERHISTORY_HXX -#define SVTOOLS_PICKERHISTORY_HXX - -#include "svl/svldllapi.h" -#include - -//......................................................................... -namespace svt -{ -//......................................................................... - - // -------------------------------------------------------------------- - SVL_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - GetTopMostFolderPicker( ); - - SVL_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - GetTopMostFilePicker( ); - -//......................................................................... -} // namespace svt -//......................................................................... - -#endif // SVTOOLS_PICKERHISTORY_HXX - diff --git a/svl/inc/pickerhistoryaccess.hxx b/svl/inc/pickerhistoryaccess.hxx deleted file mode 100644 index 210fd9b92139..000000000000 --- a/svl/inc/pickerhistoryaccess.hxx +++ /dev/null @@ -1,57 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: pickerhistoryaccess.hxx,v $ - * $Revision: 1.5 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef SVTOOLS_PICKERHISTORYACCESS_HXX -#define SVTOOLS_PICKERHISTORYACCESS_HXX - -#include "svl/svldllapi.h" - -#ifndef _COM_SUN_STAR_UNO_REFERENX_HXX_ -#include -#endif - -//......................................................................... -namespace svt -{ -//......................................................................... - - // -------------------------------------------------------------------- - SVL_DLLPUBLIC void addFolderPicker( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxPicker ); - - SVL_DLLPUBLIC void addFilePicker( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxPicker ); - -//......................................................................... -} // namespace svt -//......................................................................... - -#endif // SVTOOLS_PICKERHISTORYACCESS_HXX - diff --git a/svl/inc/poolcach.hxx b/svl/inc/poolcach.hxx deleted file mode 100644 index 21cfec4662a0..000000000000 --- a/svl/inc/poolcach.hxx +++ /dev/null @@ -1,61 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: poolcach.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SFXPOOLCACH_HXX -#define _SFXPOOLCACH_HXX - -#include "svl/svldllapi.h" -#include - -class SfxItemModifyArr_Impl; -class SfxItemPool; -class SfxItemSet; -class SfxPoolItem; -class SfxSetItem; - -class SVL_DLLPUBLIC SfxItemPoolCache -{ - SfxItemPool *pPool; - SfxItemModifyArr_Impl *pCache; - const SfxItemSet *pSetToPut; - const SfxPoolItem *pItemToPut; - -public: - SfxItemPoolCache( SfxItemPool *pPool, - const SfxPoolItem *pPutItem ); - SfxItemPoolCache( SfxItemPool *pPool, - const SfxItemSet *pPutSet ); - ~SfxItemPoolCache(); - - const SfxSetItem& ApplyTo( const SfxSetItem& rSetItem, BOOL bNew = FALSE ); -}; - - -#endif - diff --git a/svl/inc/strmadpt.hxx b/svl/inc/strmadpt.hxx deleted file mode 100644 index 2fd190f9adef..000000000000 --- a/svl/inc/strmadpt.hxx +++ /dev/null @@ -1,138 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: strmadpt.hxx,v $ - * $Revision: 1.5 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef SVTOOLS_STRMADPT_HXX -#define SVTOOLS_STRMADPT_HXX - -#include "svl/svldllapi.h" -#include -#include -#include -#include -#include - -//============================================================================ -class SVL_DLLPUBLIC SvOutputStreamOpenLockBytes: public SvOpenLockBytes -{ - com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > - m_xOutputStream; - sal_uInt32 m_nPosition; - -public: - TYPEINFO(); - - SvOutputStreamOpenLockBytes( - const com::sun::star::uno::Reference< - com::sun::star::io::XOutputStream > & - rTheOutputStream): - m_xOutputStream(rTheOutputStream), m_nPosition(0) {} - - virtual ErrCode ReadAt(ULONG, void *, ULONG, ULONG *) const; - - virtual ErrCode WriteAt(ULONG nPos, const void * pBuffer, ULONG nCount, - ULONG * pWritten); - - virtual ErrCode Flush() const; - - virtual ErrCode SetSize(ULONG); - - virtual ErrCode Stat(SvLockBytesStat * pStat, SvLockBytesStatFlag) const; - - virtual ErrCode FillAppend(const void * pBuffer, ULONG nCount, - ULONG * pWritten); - - virtual ULONG Tell() const; - - virtual ULONG Seek(ULONG); - - virtual void Terminate(); -}; - -//============================================================================ -class SVL_DLLPUBLIC SvLockBytesInputStream: public cppu::OWeakObject, - public com::sun::star::io::XInputStream, - public com::sun::star::io::XSeekable -{ - SvLockBytesRef m_xLockBytes; - sal_Int64 m_nPosition; - bool m_bDone; - -public: - SvLockBytesInputStream(SvLockBytes * pTheLockBytes): - m_xLockBytes(pTheLockBytes), m_nPosition(0), m_bDone(false) {} - - 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(); - - virtual sal_Int32 SAL_CALL - readBytes(com::sun::star::uno::Sequence< sal_Int8 > & rData, - sal_Int32 nBytesToRead) - throw (com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException); - - virtual sal_Int32 SAL_CALL - readSomeBytes(com::sun::star::uno::Sequence< sal_Int8 > & rData, - sal_Int32 nMaxBytesToRead) - throw (com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException); - - virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip) - throw (com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException); - - virtual sal_Int32 SAL_CALL available() - throw (com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException); - - virtual void SAL_CALL closeInput() - throw (com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException); - - virtual void SAL_CALL seek(sal_Int64 nLocation) - throw (com::sun::star::lang::IllegalArgumentException, - com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException); - - virtual sal_Int64 SAL_CALL getPosition() - throw (com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException); - - virtual sal_Int64 SAL_CALL getLength() - throw (com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException); -}; - -#endif // SVTOOLS_STRMADPT_HXX - diff --git a/svl/inc/stylepool.hxx b/svl/inc/stylepool.hxx deleted file mode 100644 index d69bb928e432..000000000000 --- a/svl/inc/stylepool.hxx +++ /dev/null @@ -1,103 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: stylepool.hxx,v $ - * $Revision: 1.5 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef INCLUDED_SVTOOLS_STYLEPOOL_HXX -#define INCLUDED_SVTOOLS_STYLEPOOL_HXX - -#include -#include -#include - -class StylePoolImpl; -class StylePoolIterImpl; -class IStylePoolIteratorAccess; - -class SVL_DLLPUBLIC StylePool -{ -private: - StylePoolImpl *pImpl; -public: - typedef boost::shared_ptr SfxItemSet_Pointer_t; - - // --> OD 2008-03-07 #i86923# - explicit StylePool( SfxItemSet* pIgnorableItems = 0 ); - // <-- - - /** Insert a SfxItemSet into the style pool. - - The pool makes a copy of the provided SfxItemSet. - - @param SfxItemSet - the SfxItemSet to insert - - @return a shared pointer to the SfxItemSet - */ - virtual SfxItemSet_Pointer_t insertItemSet( const SfxItemSet& rSet ); - - /** Create an iterator - - The iterator walks through the StylePool - OD 2008-03-07 #i86923# - introduce optional parameter to control, if unused SfxItemsSet are skipped or not - introduce optional parameter to control, if ignorable items are skipped or not - - @attention every change, e.g. destruction, of the StylePool could cause undefined effects. - - @param bSkipUnusedItemSets - input parameter - boolean, indicating if unused SfxItemSets are skipped or not - - @param bSkipIgnorableItems - input parameter - boolean, indicating if ignorable items are skipped or not - - @postcond the iterator "points before the first" SfxItemSet of the pool. - The first StylePoolIterator::getNext() call will deliver the first SfxItemSet. - */ - virtual IStylePoolIteratorAccess* createIterator( const bool bSkipUnusedItemSets = false, - const bool bSkipIgnorableItems = false ); - - /** Returns the number of styles - */ - virtual sal_Int32 getCount() const; - - virtual ~StylePool(); - - static ::rtl::OUString nameOf( SfxItemSet_Pointer_t pSet ); -}; - -class SVL_DLLPUBLIC IStylePoolIteratorAccess -{ -public: - /** Delivers a shared pointer to the next SfxItemSet of the pool - If there is no more SfxItemSet, the delivered share_pointer is empty. - */ - virtual StylePool::SfxItemSet_Pointer_t getNext() = 0; - virtual ::rtl::OUString getName() = 0; - virtual ~IStylePoolIteratorAccess() {}; -}; -#endif diff --git a/svl/inc/svl/PasswordHelper.hxx b/svl/inc/svl/PasswordHelper.hxx new file mode 100644 index 000000000000..c915ebe3854a --- /dev/null +++ b/svl/inc/svl/PasswordHelper.hxx @@ -0,0 +1,57 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: PasswordHelper.hxx,v $ + * $Revision: 1.6 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _SVTOOLS_PASSWORDHELPER_HXX +#define _SVTOOLS_PASSWORDHELPER_HXX + +#include "svl/svldllapi.h" +#include "sal/types.h" +#include "com/sun/star/uno/Sequence.hxx" + +class String; + +class SvPasswordHelper +{ + static void GetHashPassword(com::sun::star::uno::Sequence & rPassHash, const sal_Char* pPass, sal_uInt32 nLen); + static void GetHashPasswordLittleEndian(com::sun::star::uno::Sequence& rPassHash, const String& sPass); + static void GetHashPasswordBigEndian(com::sun::star::uno::Sequence& rPassHash, const String& sPass); + +public: + SVL_DLLPUBLIC static void GetHashPassword(com::sun::star::uno::Sequence& rPassHash, const String& sPass); + /** + Use this method to compare a given string with another given Hash value. + This is necessary, because in older versions exists different hashs of the same string. They were endian dependent. + We need this to handle old files. This method will compare against big and little endian. See #101326# + */ + SVL_DLLPUBLIC static bool CompareHashPassword(const com::sun::star::uno::Sequence& rOldPassHash, const String& sNewPass); +}; + +#endif + diff --git a/svl/inc/svl/adrparse.hxx b/svl/inc/svl/adrparse.hxx new file mode 100644 index 000000000000..a317e27b2779 --- /dev/null +++ b/svl/inc/svl/adrparse.hxx @@ -0,0 +1,110 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: adrparse.hxx,v $ + * $Revision: 1.5 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _ADRPARSE_HXX +#define _ADRPARSE_HXX + +#include "svl/svldllapi.h" +#include +#include + +//============================================================================ +struct SvAddressEntry_Impl +{ + UniString m_aAddrSpec; + UniString m_aRealName; + + SvAddressEntry_Impl() {}; + SvAddressEntry_Impl(UniString const & rTheAddrSpec, + UniString const & rTheRealName): + m_aAddrSpec(rTheAddrSpec), m_aRealName(rTheRealName) {} +}; + +//============================================================================ +DECLARE_LIST(SvAddressList_Impl, SvAddressEntry_Impl *) + +//============================================================================ +class SVL_DLLPUBLIC SvAddressParser +{ + friend class SvAddressParser_Impl; + + SvAddressEntry_Impl m_aFirst; + SvAddressList_Impl m_aRest; + bool m_bHasFirst; + +public: + SvAddressParser(UniString const & rInput); + + ~SvAddressParser(); + + sal_Int32 Count() const { return m_bHasFirst ? m_aRest.Count() + 1 : 0; } + + inline UniString const & GetEmailAddress(sal_Int32 nIndex) const; + + inline UniString const &GetRealName(sal_Int32 nIndex) const; + + /** Create an RFC 822 (i.e., 'e-mail address'). + + @param rPhrase Either an empty string (the will have no + an will be of the form ), or some text that will + become the part of a form . Non + US-ASCII characters within the text are put into a + verbatim, so the result may actually not be a valid RFC 822 , + but a more human-readable representation. + + @param rAddrSpec A valid RFC 822 . (An RFC 822 + including a cannot be created by this method.) + + @param rMailbox If this method returns true, this parameter returns + the created RFC 822 (rather, a more human-readable + representation thereof). Otherwise, this parameter is not modified. + + @return True, if rAddrSpec is a valid RFC 822 . + */ + static bool createRFC822Mailbox(String const & rPhrase, + String const & rAddrSpec, + String & rMailbox); +}; + +inline UniString const & SvAddressParser::GetEmailAddress(sal_Int32 nIndex) + const +{ + return nIndex == 0 ? m_aFirst.m_aAddrSpec : + m_aRest.GetObject(nIndex - 1)->m_aAddrSpec; +} + +inline UniString const & SvAddressParser::GetRealName(sal_Int32 nIndex) const +{ + return nIndex == 0 ? m_aFirst.m_aRealName : + m_aRest.GetObject(nIndex - 1)->m_aRealName; +} + +#endif // _ADRPARSE_HXX + diff --git a/svl/inc/svl/broadcast.hxx b/svl/inc/svl/broadcast.hxx new file mode 100644 index 000000000000..e80a2e446ebf --- /dev/null +++ b/svl/inc/svl/broadcast.hxx @@ -0,0 +1,70 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: broadcast.hxx,v $ + * $Revision: 1.4 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _SVT_BROADCAST_HXX +#define _SVT_BROADCAST_HXX + +#include "svl/svldllapi.h" +#include + +class SvtListener; +class SfxHint; +class SvtListenerBase; + +//------------------------------------------------------------------------- + +class SVL_DLLPUBLIC SvtBroadcaster +{ +friend class SvtListener; +friend class SvtListenerBase; +friend class SvtListenerIter; + SvtListenerBase* pRoot; + + const SvtBroadcaster& operator=(const SvtBroadcaster &); // verboten + +protected: + void Forward( SvtBroadcaster& rBC, + const SfxHint& rHint ); + virtual void ListenersGone(); + +public: + TYPEINFO(); + + SvtBroadcaster(); + SvtBroadcaster( const SvtBroadcaster &rBC ); + virtual ~SvtBroadcaster(); + + void Broadcast( const SfxHint &rHint ); + + BOOL HasListeners() const { return 0 != pRoot; } +}; + + +#endif + diff --git a/svl/inc/svl/cntnrsrt.hxx b/svl/inc/svl/cntnrsrt.hxx new file mode 100644 index 000000000000..13553f7f16fd --- /dev/null +++ b/svl/inc/svl/cntnrsrt.hxx @@ -0,0 +1,177 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: cntnrsrt.hxx,v $ + * $Revision: 1.5 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _CNTRSRT_HXX +#define _CNTRSRT_HXX + +#if 0 +*********************************************************************** +* +* Hier folgt die Beschreibung fuer die exportierten Makros: +* +* DECLARE_CONTAINER_SORT( ClassName, Type ) +* IMPL_CONTAINER_SORT( ClassName, Type, SortFunc ) +* +* Definiert eine von Container abgeleitete Klasse "ClassName", +* in der die Elemente des Typs "Type" sortiert enthalten sind. +* Dazu muss einer Funktion "SortFunc" definiert sein, die als +* Paramter zwei "const Type&" erwartet und 0 zurueckgibt, wenn +* beide gleich sind, -1 wenn der erste Paramter kleiner ist als +* der zweite und +1 wenn der erste Paramter groesser ist als +* der zweite. +* +* Die Zugriffs-Methoden entsprechen in etwa denen der Container- +* Klasse, mit Ausnahme von Insert, DeleteAndDestroy und Seek_Entry, +* der den SV-Pointer-Arrays entsprechen. +* +* DECLARE_CONTAINER_SORT_DEL( ClassName, Type ) +* IMPL_CONTAINER_SORT( ClassName, Type, SortFunc ) +* +* Wie DECLARE_CONTAINER_SORT, nur dass beim Aufruf des Destruktors +* alle im Conatiner vorhandenen Objekte geloescht werden. +* +#endif + +#include + +#define DECLARE_CONTAINER_SORT_COMMON( ClassName, Type ) \ + ClassName( const ClassName& ); \ + ClassName& operator =( const ClassName& ); \ +public: \ + using Container::Count; \ + \ + ClassName( USHORT InitSize, USHORT ReSize ) : \ + Container( CONTAINER_MAXBLOCKSIZE, InitSize, ReSize ) {} \ + \ + BOOL Insert( Type* pObj ); \ + \ + Type *Remove( ULONG nPos ) \ + { return (Type *)Container::Remove( nPos ); } \ + \ + Type *Remove( Type* pObj ); \ + \ + void DeleteAndDestroy( ULONG nPos ) \ + { \ + Type *pObj = Remove( nPos ); \ + if( pObj ) \ + delete pObj; \ + } \ + \ + void DeleteAndDestroy() \ + { while( Count() ) DeleteAndDestroy( 0 ); } \ + \ + Type* GetObject( ULONG nPos ) const \ + { return (Type *)Container::GetObject( nPos ); } \ + \ + Type* operator[]( ULONG nPos ) const \ + { return GetObject(nPos); } \ + \ + BOOL Seek_Entry( const Type *pObj, ULONG* pPos ) const; \ + \ + ULONG GetPos( const Type* pObj ) const; \ + + +#define DECLARE_CONTAINER_SORT( ClassName, Type ) \ +class ClassName : private Container \ +{ \ + DECLARE_CONTAINER_SORT_COMMON( ClassName, Type ) \ + ~ClassName() {} \ +}; \ + + +#define DECLARE_CONTAINER_SORT_DEL( ClassName, Type ) \ +class ClassName : private Container \ +{ \ + DECLARE_CONTAINER_SORT_COMMON( ClassName, Type ) \ + ~ClassName() { DeleteAndDestroy(); } \ +}; \ + + +#define IMPL_CONTAINER_SORT( ClassName, Type, SortFunc ) \ +BOOL ClassName::Insert( Type *pObj ) \ +{ \ + ULONG nPos; \ + BOOL bExist = Seek_Entry( pObj, &nPos ); \ + if( !bExist ) \ + Container::Insert( pObj, nPos ); \ + return !bExist; \ +} \ + \ +Type *ClassName::Remove( Type* pObj ) \ +{ \ + ULONG nPos; \ + if( Seek_Entry( pObj, &nPos ) ) \ + return Remove( nPos ); \ + else \ + return 0; \ +} \ + \ +ULONG ClassName::GetPos( const Type* pObj ) const \ +{ \ + ULONG nPos; \ + if( Seek_Entry( pObj, &nPos ) ) \ + return nPos; \ + else \ + return CONTAINER_ENTRY_NOTFOUND; \ +} \ + \ +BOOL ClassName::Seek_Entry( const Type* pObj, ULONG* pPos ) const \ +{ \ + register ULONG nO = Count(), \ + nM, \ + nU = 0; \ + if( nO > 0 ) \ + { \ + nO--; \ + while( nU <= nO ) \ + { \ + nM = nU + ( nO - nU ) / 2; \ + int nCmp = SortFunc( *GetObject(nM), *pObj ); \ + \ + if( 0 == nCmp ) \ + { \ + if( pPos ) *pPos = nM; \ + return TRUE; \ + } \ + else if( nCmp < 0 ) \ + nU = nM + 1; \ + else if( nM == 0 ) \ + { \ + if( pPos ) *pPos = nU; \ + return FALSE; \ + } \ + else \ + nO = nM - 1; \ + } \ + } \ + if( pPos ) *pPos = nU; \ + return FALSE; \ +} \ + +#endif diff --git a/svl/inc/svl/cntwids.hrc b/svl/inc/svl/cntwids.hrc new file mode 100644 index 000000000000..fcb9f855453b --- /dev/null +++ b/svl/inc/svl/cntwids.hrc @@ -0,0 +1,509 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: cntwids.hrc,v $ + * $Revision: 1.3 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _CNTWIDS_HRC +#define _CNTWIDS_HRC + +#ifndef OLD_CHAOS +#define TF_NEW_TABPAGES +#define CNT_COOL_ABO +#endif + +//========================================================================= +// ARGS, MSG, ALL, FOLDER, BOXALL, BOXEXT +//========================================================================= + +#define WID_CHAOS_START 500 + +//FUNC MSG +#define WID_MARK_THREAD_MARKED (499) +#define WID_MARK_THREAD_UNMARKED (498) + +// ARGS +#define WID_DUMMY_ARG1 (WID_CHAOS_START + 0) +#define WID_FACTORY_NO (WID_CHAOS_START + 1) +#define WID_FACTORY_NAME (WID_CHAOS_START + 2) +#define WID_NEWS_XREF (WID_CHAOS_START + 3) +#define WID_CREATION_FLAGS (WID_CHAOS_START + 4) +#define WID_FACTORY_HELP_ID (WID_CHAOS_START + 5) + +//FUNC MSG +#define WID_MSG_START (WID_CHAOS_START + 6) +#define WID_MAIL_REPLY (WID_CHAOS_START + 6) +#define WID_POST_REPLY (WID_CHAOS_START + 7) +#define WID_FORWARD (WID_CHAOS_START + 8) +#define WID_MARK_THREAD_READ (WID_CHAOS_START + 9) +#define WID_HIDE_THREAD (WID_CHAOS_START + 10) +#define WID_HIDE_AUTHOR (WID_CHAOS_START + 11) +#define WID_HIDE_SUBJECT (WID_CHAOS_START + 12) +#define WID_RESEND_MSG (WID_CHAOS_START + 13) +#define WID_MARK_THREAD_UNREAD (WID_CHAOS_START + 14) + +//PROP MSG +#define WID_PRIORITY (WID_CHAOS_START + 15) +#define WID_RULE_APPLIED (WID_CHAOS_START + 16) +#define WID_MSG_LOCK (WID_CHAOS_START + 17) +#define WID_SEEN_STATUS (WID_CHAOS_START + 18) +#define WID_REPLY_TO (WID_CHAOS_START + 19) +#define WID_IN_REPLY_TO (WID_CHAOS_START + 20) + +#define WID_MESSAGE_ID (WID_CHAOS_START + 21) +#define WID_BCC (WID_CHAOS_START + 22) +#define WID_CC (WID_CHAOS_START + 23) +#define WID_TO (WID_CHAOS_START + 24) +#define WID_FROM (WID_CHAOS_START + 25) +#define WID_TITLE (WID_CHAOS_START + 26) +#define WID_SUBJECT WID_TITLE // only here to prevent panic, should be removed +#define WID_MESSAGEBODY (WID_CHAOS_START + 27) + +#define WID_REFERENCES (WID_CHAOS_START + 28) +#define WID_NEWSGROUPS (WID_CHAOS_START + 29) +#define WID_NEWS_XREFLIST (WID_CHAOS_START + 30) + +#define WID_OUTMSGINTERNALSTATE (WID_CHAOS_START + 31) +#define WID_RECIPIENTLIST (WID_CHAOS_START + 32) +#define WID_MSG_END (WID_CHAOS_START + 32) + +//FUNC ALL +#define WID_ALL_START (WID_CHAOS_START + 33) +#define WID_DEFAULT (WID_CHAOS_START + 33) +#define WID_OPEN (WID_CHAOS_START + 34) +#define WID_DELETE (WID_CHAOS_START + 35) +#define WID_CUT (WID_CHAOS_START + 36) +#define WID_COPY (WID_CHAOS_START + 37) +#define WID_PASTE (WID_CHAOS_START + 38) +#define WID_RENAME (WID_CHAOS_START + 39) + +#define WID_HAS_DATA (WID_CHAOS_START + 40) +#define WID_GETDATA (WID_CHAOS_START + 41) +#define WID_PUTDATA (WID_CHAOS_START + 42) + +//PROP ALL +#define WID_INTERIM_URL (WID_CHAOS_START + 43) +#define WID_CONTENT_TYPE (WID_CHAOS_START + 44) + +#define WID_OWN_URL (WID_CHAOS_START + 45) +#define WID_REAL_URL (WID_CHAOS_START + 46) +#define WID_OBSOLETE_TITLE (WID_CHAOS_START + 47) +#define WID_FLAG_READONLY (WID_CHAOS_START + 48) + +#define WID_REFERED_URL (WID_CHAOS_START + 49) +#define WID_REFERER_COUNT (WID_CHAOS_START + 50) +#define WID_FLAG_IS_FOLDER (WID_CHAOS_START + 51) +#define WID_FLAG_HAS_FOLDER (WID_CHAOS_START + 52) +#define WID_FLAG_IS_MESSAGE (WID_CHAOS_START + 53) +#define WID_FLAG_IS_DOCUMENT (WID_FLAG_IS_MESSAGE) +#define WID_FLAG_HAS_MESSAGES (WID_CHAOS_START + 54) + +#define WID_DATE_CREATED (WID_CHAOS_START + 55) +#define WID_DATE_MODIFIED (WID_CHAOS_START + 56) +#define WID_VIEW_DESCRIPTION (WID_CHAOS_START + 57) +#define WID_IS_READ (WID_CHAOS_START + 58) +#define WID_IS_MARKED (WID_CHAOS_START + 59) +#define WID_ALL_END (WID_CHAOS_START + 59) + +//FUNC FOLDER +#define WID_FOLDER_START (WID_CHAOS_START + 60) +#define WID_SYNCHRONIZE (WID_CHAOS_START + 60) +#define WID_CREATE_NEW (WID_CHAOS_START + 61) +#define WID_INSERT (WID_CHAOS_START + 62) +#define WID_UPDATE (WID_CHAOS_START + 63) +#define WID_IMPORT (WID_CHAOS_START + 64) + +//PROP FOLDER VIEW +#define WID_DUMMY_PROPFOLDERVIEW1 (WID_CHAOS_START + 65) +#define WID_THREADING (WID_CHAOS_START + 66) +#define WID_MSG_COLUMN_INFO /* obsolete */ (WID_CHAOS_START + 67) +#define WID_FLD_COLUMN_INFO /* obsolete */ (WID_CHAOS_START + 68) +#define WID_FOLDERVIEW_MODE (WID_CHAOS_START + 69) +#define WID_MESSAGEVIEW_MODE (WID_CHAOS_START + 70) +#define WID_SENTMESSAGEVIEW_MODE (WID_CHAOS_START + 71) +#define WID_SORTING (WID_CHAOS_START + 72) +#define WID_THREADED (WID_CHAOS_START + 73) +#define WID_FILTERED (WID_CHAOS_START + 74) +#define WID_RULES (WID_CHAOS_START + 75) +#define WID_SUBSCRNEWSGROUPCOUNT (WID_CHAOS_START + 76) +#define WID_FLAG_SUBSCRIBED (WID_CHAOS_START + 77) +#define WID_FLAG_SUPPORTMODE (WID_CHAOS_START + 78) + +//PROP FOLDER DIR +#define WID_DUMMY_FOLDERDIR1 (WID_CHAOS_START + 79) +#define WID_TOTALCONTENTCOUNT (WID_CHAOS_START + 80) +#define WID_NEWSGROUPCOUNT /* ??? */ (WID_CHAOS_START + 81) +#define WID_ARTICLECOUNT /* ??? */ (WID_CHAOS_START + 82) +#define WID_KNOWN_RANGES (WID_CHAOS_START + 83) +#define WID_IMAPFOLDERINFO (WID_CHAOS_START + 84) + +//PROP FOLDER USER +#define WID_DUMMY_FOLDERUSER1 (WID_CHAOS_START + 85) +#define WID_SEENCONTENTCOUNT (WID_CHAOS_START + 86) +#define WID_UNREAD_ARTICLECOUNT (WID_SEENCONTENTCOUNT) +#define WID_SENTCONTENTCOUNT (WID_SEENCONTENTCOUNT) +#define WID_READ_RANGES (WID_CHAOS_START + 87) +#define WID_MARK_RANGES (WID_CHAOS_START + 88) +#define WID_FOLDER_END (WID_CHAOS_START + 88) + +//PROP BOXALL +#define WID_BOXALL_START (WID_CHAOS_START + 89) +// Used for d&d of View Storages... +#define WID_PREPARE_MOVE (WID_CHAOS_START + 89) +#define WID_OUTTRAY_WANTED (WID_CHAOS_START + 90) +#define WID_USERNAME (WID_CHAOS_START + 91) +#define WID_PASSWORD (WID_CHAOS_START + 92) +#define WID_SERVERNAME (WID_CHAOS_START + 93) +#define WID_SERVERPORT (WID_CHAOS_START + 94) +// obsolete +#define WID_MAILSEND_USERNAME (WID_CHAOS_START + 95) +#define WID_MAILSEND_PASSWORD (WID_CHAOS_START + 96) +#define WID_MAILSEND_SERVERNAME (WID_CHAOS_START + 97) +#define WID_NEWSSEND_USERNAME (WID_CHAOS_START + 98) +#define WID_NEWSSEND_PASSWORD (WID_CHAOS_START + 99) +#define WID_NEWSSEND_SERVERNAME (WID_CHAOS_START + 100) +// end obsolete +#define WID_SERVERBASE (WID_CHAOS_START + 101) +// not used +#define WID_SMTP_GATEWAY (WID_CHAOS_START + 102) + +// -> ..._DEFAULT +// obsolete +#define WID_FROM_DEFAULT (WID_CHAOS_START + 103) +// obsolete +#define WID_REPLY_TO_DEFAULT (WID_CHAOS_START + 104) + +#define WID_AUTOUPDATE_INTERVAL (WID_CHAOS_START + 105) +#define WID_UPDATE_ENABLED (WID_CHAOS_START + 106) +#define WID_BOXALL_END (WID_CHAOS_START + 106) + +//PROP BOX RNMGR +#define WID_BOXEXT_START (WID_CHAOS_START + 107) +#define WID_CONNECTION_MODE (WID_CHAOS_START + 107) +#define WID_NEWS_GROUPLIST (WID_CHAOS_START + 108) +#ifdef OLD_CHAOS +#define WID_BOX_CONNECTION_PROP (WID_CHAOS_START + 109) +#else +#define WID_MESSAGE_STOREMODE (WID_CHAOS_START + 109) +#endif +#define WID_DELETE_ON_SERVER (WID_CHAOS_START + 110) + +//PROP BOX USER + +//PROP BOX OUT DIR +#define WID_OUTMSGEXTERNALSTATE (WID_CHAOS_START + 111) + +//PROP RNM +#define WID_RNM_UPDATETIMER_LIST (WID_CHAOS_START + 112) +#define WID_BOXEXT_END (WID_CHAOS_START + 112) + +////////////////////////////////////////////////////////////////////////// +// MISC - Added after initial pool version +////////////////////////////////////////////////////////////////////////// + +// PROP BOX +#define WID_SERVER_RANGES (WID_CHAOS_START + 113) +#define WID_LAST_UPDATE (WID_CHAOS_START + 114) +#define WID_LAST_MSGID (WID_CHAOS_START + 115) +#define WID_LAST_UID (WID_CHAOS_START + 116) + +// FUNC ALL +#define WID_UNDELETE (WID_CHAOS_START + 117) +#define WID_CLOSE (WID_CHAOS_START + 118) +#define WID_REOPEN (WID_CHAOS_START + 119) + +// PROP RNM +#define WID_RNM_FILECONVERSION_LIST (WID_CHAOS_START + 120) + +// PROP FOLDER +#define WID_SHOW_MSGS_HAS_TIMELIMIT (WID_CHAOS_START + 121) +#define WID_SHOW_MSGS_TIMELIMIT (WID_CHAOS_START + 122) +#define WID_STORE_MSGS_HAS_TIMELIMIT (WID_CHAOS_START + 123) +#define WID_STORE_MSGS_TIMELIMIT (WID_CHAOS_START + 124) + +// PROP BOX +#define WID_MSG_COLUMN_WIDTHS /* obsolete */(WID_CHAOS_START + 125) + +#ifdef OLD_CHAOS + +#define WID_CHAOS_END (WID_CHAOS_START + 125) + +#else + +////////////////////////////////////////////////////////////////////////// +// WID's added after SO 4.0 release ( SUPD > 364 ) +////////////////////////////////////////////////////////////////////////// + +// PROP ALL +#define WID_PROPERTYLIST (WID_CHAOS_START + 126) + +// PROP BOXALL +#define WID_BOXALL_START2 (WID_CHAOS_START + 127) +#define WID_SEND_PUBLIC_PROT_ID (WID_CHAOS_START + 127) +#define WID_SEND_PRIVATE_PROT_ID (WID_CHAOS_START + 128) +#define WID_SEND_PUBLIC_OUTBOXPROPS (WID_CHAOS_START + 129) +#define WID_SEND_PRIVATE_OUTBOXPROPS (WID_CHAOS_START + 130) +#define WID_SEND_SERVERNAME (WID_CHAOS_START + 131) +#define WID_SEND_USERNAME (WID_CHAOS_START + 132) +#define WID_SEND_PASSWORD (WID_CHAOS_START + 133) +#define WID_SEND_REPLY_TO_DEFAULT (WID_CHAOS_START + 134) +#define WID_SEND_FROM_DEFAULT (WID_CHAOS_START + 135) +#define WID_VIM_POPATH (WID_CHAOS_START + 136) +#define WID_SEND_VIM_POPATH (WID_CHAOS_START + 137) +#define WID_PURGE (WID_CHAOS_START + 138) +#define WID_CLEAN_CACHE (WID_CHAOS_START + 139) +#define WID_SEARCH (WID_CHAOS_START + 140) +#define WID_JOURNAL (WID_CHAOS_START + 141) +#define WID_LOCALBASE (WID_CHAOS_START + 142) +#define WID_BOXALL_END2 (WID_CHAOS_START + 142) + +// PROP DOCUMENT +#define WID_DOCUMENT_HEADER (WID_CHAOS_START + 143) +#define WID_DOCUMENT_BODY (WID_CHAOS_START + 144) +#define WID_DOCUMENT_SIZE (WID_CHAOS_START + 145) + +// PROP ALL +#define WID_SIZE WID_DOCUMENT_SIZE + +// PROP PROJECT +#define WID_PRJ_MEDIUM (WID_CHAOS_START + 146) +#define WID_PRJ_FILENAMECONVENTION (WID_CHAOS_START + 147) + +// PROP FSYS +#define WID_FSYS_DISKSPACE_LEFT (WID_CHAOS_START + 148) +#define WID_TRANSFER (WID_CHAOS_START + 149) + +// PROP ALL +#define WID_KEYWORDS (WID_CHAOS_START + 150) +#define WID_IS_PROTECTED (WID_CHAOS_START + 151) + +// PROP SEARCH +#define WID_SEARCH_CRITERIA (WID_CHAOS_START + 152) +#define WID_SEARCH_LOCATIONS (WID_CHAOS_START + 153) +#define WID_SEARCH_RECURSIVE (WID_CHAOS_START + 154) +#define WID_SEARCH_FOLDER_VIEW (WID_CHAOS_START + 155) +#define WID_SEARCH_DOCUMENT_VIEW (WID_CHAOS_START + 156) + +// PROP Channel +#define WID_SCHEDULE_RANGE (WID_CHAOS_START + 157) +#define WID_ALLOWED_SCHEDULE_RANGE (WID_CHAOS_START + 158) +#define WID_TARGET_URL (WID_CHAOS_START + 159) +#define WID_FREQUENCY (WID_CHAOS_START + 160) + +// PROP HTTP +#define WID_HTTP_CONNECTION_LIMIT (WID_CHAOS_START + 161) +#define WID_HTTP_COOKIE_MANAGER (WID_CHAOS_START + 162) + +// PROP Channel +#define WID_COLUMN_NEXT_UPD (WID_CHAOS_START + 163) +#define WID_CRAWL_STATUS (WID_CHAOS_START + 164) +#define WID_CRAWL_LEVEL (WID_CHAOS_START + 165) +#define WID_CRAWL_MODE (WID_CHAOS_START + 166) +// WID_CRAWL_MAX_VOLUME shall be removed in the future! +// --> WID_SIZE_LIMIT +#define WID_CRAWL_MAX_VOLUME (WID_CHAOS_START + 167) +#define WID_CRAWL_IMAGE (WID_CHAOS_START + 168) +#define WID_CRAWL_LINK_OUT (WID_CHAOS_START + 169) +#define WID_NOTIFICATION_MODE (WID_CHAOS_START + 170) +#define WID_NOTIFICATION_ADDRESS (WID_CHAOS_START + 171) + +// PROP BOXALL +#define WID_ACCOUNT (WID_CHAOS_START + 172) + +// PROP FSYS +#define WID_FSYS_KIND (WID_CHAOS_START + 173) +#define WID_FSYS_FLAGS (WID_CHAOS_START + 174) + +// PROP FOLDER +#define WID_VIEWDATA /* obsolete */ (WID_CHAOS_START + 175) + +// PROP FSYS +#define WID_WHO_IS_MASTER (WID_CHAOS_START + 176) + +// FUNC HTTP +#define WID_HTTP_POST (WID_CHAOS_START + 177) + +// PROP ALL +#define WID_SUPPORTED_FUNCS (WID_CHAOS_START + 178) +#define WID_SIZE_LIMIT (WID_CHAOS_START + 179) + +// PROP FOLDER +#define WID_MARKED_DOCUMENT_COUNT (WID_CHAOS_START + 180) +#define WID_FOLDER_COUNT (WID_CHAOS_START + 181) + +// PROP FSYS +#define WID_FSYS_SHOW_HIDDEN (WID_CHAOS_START + 182) + +// TRASHCAN +#define WID_TRASHCAN_START (WID_CHAOS_START + 183) +#define WID_TRASHCAN_EMPTY_TRASH (WID_CHAOS_START + 183) +#define WID_TRASHCAN_FLAG_AUTODELETE (WID_CHAOS_START + 184) +#define WID_TRASHCAN_FLAG_CONFIRMEMPTY (WID_CHAOS_START + 185) +#define WID_TRASHCAN_DUMMY1 (WID_CHAOS_START + 186) +#define WID_TRASHCAN_DUMMY2 (WID_CHAOS_START + 187) +#define WID_TRASHCAN_END (WID_CHAOS_START + 187) + +// TRASH +#define WID_TRASH_START (WID_CHAOS_START + 188) +#define WID_TRASH_RESTORE (WID_CHAOS_START + 188) +#define WID_TRASH_ORIGIN (WID_CHAOS_START + 189) +#define WID_TRASH_DUMMY2 (WID_CHAOS_START + 190) +#define WID_TRASH_END (WID_CHAOS_START + 190) + +// PROP ALL +#define WID_TARGET_FRAMES (WID_CHAOS_START + 191) + +// FUNC FOLDER +#define WID_EXPORT (WID_CHAOS_START + 192) + +// COMPONENT +#define WID_COMPONENT_COMMAND (WID_CHAOS_START + 193) +#define WID_COMPONENT_MENU (WID_CHAOS_START + 194) + +// PROP Channel +#define WID_HREF (WID_CHAOS_START + 195) + +// PROP FOLDER (VIEW) +#define WID_VIEW_START (WID_CHAOS_START + 196) +#define WID_VIEW_COLS_BEAMER (WID_CHAOS_START + 196) +#define WID_VIEW_COLS_FILEDLG (WID_CHAOS_START + 197) +#define WID_VIEW_COLS_FLDWIN (WID_CHAOS_START + 198) +#define WID_VIEW_MODE_FLDWIN (WID_CHAOS_START + 199) +#define WID_VIEW_LAYOUT_FLDWIN (WID_CHAOS_START + 200) +#define WID_VIEW_ICON_POS_FLDWIN (WID_CHAOS_START + 201) +#define WID_VIEW_SORT_BEAMER (WID_CHAOS_START + 202) +#define WID_VIEW_SORT_FILEDLG (WID_CHAOS_START + 203) +#define WID_VIEW_SORT_FLDWIN_DETAILS (WID_CHAOS_START + 204) +#define WID_VIEW_SORT_FLDWIN_ICON (WID_CHAOS_START + 205) +#define WID_VIEW_WINDOW_POS_FLDWIN (WID_CHAOS_START + 206) +#define WID_VIEW_END (WID_CHAOS_START + 206) + +// PROP ALL +#define WID_IS_INVALID (WID_CHAOS_START + 207) + +// PROP Channel +#define WID_VIEW_TIPHELP (WID_CHAOS_START + 208) +#define WID_PUBLISHER_SCHEDULE (WID_CHAOS_START + 209) +#define WID_GETMODE (WID_CHAOS_START + 210) +#define WID_READ_OFFLINE (WID_CHAOS_START + 211) + +// PROP ALL +#define WID_ALL_START2 (WID_CHAOS_START + 212) +#define WID_REAL_NAME (WID_CHAOS_START + 212) +#define WID_FLAG_UPDATE_ON_OPEN (WID_CHAOS_START + 213) +#define WID_ACTION_LIST (WID_CHAOS_START + 214) +#define WID_EDIT_STRING (WID_CHAOS_START + 215) +#define WID_SET_AS_DEFAULT (WID_CHAOS_START + 216) +#define WID_ALL_END2 (WID_CHAOS_START + 216) + +// PROP FOLDER (VIEW) +#define WID_VIEW2_START (WID_CHAOS_START + 217) +#define WID_VIEW2_FLD_PIC (WID_CHAOS_START + 217) +#define WID_FLAG_EXPANDED (WID_CHAOS_START + 218) +#define WID_CHILD_DEFAULTS (WID_CHAOS_START + 219) +#define WID_VIEW2_END (WID_CHAOS_START + 219) + +// PROP HTTP +#define WID_HTTP_KEEP_EXPIRED (WID_CHAOS_START + 220) +#define WID_HTTP_VERIFY_MODE (WID_CHAOS_START + 221) +#define WID_HTTP_NOCACHE_LIST (WID_CHAOS_START + 222) +#define WID_HTTP_REFERER (WID_CHAOS_START + 223) + +// PROP FSYS +#define WID_FSYS_START (WID_CHAOS_START + 224) +#define WID_FSYS_VALUE_FOLDER (WID_CHAOS_START + 224) +#define WID_FSYS_SHOW_EXTENSION (WID_CHAOS_START + 225) +#define WID_VALUE_ADDED_MODE (WID_CHAOS_START + 226) +#define WID_FSYS_DUMMY3 (WID_CHAOS_START + 227) +#define WID_FSYS_DUMMY4 (WID_CHAOS_START + 228) +#define WID_FSYS_END (WID_CHAOS_START + 228) + +// FUNC HTTP +#define WID_HTTP_GET_COOKIE (WID_CHAOS_START + 229) +#define WID_HTTP_SET_COOKIE (WID_CHAOS_START + 230) + +// PROP HTTP +#define WID_HTTP_COOKIE (WID_CHAOS_START + 231) +#define WID_HTTP_DUMMY_1 (WID_CHAOS_START + 232) + +////////////////////////////////////////////////////////////////////////// +// WID's added after SO 5.0 release ( SUPD > 505 ) +////////////////////////////////////////////////////////////////////////// + +// PROP FOLDER +#define WID_FOLDER_START2 (WID_CHAOS_START + 233) +#define WID_USER_SORT_CRITERIUM (WID_CHAOS_START + 233) +#define WID_HEADER_CONFIG (WID_CHAOS_START + 234) +#define WID_GROUPVIEW_CONFIG (WID_CHAOS_START + 235) +#define WID_FLD_WEBVIEW_TEMPLATE (WID_CHAOS_START + 236) +// eigene Iconpositionen fuer den Explorer, da er noch +// keinen eigenen View-Storage hat +#define WID_VIEW_ICON_POS_GRPWIN (WID_CHAOS_START + 237) +#define WID_FOLDER_END2 (WID_CHAOS_START + 237) + +// PROP ALL +#define WID_SHOW_IN_EXPLORER (WID_CHAOS_START + 238) + +// PROP FOLDER (VIEW) +#define WID_VIEW3_START (WID_CHAOS_START + 239) +#define WID_FLD_FONT (WID_CHAOS_START + 239) +#define WID_FLD_WEBVIEW_USE_GLOBAL (WID_CHAOS_START + 240) +#define WID_VIEW3_DUMMY2 (WID_CHAOS_START + 241) +#define WID_VIEW3_DUMMY3 (WID_CHAOS_START + 242) +#define WID_VIEW3_END (WID_CHAOS_START + 242) + +// PROP FTP +#define WID_FTP_ACCOUNT (WID_CHAOS_START + 243) + +// PROP FOLDER +#define WID_STORE_MARKED (WID_CHAOS_START + 244) + +// REPLICATION ( Currently only here to have file compatibility between +// SO51 Client and SO51 Server, for which the functionality +// first shall be implemented ). +#define WID_REPLICATION_1 (WID_CHAOS_START + 245) +#define WID_REPLICATION_2 (WID_CHAOS_START + 246) +#define WID_REPLICATION_3 (WID_CHAOS_START + 247) +#define WID_REPLICATION_4 (WID_CHAOS_START + 248) +#define WID_REPLICATION_5 (WID_CHAOS_START + 249) + +// PROP SEARCH +#define WID_SEARCH_INDIRECTIONS (WID_CHAOS_START + 250) + +// PROP ALL +#define WID_SEND_FORMATS (WID_CHAOS_START + 251) +#define WID_SEND_COPY_TARGET (WID_CHAOS_START + 252) + +// FUNC ALL +#define WID_TRANSFER_RESULT (WID_CHAOS_START + 253) + +// END +#define WID_CHAOS_END (WID_CHAOS_START + 253) + +#endif /* OLD_CHAOS */ + +#endif /* !_CNTWIDS_HRC */ diff --git a/svl/inc/svl/converter.hxx b/svl/inc/svl/converter.hxx new file mode 100644 index 000000000000..d012a56e7416 --- /dev/null +++ b/svl/inc/svl/converter.hxx @@ -0,0 +1,46 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: converter.hxx,v $ + * $Revision: 1.4 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _SV_CONVERTER_HXX_ +#define _SV_CONVERTER_HXX_ + +#include "svl/svldllapi.h" +#include + +class SvDbaseConverter +{ +public: + SVL_DLLPUBLIC static INT32 ConvertPrecisionToDbase(INT32 _nLen, INT32 _nScale); + SVL_DLLPUBLIC static INT32 ConvertPrecisionToOdbc(INT32 _nLen, INT32 _nScale); +}; + +#endif //_CONVERTER_HXX_ + + + diff --git a/svl/inc/svl/filenotation.hxx b/svl/inc/svl/filenotation.hxx new file mode 100644 index 000000000000..c74c6c39c803 --- /dev/null +++ b/svl/inc/svl/filenotation.hxx @@ -0,0 +1,74 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: filenotation.hxx,v $ + * $Revision: 1.5 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef SVTOOLS_FILENOTATION_HXX +#define SVTOOLS_FILENOTATION_HXX + +#include "svl/svldllapi.h" +#include + +//......................................................................... +namespace svt +{ +//......................................................................... + + //===================================================================== + //= OFileNotation + //===================================================================== + class SVL_DLLPUBLIC OFileNotation + { + protected: + ::rtl::OUString m_sSystem; + ::rtl::OUString m_sFileURL; + + public: + enum NOTATION + { + N_SYSTEM, + N_URL + }; + + OFileNotation( const ::rtl::OUString& _rUrlOrPath ); + OFileNotation( const ::rtl::OUString& _rUrlOrPath, NOTATION _eInputNotation ); + + ::rtl::OUString get(NOTATION _eOutputNotation); + + private: + SVL_DLLPRIVATE void construct( const ::rtl::OUString& _rUrlOrPath ); + SVL_DLLPRIVATE bool implInitWithSystemNotation( const ::rtl::OUString& _rSystemPath ); + SVL_DLLPRIVATE bool implInitWithURLNotation( const ::rtl::OUString& _rURL ); + }; + +//......................................................................... +} // namespace svt +//......................................................................... + +#endif // SVTOOLS_FILENOTATION_HXX + diff --git a/svl/inc/svl/folderrestriction.hxx b/svl/inc/svl/folderrestriction.hxx new file mode 100644 index 000000000000..82fb4e1efef5 --- /dev/null +++ b/svl/inc/svl/folderrestriction.hxx @@ -0,0 +1,59 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: folderrestriction.hxx,v $ + * $Revision: 1.5 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef SVTOOLS_FOLDER_RESTRICTION_HXX +#define SVTOOLS_FOLDER_RESTRICTION_HXX + +#include "svl/svldllapi.h" +#include + +#ifndef INCLUDED_VECTOR +#include +#define INCLUDED_VECTOR +#endif + +//........................................................................ +namespace svt +{ +//........................................................................ + + /** retrieves a list of folders which's access is not restricted. + +

Note that this is not meant as security feature, but only as + method to restrict some UI presentation, such as browsing + in the file open dialog.

+ */ + SVL_DLLPUBLIC void getUnrestrictedFolders( ::std::vector< String >& _rFolders ); + +//........................................................................ +} // namespace svt +//........................................................................ + +#endif // SVTOOLS_FOLDER_RESTRICTION_HXX diff --git a/svl/inc/svl/fstathelper.hxx b/svl/inc/svl/fstathelper.hxx new file mode 100644 index 000000000000..1e613782b4e6 --- /dev/null +++ b/svl/inc/svl/fstathelper.hxx @@ -0,0 +1,68 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: fstathelper.hxx,v $ + * $Revision: 1.6 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _SVTOOLS_FSTATHELPER_HXX +#define _SVTOOLS_FSTATHELPER_HXX + +#include "svl/svldllapi.h" +#include + +class UniString; +class Date; +class Time; + +namespace FStatHelper { + +/** Return the modified time and date stamp for this URL. + + @param URL the asking URL + + @param pDate if unequal 0, the function set the date stamp + + @param pTime if unequal 0, the function set the time stamp + + @return it was be able to get the date/time stamp +*/ +SVL_DLLPUBLIC sal_Bool GetModifiedDateTimeOfFile( const UniString& rURL, + Date* pDate, Time* pTime ); + +/** Return if under the URL a document exist. This is only a wrapper for the + UCB.IsContent. +*/ +SVL_DLLPUBLIC sal_Bool IsDocument( const UniString& rURL ); + +/** Return if under the URL a folder exist. This is only a wrapper for the + UCB.isFolder. +*/ +SVL_DLLPUBLIC sal_Bool IsFolder( const UniString& rURL ); + +} + +#endif diff --git a/svl/inc/svl/inetdef.hxx b/svl/inc/svl/inetdef.hxx new file mode 100644 index 000000000000..6ea380529147 --- /dev/null +++ b/svl/inc/svl/inetdef.hxx @@ -0,0 +1,32 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: inetdef.hxx,v $ + * $Revision: 1.3 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#include + diff --git a/svl/inc/svl/inetmsg.hxx b/svl/inc/svl/inetmsg.hxx new file mode 100644 index 000000000000..f011102a79e2 --- /dev/null +++ b/svl/inc/svl/inetmsg.hxx @@ -0,0 +1,32 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: inetmsg.hxx,v $ + * $Revision: 1.3 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#include + diff --git a/svl/inc/svl/inetstrm.hxx b/svl/inc/svl/inetstrm.hxx new file mode 100644 index 000000000000..46e15d5e4cf4 --- /dev/null +++ b/svl/inc/svl/inetstrm.hxx @@ -0,0 +1,32 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: inetstrm.hxx,v $ + * $Revision: 1.3 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#include + diff --git a/svl/inc/svl/instrm.hxx b/svl/inc/svl/instrm.hxx new file mode 100644 index 000000000000..add43d4cc380 --- /dev/null +++ b/svl/inc/svl/instrm.hxx @@ -0,0 +1,83 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: instrm.hxx,v $ + * $Revision: 1.4 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef SVTOOLS_INSTRM_HXX +#define SVTOOLS_INSTRM_HXX + +#include "svl/svldllapi.h" +#include +#include + +namespace com { namespace sun { namespace star { namespace io { + class XInputStream; + class XSeekable; +} } } } + +class SvDataPipe_Impl; + +//============================================================================ +class SVL_DLLPUBLIC SvInputStream: public SvStream +{ + com::sun::star::uno::Reference< com::sun::star::io::XInputStream > + m_xStream; + com::sun::star::uno::Reference< com::sun::star::io::XSeekable > + m_xSeekable; + SvDataPipe_Impl * m_pPipe; + ULONG m_nSeekedFrom; + + SVL_DLLPRIVATE bool open(); + + SVL_DLLPRIVATE virtual ULONG GetData(void * pData, ULONG nSize); + + SVL_DLLPRIVATE virtual ULONG PutData(void const *, ULONG); + + SVL_DLLPRIVATE virtual ULONG SeekPos(ULONG nPos); + + SVL_DLLPRIVATE virtual void FlushData(); + + SVL_DLLPRIVATE virtual void SetSize(ULONG); + +public: + SvInputStream( + com::sun::star::uno::Reference< com::sun::star::io::XInputStream > + const & + rTheStream); + + virtual ~SvInputStream(); + + virtual USHORT IsA() const; + + virtual void AddMark(ULONG nPos); + + virtual void RemoveMark(ULONG nPos); +}; + +#endif // SVTOOLS_INSTRM_HXX + diff --git a/svl/inc/svl/listener.hxx b/svl/inc/svl/listener.hxx new file mode 100644 index 000000000000..a121197b1dd0 --- /dev/null +++ b/svl/inc/svl/listener.hxx @@ -0,0 +1,68 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: listener.hxx,v $ + * $Revision: 1.4 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _SVT_LISTENER_HXX +#define _SVT_LISTENER_HXX + +#include "svl/svldllapi.h" +#include + +class SvtBroadcaster; +class SfxHint; +class SvtListenerBase; + +//------------------------------------------------------------------------- + +class SVL_DLLPUBLIC SvtListener +{ + friend class SvtListenerBase; + SvtListenerBase *pBrdCastLst; + + const SvtListener& operator=(const SvtListener &); // n.i., ist verboten + +public: + TYPEINFO(); + + SvtListener(); + SvtListener( const SvtListener &rCopy ); + virtual ~SvtListener(); + + BOOL StartListening( SvtBroadcaster& rBroadcaster ); + BOOL EndListening( SvtBroadcaster& rBroadcaster ); + void EndListeningAll(); + BOOL IsListening( SvtBroadcaster& rBroadcaster ) const; + + BOOL HasBroadcaster() const { return 0 != pBrdCastLst; } + + virtual void Notify( SvtBroadcaster& rBC, const SfxHint& rHint ); +}; + + +#endif + diff --git a/svl/inc/svl/listeneriter.hxx b/svl/inc/svl/listeneriter.hxx new file mode 100644 index 000000000000..a2ac5693f741 --- /dev/null +++ b/svl/inc/svl/listeneriter.hxx @@ -0,0 +1,82 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: listeneriter.hxx,v $ + * $Revision: 1.4 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _SVT_LISTENERITER_HXX +#define _SVT_LISTENERITER_HXX + +#include "svl/svldllapi.h" +#include + +class SvtListener; +class SvtListenerBase; +class SvtBroadcaster; + +//------------------------------------------------------------------------- + +class SVL_DLLPUBLIC SvtListenerIter +{ + friend class SvtListenerBase; + + SvtBroadcaster& rRoot; + SvtListenerBase *pAkt, *pDelNext; + + // for the update of all iterator's, if a listener is added or removed + // at the same time. + static SvtListenerIter *pListenerIters; + SvtListenerIter *pNxtIter; + TypeId aSrchId; // fuer First/Next - suche diesen Type + + SVL_DLLPRIVATE static void RemoveListener( SvtListenerBase& rDel, + SvtListenerBase* pNext ); + +public: + SvtListenerIter( SvtBroadcaster& ); + ~SvtListenerIter(); + + const SvtBroadcaster& GetBroadcaster() const { return rRoot; } + SvtBroadcaster& GetBroadcaster() { return rRoot; } + + SvtListener* GoNext(); // to the next + SvtListener* GoPrev(); // to the previous + + SvtListener* GoStart(); // to the start of the list + SvtListener* GoEnd(); // to the end of the list + + SvtListener* GoRoot(); // to the root + SvtListener* GetCurr() const; // returns the current + + int IsChanged() const { return pDelNext != pAkt; } + + SvtListener* First( TypeId nType ); + SvtListener* Next(); +}; + + +#endif + diff --git a/svl/inc/svl/lngmisc.hxx b/svl/inc/svl/lngmisc.hxx new file mode 100644 index 000000000000..55322246f773 --- /dev/null +++ b/svl/inc/svl/lngmisc.hxx @@ -0,0 +1,76 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: lngmisc.hxx,v $ + * $Revision: 1.6 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _SVTOOLS_LNGMISC_HXX_ +#define _SVTOOLS_LNGMISC_HXX_ + +#include "svl/svldllapi.h" +#include +#include +#include + +/////////////////////////////////////////////////////////////////////////// + +#define SVT_SOFT_HYPHEN ((sal_Unicode) 0x00AD) +#define SVT_HARD_HYPHEN ((sal_Unicode) 0x2011) + +// the non-breaking space +#define SVT_HARD_SPACE ((sal_Unicode) 0x00A0) + +namespace linguistic +{ + +inline BOOL IsHyphen( sal_Unicode cChar ) +{ + return cChar == SVT_SOFT_HYPHEN || cChar == SVT_HARD_HYPHEN; +} + + +inline BOOL IsControlChar( sal_Unicode cChar ) +{ + return cChar < (sal_Unicode) ' '; +} + + +inline BOOL HasHyphens( const rtl::OUString &rTxt ) +{ + return rTxt.indexOf( SVT_SOFT_HYPHEN ) != -1 || + rTxt.indexOf( SVT_HARD_HYPHEN ) != -1; +} + +SVL_DLLPUBLIC INT32 GetNumControlChars( const rtl::OUString &rTxt ); +SVL_DLLPUBLIC BOOL RemoveHyphens( rtl::OUString &rTxt ); +SVL_DLLPUBLIC BOOL RemoveControlChars( rtl::OUString &rTxt ); + +SVL_DLLPUBLIC BOOL ReplaceControlChars( rtl::OUString &rTxt, sal_Char aRplcChar = ' ' ); + +} // namespace linguistic + +#endif diff --git a/svl/inc/svl/memberid.hrc b/svl/inc/svl/memberid.hrc new file mode 100644 index 000000000000..c917bd993e97 --- /dev/null +++ b/svl/inc/svl/memberid.hrc @@ -0,0 +1,47 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: memberid.hrc,v $ + * $Revision: 1.5 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _MEMBERID_HRC +#define _MEMBERID_HRC + +#define SFX_MEMBERID(nUserData) ( ( (nUserData) >> 20 ) & 0xFF ) +#define SFX_SLOTID(nUserData) ( (nUserData) & 0xFFFF ) + +#define MID_X 1 +#define MID_Y 2 +#define MID_RECT_LEFT 3 +#define MID_RECT_TOP 4 +#define MID_WIDTH 5 +#define MID_HEIGHT 6 +#define MID_RECT_RIGHT 7 + + +#endif + diff --git a/svl/inc/svl/nfsymbol.hxx b/svl/inc/svl/nfsymbol.hxx new file mode 100644 index 000000000000..46fe47599359 --- /dev/null +++ b/svl/inc/svl/nfsymbol.hxx @@ -0,0 +1,72 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: nfsymbol.hxx,v $ + * $Revision: 1.4 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef INCLUDED_SVTOOLS_NFSYMBOL_HXX +#define INCLUDED_SVTOOLS_NFSYMBOL_HXX + +/* ATTENTION! If new types arrive that had its content previously handled as + * SYMBOLTYPE_STRING, they have to be added at several places in zforscan.cxx + * and/or zformat.cxx, and in xmloff/source/style/xmlnumfe.cxx. Mostly these + * are places where already NF_SYMBOLTYPE_STRING together with + * NF_SYMBOLTYPE_CURRENCY or NF_SYMBOLTYPE_DATESEP are used in the same case of + * a switch respectively an if-condition. + */ + +namespace svt { + +/// Number formatter's symbol types of a token, if not key words, which are >0 +enum NfSymbolType +{ + NF_SYMBOLTYPE_STRING = -1, // literal string in output + NF_SYMBOLTYPE_DEL = -2, // special character + NF_SYMBOLTYPE_BLANK = -3, // blank for '_' + NF_SYMBOLTYPE_STAR = -4, // *-character + NF_SYMBOLTYPE_DIGIT = -5, // digit place holder + NF_SYMBOLTYPE_DECSEP = -6, // decimal separator + NF_SYMBOLTYPE_THSEP = -7, // group AKA thousand separator + NF_SYMBOLTYPE_EXP = -8, // exponent E + NF_SYMBOLTYPE_FRAC = -9, // fraction / + NF_SYMBOLTYPE_EMPTY = -10, // deleted symbols + NF_SYMBOLTYPE_FRACBLANK = -11, // delimiter between integer and fraction + NF_SYMBOLTYPE_COMMENT = -12, // comment is following + NF_SYMBOLTYPE_CURRENCY = -13, // currency symbol + NF_SYMBOLTYPE_CURRDEL = -14, // currency symbol delimiter [$] + NF_SYMBOLTYPE_CURREXT = -15, // currency symbol extension -xxx + NF_SYMBOLTYPE_CALENDAR = -16, // calendar ID + NF_SYMBOLTYPE_CALDEL = -17, // calendar delimiter [~] + NF_SYMBOLTYPE_DATESEP = -18, // date separator + NF_SYMBOLTYPE_TIMESEP = -19, // time separator + NF_SYMBOLTYPE_TIME100SECSEP = -20, // time 100th seconds separator + NF_SYMBOLTYPE_PERCENT = -21 // percent % +}; + +} // namespace svt + +#endif // INCLUDED_SVTOOLS_NFSYMBOL_HXX diff --git a/svl/inc/svl/numuno.hxx b/svl/inc/svl/numuno.hxx new file mode 100644 index 000000000000..d243c49a3113 --- /dev/null +++ b/svl/inc/svl/numuno.hxx @@ -0,0 +1,102 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: numuno.hxx,v $ + * $Revision: 1.4 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _NUMUNO_HXX +#define _NUMUNO_HXX + +#include "svl/svldllapi.h" +#include +#include +#include + +class SvNumberFormatter; +class SvNumFmtSuppl_Impl; + +namespace comphelper +{ + class SharedMutex; +} + +//------------------------------------------------------------------ + +// SvNumberFormatterServiceObj must be registered as service somewhere + +com::sun::star::uno::Reference SAL_CALL + SvNumberFormatterServiceObj_NewInstance( + const com::sun::star::uno::Reference< + com::sun::star::lang::XMultiServiceFactory>& rSMgr ); + +//------------------------------------------------------------------ + +// SvNumberFormatsSupplierObj: aggregate to document, +// construct with SvNumberFormatter + +class SVL_DLLPUBLIC SvNumberFormatsSupplierObj : public cppu::WeakAggImplHelper2< + com::sun::star::util::XNumberFormatsSupplier, + com::sun::star::lang::XUnoTunnel> +{ +private: + SvNumFmtSuppl_Impl* pImpl; + +public: + SvNumberFormatsSupplierObj(); + SvNumberFormatsSupplierObj(SvNumberFormatter* pForm); + virtual ~SvNumberFormatsSupplierObj(); + + void SetNumberFormatter(SvNumberFormatter* pNew); + SvNumberFormatter* GetNumberFormatter() const; + + // ueberladen, um Attribute im Dokument anzupassen + virtual void NumberFormatDeleted(sal_uInt32 nKey); + // ueberladen, um evtl. neu zu formatieren + virtual void SettingsChanged(); + + // XNumberFormatsSupplier + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL + getNumberFormatSettings() + throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats > SAL_CALL + getNumberFormats() + throw(::com::sun::star::uno::RuntimeException); + + // XUnoTunnel + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< + sal_Int8 >& aIdentifier ) + throw(::com::sun::star::uno::RuntimeException); + + static const com::sun::star::uno::Sequence& getUnoTunnelId(); + static SvNumberFormatsSupplierObj* getImplementation( const com::sun::star::uno::Reference< + com::sun::star::util::XNumberFormatsSupplier> xObj ); + + ::comphelper::SharedMutex& getSharedMutex() const; +}; + +#endif // #ifndef _NUMUNO_HXX + + diff --git a/svl/inc/svl/outstrm.hxx b/svl/inc/svl/outstrm.hxx new file mode 100644 index 000000000000..c01d8f460c58 --- /dev/null +++ b/svl/inc/svl/outstrm.hxx @@ -0,0 +1,69 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: outstrm.hxx,v $ + * $Revision: 1.4 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef SVTOOLS_OUTSTRM_HXX +#define SVTOOLS_OUTSTRM_HXX + +#include "svl/svldllapi.h" +#include +#include + +namespace com { namespace sun { namespace star { namespace io { + class XOutputStream; +} } } } + +//============================================================================ +class SVL_DLLPUBLIC SvOutputStream: public SvStream +{ + com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > + m_xStream; + + SVL_DLLPRIVATE virtual ULONG GetData(void *, ULONG); + + SVL_DLLPRIVATE virtual ULONG PutData(void const * pData, ULONG nSize); + + SVL_DLLPRIVATE virtual ULONG SeekPos(ULONG); + + SVL_DLLPRIVATE virtual void FlushData(); + + SVL_DLLPRIVATE virtual void SetSize(ULONG); + +public: + SvOutputStream(com::sun::star::uno::Reference< + com::sun::star::io::XOutputStream > const & + rTheStream); + + virtual ~SvOutputStream(); + + virtual USHORT IsA() const; +}; + +#endif // SVTOOLS_OUTSTRM_HXX + diff --git a/svl/inc/svl/pickerhelper.hxx b/svl/inc/svl/pickerhelper.hxx new file mode 100644 index 000000000000..e8ef23e145d4 --- /dev/null +++ b/svl/inc/svl/pickerhelper.hxx @@ -0,0 +1,72 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: pickerhelper.hxx,v $ + * $Revision: 1.4 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _PICKERHELPER_HXX +#define _PICKERHELPER_HXX + +#include "svl/svldllapi.h" +#include "sal/types.h" +#include "com/sun/star/uno/Reference.hxx" + +namespace com +{ + namespace sun + { + namespace star + { + namespace ui + { + namespace dialogs + { + class XFilePicker; + class XFolderPicker; + } + } + } + } +} + + +namespace svt +{ + + SVL_DLLPUBLIC void SetDialogHelpId( + ::com::sun::star::uno::Reference < ::com::sun::star::ui::dialogs::XFilePicker > _mxFileDlg, + sal_Int32 _nHelpId ); + + SVL_DLLPUBLIC void SetDialogHelpId( + ::com::sun::star::uno::Reference < ::com::sun::star::ui::dialogs::XFolderPicker > _mxFileDlg, + sal_Int32 _nHelpId ); + +} + +//----------------------------------------------------------------------------- + +#endif diff --git a/svl/inc/svl/pickerhistory.hxx b/svl/inc/svl/pickerhistory.hxx new file mode 100644 index 000000000000..e67729a1bbd8 --- /dev/null +++ b/svl/inc/svl/pickerhistory.hxx @@ -0,0 +1,54 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: pickerhistory.hxx,v $ + * $Revision: 1.5 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef SVTOOLS_PICKERHISTORY_HXX +#define SVTOOLS_PICKERHISTORY_HXX + +#include "svl/svldllapi.h" +#include + +//......................................................................... +namespace svt +{ +//......................................................................... + + // -------------------------------------------------------------------- + SVL_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > + GetTopMostFolderPicker( ); + + SVL_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > + GetTopMostFilePicker( ); + +//......................................................................... +} // namespace svt +//......................................................................... + +#endif // SVTOOLS_PICKERHISTORY_HXX + diff --git a/svl/inc/svl/pickerhistoryaccess.hxx b/svl/inc/svl/pickerhistoryaccess.hxx new file mode 100644 index 000000000000..210fd9b92139 --- /dev/null +++ b/svl/inc/svl/pickerhistoryaccess.hxx @@ -0,0 +1,57 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: pickerhistoryaccess.hxx,v $ + * $Revision: 1.5 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef SVTOOLS_PICKERHISTORYACCESS_HXX +#define SVTOOLS_PICKERHISTORYACCESS_HXX + +#include "svl/svldllapi.h" + +#ifndef _COM_SUN_STAR_UNO_REFERENX_HXX_ +#include +#endif + +//......................................................................... +namespace svt +{ +//......................................................................... + + // -------------------------------------------------------------------- + SVL_DLLPUBLIC void addFolderPicker( + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxPicker ); + + SVL_DLLPUBLIC void addFilePicker( + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxPicker ); + +//......................................................................... +} // namespace svt +//......................................................................... + +#endif // SVTOOLS_PICKERHISTORYACCESS_HXX + diff --git a/svl/inc/svl/poolcach.hxx b/svl/inc/svl/poolcach.hxx new file mode 100644 index 000000000000..21cfec4662a0 --- /dev/null +++ b/svl/inc/svl/poolcach.hxx @@ -0,0 +1,61 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: poolcach.hxx,v $ + * $Revision: 1.4 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _SFXPOOLCACH_HXX +#define _SFXPOOLCACH_HXX + +#include "svl/svldllapi.h" +#include + +class SfxItemModifyArr_Impl; +class SfxItemPool; +class SfxItemSet; +class SfxPoolItem; +class SfxSetItem; + +class SVL_DLLPUBLIC SfxItemPoolCache +{ + SfxItemPool *pPool; + SfxItemModifyArr_Impl *pCache; + const SfxItemSet *pSetToPut; + const SfxPoolItem *pItemToPut; + +public: + SfxItemPoolCache( SfxItemPool *pPool, + const SfxPoolItem *pPutItem ); + SfxItemPoolCache( SfxItemPool *pPool, + const SfxItemSet *pPutSet ); + ~SfxItemPoolCache(); + + const SfxSetItem& ApplyTo( const SfxSetItem& rSetItem, BOOL bNew = FALSE ); +}; + + +#endif + diff --git a/svl/inc/svl/strmadpt.hxx b/svl/inc/svl/strmadpt.hxx new file mode 100644 index 000000000000..2fd190f9adef --- /dev/null +++ b/svl/inc/svl/strmadpt.hxx @@ -0,0 +1,138 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: strmadpt.hxx,v $ + * $Revision: 1.5 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef SVTOOLS_STRMADPT_HXX +#define SVTOOLS_STRMADPT_HXX + +#include "svl/svldllapi.h" +#include +#include +#include +#include +#include + +//============================================================================ +class SVL_DLLPUBLIC SvOutputStreamOpenLockBytes: public SvOpenLockBytes +{ + com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > + m_xOutputStream; + sal_uInt32 m_nPosition; + +public: + TYPEINFO(); + + SvOutputStreamOpenLockBytes( + const com::sun::star::uno::Reference< + com::sun::star::io::XOutputStream > & + rTheOutputStream): + m_xOutputStream(rTheOutputStream), m_nPosition(0) {} + + virtual ErrCode ReadAt(ULONG, void *, ULONG, ULONG *) const; + + virtual ErrCode WriteAt(ULONG nPos, const void * pBuffer, ULONG nCount, + ULONG * pWritten); + + virtual ErrCode Flush() const; + + virtual ErrCode SetSize(ULONG); + + virtual ErrCode Stat(SvLockBytesStat * pStat, SvLockBytesStatFlag) const; + + virtual ErrCode FillAppend(const void * pBuffer, ULONG nCount, + ULONG * pWritten); + + virtual ULONG Tell() const; + + virtual ULONG Seek(ULONG); + + virtual void Terminate(); +}; + +//============================================================================ +class SVL_DLLPUBLIC SvLockBytesInputStream: public cppu::OWeakObject, + public com::sun::star::io::XInputStream, + public com::sun::star::io::XSeekable +{ + SvLockBytesRef m_xLockBytes; + sal_Int64 m_nPosition; + bool m_bDone; + +public: + SvLockBytesInputStream(SvLockBytes * pTheLockBytes): + m_xLockBytes(pTheLockBytes), m_nPosition(0), m_bDone(false) {} + + 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(); + + virtual sal_Int32 SAL_CALL + readBytes(com::sun::star::uno::Sequence< sal_Int8 > & rData, + sal_Int32 nBytesToRead) + throw (com::sun::star::io::IOException, + com::sun::star::uno::RuntimeException); + + virtual sal_Int32 SAL_CALL + readSomeBytes(com::sun::star::uno::Sequence< sal_Int8 > & rData, + sal_Int32 nMaxBytesToRead) + throw (com::sun::star::io::IOException, + com::sun::star::uno::RuntimeException); + + virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip) + throw (com::sun::star::io::IOException, + com::sun::star::uno::RuntimeException); + + virtual sal_Int32 SAL_CALL available() + throw (com::sun::star::io::IOException, + com::sun::star::uno::RuntimeException); + + virtual void SAL_CALL closeInput() + throw (com::sun::star::io::IOException, + com::sun::star::uno::RuntimeException); + + virtual void SAL_CALL seek(sal_Int64 nLocation) + throw (com::sun::star::lang::IllegalArgumentException, + com::sun::star::io::IOException, + com::sun::star::uno::RuntimeException); + + virtual sal_Int64 SAL_CALL getPosition() + throw (com::sun::star::io::IOException, + com::sun::star::uno::RuntimeException); + + virtual sal_Int64 SAL_CALL getLength() + throw (com::sun::star::io::IOException, + com::sun::star::uno::RuntimeException); +}; + +#endif // SVTOOLS_STRMADPT_HXX + diff --git a/svl/inc/svl/stylepool.hxx b/svl/inc/svl/stylepool.hxx new file mode 100644 index 000000000000..d69bb928e432 --- /dev/null +++ b/svl/inc/svl/stylepool.hxx @@ -0,0 +1,103 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: stylepool.hxx,v $ + * $Revision: 1.5 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef INCLUDED_SVTOOLS_STYLEPOOL_HXX +#define INCLUDED_SVTOOLS_STYLEPOOL_HXX + +#include +#include +#include + +class StylePoolImpl; +class StylePoolIterImpl; +class IStylePoolIteratorAccess; + +class SVL_DLLPUBLIC StylePool +{ +private: + StylePoolImpl *pImpl; +public: + typedef boost::shared_ptr SfxItemSet_Pointer_t; + + // --> OD 2008-03-07 #i86923# + explicit StylePool( SfxItemSet* pIgnorableItems = 0 ); + // <-- + + /** Insert a SfxItemSet into the style pool. + + The pool makes a copy of the provided SfxItemSet. + + @param SfxItemSet + the SfxItemSet to insert + + @return a shared pointer to the SfxItemSet + */ + virtual SfxItemSet_Pointer_t insertItemSet( const SfxItemSet& rSet ); + + /** Create an iterator + + The iterator walks through the StylePool + OD 2008-03-07 #i86923# + introduce optional parameter to control, if unused SfxItemsSet are skipped or not + introduce optional parameter to control, if ignorable items are skipped or not + + @attention every change, e.g. destruction, of the StylePool could cause undefined effects. + + @param bSkipUnusedItemSets + input parameter - boolean, indicating if unused SfxItemSets are skipped or not + + @param bSkipIgnorableItems + input parameter - boolean, indicating if ignorable items are skipped or not + + @postcond the iterator "points before the first" SfxItemSet of the pool. + The first StylePoolIterator::getNext() call will deliver the first SfxItemSet. + */ + virtual IStylePoolIteratorAccess* createIterator( const bool bSkipUnusedItemSets = false, + const bool bSkipIgnorableItems = false ); + + /** Returns the number of styles + */ + virtual sal_Int32 getCount() const; + + virtual ~StylePool(); + + static ::rtl::OUString nameOf( SfxItemSet_Pointer_t pSet ); +}; + +class SVL_DLLPUBLIC IStylePoolIteratorAccess +{ +public: + /** Delivers a shared pointer to the next SfxItemSet of the pool + If there is no more SfxItemSet, the delivered share_pointer is empty. + */ + virtual StylePool::SfxItemSet_Pointer_t getNext() = 0; + virtual ::rtl::OUString getName() = 0; + virtual ~IStylePoolIteratorAccess() {}; +}; +#endif diff --git a/svl/inc/svl/urihelper.hxx b/svl/inc/svl/urihelper.hxx new file mode 100644 index 000000000000..8be500e438ce --- /dev/null +++ b/svl/inc/svl/urihelper.hxx @@ -0,0 +1,238 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: urihelper.hxx,v $ + * $Revision: 1.7 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef SVTOOLS_URIHELPER_HXX +#define SVTOOLS_URIHELPER_HXX + +#include "svl/svldllapi.h" +#include "com/sun/star/uno/Reference.hxx" +#include +#include +#include +#include +#include + +namespace com { namespace sun { namespace star { + namespace uno { class XComponentContext; } + namespace uri { class XUriReference; } +} } } +namespace rtl { class OUString; } +class ByteString; +class CharClass; +class UniString; + +//============================================================================ +namespace URIHelper { + +/** + @ATT + Calling this function with defaulted arguments rMaybeFileHdl = Link() and + bCheckFileExists = true often leads to results that are not intended: + Whenever the given rTheBaseURIRef is a file URL, the given rTheRelURIRef is + relative, and rTheRelURIRef could also be smart-parsed as a non-file URL + (e.g., the relative URL "foo/bar" can be smart-parsed as "http://foo/bar"), + then SmartRel2Abs called with rMaybeFileHdl = Link() and bCheckFileExists = + true returns the non-file URL interpretation. To avoid this, either pass + some non-null rMaybeFileHdl if you want to check generated file URLs for + existence (see URIHelper::GetMaybeFileHdl), or use bCheckFileExists = false + if you want to generate file URLs without checking for their existence. +*/ +SVL_DLLPUBLIC UniString +SmartRel2Abs(INetURLObject const & rTheBaseURIRef, + ByteString const & rTheRelURIRef, + Link const & rMaybeFileHdl = Link(), + bool bCheckFileExists = true, + bool bIgnoreFragment = false, + INetURLObject::EncodeMechanism eEncodeMechanism + = INetURLObject::WAS_ENCODED, + INetURLObject::DecodeMechanism eDecodeMechanism + = INetURLObject::DECODE_TO_IURI, + rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8, + bool bRelativeNonURIs = false, + INetURLObject::FSysStyle eStyle = INetURLObject::FSYS_DETECT); + +/** + @ATT + Calling this function with defaulted arguments rMaybeFileHdl = Link() and + bCheckFileExists = true often leads to results that are not intended: + Whenever the given rTheBaseURIRef is a file URL, the given rTheRelURIRef is + relative, and rTheRelURIRef could also be smart-parsed as a non-file URL + (e.g., the relative URL "foo/bar" can be smart-parsed as "http://foo/bar"), + then SmartRel2Abs called with rMaybeFileHdl = Link() and bCheckFileExists = + true returns the non-file URL interpretation. To avoid this, either pass + some non-null rMaybeFileHdl if you want to check generated file URLs for + existence (see URIHelper::GetMaybeFileHdl), or use bCheckFileExists = false + if you want to generate file URLs without checking for their existence. +*/ +SVL_DLLPUBLIC UniString +SmartRel2Abs(INetURLObject const & rTheBaseURIRef, + UniString const & rTheRelURIRef, + Link const & rMaybeFileHdl = Link(), + bool bCheckFileExists = true, + bool bIgnoreFragment = false, + INetURLObject::EncodeMechanism eEncodeMechanism + = INetURLObject::WAS_ENCODED, + INetURLObject::DecodeMechanism eDecodeMechanism + = INetURLObject::DECODE_TO_IURI, + rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8, + bool bRelativeNonURIs = false, + INetURLObject::FSysStyle eStyle = INetURLObject::FSYS_DETECT); + +//============================================================================ +SVL_DLLPUBLIC void SetMaybeFileHdl(Link const & rTheMaybeFileHdl); + +//============================================================================ +SVL_DLLPUBLIC Link GetMaybeFileHdl(); + +/** + Converts a URI reference to a relative one, ignoring certain differences (for + example, treating file URLs for case-ignoring file systems + case-insensitively). + + @param context a component context; must not be null + + @param baseUriReference a base URI reference + + @param uriReference a URI reference + + @return a URI reference representing the given uriReference relative to the + given baseUriReference; if the given baseUriReference is not an absolute, + hierarchical URI reference, or the given uriReference is not a valid URI + reference, null is returned + + @exception std::bad_alloc if an out-of-memory condition occurs + + @exception com::sun::star::uno::RuntimeException if any error occurs + */ +SVL_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uri::XUriReference > +normalizedMakeRelative( + com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > + const & context, + rtl::OUString const & baseUriReference, rtl::OUString const & uriReference); + +/** + A variant of normalizedMakeRelative with a simplified interface. + + Internally calls normalizedMakeRelative with the default component context. + + @param baseUriReference a base URI reference, passed to + normalizedMakeRelative + + @param uriReference a URI reference, passed to normalizedMakeRelative + + @return if the XUriReference returnd by normalizedMakeRelative is empty, + uriReference is returned unmodified; otherwise, the result of calling + XUriReference::getUriReference on the XUriReference returnd by + normalizedMakeRelative is returned + + @exception std::bad_alloc if an out-of-memory condition occurs + + @exception com::sun::star::uno::RuntimeException if any error occurs + + @deprecated + No code should rely on the default component context. +*/ +SVL_DLLPUBLIC rtl::OUString simpleNormalizedMakeRelative( + rtl::OUString const & baseUriReference, rtl::OUString const & uriReference); + +//============================================================================ +SVL_DLLPUBLIC UniString +FindFirstURLInText(UniString const & rText, + xub_StrLen & rBegin, + xub_StrLen & rEnd, + CharClass const & rCharClass, + INetURLObject::EncodeMechanism eMechanism + = INetURLObject::WAS_ENCODED, + rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8, + INetURLObject::FSysStyle eStyle + = INetURLObject::FSYS_DETECT); + +//============================================================================ +/** Remove any password component from both absolute and relative URLs. + + @ATT The current implementation will not remove a password from a + relative URL that has an authority component (e.g., the password is not + removed from the relative ftp URL ). But + since our functions to translate between absolute and relative URLs never + produce relative URLs with authority components, this is no real problem. + + @ATT For relative URLs (or anything not recognized as an absolute URI), + the current implementation will return the input unmodified, not applying + any translations implied by the encode/decode parameters. + + @param rURI An absolute or relative URI reference. + + @param eEncodeMechanism See the general discussion for INetURLObject set- + methods. + + @param eDecodeMechanism See the general discussion for INetURLObject get- + methods. + + @param eCharset See the general discussion for INetURLObject get- and + set-methods. + + @return The input URI with any password component removed. + */ +SVL_DLLPUBLIC UniString +removePassword(UniString const & rURI, + INetURLObject::EncodeMechanism eEncodeMechanism + = INetURLObject::WAS_ENCODED, + INetURLObject::DecodeMechanism eDecodeMechanism + = INetURLObject::DECODE_TO_IURI, + rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8); + +//============================================================================ +/** Query the notational conventions used in the file system provided by some + file content provider. + + @param rFileUrl This file URL determines which file content provider is + used to query the desired information. (The UCB's usual mapping from URLs + to content providers is used.) + + @param bAddConvenienceStyles If true, the return value contains not only + the style bit corresponding to the queried content provider's conventions, + but may also contain additional style bits that make using this function + more convenient in certain situations. Currently, the effect is that + FSYS_UNX is extended with FSYS_VOS, and both FSYS_DOS and FSYS_MAC are + extended with FSYS_VOS and FSYS_UNX (i.e., the---unambiguous---detection + of VOS style and Unix style file system paths is always enabled); also, in + case the content provider's conventions cannot be determined, FSYS_DETECT + is returned instead of FSysStyle(0). + + @return The style bit corresponding to the queried content provider's + conventions, or FSysStyle(0) if these cannot be determined. + */ +SVL_DLLPUBLIC INetURLObject::FSysStyle queryFSysStyle(UniString const & rFileUrl, + bool bAddConvenienceStyles = true) + throw (com::sun::star::uno::RuntimeException); + +} + +#endif // SVTOOLS_URIHELPER_HXX diff --git a/svl/inc/svl/urlbmk.hxx b/svl/inc/svl/urlbmk.hxx new file mode 100644 index 000000000000..d3342b398878 --- /dev/null +++ b/svl/inc/svl/urlbmk.hxx @@ -0,0 +1,72 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: urlbmk.hxx,v $ + * $Revision: 1.5 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _URLBMK_HXX +#define _URLBMK_HXX + + +#include + +//========================================================================= + +class INetBookmark + +/* [Beschreibung] + + Diese Klasse stellt ein Bookmark dar, welches aus einer URL und + einem dazuge"horigen Beschreibungstext besteht. + + Es gibt ein eigenes Clipboardformat und Hilfsmethoden zum Kopieren + und Einf"ugen in und aus Clipboard und DragServer. +*/ + +{ + String aUrl; + String aDescr; + +protected: + + void SetURL( const String& rS ) { aUrl = rS; } + void SetDescription( const String& rS ) { aDescr = rS; } + +public: + INetBookmark( const String &rUrl, const String &rDescr ) + : aUrl( rUrl ), aDescr( rDescr ) + {} + INetBookmark() + {} + + const String& GetURL() const { return aUrl; } + const String& GetDescription() const { return aDescr; } +}; + + +#endif + diff --git a/svl/inc/svl/whiter.hxx b/svl/inc/svl/whiter.hxx new file mode 100644 index 000000000000..d2bd7c88d521 --- /dev/null +++ b/svl/inc/svl/whiter.hxx @@ -0,0 +1,63 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: whiter.hxx,v $ + * $Revision: 1.4 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _SFX_WHITER_HXX +#define _SFX_WHITER_HXX + +#include "svl/svldllapi.h" + +#ifndef INCLUDED_LIMITS_H +#include +#define INCLUDED_LIMITS_H +#endif +#include + +class SfxItemSet; + + +// INCLUDE --------------------------------------------------------------- + +class SVL_DLLPUBLIC SfxWhichIter +{ + const USHORT *pRanges, *pStart; + USHORT nOfst, nFrom, nTo; + +public: + SfxWhichIter( const SfxItemSet& rSet, USHORT nFrom = 0, USHORT nTo = USHRT_MAX ); + ~SfxWhichIter(); + + USHORT GetCurWhich() const { return *pRanges + nOfst; } + USHORT NextWhich(); + USHORT PrevWhich(); + + USHORT FirstWhich(); + USHORT LastWhich(); +}; + +#endif diff --git a/svl/inc/svl/xmlement.hxx b/svl/inc/svl/xmlement.hxx new file mode 100644 index 000000000000..ed0e4dafc57a --- /dev/null +++ b/svl/inc/svl/xmlement.hxx @@ -0,0 +1,46 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: xmlement.hxx,v $ + * $Revision: 1.3 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _SVTOOLS_XMLEMENT_HXX +#define _SVTOOLS_XMLEMENT_HXX + +#ifndef _SAL_TYPES_H +#include +#endif + +struct SvXMLEnumMapEntry +{ + const sal_Char *pName; + sal_uInt16 nValue; +}; + + +#endif // _SVTOOLS_XMLEMENT_HXX + diff --git a/svl/inc/urihelper.hxx b/svl/inc/urihelper.hxx deleted file mode 100644 index 8be500e438ce..000000000000 --- a/svl/inc/urihelper.hxx +++ /dev/null @@ -1,238 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: urihelper.hxx,v $ - * $Revision: 1.7 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef SVTOOLS_URIHELPER_HXX -#define SVTOOLS_URIHELPER_HXX - -#include "svl/svldllapi.h" -#include "com/sun/star/uno/Reference.hxx" -#include -#include -#include -#include -#include - -namespace com { namespace sun { namespace star { - namespace uno { class XComponentContext; } - namespace uri { class XUriReference; } -} } } -namespace rtl { class OUString; } -class ByteString; -class CharClass; -class UniString; - -//============================================================================ -namespace URIHelper { - -/** - @ATT - Calling this function with defaulted arguments rMaybeFileHdl = Link() and - bCheckFileExists = true often leads to results that are not intended: - Whenever the given rTheBaseURIRef is a file URL, the given rTheRelURIRef is - relative, and rTheRelURIRef could also be smart-parsed as a non-file URL - (e.g., the relative URL "foo/bar" can be smart-parsed as "http://foo/bar"), - then SmartRel2Abs called with rMaybeFileHdl = Link() and bCheckFileExists = - true returns the non-file URL interpretation. To avoid this, either pass - some non-null rMaybeFileHdl if you want to check generated file URLs for - existence (see URIHelper::GetMaybeFileHdl), or use bCheckFileExists = false - if you want to generate file URLs without checking for their existence. -*/ -SVL_DLLPUBLIC UniString -SmartRel2Abs(INetURLObject const & rTheBaseURIRef, - ByteString const & rTheRelURIRef, - Link const & rMaybeFileHdl = Link(), - bool bCheckFileExists = true, - bool bIgnoreFragment = false, - INetURLObject::EncodeMechanism eEncodeMechanism - = INetURLObject::WAS_ENCODED, - INetURLObject::DecodeMechanism eDecodeMechanism - = INetURLObject::DECODE_TO_IURI, - rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8, - bool bRelativeNonURIs = false, - INetURLObject::FSysStyle eStyle = INetURLObject::FSYS_DETECT); - -/** - @ATT - Calling this function with defaulted arguments rMaybeFileHdl = Link() and - bCheckFileExists = true often leads to results that are not intended: - Whenever the given rTheBaseURIRef is a file URL, the given rTheRelURIRef is - relative, and rTheRelURIRef could also be smart-parsed as a non-file URL - (e.g., the relative URL "foo/bar" can be smart-parsed as "http://foo/bar"), - then SmartRel2Abs called with rMaybeFileHdl = Link() and bCheckFileExists = - true returns the non-file URL interpretation. To avoid this, either pass - some non-null rMaybeFileHdl if you want to check generated file URLs for - existence (see URIHelper::GetMaybeFileHdl), or use bCheckFileExists = false - if you want to generate file URLs without checking for their existence. -*/ -SVL_DLLPUBLIC UniString -SmartRel2Abs(INetURLObject const & rTheBaseURIRef, - UniString const & rTheRelURIRef, - Link const & rMaybeFileHdl = Link(), - bool bCheckFileExists = true, - bool bIgnoreFragment = false, - INetURLObject::EncodeMechanism eEncodeMechanism - = INetURLObject::WAS_ENCODED, - INetURLObject::DecodeMechanism eDecodeMechanism - = INetURLObject::DECODE_TO_IURI, - rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8, - bool bRelativeNonURIs = false, - INetURLObject::FSysStyle eStyle = INetURLObject::FSYS_DETECT); - -//============================================================================ -SVL_DLLPUBLIC void SetMaybeFileHdl(Link const & rTheMaybeFileHdl); - -//============================================================================ -SVL_DLLPUBLIC Link GetMaybeFileHdl(); - -/** - Converts a URI reference to a relative one, ignoring certain differences (for - example, treating file URLs for case-ignoring file systems - case-insensitively). - - @param context a component context; must not be null - - @param baseUriReference a base URI reference - - @param uriReference a URI reference - - @return a URI reference representing the given uriReference relative to the - given baseUriReference; if the given baseUriReference is not an absolute, - hierarchical URI reference, or the given uriReference is not a valid URI - reference, null is returned - - @exception std::bad_alloc if an out-of-memory condition occurs - - @exception com::sun::star::uno::RuntimeException if any error occurs - */ -SVL_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uri::XUriReference > -normalizedMakeRelative( - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > - const & context, - rtl::OUString const & baseUriReference, rtl::OUString const & uriReference); - -/** - A variant of normalizedMakeRelative with a simplified interface. - - Internally calls normalizedMakeRelative with the default component context. - - @param baseUriReference a base URI reference, passed to - normalizedMakeRelative - - @param uriReference a URI reference, passed to normalizedMakeRelative - - @return if the XUriReference returnd by normalizedMakeRelative is empty, - uriReference is returned unmodified; otherwise, the result of calling - XUriReference::getUriReference on the XUriReference returnd by - normalizedMakeRelative is returned - - @exception std::bad_alloc if an out-of-memory condition occurs - - @exception com::sun::star::uno::RuntimeException if any error occurs - - @deprecated - No code should rely on the default component context. -*/ -SVL_DLLPUBLIC rtl::OUString simpleNormalizedMakeRelative( - rtl::OUString const & baseUriReference, rtl::OUString const & uriReference); - -//============================================================================ -SVL_DLLPUBLIC UniString -FindFirstURLInText(UniString const & rText, - xub_StrLen & rBegin, - xub_StrLen & rEnd, - CharClass const & rCharClass, - INetURLObject::EncodeMechanism eMechanism - = INetURLObject::WAS_ENCODED, - rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8, - INetURLObject::FSysStyle eStyle - = INetURLObject::FSYS_DETECT); - -//============================================================================ -/** Remove any password component from both absolute and relative URLs. - - @ATT The current implementation will not remove a password from a - relative URL that has an authority component (e.g., the password is not - removed from the relative ftp URL ). But - since our functions to translate between absolute and relative URLs never - produce relative URLs with authority components, this is no real problem. - - @ATT For relative URLs (or anything not recognized as an absolute URI), - the current implementation will return the input unmodified, not applying - any translations implied by the encode/decode parameters. - - @param rURI An absolute or relative URI reference. - - @param eEncodeMechanism See the general discussion for INetURLObject set- - methods. - - @param eDecodeMechanism See the general discussion for INetURLObject get- - methods. - - @param eCharset See the general discussion for INetURLObject get- and - set-methods. - - @return The input URI with any password component removed. - */ -SVL_DLLPUBLIC UniString -removePassword(UniString const & rURI, - INetURLObject::EncodeMechanism eEncodeMechanism - = INetURLObject::WAS_ENCODED, - INetURLObject::DecodeMechanism eDecodeMechanism - = INetURLObject::DECODE_TO_IURI, - rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8); - -//============================================================================ -/** Query the notational conventions used in the file system provided by some - file content provider. - - @param rFileUrl This file URL determines which file content provider is - used to query the desired information. (The UCB's usual mapping from URLs - to content providers is used.) - - @param bAddConvenienceStyles If true, the return value contains not only - the style bit corresponding to the queried content provider's conventions, - but may also contain additional style bits that make using this function - more convenient in certain situations. Currently, the effect is that - FSYS_UNX is extended with FSYS_VOS, and both FSYS_DOS and FSYS_MAC are - extended with FSYS_VOS and FSYS_UNX (i.e., the---unambiguous---detection - of VOS style and Unix style file system paths is always enabled); also, in - case the content provider's conventions cannot be determined, FSYS_DETECT - is returned instead of FSysStyle(0). - - @return The style bit corresponding to the queried content provider's - conventions, or FSysStyle(0) if these cannot be determined. - */ -SVL_DLLPUBLIC INetURLObject::FSysStyle queryFSysStyle(UniString const & rFileUrl, - bool bAddConvenienceStyles = true) - throw (com::sun::star::uno::RuntimeException); - -} - -#endif // SVTOOLS_URIHELPER_HXX diff --git a/svl/inc/urlbmk.hxx b/svl/inc/urlbmk.hxx deleted file mode 100644 index d3342b398878..000000000000 --- a/svl/inc/urlbmk.hxx +++ /dev/null @@ -1,72 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: urlbmk.hxx,v $ - * $Revision: 1.5 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _URLBMK_HXX -#define _URLBMK_HXX - - -#include - -//========================================================================= - -class INetBookmark - -/* [Beschreibung] - - Diese Klasse stellt ein Bookmark dar, welches aus einer URL und - einem dazuge"horigen Beschreibungstext besteht. - - Es gibt ein eigenes Clipboardformat und Hilfsmethoden zum Kopieren - und Einf"ugen in und aus Clipboard und DragServer. -*/ - -{ - String aUrl; - String aDescr; - -protected: - - void SetURL( const String& rS ) { aUrl = rS; } - void SetDescription( const String& rS ) { aDescr = rS; } - -public: - INetBookmark( const String &rUrl, const String &rDescr ) - : aUrl( rUrl ), aDescr( rDescr ) - {} - INetBookmark() - {} - - const String& GetURL() const { return aUrl; } - const String& GetDescription() const { return aDescr; } -}; - - -#endif - diff --git a/svl/inc/whiter.hxx b/svl/inc/whiter.hxx deleted file mode 100644 index d2bd7c88d521..000000000000 --- a/svl/inc/whiter.hxx +++ /dev/null @@ -1,63 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: whiter.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SFX_WHITER_HXX -#define _SFX_WHITER_HXX - -#include "svl/svldllapi.h" - -#ifndef INCLUDED_LIMITS_H -#include -#define INCLUDED_LIMITS_H -#endif -#include - -class SfxItemSet; - - -// INCLUDE --------------------------------------------------------------- - -class SVL_DLLPUBLIC SfxWhichIter -{ - const USHORT *pRanges, *pStart; - USHORT nOfst, nFrom, nTo; - -public: - SfxWhichIter( const SfxItemSet& rSet, USHORT nFrom = 0, USHORT nTo = USHRT_MAX ); - ~SfxWhichIter(); - - USHORT GetCurWhich() const { return *pRanges + nOfst; } - USHORT NextWhich(); - USHORT PrevWhich(); - - USHORT FirstWhich(); - USHORT LastWhich(); -}; - -#endif diff --git a/svl/inc/xmlement.hxx b/svl/inc/xmlement.hxx deleted file mode 100644 index ed0e4dafc57a..000000000000 --- a/svl/inc/xmlement.hxx +++ /dev/null @@ -1,46 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: xmlement.hxx,v $ - * $Revision: 1.3 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVTOOLS_XMLEMENT_HXX -#define _SVTOOLS_XMLEMENT_HXX - -#ifndef _SAL_TYPES_H -#include -#endif - -struct SvXMLEnumMapEntry -{ - const sal_Char *pName; - sal_uInt16 nValue; -}; - - -#endif // _SVTOOLS_XMLEMENT_HXX - diff --git a/svl/source/filepicker/pickerhelper.cxx b/svl/source/filepicker/pickerhelper.cxx index cda263338d5d..66fb2482fbe0 100644 --- a/svl/source/filepicker/pickerhelper.cxx +++ b/svl/source/filepicker/pickerhelper.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svl.hxx" -#include "pickerhelper.hxx" +#include #include "rtl/ustring.hxx" #include "com/sun/star/ui/dialogs/XFilePicker.hpp" #include "com/sun/star/ui/dialogs/XFolderPicker.hpp" diff --git a/svl/source/filepicker/pickerhistory.cxx b/svl/source/filepicker/pickerhistory.cxx index 5cc12779f0b5..9f8601c641a8 100644 --- a/svl/source/filepicker/pickerhistory.cxx +++ b/svl/source/filepicker/pickerhistory.cxx @@ -30,8 +30,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svl.hxx" -#include "pickerhistory.hxx" -#include "pickerhistoryaccess.hxx" +#include +#include #include #include diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx index 45516660ee21..55e3811532c6 100644 --- a/svl/source/items/itemset.cxx +++ b/svl/source/items/itemset.cxx @@ -37,9 +37,6 @@ #include #endif -#ifndef GCC -#endif - #define _SVSTDARR_USHORTS #define _SVSTDARR_ULONGS @@ -47,7 +44,7 @@ #include #include #include -#include "whiter.hxx" +#include #include #include "whassert.hxx" diff --git a/svl/source/items/poolcach.cxx b/svl/source/items/poolcach.cxx index e64325213ff4..94cc2065bf84 100644 --- a/svl/source/items/poolcach.cxx +++ b/svl/source/items/poolcach.cxx @@ -38,7 +38,7 @@ #include #include -#include "poolcach.hxx" +#include // STATIC DATA ----------------------------------------------------------- diff --git a/svl/source/items/ptitem.cxx b/svl/source/items/ptitem.cxx index 30fef0227397..7abf574dfaff 100644 --- a/svl/source/items/ptitem.cxx +++ b/svl/source/items/ptitem.cxx @@ -37,7 +37,7 @@ #include #include -#include "memberid.hrc" +#include using namespace ::com::sun::star; // STATIC DATA ----------------------------------------------------------- diff --git a/svl/source/items/rectitem.cxx b/svl/source/items/rectitem.cxx index 26c4876d8c2c..30f4312a914c 100644 --- a/svl/source/items/rectitem.cxx +++ b/svl/source/items/rectitem.cxx @@ -37,7 +37,7 @@ #include #include -#include "memberid.hrc" +#include // STATIC DATA ----------------------------------------------------------- diff --git a/svl/source/items/stylepool.cxx b/svl/source/items/stylepool.cxx index 6d214b6b94dd..e48473ebea6e 100644 --- a/svl/source/items/stylepool.cxx +++ b/svl/source/items/stylepool.cxx @@ -37,7 +37,7 @@ #include #include -#include "stylepool.hxx" +#include #include #include diff --git a/svl/source/items/szitem.cxx b/svl/source/items/szitem.cxx index a7667a25a97c..43706d82c308 100644 --- a/svl/source/items/szitem.cxx +++ b/svl/source/items/szitem.cxx @@ -38,7 +38,7 @@ #include #include -#include "memberid.hrc" +#include // STATIC DATA ----------------------------------------------------------- diff --git a/svl/source/items/whiter.cxx b/svl/source/items/whiter.cxx index b5e53e0bc278..0cded7ac732a 100644 --- a/svl/source/items/whiter.cxx +++ b/svl/source/items/whiter.cxx @@ -31,10 +31,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svl.hxx" // INCLUDE --------------------------------------------------------------- -#ifndef GCC -#endif -#include "whiter.hxx" +#include #include DBG_NAME(SfxWhichIter) diff --git a/svl/source/misc/PasswordHelper.cxx b/svl/source/misc/PasswordHelper.cxx index a1125306eb7b..20b949ddc44c 100644 --- a/svl/source/misc/PasswordHelper.cxx +++ b/svl/source/misc/PasswordHelper.cxx @@ -31,10 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svl.hxx" - -#ifndef GCC -#endif -#include "PasswordHelper.hxx" +#include #include #include diff --git a/svl/source/misc/adrparse.cxx b/svl/source/misc/adrparse.cxx index b45650846df5..28fcab90868b 100644 --- a/svl/source/misc/adrparse.cxx +++ b/svl/source/misc/adrparse.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svl.hxx" #include -#include +#include namespace unnamed_svl_adrparse {} using namespace unnamed_svl_adrparse; diff --git a/svl/source/misc/filenotation.cxx b/svl/source/misc/filenotation.cxx index d50645c97439..1a87276cae30 100644 --- a/svl/source/misc/filenotation.cxx +++ b/svl/source/misc/filenotation.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svl.hxx" -#include "filenotation.hxx" +#include #include #include #include diff --git a/svl/source/misc/folderrestriction.cxx b/svl/source/misc/folderrestriction.cxx index 9ec7ead0a4be..932a64571827 100644 --- a/svl/source/misc/folderrestriction.cxx +++ b/svl/source/misc/folderrestriction.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svl.hxx" -#include "folderrestriction.hxx" +#include #include "osl/process.h" #include "tools/urlobj.hxx" #include "unotools/localfilehelper.hxx" diff --git a/svl/source/misc/fstathelper.cxx b/svl/source/misc/fstathelper.cxx index 43619e879a91..f05e7f8f93cc 100644 --- a/svl/source/misc/fstathelper.cxx +++ b/svl/source/misc/fstathelper.cxx @@ -35,8 +35,7 @@ #include #include #include - -#include +#include using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/svl/source/misc/lngmisc.cxx b/svl/source/misc/lngmisc.cxx index df7c28d22b1d..ea628da51307 100644 --- a/svl/source/misc/lngmisc.cxx +++ b/svl/source/misc/lngmisc.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svl.hxx" -#include +#include #include #include #include diff --git a/svl/source/misc/strmadpt.cxx b/svl/source/misc/strmadpt.cxx index 9803f2bcc32f..06afa326f2b6 100644 --- a/svl/source/misc/strmadpt.cxx +++ b/svl/source/misc/strmadpt.cxx @@ -38,9 +38,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include using namespace com::sun::star; diff --git a/svl/source/misc/svldata.cxx b/svl/source/misc/svldata.cxx index 0ba8075069cd..837784f847cb 100644 --- a/svl/source/misc/svldata.cxx +++ b/svl/source/misc/svldata.cxx @@ -78,7 +78,7 @@ SimpleResMgr* ImpSvlData::GetSimpleRM(const ::com::sun::star::lang::Locale& rLoc = (*static_cast< SimpleResMgrMap * >(m_pThreadsafeRMs))[aISOcode]; if (!rResMgr) { - rResMgr = new SimpleResMgr(CREATEVERSIONRESMGR_NAME(svs), rLocale ); + rResMgr = new SimpleResMgr(CREATEVERSIONRESMGR_NAME(svl), rLocale ); } return rResMgr; } diff --git a/svl/source/misc/urihelper.cxx b/svl/source/misc/urihelper.cxx index 5473bf1c995d..44360a12417c 100644 --- a/svl/source/misc/urihelper.cxx +++ b/svl/source/misc/urihelper.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svl.hxx" -#include +#include #include #include "com/sun/star/lang/WrappedTargetRuntimeException.hpp" #include "com/sun/star/lang/XMultiComponentFactory.hpp" diff --git a/svl/source/notify/broadcast.cxx b/svl/source/notify/broadcast.cxx index ede14e4171b2..c245e1ad4cb5 100644 --- a/svl/source/notify/broadcast.cxx +++ b/svl/source/notify/broadcast.cxx @@ -35,9 +35,9 @@ #endif #include -#include "listener.hxx" -#include "listeneriter.hxx" -#include "broadcast.hxx" +#include +#include +#include #include diff --git a/svl/source/notify/listener.cxx b/svl/source/notify/listener.cxx index 7d9a223e1a73..70beb3d004b0 100644 --- a/svl/source/notify/listener.cxx +++ b/svl/source/notify/listener.cxx @@ -30,17 +30,12 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svl.hxx" -#ifndef GCC -#endif -#ifndef DEBUG_HXX #include -#endif - -#include "broadcast.hxx" -#include "listener.hxx" +#include +#include #include "listenerbase.hxx" -#include "listeneriter.hxx" +#include //==================================================================== diff --git a/svl/source/notify/listenerbase.cxx b/svl/source/notify/listenerbase.cxx index bb1569c128c5..6b0a7667ffc4 100644 --- a/svl/source/notify/listenerbase.cxx +++ b/svl/source/notify/listenerbase.cxx @@ -30,17 +30,12 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svl.hxx" -#ifndef GCC -#endif -#ifndef DEBUG_HXX #include -#endif - #include "listenerbase.hxx" -#include "listeneriter.hxx" -#include "listener.hxx" -#include "broadcast.hxx" +#include +#include +#include SvtListenerBase::SvtListenerBase( SvtListener& rLst, diff --git a/svl/source/notify/listeneriter.cxx b/svl/source/notify/listeneriter.cxx index 1f92eadfedbc..97a7411c413c 100644 --- a/svl/source/notify/listeneriter.cxx +++ b/svl/source/notify/listeneriter.cxx @@ -30,14 +30,12 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svl.hxx" -#ifndef GCC -#endif #include #include "listenerbase.hxx" -#include "listeneriter.hxx" -#include "broadcast.hxx" -#include "listener.hxx" +#include +#include +#include SvtListenerIter* SvtListenerIter::pListenerIters = 0; diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx index 23f627834955..73058c117ae4 100644 --- a/svl/source/numbers/numfmuno.cxx +++ b/svl/source/numbers/numfmuno.cxx @@ -43,7 +43,7 @@ #include #include "numfmuno.hxx" -#include "numuno.hxx" +#include #include #include #include diff --git a/svl/source/numbers/numuno.cxx b/svl/source/numbers/numuno.cxx index 3cc90998e2dc..d7cf8471121c 100644 --- a/svl/source/numbers/numuno.cxx +++ b/svl/source/numbers/numuno.cxx @@ -41,7 +41,7 @@ #include #include -#include "numuno.hxx" +#include #include "numfmuno.hxx" #include diff --git a/svl/source/numbers/supservs.cxx b/svl/source/numbers/supservs.cxx index 7e4d8560dae7..25148c3a9716 100644 --- a/svl/source/numbers/supservs.cxx +++ b/svl/source/numbers/supservs.cxx @@ -37,8 +37,8 @@ #include #include #include -#include -#include "instrm.hxx" +#include +#include using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/svl/source/numbers/supservs.hxx b/svl/source/numbers/supservs.hxx index 7dbbfe27177d..7d7e7f9ee6f2 100644 --- a/svl/source/numbers/supservs.hxx +++ b/svl/source/numbers/supservs.hxx @@ -31,7 +31,7 @@ #ifndef _SVTOOLS_NUMBERS_SUPPLIERSERVICE_HXX_ #define _SVTOOLS_NUMBERS_SUPPLIERSERVICE_HXX_ -#include "numuno.hxx" +#include #include #include #include diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index 52d37b9cd26f..fbb157b233a1 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -50,13 +50,13 @@ #define _ZFORMAT_CXX #include -#include "zforscan.hxx" +#include #include "zforfind.hxx" #include #include "numhead.hxx" #include -#include "nfsymbol.hxx" +#include using namespace svt; namespace { diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx index 5c0d45a53ed2..c0486ad1f5f9 100644 --- a/svl/source/numbers/zforscan.cxx +++ b/svl/source/numbers/zforscan.cxx @@ -48,7 +48,7 @@ #define _ZFORSCAN_CXX #include "zforscan.hxx" #undef _ZFORSCAN_CXX -#include "nfsymbol.hxx" +#include using namespace svt; const sal_Unicode cNonBreakingSpace = 0xA0; diff --git a/svl/source/numbers/zforscan.hxx b/svl/source/numbers/zforscan.hxx index 300715dfeaa5..3168dbe65296 100644 --- a/svl/source/numbers/zforscan.hxx +++ b/svl/source/numbers/zforscan.hxx @@ -35,7 +35,7 @@ #include #include #include -#include "nfsymbol.hxx" +#include class SvNumberFormatter; struct ImpSvNumberformatInfo; diff --git a/svl/source/svdde/ddedll.cxx b/svl/source/svdde/ddedll.cxx deleted file mode 100644 index b27272a2a910..000000000000 --- a/svl/source/svdde/ddedll.cxx +++ /dev/null @@ -1,67 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: ddedll.cxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svl.hxx" -#ifdef WIN - - -#include // included svwin.h - -// Statische DLL-Verwaltungs-Variablen -static HINSTANCE hDLLInst = 0; // HANDLE der DLL - -/*************************************************************************** -|* LibMain() -|* Beschreibung Initialisierungsfunktion der DLL -***************************************************************************/ -extern "C" int CALLBACK LibMain( HINSTANCE hDLL, WORD, WORD nHeap, LPSTR ) -{ -#ifndef WNT - if ( nHeap ) - UnlockData( 0 ); -#endif - - hDLLInst = hDLL; - - return TRUE; -} - -/*************************************************************************** -|* WEP() -|* Beschreibung DLL-Deinitialisierung -***************************************************************************/ -extern "C" int CALLBACK WEP( int ) -{ - return 1; -} - -#endif - diff --git a/svl/source/svdde/ddeml1.cxx b/svl/source/svdde/ddeml1.cxx deleted file mode 100644 index 9d1351b17f16..000000000000 --- a/svl/source/svdde/ddeml1.cxx +++ /dev/null @@ -1,2661 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: ddeml1.cxx,v $ - * $Revision: 1.5 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svl.hxx" - -/* - ToDo / Bugs: - - - DdeInitiate: Eigener Thread? - - Timeout bei Disconnects (IBM:nicht auf Ack warten!) - - Konzept Errorhandling (globale/lokale Fehler) - - Bedeutung/Anwendung Conversation-Contexte - - Bei Zugriffen auf ConversationHandles WindowHandles checken - - Namen der Partner-App ermitteln - - Codepage-Geraffel -*/ -#define INCL_DOSPROCESS - -#include "ddemlimp.hxx" - -#define LOGFILE -#define STATUSFILE -#define DDEDATAFILE -#include "ddemldeb.hxx" - - -#if defined (OS2) && defined (__BORLANDC__) -#pragma option -w-par -#endif - -// static -inline BOOL ImpDdeMgr::MyWinDdePostMsg( HWND hWndTo, HWND hWndFrom, - USHORT nMsg, PDDESTRUCT pData, ULONG nFlags ) -{ - BOOL bSuccess = WinDdePostMsg( hWndTo,hWndFrom,nMsg,pData,nFlags); - if( !bSuccess ) - { - WRITELOG("WinDdePostMsg:Failed!") - if ( !(nFlags & DDEPM_NOFREE) ) - { - MyDosFreeMem( pData,"MyWinDdePostMsg" ); - } - } - return bSuccess; -} - - -// ********************************************************************* -// ImpDdeMgr -// ********************************************************************* - -USHORT ImpDdeMgr::nLastErrInstance = 0; - -// -// Conversation-WndProc -// Steuert Transaktionen eines Conversationhandles -// -MRESULT EXPENTRY ConvWndProc(HWND hWnd,ULONG nMsg,MPARAM nPar1,MPARAM nPar2) -{ -#if defined(DBG_UTIL) && defined(OV_DEBUG) - if( nMsg >= WM_DDE_FIRST && nMsg <= WM_DDE_LAST) - { - ////WRITELOG("::ConvWndProc:DDE-Msg received") - } -#endif - ImpConvWndData* pObj = (ImpConvWndData*)WinQueryWindowULong( hWnd, 0 ); - return pObj->pThis->ConvWndProc( hWnd, nMsg, nPar1, nPar2 ); -} - -// -// Server-WndProc -// DDE-Server-Window der App -// -MRESULT EXPENTRY ServerWndProc(HWND hWnd,ULONG nMsg,MPARAM nPar1,MPARAM nPar2) -{ -#if defined(DBG_UTIL) && defined(OV_DEBUG) - if( nMsg >= WM_DDE_FIRST && nMsg <= WM_DDE_LAST) - { - ////WRITELOG("::ServerWndProc:DDE-Msg received") - } -#endif - ImpDdeMgr* pObj = (ImpDdeMgr*)WinQueryWindowULong( hWnd, 0 ); - return pObj->SrvWndProc( hWnd, nMsg, nPar1, nPar2 ); -} - - -inline HDDEDATA ImpDdeMgr::Callback( USHORT nTransactionType, - USHORT nClipboardFormat, HCONV hConversationHandle, HSZ hsz1, - HSZ hsz2, HDDEDATA hData, ULONG nData1, ULONG nData2 ) -{ - HDDEDATA hRet = (HDDEDATA)0; - if( pCallback ) - hRet = (*pCallback)(nTransactionType, nClipboardFormat, - hConversationHandle, hsz1, hsz2, hData, nData1, nData2); - return hRet; -} - - - -ImpDdeMgr::ImpDdeMgr() -{ - nLastErrInstance = DMLERR_NO_ERROR; - pCallback = 0; - nTransactFilter = 0; - nServiceCount = 0; - pServices = 0; - pAppTable = 0; - pConvTable = 0; - pTransTable = 0; - bServFilterOn = TRUE; - bInSyncTrans = FALSE; - - CreateServerWnd(); - pData = InitAll(); - if ( !pData ) - nLastErrInstance = DMLERR_MEMORY_ERROR; - else - RegisterDDEMLApp(); -} - -ImpDdeMgr::~ImpDdeMgr() -{ - CleanUp(); - DestroyServerWnd(); -// Named Shared Mem vom BS loeschen lassen, da nicht bekannt ist, -// wieviele DDEML-Instanzen die App erzeugt hat, und OS/2 -// keinen App-Referenzzaehler fuer shared mem fuehrt. -// if ( pData ) -// DosFreeMem( pData ); -} - - -BOOL ImpDdeMgr::IsSameInstance( HWND hWnd ) -{ - TID tid; PID pid; - WinQueryWindowProcess( hWnd, &pid, &tid ); - return (BOOL)(pid == pidThis); -} - -HSZ ImpDdeMgr::GetAppName( HWND hWnd ) -{ - return 0; -} - -// static -ImpDdeMgr* ImpDdeMgr::GetImpDdeMgrInstance( HWND hWnd ) -{ - ImpDdeMgrData* pData = ImpDdeMgr::AccessMgrData(); - if( !pData ) - return 0; - - ImpDdeMgr* pResult = 0; - TID tid; PID pidApp; - WinQueryWindowProcess( hWnd, &pidApp, &tid ); - HWND* pApp = ImpDdeMgr::GetAppTable( pData ); - USHORT nCurApp = 0; - while( nCurApp < pData->nMaxAppCount ) - { - HWND hCurWin = *pApp; - if( hCurWin ) - { - PID pidCurApp; - WinQueryWindowProcess( hCurWin, &pidCurApp, &tid ); - if( pidCurApp == pidApp ) - { - pResult = (ImpDdeMgr*)WinQueryWindowULong( hCurWin, 0 ); - break; - } - } - pApp++; - nCurApp++; - } - return pResult; -} - - - - - -void ImpDdeMgr::CleanUp() -{ - DisconnectAll(); - ImpService* pPtr = pServices; - if( pPtr ) - { - for( USHORT nIdx = 0; nIdx < nServiceCount; nIdx++, pPtr++ ) - { - HSZ hStr = pPtr->hBaseServName; - if( hStr ) - DdeFreeStringHandle( hStr ); - hStr = pPtr->hInstServName; - if( hStr ) - DdeFreeStringHandle( hStr ); - } - nServiceCount = 0; - delete pServices; - pServices = 0; - } - bServFilterOn = TRUE; // default setting DDEML - UnregisterDDEMLApp(); -} - -void ImpDdeMgr::RegisterDDEMLApp() -{ - HWND* pPtr = pAppTable; - HWND hCur; - USHORT nPos = 0; - while( nPos < pData->nMaxAppCount ) - { - hCur = *pPtr; - if (hCur == (HWND)0 ) - { - // in Tabelle stellen - *pPtr = hWndServer; - break; - } - nPos++; - pPtr++; - } -} - -void ImpDdeMgr::UnregisterDDEMLApp() -{ - HWND* pPtr = pAppTable; - USHORT nPos = 0; - while( nPos < pData->nMaxAppCount ) - { - if (*pPtr == hWndServer ) - { - *pPtr = 0; - break; - } - nPos++; - pPtr++; - } -} - -// static -ImpDdeMgrData* ImpDdeMgr::AccessMgrData() -{ - ImpDdeMgrData* pData = 0; - APIRET nRet = DosGetNamedSharedMem((PPVOID)&pData,DDEMLDATA,PAG_READ|PAG_WRITE); - DBG_ASSERT(!nRet,"DDE:AccessMgrData failed"); - return pData; -} - -USHORT ImpDdeMgr::DdeGetLastError() -{ - USHORT nErr; - if ( !pData ) - nErr = DMLERR_DLL_NOT_INITIALIZED; - else if ( nLastErrInstance ) - nErr = nLastErrInstance; - else - nErr = pData->nLastErr; - - nLastErrInstance = 0; - pData->nLastErr = 0; - return nErr; -} - - - -USHORT ImpDdeMgr::DdeInitialize( PFNCALLBACK pCallbackProc, ULONG nTransactionFilter ) -{ - if ( !nLastErrInstance ) - { - if ( !pCallbackProc ) - { - nLastErrInstance = DMLERR_INVALIDPARAMETER; - return nLastErrInstance; - } - pCallback = pCallbackProc; - nTransactFilter = nTransactionFilter; - nTransactFilter |= CBF_FAIL_SELFCONNECTIONS; - } - return nLastErrInstance; -} - - -// static -HWND ImpDdeMgr::NextFrameWin( HENUM hEnum ) -{ - char aBuf[ 10 ]; - - HWND hWnd = WinGetNextWindow( hEnum ); - while( hWnd ) - { - WinQueryClassName( hWnd, sizeof(aBuf)-1, (PCH)aBuf ); - // Frame-Window ? - if( !strcmp( aBuf, "#1" ) ) // #define WC_FRAME ((PSZ)0xffff0001L) - break; - hWnd = WinGetNextWindow( hEnum ); - } - return hWnd; -} - - -HCONV ImpDdeMgr::DdeConnectImp( HSZ hszService,HSZ hszTopic,CONVCONTEXT* pCC) -{ - hCurConv = 0; - if( !pCC ) - pCC = &aDefaultContext; - - ULONG nBufLen; - PSZ pService = AllocAtomName( (ATOM)hszService, nBufLen ); - PSZ pTopic = AllocAtomName( (ATOM)hszTopic, nBufLen ); -#if 0 && defined(OV_DEBUG) - String aStr("DdeConnectImp Service:"); - aStr += pService; - aStr += " Topic:"; - aStr += pTopic; - WRITELOG((char*)(const char*)aStr) -#endif - -#if defined(OV_DEBUG) - if( !strcmp(pService,"oliver voeltz") ) - { - WRITESTATUS("Table of connections"); - MyDosFreeMem( pTopic,"DdeConnectImp" ); - MyDosFreeMem( pService,"DdeConnectImp" ); - return 0; - } -#endif - -#if 0 - // original pm-fkt benutzen - HWND hWndCurClient = CreateConversationWnd(); - WinDdeInitiate( hWndCurClient, pService, pTopic, pCC ); - if( GetConversationWndRefCount(hWndCurClient) == 0) - DestroyConversationWnd( hWndCurClient ); -#else - // eigener Verbindungsaufbau - HENUM hEnum = WinBeginEnumWindows( HWND_DESKTOP ); - HWND hWndCurSrv = NextFrameWin( hEnum ); - HWND hWndCurClient = CreateConversationWnd(); - while( hWndCurSrv && !hCurConv ) - { - if( hWndCurSrv != hWndServer || - ((nTransactFilter & CBF_FAIL_SELFCONNECTIONS)==0 )) - { - // pro DDE-Server ein Conversation-Window erzeugen - if( GetConversationWndRefCount(hWndCurClient) >= 2) - { - DestroyConversationWnd( hWndCurClient ); - hWndCurClient = CreateConversationWnd(); - } - MyInitiateDde(hWndCurSrv,hWndCurClient,hszService,hszTopic,pCC); - if( !bListConnect && hCurConv ) - break; - } - hWndCurSrv = NextFrameWin( hEnum ); - } - - if( GetConversationWndRefCount(hWndCurClient) == 0) - DestroyConversationWnd( hWndCurClient ); - WinEndEnumWindows( hEnum ); -#endif - - if( !hCurConv ) - nLastErrInstance = DMLERR_NO_CONV_ESTABLISHED; - -#if 0 && defined(OV_DEBUG) - String aCStr( "DdeConnectImp:End "); - if( nLastErrInstance != DMLERR_NO_CONV_ESTABLISHED ) - aCStr += "(Success)"; - else - aCStr += "(Failed)"; - WRITELOG((char*)aCStr.GetStr()) -#endif - - MyDosFreeMem( pTopic,"DdeConnectImp" ); - MyDosFreeMem( pService,"DdeConnectImp" ); - return hCurConv; -} - -HCONV ImpDdeMgr::DdeConnect( HSZ hszService, HSZ hszTopic, CONVCONTEXT* pCC) -{ - ////WRITELOG("DdeConnect:Start") - bListConnect = FALSE; - HCONV hResult = DdeConnectImp( hszService, hszTopic, pCC ); - ////WRITELOG("DdeConnect:End") - ////WRITESTATUS("DdeConnect:End") - return hResult; -} - - -HCONVLIST ImpDdeMgr::DdeConnectList( HSZ hszService, HSZ hszTopic, - HCONVLIST hConvList, CONVCONTEXT* pCC ) -{ - nPrevConv = 0; - ////WRITESTATUS("Before DdeConnectList") - if( hConvList ) - { - HCONV hLastConvInList; - - hCurListId = hConvList; - ImpHCONV* pConv = pConvTable; - pConv += (USHORT)hConvList; - if( (USHORT)hConvList >= pData->nMaxConvCount ||pConv->hWndThis==0 ) - { - nLastErrInstance = DMLERR_INVALIDPARAMETER; - return 0; - } - GetLastServer(pData, hConvList, hLastConvInList); - nPrevConv = (USHORT)hLastConvInList; - } - else - hCurListId = (HCONVLIST)WinCreateWindow( HWND_OBJECT, WC_FRAME, - CONVLISTNAME, 0,0,0,0,0, HWND_DESKTOP, HWND_BOTTOM, 0,0,0); - - bListConnect = TRUE; - DdeConnectImp( hszService, hszTopic, pCC ); -#if 0 && defined(OV_DEBUG) - WRITELOG("DdeConnectList:ConnectionList:") - HCONV hDebug = 0; - do - { - hDebug = DdeQueryNextServer( hCurListId, hDebug); - String aStr( (ULONG)hDebug ); - WRITELOG((char*)(const char*)aStr) - } while( hDebug ); -#endif - ////WRITESTATUS("After DdeConnectList") - return (HCONVLIST)hCurListId; -} - -DDEINIT* ImpDdeMgr::CreateDDEInitData( HWND hWndDestination, HSZ hszService, - HSZ hszTopic, CONVCONTEXT* pCC ) -{ - ULONG nLen1 = 0, nLen2 = 0; - HATOMTBL hAtomTable = WinQuerySystemAtomTable(); - - if( hszService ) - nLen1 = WinQueryAtomLength( hAtomTable, hszService ); - if( hszTopic ) - nLen2 = WinQueryAtomLength( hAtomTable, hszTopic ); - nLen1++; nLen2++; - - DDEINIT* pBuf = 0; - - ULONG nLen = sizeof(DDEINIT) + nLen1+ nLen2 + sizeof(CONVCONTEXT); - if( !(MyDosAllocSharedMem((PPVOID)&pBuf, NULL, nLen, - PAG_COMMIT | PAG_READ | PAG_WRITE | OBJ_GIVEABLE | OBJ_ANY, - "CreateDDEInitData"))) - { - memset( pBuf, 0, nLen ); - - /* - PID pid; TID tid; - WinQueryWindowProcess( hWndDestination, &pid, &tid ); - APIRET nRet = DosGiveSharedMem( pBuf, pid, PAG_READ | PAG_WRITE ); - */ - - pBuf->cb = nLen; - pBuf->offConvContext = sizeof( DDEINIT ); - char* pBase = (char*)pBuf; - pBase += sizeof(DDEINIT); - if( pCC ) - memcpy( pBase, pCC, sizeof(CONVCONTEXT) ); - pBase += sizeof(CONVCONTEXT); - pBuf->pszAppName = pBase; - if( hszService ) - WinQueryAtomName( hAtomTable, hszService, pBase, nLen1 ); - pBase += nLen1; - pBuf->pszTopic = pBase; - if( hszTopic ) - WinQueryAtomName( hAtomTable, hszTopic, pBase, nLen2 ); - } - return pBuf; -} - - - -void ImpDdeMgr::MyInitiateDde( HWND hWndSrv, HWND hWndClient, - HSZ hszService, HSZ hszTopic, CONVCONTEXT* pCC ) -{ - DDEINIT* pBuf = CreateDDEInitData( hWndSrv, hszService, hszTopic, pCC ); - if( pBuf ) - { - PID pid; TID tid; - WinQueryWindowProcess( hWndSrv, &pid, &tid ); - APIRET nRet = DosGiveSharedMem( pBuf, pid, PAG_READ | PAG_WRITE ); - WinSendMsg( hWndSrv,WM_DDE_INITIATE,(MPARAM)hWndClient,(MPARAM)pBuf); - MyDosFreeMem( pBuf,"MyInitiateDde" ); - } -} - -// static -ImpHCONV* ImpDdeMgr::GetFirstServer(ImpDdeMgrData* pData, HCONVLIST hConvList, - HCONV& rhConv ) -{ - ImpHCONV* pPtr = GetConvTable( pData ); - HCONV hConv; - if( !rhConv ) - { - pPtr++; - hConv = 1; - } - else - { - // Startposition - pPtr += (USHORT)rhConv; - hConv = rhConv; - pPtr++; hConv++; // auf den naechsten - } - while( hConv < pData->nMaxConvCount ) - { - if( pPtr->hConvList == hConvList ) - { - rhConv = hConv; - return pPtr; - } - pPtr++; - hConv++; - } - rhConv = 0; - return 0; -} - -// static -ImpHCONV* ImpDdeMgr::GetLastServer(ImpDdeMgrData* pData, HCONVLIST hConvList, - HCONV& rhConv ) -{ - ImpHCONV* pPtr = GetConvTable( pData ); - pPtr += pData->nMaxConvCount; - pPtr--; - HCONV hConv = pData->nMaxConvCount; - hConv--; - while( hConv > 0 ) - { - if( pPtr->hConvList == hConvList ) - { - rhConv = hConv; - return pPtr; - } - pPtr--; - hConv--; - } - rhConv = 0; - return 0; -} - -// static -BOOL ImpDdeMgr::CheckConvListId( HCONVLIST hConvListId ) -{ - HAB hAB = WinQueryAnchorBlock( (HWND)hConvListId ); - if( hAB ) - return WinIsWindow( hAB, (HWND)hConvListId ); - return FALSE; - /* - HAB hAB = WinQueryAnchorBlock( (HWND)hConvListId ); - if( hAB ) - { - char aBuf[ 16 ]; - WinQueryWindowText( (HWND)hConvListId, sizeof(aBuf), aBuf ); - if( strcmp(aBuf, CONVLISTNAME ) == 0 ) - return TRUE; - } - return FALSE; - */ -} - -// static -HCONV ImpDdeMgr::DdeQueryNextServer(HCONVLIST hConvList, HCONV hConvPrev) -{ - if( !CheckConvListId( hConvList ) ) - return (HCONV)0; - ImpDdeMgrData* pData = ImpDdeMgr::AccessMgrData(); - GetFirstServer( pData, hConvList, hConvPrev ); - return hConvPrev; -} - -// static - -// Idee: DisconnectAll uebergibt das ServerWindow. Zu jedem HCONV -// wird das Creator-Server-Wnd gespeichert. Disconnect braucht -// dann nur noch die Window-Handles zu vergleichen -BOOL ImpDdeMgr::DdeDisconnect( HCONV hConv ) -{ - WRITELOG("DdeDisconnect:Start") - ////WRITESTATUS("DdeDisconnect:Start") - - ImpDdeMgrData* pData = ImpDdeMgr::AccessMgrData(); - if ( !pData ) - { - ImpDdeMgr::nLastErrInstance = DMLERR_DLL_NOT_INITIALIZED; - return FALSE; - } - ImpHCONV* pConv = GetConvTable(pData) + (USHORT)hConv; - - if( (USHORT)hConv >= pData->nMaxConvCount || pConv->hWndThis==0 ) - { - nLastErrInstance = DMLERR_NO_CONV_ESTABLISHED; - return FALSE; - } - - PID pidApp; TID tid; - HWND hWndDummy = WinCreateWindow( HWND_OBJECT, WC_FRAME, - "Bla", 0, 0,0,0,0, HWND_DESKTOP, HWND_BOTTOM, 0, 0, 0 ); - WinQueryWindowProcess( hWndDummy, &pidApp, &tid ); - WinDestroyWindow( hWndDummy ); - PID pidThis; PID pidPartner; - - HWND hWndThis = pConv->hWndThis; - HWND hWndPartner = pConv->hWndPartner; - - WinQueryWindowProcess( hWndThis, &pidThis, &tid ); - WinQueryWindowProcess( hWndPartner, &pidPartner, &tid ); - if( pidApp != pidThis && pidApp != pidPartner ) - return TRUE; // gehoert nicht der App -> ueberspringen - - HCONV hConvPartner = pConv->hConvPartner; - - // die App benachrichtigen, dass alle offenen Advise-Loops - // beendet werden, egal ob sie vom Server oder Client - // initiiert wurden. Die Dinger aber nicht loeschen, da sie evtl. - // noch vom Partner gebraucht werden. - ImpConvWndData* pObj = - (ImpConvWndData*)WinQueryWindowULong( pConv->hWndThis, 0 ); - ImpDdeMgr* pThis = pObj->pThis; - pThis->SendUnadvises( hConv, 0, FALSE ); // alle Formate & NICHT loeschen - pThis->SendUnadvises( hConvPartner, 0, FALSE ); // alle Formate & NICHT loeschen - - pConv->nStatus |= ST_TERMINATED; - - HAB hAB = WinQueryAnchorBlock( pConv->hWndThis ); - // um die MessageQueue inne Gaenge zu halten - ULONG nTimerId = WinStartTimer( hAB, 0, 0, 50 ); - - /* - Die Partner-App muss ein DDE_TERMINATE posten, auf das - wir warten muessen, um alle Messages zu bearbeiten, die - _vor_ dem DdeDisconnect von der Partner-App gepostet - wurden. - */ - WRITELOG("DdeDisconnect:Waiting for acknowledge...") - WinDdePostMsg( hWndPartner, hWndThis, WM_DDE_TERMINATE, - (PDDESTRUCT)0,DDEPM_RETRY); - - QMSG aQueueMsg; - BOOL bContinue = TRUE; - while( bContinue ) - { - if( WinGetMsg( hAB, &aQueueMsg, 0, 0, 0 )) - { - WinDispatchMsg( hAB, &aQueueMsg ); - if( (!WinIsWindow( hAB, hWndPartner)) || - (pConv->nStatus & ST_TERMACKREC) ) - { - bContinue = FALSE; - if( pConv->nStatus & ST_TERMACKREC ) - { - WRITELOG("DdeDisconnect: TermAck received") - } - else - { - WRITELOG("DdeDisconnect: Partner died") - } - } - } - else - bContinue = FALSE; - } - - WinStopTimer( hAB, 0, nTimerId ); - - // WRITELOG("DdeDisconnect:Freeing data") - // Transaktionstabelle aufraeumen - FreeTransactions( pData, hConv ); - if( hConvPartner ) - FreeTransactions( pData, hConvPartner ); - - FreeConvHandle( pData, hConv ); - - WRITELOG("DdeDisconnect:End") - //WRITESTATUS("DdeDisconnect:End") - return TRUE; -} - -// static -BOOL ImpDdeMgr::DdeDisconnectList( HCONVLIST hConvList ) -{ - if( !CheckConvListId( hConvList ) ) - { - ImpDdeMgr::nLastErrInstance = DMLERR_INVALIDPARAMETER; - return FALSE; - } - - ImpDdeMgrData* pData = ImpDdeMgr::AccessMgrData(); - if ( !pData ) - { - ImpDdeMgr::nLastErrInstance = DMLERR_DLL_NOT_INITIALIZED; - return FALSE; - } - HCONV hConv = 0; - GetFirstServer( pData, hConvList, hConv ); - while( hConv ) - { - DdeDisconnect( hConv ); - GetFirstServer( pData, hConvList, hConv ); - } - WinDestroyWindow( (HWND)hConvList ); - return TRUE; -} - - - -// static -HCONV ImpDdeMgr::DdeReconnect(HCONV hConv) -{ - ImpDdeMgrData* pData = ImpDdeMgr::AccessMgrData(); - if ( !pData ) - { - ImpDdeMgr::nLastErrInstance = DMLERR_DLL_NOT_INITIALIZED; - return 0; - } - return 0; -} - -// static -USHORT ImpDdeMgr::DdeQueryConvInfo(HCONV hConv, ULONG nTransId, CONVINFO* pCI) -{ - if( !pCI || pCI->nSize == 0) - return 0; - ImpDdeMgrData* pData = ImpDdeMgr::AccessMgrData(); - if ( !pData ) - { - ImpDdeMgr::nLastErrInstance = DMLERR_DLL_NOT_INITIALIZED; - return 0; - } - Transaction* pTrans; - if( nTransId != QID_SYNC ) - { - pTrans = ImpDdeMgr::GetTransTable( pData ); - pTrans += nTransId; - if( nTransId >= pData->nMaxTransCount || pTrans->hConvOwner == 0 ) - { - ImpDdeMgr::nLastErrInstance = DMLERR_UNFOUND_QUEUE_ID; - return 0; - } - } - else - pTrans = 0; - - ImpHCONV* pConv = ImpDdeMgr::GetConvTable( pData ); - pConv += (ULONG)hConv; - if( hConv >= pData->nMaxConvCount || pConv->hWndThis == 0 ) - { - ImpDdeMgr::nLastErrInstance = DMLERR_NO_CONV_ESTABLISHED; - return 0; - } - - USHORT nSize = pCI->nSize; - if( nSize > sizeof(CONVINFO) ) - nSize = sizeof(CONVINFO); - CONVINFO aTempInfo; - memset( &aTempInfo, 0, sizeof(CONVINFO) ); - aTempInfo.nSize = pCI->nSize; - aTempInfo.hConvPartner = pConv->hConvPartner; - aTempInfo.hszPartner = pConv->hszPartner; - aTempInfo.hszServiceReq = pConv->hszServiceReq; - aTempInfo.hszTopic = pConv->hszTopic; - aTempInfo.nStatus = pConv->nStatus; - aTempInfo.hConvList = pConv->hConvList; - aTempInfo.aConvCtxt = pConv->aConvContext; - if( pTrans ) - { - aTempInfo.nUser = pTrans->nUser; - aTempInfo.hszItem = pTrans->hszItem; - aTempInfo.nFormat = pTrans->nFormat; - aTempInfo.nType = pTrans->nType; - aTempInfo.nConvst = pTrans->nConvst; - aTempInfo.nLastError= pTrans->nLastError; - } - memcpy( pCI, &aTempInfo, nSize ); - - return nSize; -} - -// static -BOOL ImpDdeMgr::DdeSetUserHandle(HCONV hConv, ULONG nTransId, ULONG hUser) -{ - ImpDdeMgrData* pData = ImpDdeMgr::AccessMgrData(); - if ( !pData ) - { - ImpDdeMgr::nLastErrInstance = DMLERR_DLL_NOT_INITIALIZED; - return FALSE; - } - Transaction* pTrans = GetTransTable( pData ); - pTrans += nTransId; - if( !nTransId || !hConv || nTransId >= pData->nMaxTransCount || - pTrans->hConvOwner != hConv ) - { - ImpDdeMgr::nLastErrInstance = DMLERR_INVALIDPARAMETER; - return FALSE; - } - if( !pTrans->hConvOwner) - { - ImpDdeMgr::nLastErrInstance = DMLERR_UNFOUND_QUEUE_ID; - return FALSE; - } - pTrans->nUser = hUser; - return TRUE; -} - -BOOL ImpDdeMgr::DdeAbandonTransaction( HCONV hConv, ULONG nTransId ) -{ - ////WRITELOG("DdeAbandonTransaction:Start") - if( !pData ) - { - nLastErrInstance = DMLERR_DLL_NOT_INITIALIZED; - return FALSE; - } - ImpHCONV* pConv = pConvTable; - pConv += (USHORT)hConv; - if( nTransId < 1 || nTransId >= pData->nMaxTransCount || - hConv < 1 || hConv >= pData->nMaxConvCount || !pConv->hWndThis) - { - nLastErrInstance = DMLERR_INVALIDPARAMETER; - return FALSE; - } - if( !hConv ) - { - DBG_ASSERT(0,"DdeAbandonTransaction:NULL-hConv not supported"); - nLastErrInstance = DMLERR_INVALIDPARAMETER; - return FALSE; - } - Transaction* pTrans = pTransTable; - pTrans += (USHORT)nTransId; - if( pTrans->hConvOwner != hConv ) - { - nLastErrInstance = DMLERR_UNFOUND_QUEUE_ID; - return FALSE; - } - - if( bInSyncTrans && nTransId == nSyncTransId ) - { - bSyncAbandonTrans = TRUE; - return TRUE; - } - USHORT nTempType = pTrans->nType; - nTempType &= (~XTYPF_MASK); - if( nTempType == (XTYP_ADVREQ & ~(XTYPF_NOBLOCK))) - { - ////WRITELOG("DdeAbandTrans:Advise Loop") - -// ---------------------------------------------------------------------- -// Der von der Deutschen Bank eingesetzte DDE-Server -// "Invision V2.71 Build 36 Mar 12 1999 V4.8.2" hat einen Bug, der -// dazu fuehrt, dass auf per WM_DDE_TERMINATE geschlossene Verbindungen -// nicht mit einem WM_DDE_TERMINATE geantwortet wird, wenn der -// entsprechende Link vorher per WM_DDE_UNADVISE beendet wurde. Dieser -// Bug tritt ab zwei parallel laufenden Links auf. Auf Wunsch der DB -// wurde das folgende Workaround eingebaut. -// ---------------------------------------------------------------------- -#define DEUTSCHE_BANK -#ifndef DEUTSCHE_BANK - -// Acknowledge ist beim Unadvise nicht ueblich -//#define SO_DDE_ABANDON_TRANSACTION_WAIT_ACK -#ifdef SO_DDE_ABANDON_TRANSACTION_WAIT_ACK - DDESTRUCT* pOutDDEData = MakeDDEObject( pConv->hWndPartner, - pTrans->hszItem, DDE_FACKREQ, 0 /*pTrans->nFormat*/, 0, 0); -#else - DDESTRUCT* pOutDDEData = MakeDDEObject( pConv->hWndPartner, - pTrans->hszItem, 0, 0 /*pTrans->nFormat*/, 0, 0); -#endif - WRITELOG("DdeAbandTrans:Waiting for acknowledge...") - pTrans->nConvst = XST_UNADVSENT; - if ( !MyWinDdePostMsg( pConv->hWndPartner, pConv->hWndThis, - WM_DDE_UNADVISE, pOutDDEData, DDEPM_RETRY ) ) - { - WRITELOG("DdeAbandTrans:PostMsg Failed") - return FALSE; - } -#ifdef SO_DDE_ABANDON_TRANSACTION_WAIT_ACK - WaitTransState( pTrans, nTransId, XST_UNADVACKRCVD, 0 ); -#else - pTrans->nConvst = XST_UNADVACKRCVD; -#endif - -#endif // DEUTSCHE_BANK - - WRITELOG("DdeAbandTrans:Ack received->Freeing transaction") - FreeTransaction( pData, nTransId ); - } - WRITELOG("DdeAbandonTransaction:End") - return TRUE; -} - -// wird von einem Server aufgerufen, wenn sich die Daten des -// Topic/Item-Paars geaendert haben. Diese Funktion fordert -// dann den Server auf, die Daten zu rendern (bei Hotlinks) und -// benachrichtigt die Clients -BOOL ImpDdeMgr::DdePostAdvise( HSZ hszTopic, HSZ hszItem) -{ - ////WRITELOG("DdePostAdvise:Start") - ////WRITESTATUS("DdePostAdvise:Start") - -#if 0 && defined( OV_DEBUG ) - String aDebStr("DdePostAdvise:Item "); - aDebStr += (ULONG)hszItem; - WRITELOG((char*)(const char*)aDebStr) -#endif - - Transaction* pTrans = pTransTable; - pTrans++; - USHORT nCurTrans = 1; - USHORT nUsedTransactions = pData->nCurTransCount; - while( nUsedTransactions && nCurTrans < pData->nMaxTransCount ) - { - HCONV hOwner = pTrans->hConvOwner; - if( hOwner ) - { - nUsedTransactions--; - USHORT nTempType = pTrans->nType; - nTempType &= (~XTYPF_MASK); - if( nTempType == (XTYP_ADVREQ & (~XTYPF_NOBLOCK) ) ) - { - ImpHCONV* pConv = pConvTable; - pConv += (USHORT)hOwner; - if(hszItem == pTrans->hszItem && pConv->hszTopic == hszTopic) - { - if( pConv->hConvPartner ) - { - // Transaktionen werden immer vom Client erzeugt - // -> auf Server-HCONV umschalten - hOwner = pConv->hConvPartner; - pConv = pConvTable; - pConv += (USHORT)hOwner; - } - HWND hWndClient = pConv->hWndPartner; - HWND hWndServer = pConv->hWndThis; -#if 0 && defined( OV_DEBUG ) - String aDebStr("DdePostAdvise: Server:"); - aDebStr += (ULONG)hWndServer; - aDebStr += " Client:"; - aDebStr += (ULONG)hWndClient; - WRITELOG((char*)(const char*)aDebStr) -#endif - DDESTRUCT* pOutDDEData; - if ( pTrans->nType & XTYPF_NODATA ) - { - // Warm link - ////WRITELOG("DdePostAdvise:Warm link found") - pOutDDEData = MakeDDEObject( hWndClient, hszItem, - DDE_FNODATA, pTrans->nFormat, 0, 0 ); - } - else - { - // Hot link - ////WRITELOG("DdePostAdvise:Hot link found") - pOutDDEData = Callback( XTYP_ADVREQ, - pTrans->nFormat, hOwner, hszTopic, - hszItem, (HDDEDATA)0, 1, 0 ); - } - if( pOutDDEData ) - { - // todo: FACK_REQ in Out-Data setzen, wenn pTrans->nType & XTYPF_ACKREQ - ////WRITELOG("DdePostAdvise:Sending data/notification") - BOOL bSuccess = MyWinDdePostMsg( hWndClient, - hWndServer,WM_DDE_DATA, pOutDDEData, DDEPM_RETRY); - if( bSuccess ) - { - // auf Acknowledge des Partners warten ? - if( pTrans->nType & XTYPF_ACKREQ ) - { - pTrans->nConvst = XST_ADVDATASENT; - // Impl. ist falsch! => korrekt: XST_ADVDATAACKRCVD - WaitTransState(pTrans, nCurTrans, - XST_UNADVACKRCVD, 0); - } - } - else - { - ////WRITELOG("DdePostAdvise:PostMsg failed") - nLastErrInstance = DMLERR_POSTMSG_FAILED; - } - } - else - { - ////WRITELOG("DdePostAdvise:No data to send") - } - } - } - } - nCurTrans++; - pTrans++; - } - ////WRITELOG("DdePostAdvise:End") - return TRUE; -} - -BOOL ImpDdeMgr::DdeEnableCallback( HCONV hConv, USHORT wCmd) -{ - return FALSE; -} - -// Rueckgabe: 0==Service nicht registriert; sonst Pointer auf Service-Eintrag -ImpService* ImpDdeMgr::GetService( HSZ hszService ) -{ - ImpService* pPtr = pServices; - if( !pPtr || !hszService ) - return 0; - for( ULONG nIdx = 0; nIdx < nServiceCount; nIdx++, pPtr++ ) - { - if(( hszService == pPtr->hBaseServName ) || - ( hszService == pPtr->hInstServName ) ) - return pPtr; - } - return 0; -} - - -// legt Service in Service-Tabelle ab. Tabelle wird ggf. expandiert -ImpService* ImpDdeMgr::PutService( HSZ hszService ) -{ - if( !pServices ) - { - DBG_ASSERT(nServiceCount==0,"DDE:Bad ServiceCount"); - pServices = new ImpService[ DDEMLSERVICETABLE_INISIZE ]; - memset( pServices, 0, DDEMLSERVICETABLE_INISIZE* sizeof(ImpService)); - nServiceCount = DDEMLSERVICETABLE_INISIZE; - } - ImpService* pPtr = pServices; - USHORT nCurPos = 0; - while( pPtr ) - { - if( pPtr->hBaseServName == 0 ) - break; - nCurPos++; - if( nCurPos < nServiceCount ) - pPtr++; - else - pPtr = 0; - } - if( !pPtr ) - { - // Tabelle vergroessern - pPtr = new ImpService[ nServiceCount + DDEMLSERVICETABLE_INISIZE ]; - memset( pPtr, 0, DDEMLSERVICETABLE_INISIZE* sizeof(ImpService)); - memcpy( pPtr, pServices, nServiceCount * sizeof(ImpService) ); -#ifdef DBG_UTIL - memset( pServices, 0, nServiceCount * sizeof(ImpService) ); -#endif - delete pServices; - pServices = pPtr; - pPtr += nServiceCount; // zeigt auf erste neue Position - nServiceCount += DDEMLSERVICETABLE_INISIZE; - } - DBG_ASSERT(pPtr->hBaseServName==0,"DDE:Service not empty"); - DBG_ASSERT(pPtr->hInstServName==0,"DDE:Service not empty"); - - DdeKeepStringHandle( hszService ); - - USHORT nStrLen = (USHORT)DdeQueryString( hszService, 0, 0, 0); - char* pBuf = new char[ nStrLen + 1 ]; - DdeQueryString(hszService, pBuf, nStrLen, 850 /* CodePage*/ ); - pBuf[ nStrLen ] = 0; - String aStr( (ULONG)hWndServer ); - aStr += pBuf; - HSZ hszInstServ = DdeCreateStringHandle( (PSZ)(const char*)pBuf, 850 ); - delete [] pBuf; - - pPtr->hBaseServName = hszService; - pPtr->hInstServName = hszInstServ; - return pPtr; -} - -void ImpDdeMgr::BroadcastService( ImpService* pService, BOOL bRegistered ) -{ - DBG_ASSERT(pService,"DDE:No Service"); - if( !pService ) - return; - MPARAM aMp1 = (MPARAM)(pService->hBaseServName); - MPARAM aMp2 = (MPARAM)(pService->hInstServName); - ULONG nMsg; - if( bRegistered ) - nMsg = WM_DDEML_REGISTER; - else - nMsg = WM_DDEML_UNREGISTER; - - HWND* pPtr = pAppTable; - for( USHORT nPos = 0; nPos < pData->nMaxAppCount; nPos++, pPtr++ ) - { - HWND hWndCurWin = *pPtr; - if ( hWndCurWin && hWndCurWin != hWndServer ) - WinSendMsg( hWndCurWin, nMsg, aMp1, aMp2 ); - } -} - -HDDEDATA ImpDdeMgr::DdeNameService( HSZ hszService, USHORT afCmd ) -{ - HDDEDATA hRet = (HDDEDATA)1; - - if( afCmd & DNS_FILTERON ) - bServFilterOn = TRUE; - else if( afCmd & DNS_FILTEROFF ) - bServFilterOn = FALSE; - ImpService* pService = GetService( hszService ); - BOOL bRegister = (BOOL)(afCmd & DNS_REGISTER); - if( bRegister ) - { - if( !pService ) - { - pService = PutService( hszService ); - BroadcastService( pService, TRUE ); - } - } - else - { - if( pService ) - { - BroadcastService( pService, FALSE ); - DdeFreeStringHandle( pService->hBaseServName ); - pService->hBaseServName = 0; - DdeFreeStringHandle( pService->hInstServName ); - pService->hInstServName = 0; - } - hRet = (HDDEDATA)0; // Service nicht gefunden - } - return hRet; -} - - -// static -HDDEDATA ImpDdeMgr::DdeClientTransaction(void* pDdeData, ULONG cbData, - HCONV hConv, HSZ hszItem, USHORT nFormat, USHORT nType, - ULONG nTimeout, ULONG* pResult) -{ - //WRITELOG("DdeClientTransaction:Start") - -#if 0 && defined(OV_DEBUG) - if( nType == XTYP_REQUEST ) - { - WRITELOG("Start XTYP_REQUEST"); - WinMessageBox(HWND_DESKTOP,HWND_DESKTOP, - "Start XTYP_REQUEST","DdeClientTransaction", - HWND_DESKTOP,MB_OK); - } -#endif - - if( pResult ) - *pResult = 0; - - ImpDdeMgrData* pData = ImpDdeMgr::AccessMgrData(); - if ( !pData ) - { - ImpDdeMgr::nLastErrInstance = DMLERR_DLL_NOT_INITIALIZED; - return (HDDEDATA)0; - } - - BOOL bIsDdeHandle = (BOOL)(pDdeData && cbData==0xffffffff); - BOOL bAppOwnsHandle = (BOOL)( bIsDdeHandle && - (((DDESTRUCT*)pDdeData)->fsStatus & IMP_HDATAAPPOWNED) ); - - BOOL bNoData = (BOOL)(nType & XTYPF_NODATA)!=0; - BOOL bAckReq = (BOOL)(nType & XTYPF_ACKREQ)!=0; - USHORT nTypeFlags = nType & XTYPF_MASK; - nType &= (~XTYPF_MASK); - - BOOL bSync = (BOOL)( nTimeout != TIMEOUT_ASYNC ) != 0; - if( nType == XTYP_ADVSTART ) - bSync = TRUE; - - // Mapping transaction -> OS/2-Message - USHORT nTimeoutErr, nMsg; - switch ( nType ) - { - case XTYP_ADVSTART: - nMsg = WM_DDE_ADVISE; - nTimeoutErr = DMLERR_ADVACKTIMEOUT; -{ - nTimeout = 60000; -#if 0 && defined(OV_DEBUG) - char aBuf[ 128 ]; - ImpDdeMgr::DdeQueryString( hszItem,aBuf,127,850); - String aXXStr("Establishing hotlink "); - aXXStr += aBuf; - WRITELOG((char*)aXXStr.GetStr()); -#endif - -} - break; - - case XTYP_ADVSTOP: - nMsg = WM_DDE_UNADVISE; - nTimeoutErr = DMLERR_UNADVACKTIMEOUT; - break; - - case XTYP_REQUEST: - nMsg = WM_DDE_REQUEST; - nTimeoutErr = DMLERR_DATAACKTIMEOUT; - break; - - case XTYP_POKE: - nMsg = WM_DDE_POKE; - nTimeoutErr = DMLERR_POKEACKTIMEOUT; - break; - - case XTYP_EXECUTE: - nMsg = WM_DDE_EXECUTE; - nTimeoutErr = DMLERR_EXECACKTIMEOUT; - break; - - default: - nMsg = 0; - } - if(!hConv || (USHORT)hConv>= pData->nMaxConvCount || !nType || !nMsg || - (nType != XTYP_EXECUTE && (!hszItem || !nFormat)) ) - { - WRITELOG("DdeClientTransaction:Invalid parameter") - ImpDdeMgr::nLastErrInstance = DMLERR_INVALIDPARAMETER; - if( bIsDdeHandle && !bAppOwnsHandle ) - DdeFreeDataHandle( (HDDEDATA)pDdeData ); - return (HDDEDATA)0; - } - - // ueber den Conversation handle das ImpDdeMgr-Objekt holen - ImpHCONV* pConv = GetConvTable( pData ); - pConv += (USHORT)hConv; - ImpConvWndData* pObj = - (ImpConvWndData*)WinQueryWindowULong( pConv->hWndThis, 0 ); - ImpDdeMgr* pThis = pObj->pThis; - - if( bSync && pThis->bInSyncTrans ) - { - WRITELOG("DdeClientTransaction:Already in sync. transaction") - ImpDdeMgr::nLastErrInstance = DMLERR_REENTRANCY; - if( bIsDdeHandle && !bAppOwnsHandle ) - DdeFreeDataHandle( (HDDEDATA)pDdeData ); - return (HDDEDATA)0; - } - - Transaction* pTrans; - - BOOL bReqOnAdvLoop = FALSE; - ULONG nTransId = GetTransaction( pData, hConv, hszItem, nFormat ); - if( nTransId ) - { - // WRITELOG("DdeClientTransaction:Transaction found") - pTrans = GetTransTable( pData ); - pTrans += (USHORT)nTransId; - USHORT nTransType = pTrans->nType; - nTransType &= (~XTYPF_MASK); - if( (nType != XTYP_REQUEST && nTransType == nType) || - // wird Advise-Loop schon zum requesten missbraucht ? - (nType == XTYP_REQUEST && - nTransType == XTYP_ADVREQ && - pTrans->nConvst == XST_WAITING_REQDATA)) - { - // dieser Kanal ist dicht! - WRITELOG("DdeClientTransaction:Transaction already used") - ImpDdeMgr::nLastErrInstance = DMLERR_REENTRANCY; - if( bIsDdeHandle && !bAppOwnsHandle ) - DdeFreeDataHandle( (HDDEDATA)pDdeData ); - return (HDDEDATA)0; - } - else if( nTransType == XTYP_ADVREQ ) - { - switch( nType ) - { - case XTYP_ADVSTOP: - //WRITELOG("DdeClientTransaction:Stopping advise trans") - pTrans->nType = XTYP_ADVSTOP; - break; - - case XTYP_ADVSTART: - //WRITELOG("DdeClientTransaction:Adj. Advise-Params") - pTrans->nType = XTYP_ADVREQ; - if( bNoData ) - pTrans->nType |= XTYPF_NODATA; - if( bAckReq ) - pTrans->nType |= XTYPF_ACKREQ; - if( pResult ) - *pResult = nTransId; - return (HDDEDATA)TRUE; - - case XTYP_REQUEST: - // WRITELOG("DdeClientTransaction:Using adv trans for req") - // nConvst wird unten auf XST_WAITING_REQDATA gesetzt - bReqOnAdvLoop = TRUE; - break; - - default: - WRITELOG("DdeClientTransaction:Invalid parameter") - ImpDdeMgr::nLastErrInstance = DMLERR_INVALIDPARAMETER; - if( bIsDdeHandle && !bAppOwnsHandle ) - DdeFreeDataHandle( (HDDEDATA)pDdeData ); - return (HDDEDATA)FALSE; - } - } - } - else - { - // WRITELOG("DdeClientTransaction:Creating transaction") - nTransId = CreateTransaction(pData, hConv, hszItem, nFormat, nType); - } - - pTrans = GetTransTable( pData ); - pTrans += (USHORT)nTransId; - pTrans->nConvst = XST_WAITING_ACK; - if( nType == XTYP_REQUEST ) - pTrans->nConvst = XST_WAITING_REQDATA; - - HWND hWndServer = pConv->hWndPartner; - HWND hWndClient = pConv->hWndThis; - - HDDEDATA pOutDDEData; - if( bIsDdeHandle ) - { - if( bAppOwnsHandle ) - { - // wir muessen leider leider duplizieren, da uns OS/2 - // keine Chance laesst, diesen Status im Datenobjekt - // zu versenken. - ////WRITELOG("DdeClientTransaction:Copying handle") - HDDEDATA pNew; - HDDEDATA pData = (HDDEDATA)pDdeData; - if( !(MyDosAllocSharedMem((PPVOID)&pNew, NULL, pData->cbData, - PAG_COMMIT | PAG_READ | PAG_WRITE | OBJ_GIVEABLE | OBJ_ANY, - "MakeDDEObject"))) - { - memcpy( pNew, pData, pData->cbData ); - pOutDDEData = pNew; - } - else - { - WRITELOG("DdeClientTransaction:No Memory") - ImpDdeMgr::nLastErrInstance = DMLERR_LOW_MEMORY; - return (HDDEDATA)0; - } - } - else - pOutDDEData = (HDDEDATA)pDdeData; - } - else - pOutDDEData=MakeDDEObject(hWndServer,hszItem,0,nFormat,pDdeData,cbData); - - pOutDDEData->fsStatus |= nTypeFlags; - - HDDEDATA pDDEInData = 0; - if( bSync ) - { - if( nType != XTYP_REQUEST ) - pOutDDEData->fsStatus |= DDE_FACKREQ; - - // WRITELOG("DdeClientTransaction:Starting sync. trans.") - pThis->hSyncResponseData = (HDDEDATA)0; - pThis->nSyncResponseMsg = 0; - pThis->bInSyncTrans = TRUE; - pThis->nSyncTransId = nTransId; - pThis->bSyncAbandonTrans = FALSE; - - if ( !MyWinDdePostMsg( hWndServer, hWndClient, nMsg, pOutDDEData, - DDEPM_RETRY) ) - { - WRITELOG("DdeClientTransaction:PostMsg failed") - nLastErrInstance = DMLERR_POSTMSG_FAILED; - if( !bReqOnAdvLoop ) - FreeTransaction( pData, nTransId ); - else - { - DBG_ASSERT(pTrans->nType==XTYP_ADVREQ,"DDE:Error!") - pTrans->nConvst = 0; - } - return FALSE; - } - HAB hAB = WinQueryAnchorBlock( hWndClient ); - ULONG nDummyTimer = WinStartTimer( hAB, 0, 0, 50 ); - ULONG nTimeoutId = TID_USERMAX - nTransId; - WinStartTimer( hAB, hWndClient, nTimeoutId, nTimeout ); - QMSG aQueueMsg; - BOOL bLoop = TRUE; - while( bLoop ) - { - if( pThis->nSyncResponseMsg ) - bLoop = FALSE; - else - { - if( WinGetMsg(hAB,&aQueueMsg,0,0,0 )) - { - WinDispatchMsg( hAB, &aQueueMsg ); - } - else - bLoop = FALSE; - } - } - - WinStopTimer( hAB, hWndClient, nTimeoutId ); - WinStopTimer( hAB, 0, nDummyTimer ); - - // - // Der Speicherblock pOutDDEData muss vom Server geloescht worden sein! - // Ueberlegen: Nochmal loeschen, falls Server buggy ist, ansonsten - // platzt uns bald der Adressraum! - // - if( !pThis->nSyncResponseMsg ) - { - // unsere App wurde beendet - ////WRITELOG("DdeClientTransaction:App terminated") - return 0; - } - pDDEInData = pThis->hSyncResponseData; - nMsg = pThis->nSyncResponseMsg; - pThis->hSyncResponseData= 0; - pThis->nSyncResponseMsg = 0; - pThis->bInSyncTrans = FALSE; - pThis->nSyncTransId = 0; - if( !pDDEInData && nMsg != WM_TIMER ) - { - DBG_ASSERT(0,"Dde:No data!"); - WRITELOG("DdeClientTransaction: No Data!") - return (HDDEDATA)0; - } - switch( nMsg ) - { - case WM_TIMER: - WRITELOG("DdeClientTransaction:Timeout!") - nLastErrInstance = nTimeoutErr; - if( bReqOnAdvLoop ) - // auf normalen Loop-Betrieb zurueckschalten - pTrans->nConvst = XST_WAITING_ADVDATA; - break; - - case WM_DDE_ACK: - { - // WRITELOG("DdeClientTransaction:Ack received") - BOOL bPositive = (BOOL)(pDDEInData->fsStatus & DDE_FACK); - MyDosFreeMem( pDDEInData,"DdeClientTransaction" ); - pDDEInData = (HDDEDATA)bPositive; - if( nType == XTYP_ADVSTART && pDDEInData ) - { - -#if 0 && defined(OV_DEBUG) - char aBuf[ 128 ]; - ImpDdeMgr::DdeQueryString( pTrans->hszItem,aBuf,128,850); - String aXXStr("Hotlink "); -#endif - - if( bPositive ) - { - pTrans->nType = XTYP_ADVREQ; - // Hot/Warmlink, Ack - pTrans->nType |= nTypeFlags; - // XST_WAITING_ACK ==> XST_WAITING_ADVDATA - pTrans->nConvst = XST_WAITING_ADVDATA; - -#if 0 && defined(OV_DEBUG) - aXXStr += "established "; - aXXStr += aBuf; -#endif - - } - -#if 0 && defined(OV_DEBUG) - else - { - aXXStr += "failed "; - aXXStr += aBuf; - } - WRITELOG((char*)aXXStr.GetStr()); -#endif - - } - } - break; - - case WM_DDE_DATA: - // WRITELOG("DdeClientTransaction:Data received") - // WRITEDATA(pDDEInData) - if( bReqOnAdvLoop ) - { - DBG_ASSERT(pTrans->nConvst==XST_WAITING_REQDATA,"DDE:Bad state"); - DBG_ASSERT(pTrans->nType==XTYP_ADVREQ,"DDE:Bad state"); - // auf Loop-Betrieb umschalten - pTrans->nConvst = XST_WAITING_ADVDATA; - } - break; - - default: - WRITELOG("DdeClientTransaction:Unexpected msg") - MyDosFreeMem( pDDEInData,"DdeClientTransaction" ); - pDDEInData = 0; - } - pThis->bSyncAbandonTrans = FALSE; - pThis->bInSyncTrans = FALSE; - if( pThis->bSyncAbandonTrans && bReqOnAdvLoop ) - pThis->DdeAbandonTransaction( hConv, nTransId ); - } - else - { - // WRITELOG("DdeClientTransaction:Starting async. trans.") - pDDEInData = (HDDEDATA)MyWinDdePostMsg( hWndServer, hWndClient, nMsg, - pOutDDEData, DDEPM_RETRY); - if( !pDDEInData ) - { - WRITELOG("DdeClientTransaction:PostMsg failed") - nLastErrInstance = DMLERR_POSTMSG_FAILED; - if( !bReqOnAdvLoop ) - FreeTransaction( pData, nTransId ); - else - { - DBG_ASSERT(pTrans->nType==XTYP_ADVREQ,"DDE:Error!") - pTrans->nConvst = 0; - } - } - else - { - // WRITELOG("DdeClientTransaction:Async trans. success") - if( pResult ) - *pResult = nTransId; - } - } -#if 0 && defined( OV_DEBUG ) - if( nType == XTYP_REQUEST ) - { - WRITELOG("End XTYP_REQUEST"); - WinMessageBox(HWND_DESKTOP,HWND_DESKTOP, - "End XTYP_REQUEST","DdeClientTransaction", - HWND_DESKTOP,MB_OK); - } -#endif - //WRITELOG("DdeClientTransaction:End") - //WRITESTATUS("DdeClientTransaction:End") - return pDDEInData; -} - -MRESULT ImpDdeMgr::DdeRegister( ImpWndProcParams* pParams ) -{ - MRESULT nRet = (MRESULT)0; - if ( !(nTransactFilter & CBF_SKIP_REGISTRATIONS) ) - { - HSZ hSBaseName = (HSZ)pParams->nPar1; - HSZ hIBaseName = (HSZ)pParams->nPar2; - nRet=(MRESULT)Callback(XTYP_REGISTER,0,0,hSBaseName,hIBaseName,0,0,0); - } - return nRet; -} - -MRESULT ImpDdeMgr::DdeUnregister( ImpWndProcParams* pParams ) -{ - MRESULT nRet = (MRESULT)0; - if ( !(nTransactFilter & CBF_SKIP_UNREGISTRATIONS) ) - { - HSZ hSBaseName = (HSZ)pParams->nPar1; - HSZ hIBaseName = (HSZ)pParams->nPar2; - nRet=(MRESULT)Callback(XTYP_UNREGISTER,0,0,hSBaseName,hIBaseName,0,0,0); - } - return nRet; -} - -MRESULT ImpDdeMgr::DdeTimeout( ImpWndProcParams* pParams ) -{ - ////WRITELOG("DdeTimeout:Received") - if( nSyncResponseMsg ) - { - ////WRITELOG("DdeTimeout:Trans already processed->ignoring timeout") - return (MRESULT)1; - } - ULONG nTimerId = (ULONG)pParams->nPar1; - ULONG nTransId = TID_USERMAX - nTimerId; - Transaction* pTrans = pTransTable; - pTrans += (USHORT)nTransId; - if( nTransId < 1 || nTransId >= pData->nMaxTransCount || - pTrans->hConvOwner == 0 ) - { - DBG_ASSERT(0,"DdeTimeout:Invalid TransactionId"); - return (MRESULT)1; - } - if( bInSyncTrans && nTransId == nSyncTransId ) - { - USHORT nTempType = pTrans->nType; - nTempType &= (~XTYPF_MASK); - // advise-loops koennen nur innerhalb synchroner - // requests timeouts bekommen. die transaktion wird - // in diesem fall nicht geloescht. - if( nTempType != (XTYP_ADVREQ & (~XTYPF_NOBLOCK) )) - { - ////WRITELOG("DdeTimeout:Freeing transaction") - FreeTransaction( pData, nTransId ); - } - nSyncResponseMsg = WM_TIMER; -#if 0 && defined( OV_DEBUG ) - String aMsg("DdeTimeout:Transaction="); - aMsg += nTransId; - WRITELOG((char*)(const char*)aMsg) -#endif - } - else - { - ////WRITELOG("DdeTimeout:Async transaction timed out") - pTrans->nConvst = XST_TIMEOUT; - } - return (MRESULT)1; -} - - - -MRESULT ImpDdeMgr::DdeTerminate( ImpWndProcParams* pParams ) -{ - WRITELOG("DdeTerminate:Received") - HWND hWndThis = pParams->hWndReceiver; - HWND hWndPartner = (HWND)(pParams->nPar1); - - HCONV hConv = GetConvHandle( pData, hWndThis, hWndPartner ); -#if 0 && defined( OV_DEBUG ) - String strDebug("DdeTerminate:ConvHandle="); - strDebug += (USHORT)hConv; - WRITELOG((char*)(const char*)strDebug) -#endif - ImpHCONV* pConv = pConvTable + (USHORT)hConv; - if( hConv ) - { - // warten wir auf ein DDE_TERMINATE Acknowledge ? - if( pConv->nStatus & ST_TERMINATED ) - { - ////WRITELOG("DdeTerminate:TERMINATE-Ack received") - pConv->nStatus |= ST_TERMACKREC; - return (MRESULT)0; // DdeDisconnect raeumt jetzt auf - } - - // sind wir Server?, wenn ja: die App benachrichtigen, - // dass die Advise loops gestoppt wurden und die - // Transaktionen loeschen - - // OV 26.07.96: Die das TERMINATE empfangende App muss - // die Transaction-Tabelle abraeumen, egal ob Server oder Client!! - // Es muessen alle Trans geloescht werden, die als Owner den - // Client oder den Server haben! - // if( !(pConv->nStatus & ST_CLIENT ) ) - SendUnadvises( hConv, 0, FALSE ); // alle Formate & nicht loeschen - SendUnadvises( pConv->hConvPartner, 0, FALSE ); - - // wir werden von draussen gekillt - if ( !(nTransactFilter & CBF_SKIP_DISCONNECTS) ) - { - Callback( XTYP_DISCONNECT, 0, hConv, 0, 0, 0, - 0, (ULONG)IsSameInstance(hWndPartner)); - } - - // kann unsere Partner-App DDEML ? - if( !(pConv->hConvPartner) ) - { - // nein, deshalb Transaktionstabelle selbst loeschen - ////WRITELOG("DdeTerminate:Freeing transactions") - FreeTransactions( pData, hConv ); - } - } - else - nLastErrInstance = DMLERR_NO_CONV_ESTABLISHED; - -#if 0 && defined(OV_DEBUG) - if( !WinIsWindow(0,hWndPartner)) - { - WRITELOG("DdeTerminate:hWndPartner not valid") - } - if(!WinIsWindow(0,hWndThis)) - { - WRITELOG("DdeTerminate:hWndThis not valid") - } -#endif - - if( hConv ) - { - // hWndThis nicht loeschen, da wir den Handle noch fuer - // das Acknowledge brauchen - ////WRITELOG("DdeTerminate:Freeing conversation") - FreeConvHandle( pData, hConv, FALSE ); - } - - ////WRITELOG("DdeTerminate:Acknowledging DDE_TERMINATE") - -#ifdef OV_DEBUG - DBG_ASSERT(WinIsWindow( 0, hWndThis ),"hWndThis not valid"); -#endif - - if( !WinDdePostMsg( hWndPartner, hWndThis, WM_DDE_TERMINATE, 0, DDEPM_RETRY )) - { - ////WRITELOG("DdeTerminate:Acknowledging DDE_TERMINATE failed") - } - // jetzt hWndThis loeschen - DestroyConversationWnd( hWndThis ); - - return (MRESULT)0; -} - - -/* - Zuordnung des Conversationhandles: - - Verbindungsaufbau: - Client: DdeInitiate( HWNDClient ) - Server: Post( WM_DDE_INITIATEACK( HWNDServer )) - Client: CreateConvHandle( HWNDClient, HWNDServer ) - - Datenaustausch: - Server: Post(WM_DDE_ACK( HWNDSender )) - Client: GetConvHandle( HWNDClient, HWNDSender ) -*/ - -MRESULT ImpDdeMgr::ConvWndProc( HWND hWnd,ULONG nMsg,MPARAM nPar1,MPARAM nPar2 ) -{ - ImpWndProcParams aParams; - - MRESULT nRet = (MRESULT)0; - aParams.hWndReceiver= hWnd; - aParams.nPar1 = nPar1; - aParams.nPar2 = nPar2; - - switch( nMsg ) - { - -#ifdef DBG_UTIL - case WM_DDE_INITIATE : - DBG_ASSERT(0,"dde:unexpected msg"); - nRet = (MRESULT)TRUE; - break; -#endif - - case WM_DDE_INITIATEACK : nRet = DdeInitiateAck(&aParams); break; - case WM_DDE_ACK : nRet = DdeAck( &aParams ); break; - case WM_DDE_ADVISE : nRet = DdeAdvise( &aParams ); break; - case WM_DDE_DATA : nRet = DdeData( &aParams ); break; - case WM_DDE_EXECUTE : nRet = DdeExecute( &aParams ); break; - case WM_DDE_POKE : nRet = DdePoke( &aParams ); break; - case WM_DDE_REQUEST : nRet = DdeRequest( &aParams ); break; - case WM_DDE_TERMINATE : nRet = DdeTerminate( &aParams ); break; - case WM_DDE_UNADVISE : nRet = DdeUnadvise( &aParams ); break; - case WM_TIMER : nRet = DdeTimeout( &aParams ); break; - } - return nRet; -} - -MRESULT ImpDdeMgr::SrvWndProc( HWND hWnd,ULONG nMsg,MPARAM nPar1,MPARAM nPar2 ) -{ - MRESULT nRet = (MRESULT)0; - - ImpWndProcParams aParams; - aParams.hWndReceiver= hWnd; - aParams.nPar1 = nPar1; - aParams.nPar2 = nPar2; - - switch( nMsg ) - { -#ifdef DBG_UTIL - case WM_DDE_ACK : - case WM_DDE_ADVISE : - case WM_DDE_EXECUTE : - case WM_DDE_POKE : - case WM_DDE_REQUEST : - case WM_DDE_UNADVISE : - case WM_DDE_DATA : - case WM_DDE_INITIATEACK : - DBG_ASSERT(0,"dde:unexpected msg"); - nRet = (MRESULT)TRUE; - break; -#endif - - case WM_DDE_TERMINATE : - break; // DDE_INITIATE wurde im DDE_INITIATEACK terminiert - - // ein Client will was von uns - case WM_DDE_INITIATE : - nRet = DdeInitiate( &aParams ); - break; - - // eine ddeml-faehige App. hat einen Service (typ. AppName) [de]reg. - case WM_DDEML_REGISTER : - nRet = DdeRegister( &aParams ); - break; - - case WM_DDEML_UNREGISTER : - nRet = DdeUnregister( &aParams ); - break; - }; - return nRet; -} - - -MRESULT ImpDdeMgr::DdeAck( ImpWndProcParams* pParams ) -{ - //WRITELOG("DdeAck:Start") - HSZ hszItem; - DDESTRUCT* pInDDEData = (DDESTRUCT*)(pParams->nPar2); - if( pInDDEData ) - { - BOOL bPositive = (BOOL)(pInDDEData->fsStatus & DDE_FACK ) != 0; - BOOL bBusy = bPositive ? FALSE : (BOOL)(pInDDEData->fsStatus & DDE_FBUSY ) != 0; - BOOL bNotProcessed = (BOOL)(pInDDEData->fsStatus & DDE_NOTPROCESSED ) != 0; -#if 0 && defined( OV_DEBUG ) - String aDebStr("DdeAck:Received "); - if( bPositive ) - aDebStr += "(positive)"; - else - aDebStr += "(negative)"; - if( bBusy ) - aDebStr += "(busy)"; - if( bNotProcessed ) - aDebStr += "(not processed)"; - WRITELOG((char*)(const char*)aDebStr) -#endif - // ein DDE_ACK niemals bestaetigen (um endlosschleifen zu vermeiden) - pInDDEData->fsStatus &= (~DDE_FACKREQ); - } - else - { - //WRITELOG("DdeAck:Received (no data!)") - return (MRESULT)0; - } - - HCONV hConv = CheckIncoming(pParams, 0, hszItem); -#ifdef OV_DEBUG - if( !hConv ) - { - WRITELOG("DdeAck:HCONV not found") - } -#endif - ULONG nTransId=GetTransaction(pData,hConv,hszItem,pInDDEData->usFormat); - if( !nTransId ) - { - WRITELOG("DdeAck:Transaction not found") - MyDosFreeMem( pInDDEData,"DdeAck" ); - return (MRESULT)0; - } - - BOOL bThisIsSync = (BOOL)( bInSyncTrans && nTransId == nSyncTransId ); -#if 0 && defined( OV_DEBUG ) - if( bThisIsSync) - WRITELOG("DdeAck: sync transaction") - else - WRITELOG("DdeAck: async transaction") -#endif - // pruefen, ob die Transaktion abgeschlossen ist. - Transaction* pTrans = pTransTable; - pTrans += (USHORT)nTransId; - ImpHCONV* pConv = pConvTable; - pConv += (USHORT)hConv; - - if( pTrans->nConvst == XST_UNADVSENT ) - { - //WRITELOG("DdeAck:Unadvise-Ack received") - pTrans->nConvst = XST_UNADVACKRCVD; - MyDosFreeMem( pInDDEData,"DdeAck" ); - DdeFreeStringHandle( hszItem ); - return (MRESULT)0; - } - if( pTrans->nConvst == XST_ADVDATASENT ) - { - //WRITELOG("DdeAck:AdvData-Ack received") - pTrans->nConvst = XST_ADVDATAACKRCVD; - MyDosFreeMem( pInDDEData,"DdeAck" ); - DdeFreeStringHandle( hszItem ); - return (MRESULT)0; - } - - USHORT nType = pTrans->nType; - nType &= (~XTYPF_MASK); - // beginn einer advise-loop oder request auf advise-loop ? - // wenn ja: transaktion nicht loeschen - BOOL bFinished = (BOOL)(nType != XTYP_ADVSTART && - nType != (XTYP_ADVREQ & (~XTYPF_NOBLOCK)) ); - if( bFinished ) - { - if( !bThisIsSync ) - { - ////WRITELOG("DdeAck:Transaction completed") - Callback( XTYP_XACT_COMPLETE, pInDDEData->usFormat, hConv, - pConv->hszTopic, hszItem, (HDDEDATA)0, nTransId, 0 ); - } - ////WRITELOG("DdeAck:Freeing transaction") - FreeTransaction( pData, nTransId ); - } - - if( bThisIsSync ) - { - hSyncResponseData = pInDDEData; - nSyncResponseMsg = WM_DDE_ACK; - } - else - { - MyDosFreeMem( pInDDEData,"DdeAck" ); - } - - DdeFreeStringHandle( hszItem ); - - return (MRESULT)0; -} - - -USHORT ImpDdeMgr::SendUnadvises(HCONV hConvServer,USHORT nFormat,BOOL bFree) -{ - USHORT nTransFound = 0; - BOOL bCallApp = (BOOL)(!(nTransactFilter & CBF_FAIL_ADVISES)); -#if 0 && defined( OV_DEBUG ) - String aStr("Unadvising transactions for HCONV="); - aStr += (ULONG)hConvServer; - aStr += " CallApp:"; aStr += (USHORT)bCallApp; - WRITELOG((char*)aStr.GetStr()) -#endif - - - // wenn wir weder loeschen noch die App benachrichtigen sollen, - // koennen wir gleich wieder returnen - if( !hConvServer || ( !bFree && !bCallApp ) ) - return 0; - - ImpHCONV* pConvSrv = pConvTable; - pConvSrv += (USHORT)hConvServer; - HSZ hszTopic = pConvSrv->hszTopic; - - Transaction* pTrans = pTransTable; - pTrans++; - USHORT nCurTransId = 1; - USHORT nCurTransactions = pData->nCurTransCount; - while( nCurTransactions && nCurTransId < pData->nMaxTransCount ) - { - if( pTrans->hConvOwner ) - nCurTransactions--; - if( pTrans->hConvOwner == hConvServer && - (pTrans->nType & XTYP_ADVREQ) ) - { - if( !nFormat || (nFormat == pTrans->nFormat) ) - { - nTransFound++; - if( bCallApp ) - { - //WRITELOG("SendUnadvises:Notifying App") - Callback( XTYP_ADVSTOP, pTrans->nFormat, hConvServer, - hszTopic, pTrans->hszItem, 0,0,0 ); - } - if( bFree ) - FreeTransaction( pData, (ULONG)nCurTransId ); - } - } - nCurTransId++; - pTrans++; - } - return nTransFound; -} - - - -HCONV ImpDdeMgr::CheckIncoming( ImpWndProcParams* pParams, ULONG nTransMask, - HSZ& rhszItem ) -{ -// ////WRITELOG("CheckIncoming") - rhszItem = 0; - DDESTRUCT* pInDDEData = (DDESTRUCT*)(pParams->nPar2); - if( !pInDDEData ) - { - // ////WRITELOG("CheckIncoming:PDDESTRUCT==0") - return (HCONV)0; - } - - HWND hWndThis = pParams->hWndReceiver; - HWND hWndClient = (HWND)pParams->nPar1; - - BOOL bReject = (BOOL)(nTransactFilter & nTransMask); - HCONV hConv; - if( !bReject ) - hConv = GetConvHandle( pData, hWndThis, hWndClient ); - if ( bReject || !hConv ) - return (HCONV)0; - - rhszItem = DdeCreateStringHandle( - ((char*)(pInDDEData)+pInDDEData->offszItemName), 850 ); - - // ////WRITELOG("CheckIncoming:OK"); - return hConv; -} - - -MRESULT ImpDdeMgr::DdeAdvise( ImpWndProcParams* pParams ) -{ - ////WRITELOG("DdeAdvise:Received") - HSZ hszItem; - HCONV hConv = CheckIncoming(pParams, CBF_FAIL_ADVISES, hszItem); - DDESTRUCT* pInDDEData = (DDESTRUCT*)(pParams->nPar2); - HWND hWndThis = pParams->hWndReceiver; - HWND hWndClient = (HWND)pParams->nPar1; - if( !hConv ) - { - ////WRITELOG("DdeAdvise:Conversation not found") - pInDDEData->fsStatus &= (~DDE_FACK); - MyWinDdePostMsg(hWndClient,hWndThis,WM_DDE_ACK,pInDDEData,DDEPM_RETRY); - DdeFreeStringHandle( hszItem ); - return (MRESULT)0; - } - - Transaction* pTrans = pTransTable; - ImpHCONV* pConv = pConvTable; - pConv += (USHORT)hConv; - - // existiert schon ein Link auf Topic/Item/Format-Vektor ? - - ULONG nTransId=GetTransaction(pData,hConv,hszItem,pInDDEData->usFormat); - if( nTransId ) - { - ////WRITELOG("DdeAdvise:Transaction already exists") - pTrans += (USHORT)nTransId; - // ist es eine AdviseLoop ? - USHORT nTempType = pTrans->nType; - nTempType &= (~XTYPF_MASK); - if( nTempType == XTYP_ADVREQ ) - { - // Flags der laufenden Advise-Loop aktualisieren - ////WRITELOG("DdeAdvise:Adjusting Advise-Params") - pTrans->nType = XTYP_ADVREQ; - if( pInDDEData->fsStatus & DDE_FNODATA ) - pTrans->nType |= XTYPF_NODATA; - if( pInDDEData->fsStatus & DDE_FACKREQ ) - pTrans->nType |= XTYPF_ACKREQ; - pInDDEData->fsStatus |= DDE_FACK; - MyWinDdePostMsg(hWndClient,hWndThis,WM_DDE_ACK,pInDDEData,DDEPM_RETRY); - DdeFreeStringHandle( hszItem ); - return (MRESULT)0; - } - else if( nTempType != XTYP_ADVSTART ) - { - ////WRITELOG("DdeAdvise:Not a advise transaction") - pInDDEData->fsStatus &= (~DDE_FACK); - MyWinDdePostMsg(hWndClient,hWndThis,WM_DDE_ACK,pInDDEData,DDEPM_RETRY); - DdeFreeStringHandle( hszItem ); - return (MRESULT)0; - } - } - - if( !nTransId ) - { - ////WRITELOG("DdeAdvise:Creating Transaction") - ////WRITESTATUS("DdeAdvise:Creating Transaction") - nTransId = CreateTransaction( pData, hConv, hszItem, - pInDDEData->usFormat, XTYP_ADVREQ ); - ////WRITESTATUS("DdeAdvise:Created Transaction") - } - if( nTransId ) - { - pTrans = pTransTable; - pTrans += (USHORT)nTransId; - if( pInDDEData->fsStatus & DDE_FNODATA ) - pTrans->nType |= XTYPF_NODATA; - if( pInDDEData->fsStatus & DDE_FACKREQ ) - pTrans->nType |= XTYPF_ACKREQ; - } - else - { - ////WRITELOG("DdeAdvise:Cannot create Transaction") - pInDDEData->fsStatus &= (~DDE_FACK); - MyWinDdePostMsg(hWndClient,hWndThis,WM_DDE_ACK,pInDDEData,DDEPM_RETRY); - DdeFreeStringHandle( hszItem ); - return (MRESULT)0; - } - - ////WRITELOG("DdeAdvise:Calling Server") - - if ( Callback( XTYP_ADVSTART, pInDDEData->usFormat, - hConv, pConv->hszTopic, hszItem, (HDDEDATA)0, 0, 0 ) ) - { - // - // ServerApp erlaubt AdviseLoop - // - ////WRITELOG("DdeAdvise:Advise loop established") - pInDDEData->fsStatus |= DDE_FACK; - MyWinDdePostMsg(hWndClient,hWndThis,WM_DDE_ACK,pInDDEData,DDEPM_RETRY); - } - else - { - ////WRITELOG("DdeAdvise:Advise loop not established") - FreeTransaction( pData, nTransId ); - pInDDEData->fsStatus &= (~DDE_FACK); // DDE_FNOTPROCESSED; - MyWinDdePostMsg(hWndClient,hWndThis,WM_DDE_ACK,pInDDEData,DDEPM_RETRY); - } - ////WRITESTATUS("DdeAdvise:End") - ////WRITELOG("DdeAdvise:End") - DdeFreeStringHandle( hszItem ); - return (MRESULT)0; -} - -MRESULT ImpDdeMgr::DdeData( ImpWndProcParams* pParams ) -{ - WRITELOG("DdeData:Received") - HSZ hszItem; - HCONV hConv = CheckIncoming(pParams, 0, hszItem); - HWND hWndThis = pParams->hWndReceiver; - HWND hWndClient = (HWND)pParams->nPar1; - DDESTRUCT* pInDDEData = (DDESTRUCT*)(pParams->nPar2); -#if 0 && defined( OV_DEBUG ) - { - String aStr("DdeData Address:"); - aStr += (ULONG)pInDDEData; - WRITELOG((char*)aStr.GetStr()) - } -#endif - - BOOL bSendAck; - if( pInDDEData && (pInDDEData->fsStatus & DDE_FACKREQ )) - { - WRITELOG("DdeData: Ackn requested") - bSendAck = TRUE; - } - else - { - WRITELOG("DdeData: Ackn not requested") - bSendAck = FALSE; - } - - ULONG nTransId = GetTransaction(pData,hConv,hszItem,pInDDEData->usFormat); - if( !nTransId ) - { - WRITELOG("DdeData:Transaction not found") - WRITEDATA(pInDDEData) - if( bSendAck ) - { - WRITELOG("DdeData: Posting Ackn") - pInDDEData->fsStatus &= (~DDE_FACK); // NOTPROCESSED; - MyWinDdePostMsg(hWndClient,hWndThis,WM_DDE_ACK,pInDDEData,DDEPM_RETRY); - } - else - { - MyDosFreeMem( pInDDEData,"DdeData" ); - } - return (MRESULT)0; - } - -#if 0 && defined( OV_DEBUG ) - if( pInDDEData ) - { - WRITEDATA(pInDDEData) - } -#endif - - BOOL bThisIsSync = (BOOL)( bInSyncTrans && nTransId == nSyncTransId ); - - // pruefen, ob die Transaktion abgeschlossen ist. - Transaction* pTrans = pTransTable; - pTrans += (USHORT)nTransId; - - if( pTrans->nConvst == XST_WAITING_ACK ) - { - // dieser Fall kann eintreten, wenn ein Server innerhalb - // einer WM_DDE_ADVISE-Msg. oder bevor beim Client das - // Ack eintrifft, Advise-Daten sendet. - WRITELOG("DdeData:Ignoring unexpected data") - if( bSendAck ) - { - WRITELOG("DdeData: Posting Ackn") - pInDDEData->fsStatus &= (~DDE_FACK); // NOTPROCESSED; - MyWinDdePostMsg(hWndClient,hWndThis,WM_DDE_ACK,pInDDEData,DDEPM_RETRY); - } - else - { - MyDosFreeMem( pInDDEData,"DdeData" ); - } - return (MRESULT)0; - } - - ImpHCONV* pConv = pConvTable; - pConv += (USHORT)hConv; - - USHORT nType = pTrans->nType; - nType &= (~XTYPF_MASK); - BOOL bNotAdviseLoop = (BOOL)(nType != (XTYP_ADVREQ & (~XTYPF_NOBLOCK))); - if( !bThisIsSync ) - { - // WRITELOG("DdeData:Is async transaction") - if( bNotAdviseLoop ) - { - // WRITELOG("DdeData:Transaction completed -> calling client") - Callback( XTYP_XACT_COMPLETE, pInDDEData->usFormat, hConv, - pConv->hszTopic, hszItem, pInDDEData, nTransId, 0 ); - // WRITELOG("DdeData:Freeing transaction") - FreeTransaction( pData, nTransId ); - } - else - { - WRITELOG("DdeData:Advise-Loop -> calling client") - HDDEDATA pToSend = pInDDEData; - if( pTrans->nType & XTYPF_NODATA ) - { - pToSend = 0; - // WRITELOG("DdeData:Is warm link") - } - Callback( XTYP_ADVDATA, pInDDEData->usFormat, hConv, - pConv->hszTopic, hszItem, pToSend, nTransId, 0 ); - } - if( bSendAck ) - { - WRITELOG("DdeData: Posting Ackn") - pInDDEData->fsStatus = DDE_FACK; - MyWinDdePostMsg(hWndClient,hWndThis,WM_DDE_ACK,pInDDEData,DDEPM_RETRY); - } - else - MyDosFreeMem( pInDDEData,"DdeData" ); - } - else // synchrone Transaktion (Datenhandle nicht freigeben!) - { - // WRITELOG("DdeData:Is sync transaction") - hSyncResponseData = pInDDEData; - nSyncResponseMsg = WM_DDE_DATA; - if( bSendAck ) - { - pInDDEData->fsStatus |= DDE_FACK; - WRITELOG("DdeData: Posting Ackn") - MyWinDdePostMsg(hWndClient,hWndThis,WM_DDE_ACK,pInDDEData, - DDEPM_RETRY | DDEPM_NOFREE ); - } - } - - DdeFreeStringHandle( hszItem ); - // WRITELOG("DdeData:End") - return (MRESULT)0; -} - -MRESULT ImpDdeMgr::DdeExecute( ImpWndProcParams* pParams ) -{ - ////WRITELOG("DdeExecute:Received") - DDESTRUCT* pInDDEData = (DDESTRUCT*)(pParams->nPar2); - HSZ hszItem; - HCONV hConv = CheckIncoming(pParams, 0, hszItem); - BOOL bSuccess = FALSE; - ImpHCONV* pConv = pConvTable; - pConv += (USHORT)hConv; - if ( hConv && !(nTransactFilter & CBF_FAIL_EXECUTES) && pInDDEData ) - { - if ( Callback( XTYP_EXECUTE, pInDDEData->usFormat, hConv, - pConv->hszTopic, hszItem, pInDDEData, 0, 0 ) - == (DDESTRUCT*)DDE_FACK ) - bSuccess = TRUE; - } - else - { - ////WRITELOG("DdeExecute:Not processed") - } - if( pInDDEData ) - { - if( bSuccess ) - pInDDEData->fsStatus |= DDE_FACK; - else - pInDDEData->fsStatus &= (~DDE_FACK); - MyWinDdePostMsg( pConv->hWndPartner, pConv->hWndThis, WM_DDE_ACK, - pInDDEData, DDEPM_RETRY ); - } - DdeFreeStringHandle( hszItem ); - return (MRESULT)0; -} - -HCONV ImpDdeMgr::ConnectWithClient( HWND hWndClient, - HSZ hszPartner, HSZ hszService, HSZ hszTopic, BOOL bSameInst, - DDEINIT* pDDEData, CONVCONTEXT* pCC ) -{ - ////WRITELOG("ConnectWithClient:Start") - HWND hWndSrv = CreateConversationWnd(); - IncConversationWndRefCount( hWndSrv ); - HCONV hConv = CreateConvHandle( pData, pidThis, hWndSrv, hWndClient, - hszPartner, hszService, hszTopic ); - if(!hConv ) - return 0; - BOOL bFreeDdeData = FALSE; - if( !pDDEData ) - { - bFreeDdeData = TRUE; - pDDEData = CreateDDEInitData( hWndClient,hszService,hszTopic, pCC ); - PID pid; TID tid; - WinQueryWindowProcess( hWndClient, &pid, &tid ); - DosGiveSharedMem( pDDEData, pid, PAG_READ | PAG_WRITE); - } - HAB hAB = WinQueryAnchorBlock( hWndSrv ); - WinGetLastError( hAB ); // fehlercode zuruecksetzen - WinSendMsg(hWndClient,WM_DDE_INITIATEACK,(MPARAM)hWndSrv,(MPARAM)pDDEData); - if( WinGetLastError( hAB ) ) - { - // ////WRITELOG("DdeConnectWithClient:Client died") - if( bFreeDdeData ) - { - MyDosFreeMem( pDDEData,"ConnectWithClient" ); - } - FreeConvHandle( pData, hConv ); - return (HCONV)0; - } - - if( !(nTransactFilter & CBF_SKIP_CONNECT_CONFIRMS) ) - { - Callback( XTYP_CONNECT_CONFIRM, 0, hConv, hszTopic, hszService, - 0, 0, (ULONG)bSameInst ); - } - - if( bFreeDdeData ) - { - MyDosFreeMem( pDDEData,"ConnectWithClient" ); - } - // HCONV der PartnerApp suchen & bei uns eintragen - ImpHCONV* pConv = pConvTable; - pConv += (USHORT)hConv; - pConv->hConvPartner = GetConvHandle( pData, hWndClient, hWndSrv ); -#if 0 && defined(OV_DEBUG) - if( !pConv->hConvPartner ) - { - WRITELOG("DdeConnectWithClient:Partner not found") - } -#endif - pConv->nStatus = ST_CONNECTED; - //WRITESTATUS("Server:Connected with client") - //WRITELOG("ConnectWithClient:End") - return hConv; -} - -MRESULT ImpDdeMgr::DdeInitiate( ImpWndProcParams* pParams ) -{ - ////WRITELOG("DdeInitiate:Received") - HWND hWndClient = (HWND)(pParams->nPar1); -// BOOL bSameInst = IsSameInstance( hWndClient ); - BOOL bSameInst = (BOOL)(hWndClient==hWndServer); - DDEINIT* pDDEData = (DDEINIT*)pParams->nPar2; - - if ( ( nTransactFilter & (CBF_FAIL_CONNECTIONS | APPCMD_CLIENTONLY)) || - (( nTransactFilter & CBF_FAIL_SELFCONNECTIONS) && bSameInst ) - ) - { - MyDosFreeMem( pDDEData,"DdeInitiate" ); - return (MRESULT)FALSE; // narda - } - - HSZ hszService = (HSZ)0; - if( *(pDDEData->pszAppName) != '\0' ) - { - hszService = DdeCreateStringHandle( pDDEData->pszAppName, 850 ); - ////WRITELOG(pDDEData->pszAppName); - } - HSZ hszTopic = (HSZ)0; - if( *(pDDEData->pszTopic) != '\0' ) - { - hszTopic = DdeCreateStringHandle( pDDEData->pszTopic, 850 ); - ////WRITELOG(pDDEData->pszTopic); - } - HSZ hszPartner = GetAppName( hWndClient ); - - // nur weitermachen, wenn Service registriert oder - // Service-Name-Filtering ausgeschaltet. - if( !bServFilterOn || GetService(hszService) ) - { - // XTYP_CONNECT-Transaktionen erfolgen nur mit - // Services & Topics ungleich 0! - if( hszService && hszTopic ) - { - if( IsConvHandleAvailable(pData) && Callback( XTYP_CONNECT, - 0, 0, hszTopic,hszService, 0, 0, (ULONG)bSameInst)) - { - // App erlaubt Verbindung mit Client - ConnectWithClient( hWndClient, hszPartner, - hszService, hszTopic, bSameInst, pDDEData ); - } - } - else - { - // ** Wildcard-Connect ** - ////WRITELOG("DdeInitiate:Wildconnect") - // vom Server eine Liste aller Service/Topic-Paare anfordern - CONVCONTEXT* pCC=(CONVCONTEXT*)(pDDEData+pDDEData->offConvContext); - DDESTRUCT* hList = Callback( XTYP_WILDCONNECT, 0, (HCONV)0, - hszTopic,hszService, (HDDEDATA)0, (ULONG)pCC, (ULONG)bSameInst ); - if( hList ) - { - HSZPAIR* pPairs = (HSZPAIR*)((char*)hList+hList->offabData); - while( pPairs->hszSvc ) - { - ////WRITELOG("DdeInitiate:Wildconnect.Connecting") - ConnectWithClient( hWndClient, hszPartner, - pPairs->hszSvc, pPairs->hszTopic, bSameInst, 0, pCC); - // Stringhandles gehoeren der App! (nicht free-en) - pPairs++; - } - DdeFreeDataHandle( hList ); - } - } - } -#if 0 && defined(OV_DEBUG) - else - { - WRITELOG("DdeInitiate:Service filtered") - } -#endif - DdeFreeStringHandle( hszTopic ); - DdeFreeStringHandle( hszService ); - DdeFreeStringHandle( hszPartner ); - MyDosFreeMem( pDDEData,"DdeInitiate" ); - ////WRITELOG("DdeInitiate:End") - return (MRESULT)TRUE; -} - -MRESULT ImpDdeMgr::DdeInitiateAck( ImpWndProcParams* pParams ) -{ - ////WRITELOG("DdeInitiateAck:Received") - DDEINIT* pDDEData = (DDEINIT*)(pParams->nPar2); - - if( !bListConnect && hCurConv ) - { - ////WRITELOG("DdeInitiateAck:Already connected") - MyDosFreeMem( pDDEData,"DdeInitiateAck" ); - WinPostMsg( hWndServer, WM_DDE_TERMINATE, (MPARAM)hWndServer, 0 ); - return (MRESULT)FALSE; - } - - HWND hWndThis = pParams->hWndReceiver; - // Referenz-Count unseres Client-Windows inkrementieren - IncConversationWndRefCount( hWndThis ); - - HWND hWndSrv = (HWND)(pParams->nPar1); - HSZ hszService = DdeCreateStringHandle( pDDEData->pszAppName, 850 ); - HSZ hszTopic = DdeCreateStringHandle( pDDEData->pszTopic, 850 ); - HSZ hszPartnerApp = GetAppName( hWndSrv ); - - hCurConv = CreateConvHandle( pData, pidThis, hWndThis, hWndSrv, - hszPartnerApp, hszService, hszTopic, 0 ); - - ImpHCONV* pConv = pConvTable; - pConv += (USHORT)hCurConv; - - // HCONV der PartnerApp suchen & bei uns eintragen - pConv->hConvPartner = GetConvHandle( pData, hWndSrv, hWndThis ); - // nicht asserten, da ja non-ddeml-Partner moeglich - // DBG_ASSERT(pConv->hConvPartner,"DDE:Partner not found"); - pConv->nStatus = ST_CONNECTED | ST_CLIENT; - - if( bListConnect ) - { - ////WRITELOG("DdeInitiateAck:ListConnect/Connecting hConvs") - // Status setzen & verketten - pConv->hConvList = hCurListId; - pConv->nPrevHCONV = nPrevConv; - pConv->nStatus |= ST_INLIST; - if( nPrevConv ) - { - pConv = pConvTable; - pConv += nPrevConv; - pConv->nNextHCONV = (USHORT)hCurConv; - } - nPrevConv = (USHORT)hCurConv; - } - - DdeFreeStringHandle( hszService ); - DdeFreeStringHandle( hszTopic ); - DdeFreeStringHandle( hszPartnerApp ); - MyDosFreeMem( pDDEData,"DdeInitiateAck" ); - ////WRITESTATUS("After DdeInitiateAck") - ////WRITELOG("DdeInitiateAck:End") - return (MRESULT)TRUE; -} - -MRESULT ImpDdeMgr::DdePoke( ImpWndProcParams* pParams ) -{ - ////WRITELOG("DdePoke:Received") - HSZ hszItem = 0; - DDESTRUCT* pInDDEData = (DDESTRUCT*)(pParams->nPar2); - HCONV hConv = CheckIncoming( pParams, CBF_FAIL_REQUESTS, hszItem ); - BOOL bSuccess =FALSE; - ImpHCONV* pConv = pConvTable; - pConv += (USHORT)hConv; - if ( hConv && !(nTransactFilter & CBF_FAIL_POKES) && pInDDEData ) - { - if( Callback( XTYP_POKE, pInDDEData->usFormat, hConv, - pConv->hszTopic, hszItem, pInDDEData, 0, 0 ) - == (DDESTRUCT*)DDE_FACK ) - bSuccess = TRUE; - } -#if 0 && defined( OV_DEBUG ) - else - { - WRITELOG("DdePoke:Not processed") - } -#endif - if( pInDDEData ) - { - if( bSuccess ) - pInDDEData->fsStatus |= DDE_FACK; - else - pInDDEData->fsStatus &= (~DDE_FACK); - - MyWinDdePostMsg( pConv->hWndPartner, pConv->hWndThis, WM_DDE_ACK, - pInDDEData, DDEPM_RETRY ); - } - DdeFreeStringHandle( hszItem ); - return (MRESULT)0; -} - -MRESULT ImpDdeMgr::DdeRequest( ImpWndProcParams* pParams ) -{ - ////WRITELOG("DdeRequest:Received") - HSZ hszItem = 0; - DDESTRUCT* pInDDEData = (DDESTRUCT*)(pParams->nPar2); - if( pInDDEData ) - // ist fuer Requests nicht definiert - pInDDEData->fsStatus = 0; - HCONV hConv = CheckIncoming( pParams, CBF_FAIL_REQUESTS, hszItem ); - HWND hWndThis = pParams->hWndReceiver; - HWND hWndClient = (HWND)pParams->nPar1; - if( hConv ) - { - ImpHCONV* pConv = pConvTable; - pConv += (USHORT)hConv; - - DDESTRUCT* pOutDDEData = Callback( XTYP_REQUEST, pInDDEData->usFormat, - hConv, pConv->hszTopic, hszItem, (HDDEDATA)0, 0, 0 ); - - if ( !pOutDDEData ) - { - ////WRITELOG("DdeRequest:Not processed") - pInDDEData->fsStatus &= (~DDE_FACK); - MyWinDdePostMsg(hWndClient,hWndThis,WM_DDE_ACK,pInDDEData,DDEPM_RETRY); - } - else - { - ////WRITELOG("DdeRequest:Success") - MyDosFreeMem( pInDDEData,"DdeRequest" ); - pOutDDEData->fsStatus |= DDE_FRESPONSE; - MyWinDdePostMsg(hWndClient,hWndThis,WM_DDE_DATA,pOutDDEData,DDEPM_RETRY); - } - } - else - { - pInDDEData->fsStatus &= (~DDE_FACK); - MyWinDdePostMsg(hWndClient,hWndThis,WM_DDE_ACK,pInDDEData,DDEPM_RETRY); - } - - DdeFreeStringHandle( hszItem ); - ////WRITELOG("DdeRequest:End") - return (MRESULT)0; -} - - -MRESULT ImpDdeMgr::DdeUnadvise( ImpWndProcParams* pParams ) -{ - ////WRITELOG("DdeUnadvise:Received") - - HSZ hszItem; - HCONV hConv = CheckIncoming( pParams, 0, hszItem ); - DDESTRUCT* pInDDEData = (DDESTRUCT*)(pParams->nPar2); - HWND hWndThis = pParams->hWndReceiver; - HWND hWndClient = (HWND)pParams->nPar1; - USHORT nClosedTransactions = 0; - if( hConv ) - { - USHORT nFormat = pInDDEData->usFormat; - // alle Transaktionen des HCONVs loeschen ? - if( !hszItem ) - { - // App benachrichtigen & Transaktionen loeschen - nClosedTransactions = SendUnadvises( hConv, nFormat, TRUE ); - } - else - { - ULONG nTransId = GetTransaction(pData, hConv, hszItem, nFormat); - if( nTransId ) - { - ////WRITELOG("DdeUnadvise:Transaction found") - Transaction* pTrans = pTransTable; - pTrans += (USHORT)nTransId; - ImpHCONV* pConv = pConvTable; - pConv += (USHORT)hConv; - nClosedTransactions = 1; - if( !(nTransactFilter & CBF_FAIL_ADVISES) ) - Callback( XTYP_ADVSTOP, nFormat, hConv, - pConv->hszTopic, hszItem, 0, 0, 0 ); - if( !pConv->hConvPartner ) - FreeTransaction( pData, nTransId ); - } -#if defined(OV_DEBUG) - else - { - WRITELOG("DdeUnadvise:Transaction not found") - } -#endif - } - } -#if defined(OV_DEBUG) - else - { - WRITELOG("DdeUnadvise:Conversation not found") - } -#endif - - if( !nClosedTransactions ) - pInDDEData->fsStatus &= (~DDE_FACK); - else - pInDDEData->fsStatus |= DDE_FACK; - - MyWinDdePostMsg(hWndClient,hWndThis,WM_DDE_ACK,pInDDEData,DDEPM_RETRY); - DdeFreeStringHandle( hszItem ); - return (MRESULT)0; -} - -BOOL ImpDdeMgr::WaitTransState( Transaction* pTrans, ULONG nTransId, - USHORT nNewState, ULONG nTimeout ) -{ - ////WRITELOG("WaitTransState:Start") - ImpHCONV* pConv = pConvTable; - pConv += pTrans->hConvOwner; - HAB hAB = WinQueryAnchorBlock( pConv->hWndThis ); - ULONG nTimerId = WinStartTimer( hAB, 0, 0, 50 ); - QMSG aQueueMsg; - -// while( WinGetMsg( hAB, &aQueueMsg, 0, 0, 0 ) && -// WinIsWindow( hAB, pConv->hWndPartner) && -// pTrans->nConvst != nNewState ) -// { -// WinDispatchMsg( hAB, &aQueueMsg ); -// } - - BOOL bContinue = TRUE; - while( bContinue ) - { - if( WinGetMsg( hAB, &aQueueMsg, 0, 0, 0 )) - { - WinDispatchMsg( hAB, &aQueueMsg ); - if( (!WinIsWindow( hAB, pConv->hWndPartner)) || - (pTrans->nConvst == nNewState) ) - { - bContinue = FALSE; - } - } - else - bContinue = FALSE; - } - - WinStopTimer( hAB, 0, nTimerId ); - ////WRITELOG("WaitTransState:End") - return TRUE; -} - - - - diff --git a/svl/source/svdde/ddeml2.cxx b/svl/source/svdde/ddeml2.cxx deleted file mode 100644 index e0cdee2d52d1..000000000000 --- a/svl/source/svdde/ddeml2.cxx +++ /dev/null @@ -1,1014 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: ddeml2.cxx,v $ - * $Revision: 1.7 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svl.hxx" - -#define INCL_DOS -#include - -#include "ddemlimp.hxx" -#define LOGFILE -#define STATUSFILE -#define DDEDATAFILE -#include "ddemldeb.hxx" - -#if defined (OS2) && defined (__BORLANDC__) -#pragma option -w-par -#endif - - -// ************************************************************************ -// Hilfsfunktionen Speicherverwaltung -// ************************************************************************ - -// -// AllocAtomName -// - -PSZ ImpDdeMgr::AllocAtomName( ATOM hString, ULONG& rBufLen ) -{ - HATOMTBL hAtomTable = WinQuerySystemAtomTable(); - ULONG nLen = WinQueryAtomLength( hAtomTable, hString ); - nLen++; - PSZ pBuf = 0; - if ( !MyDosAllocMem( (PPVOID)&pBuf, nLen, PAG_READ|PAG_WRITE|PAG_COMMIT | OBJ_ANY,"Atom" ) ) - { - WinQueryAtomName( hAtomTable, hString, pBuf, nLen ); - rBufLen = nLen; - } - return pBuf; -} - - -// -// MakeDDEObject -// - -PDDESTRUCT ImpDdeMgr::MakeDDEObject( HWND hwnd, ATOM hItemName, - USHORT fsStatus, USHORT usFormat, PVOID pabData, ULONG usDataLen ) -{ - PDDESTRUCT pddes = 0; - ULONG usItemLen; - PULONG pulSharedObj; - //WRITELOG("MakeDDEObject: Start") - - PSZ pItemName = 0; - if( hItemName != NULL ) - pItemName = AllocAtomName( hItemName, usItemLen ); - else - usItemLen = 1; - - ULONG nTotalSize = sizeof(DDESTRUCT) + usItemLen + usDataLen; - - if( !(MyDosAllocSharedMem((PPVOID)&pulSharedObj, NULL, - nTotalSize, - PAG_COMMIT | PAG_READ | PAG_WRITE | OBJ_GETTABLE | OBJ_GIVEABLE | OBJ_ANY, - "MakeDDEObject"))) - { - pddes = (PDDESTRUCT) pulSharedObj; - // siehe "Glenn Puchtel, DDE for OS/2" p.60 - pddes->cbData = (ULONG)usDataLen; - pddes->fsStatus = fsStatus; - pddes->usFormat = usFormat; - pddes->offszItemName = sizeof( DDESTRUCT ); - if( (usDataLen) && (pabData != NULL ) ) - pddes->offabData = sizeof(DDESTRUCT) + usItemLen; - else - pddes->offabData = 0; - - if( pItemName != NULL ) - memcpy(DDES_PSZITEMNAME(pddes), pItemName, usItemLen ); - else - *(DDES_PSZITEMNAME(pddes)) = '\0'; - - if( pabData != NULL ) - memcpy( DDES_PABDATA(pddes), pabData, usDataLen ); - } - - if ( pItemName ) - { - MyDosFreeMem( pItemName,"MakeDDEObject" ); - } - return pddes; -} - -// -// AllocNamedSharedMem -// - -APIRET ImpDdeMgr::AllocNamedSharedMem( PPVOID ppBaseAddress, PSZ pName, - ULONG nElementSize, ULONG nElementCount ) -{ - ULONG nObjSize = (ULONG)(nElementSize * nElementCount ); - nObjSize += sizeof( ULONG ); // fuer ElementCount am Anfang des Blocks - - *ppBaseAddress = 0; - APIRET nRet = MyDosAllocSharedMem( ppBaseAddress, pName, nObjSize, - PAG_READ | PAG_WRITE | PAG_COMMIT | OBJ_ANY, - "AllocNamedSharedMem" ); - if ( !nRet ) - { - memset( *ppBaseAddress, 0, nObjSize ); - ULONG* pULONG = (ULONG*)*ppBaseAddress; - *pULONG = nObjSize; - } - return nRet; -} - -void ImpDdeMgr::CreateServerWnd() -{ - hWndServer = WinCreateWindow( HWND_DESKTOP, WC_FRAME, "DDEServer", 0, - 0,0,0,0, HWND_DESKTOP, HWND_BOTTOM, 0, 0, 0 ); - WinSetWindowULong( hWndServer, 0, (ULONG)this ); - WinSubclassWindow( hWndServer, ::ServerWndProc ); - TID tidDummy; - WinQueryWindowProcess( hWndServer, &pidThis, &tidDummy ); -} - -void ImpDdeMgr::DestroyServerWnd() -{ - WinDestroyWindow( hWndServer ); - hWndServer = NULLHANDLE; -} - -HWND ImpDdeMgr::CreateConversationWnd() -{ - HWND hWnd = WinCreateWindow( HWND_OBJECT, WC_FRAME, "DDEConvWnd", 0, - 0,0,0,0, HWND_DESKTOP, HWND_BOTTOM, 0, 0, 0 ); - if ( hWnd ) - { - ImpConvWndData* pWndData = new ImpConvWndData; - pWndData->pThis = this; - pWndData->nRefCount = 0; - WinSetWindowULong( hWnd, 0, (ULONG)pWndData ); - WinSubclassWindow( hWnd, ::ConvWndProc ); -#if 0 && defined( OV_DEBUG ) - String aStr("ConvWnd created:"); - aStr += (ULONG)hWnd; - WRITELOG((char*)aStr.GetStr()) -#endif - } - else - nLastErrInstance = DMLERR_SYS_ERROR; - - return hWnd; -} - -// static -void ImpDdeMgr::DestroyConversationWnd( HWND hWnd ) -{ - ImpConvWndData* pObj = (ImpConvWndData*)WinQueryWindowULong( hWnd, 0 ); - if( pObj ) - { - pObj->nRefCount--; - if( pObj->nRefCount == 0 - // auch Windows mit Refcount vonm loeschen, da dieser in initial - // auf 0 gesetzt wird - || pObj->nRefCount == (USHORT)-1 ) - { - delete pObj; - WinDestroyWindow( hWnd ); -#if 0 && defined( OV_DEBUG ) - String aStr("ConvWnd destroyed:"); - aStr += (ULONG)hWnd; - WRITELOG((char*)aStr.GetStr()) -#endif - } - else - { -#if 0 && defined( OV_DEBUG ) - String aStr("ConvWnd not destroyed (Refcount="); - aStr += pObj->nRefCount; - aStr += ") "; aStr += (ULONG)hWnd; - WRITELOG((char*)aStr.GetStr()) -#endif - } - } -#if defined( OV_DEBUG ) - else - { - WRITELOG("DestroyCnvWnd:Already destroyed/No win data/Partner died") - } -#endif -} - -// static -USHORT ImpDdeMgr::GetConversationWndRefCount( HWND hWnd ) -{ - ImpConvWndData* pObj = (ImpConvWndData*)WinQueryWindowULong( hWnd, 0 ); - DBG_ASSERT(pObj,"Dde:ConvWnd has no data"); - if( pObj ) - return pObj->nRefCount; - return 0; -} - -// static -USHORT ImpDdeMgr::IncConversationWndRefCount( HWND hWnd ) -{ -#if 0 && defined( OV_DEBUG ) - String aStr("IncConversationWndRefCount "); - aStr += (ULONG)hWnd; - WRITELOG((char*)aStr.GetStr()) -#endif - ImpConvWndData* pObj = (ImpConvWndData*)WinQueryWindowULong( hWnd, 0 ); - DBG_ASSERT(pObj,"Dde:ConvWnd has no data"); - if( pObj ) - { - pObj->nRefCount++; - return pObj->nRefCount; - } - return 0; -} - -ImpDdeMgrData* ImpDdeMgr::InitAll() -{ - ImpDdeMgrData* pBase = 0; - // nur dann neu anlegen, wenn die Tabelle nicht existiert - APIRET nRet=DosGetNamedSharedMem((PPVOID)&pBase,DDEMLDATA,PAG_READ| PAG_WRITE); - if ( nRet ) - { - if ( nRet == 2 ) // ERROR_FILE_NOT_FOUND ) - { - // DDECONVERSATIONCOUNT=4096 - USHORT nConvTransCount = 128; - PSZ pResult; - nRet = DosScanEnv( "SOMAXDDECONN", (const char**)&pResult ); - if( !nRet ) - { - int nTemp = 0; - nTemp = atoi( pResult ); - nTemp++; // der nullte Eintrag wird nicht benutzt - if( nTemp > 128 ) - nConvTransCount = (USHORT)nTemp; - } - ULONG nSize = sizeof(ImpDdeMgrData); - nSize += sizeof(ImpHCONV) * nConvTransCount; - nSize += sizeof(Transaction) * nConvTransCount; - nSize += sizeof(HWND) * DDEMLAPPCOUNT; - - nRet = ImpDdeMgr::AllocNamedSharedMem( (PPVOID)&pBase, - DDEMLDATA, nSize, 1 ); - if ( !nRet ) - { - pBase->nTotalSize = nSize; - ULONG nAppTable = (ULONG)&(pBase->aAppTable); - ULONG nCharBase = (ULONG)pBase; - pBase->nOffsAppTable = nAppTable - nCharBase; - pBase->nOffsConvTable = pBase->nOffsAppTable; - pBase->nOffsConvTable += sizeof(HWND) * DDEMLAPPCOUNT; - pBase->nOffsTransTable = pBase->nOffsConvTable; - pBase->nOffsTransTable += sizeof(ImpHCONV) * nConvTransCount; - - pBase->nMaxAppCount = DDEMLAPPCOUNT; - pBase->nMaxConvCount = nConvTransCount; - pBase->nMaxTransCount = nConvTransCount; - } - } - } - - if( pBase ) - { - pConvTable = ImpDdeMgr::GetConvTable( pBase ); - pTransTable = ImpDdeMgr::GetTransTable( pBase ); - pAppTable = ImpDdeMgr::GetAppTable( pBase ); - } - - memset( &aDefaultContext, 0, sizeof(CONVCONTEXT) ); - aDefaultContext.cb = sizeof(CONVCONTEXT); - aDefaultContext.idCountry = 49; // ?? - aDefaultContext.usCodepage = 850; // ?? - - return pBase; -} - -// static -HCONV ImpDdeMgr::CreateConvHandle( ImpDdeMgrData* pData, - PID pidOwner, - HWND hWndMe, HWND hWndPartner, - HSZ hszPartner, HSZ hszServiceReq, HSZ hszTopic, - HCONV hPrevHCONV ) -{ - DBG_ASSERT(pData,"DDE:Invalid data"); - if( !pData ) - return (HCONV)0; - - ImpHCONV* pPtr = ImpDdeMgr::GetConvTable( pData ); - USHORT nCount = pData->nMaxConvCount; - pPtr++; - nCount--; // ersten Handle (NULLHANDLE) ueberspringen - USHORT nIdx = 1; - DBG_ASSERT(pPtr,"No ConvTable"); - if( !pPtr ) - return (HCONV)0; - - while( nCount && pPtr->hWndThis != (HWND)NULL ) - { - nCount--; - pPtr++; - nIdx++; - } - if( !nCount ) - return (HCONV)0; - - DdeKeepStringHandle( hszPartner ); - DdeKeepStringHandle( hszServiceReq ); - DdeKeepStringHandle( hszTopic ); - pPtr->hszPartner = hszPartner; - pPtr->hszServiceReq = hszServiceReq; - pPtr->hszTopic = hszTopic; - - pPtr->hWndThis = hWndMe; - pPtr->hWndPartner = hWndPartner; - pPtr->pidOwner = pidOwner; - pPtr->hConvPartner = (HCONV)0; - pPtr->nPrevHCONV = (USHORT)hPrevHCONV; - pPtr->nNextHCONV = 0; - pPtr->nStatus = ST_CONNECTED; - - pData->nCurConvCount++; - - return (HCONV)nIdx; -} - -// static -void ImpDdeMgr::FreeConvHandle( ImpDdeMgrData* pBase, HCONV hConv, - BOOL bDestroyHWndThis ) -{ - DBG_ASSERT(pBase,"DDE:No data"); -#if 0 && defined( OV_DEBUG ) - String aStr("FreeConvHandle: Start "); - aStr += (ULONG)hConv; - aStr += " Destroy: "; aStr += (USHORT)bDestroyHWndThis; - WRITELOG((char*)aStr.GetStr()); - WRITESTATUS("FreeConvHandle: Start"); -#endif - if( !pBase ) - { - WRITELOG("FreeConvHandle: FAIL"); - return; - } - DBG_ASSERT(hConv&&hConvnMaxConvCount,"DDE:Invalid Conv-Handle"); - if( hConv && hConv < pBase->nMaxConvCount ) - { - ImpHCONV* pTable = ImpDdeMgr::GetConvTable( pBase ); - ImpHCONV* pPtr = pTable + (USHORT)hConv; - if( pPtr->nStatus & ST_INLIST ) - { - // Verkettung umsetzen - USHORT nPrev = pPtr->nPrevHCONV; - USHORT nNext = pPtr->nNextHCONV; - if( nPrev ) - { - pPtr = pTable + nPrev; - pPtr->nNextHCONV = nNext; - } - if( nNext ) - { - pPtr = pTable + nNext; - pPtr->nPrevHCONV = nPrev; - } - pPtr = pTable + (USHORT)hConv; - } - - DdeFreeStringHandle( pPtr->hszPartner ); - DdeFreeStringHandle( pPtr->hszServiceReq ); - DdeFreeStringHandle( pPtr->hszTopic ); - if( bDestroyHWndThis ) - DestroyConversationWnd( pPtr->hWndThis ); - memset( pPtr, 0, sizeof(ImpHCONV) ); - DBG_ASSERT(pBase->nCurConvCount,"Dde:Invalid Trans. count"); - pBase->nCurConvCount--; - } -#if defined(OV_DEBUG) - else - { - WRITELOG("FreeConvHandle: FAIL"); - } -#endif - //WRITELOG("FreeConvHandle: END"); - //WRITESTATUS("FreeConvHandle: End"); -} - -// static -HCONV ImpDdeMgr::IsConvHandleAvailable( ImpDdeMgrData* pBase ) -{ - DBG_ASSERT(pBase,"DDE:No data"); - if( !pBase ) - return 0; - - ImpHCONV* pPtr = ImpDdeMgr::GetConvTable( pBase ); - USHORT nCurPos = pBase->nMaxConvCount - 1; - pPtr += nCurPos; // von hinten aufrollen - while( nCurPos >= 1 ) - { - if( pPtr->hWndThis == 0 ) - return TRUE; - pPtr--; - nCurPos--; - } - return FALSE; -} - -// static -HCONV ImpDdeMgr::GetConvHandle( ImpDdeMgrData* pBase, HWND hWndThis, - HWND hWndPartner ) -{ - DBG_ASSERT(pBase,"DDE:No data"); - if( !pBase ) - return 0; - ImpHCONV* pPtr = ImpDdeMgr::GetConvTable( pBase ); - USHORT nCurPos = 1; - pPtr++; // ersten Handle ueberspringen - USHORT nCurConvCount = pBase->nCurConvCount; - while( nCurConvCount && nCurPos < pBase->nMaxConvCount ) - { - if( pPtr->hWndThis ) - { - if(pPtr->hWndThis == hWndThis && pPtr->hWndPartner == hWndPartner) - return (HCONV)nCurPos; - nCurConvCount--; - if( !nCurConvCount ) - return (HCONV)0; - } - nCurPos++; - pPtr++; - } - return (HCONV)0; -} - - - -// static -ULONG ImpDdeMgr::CreateTransaction( ImpDdeMgrData* pBase, HCONV hOwner, - HSZ hszItem, USHORT nFormat, USHORT nTransactionType ) -{ - DBG_ASSERT(pBase,"DDE:No Data"); - DBG_ASSERT(hOwner!=0,"DDE:No Owner"); - - if( pBase && hOwner ) - { - Transaction* pPtr = ImpDdeMgr::GetTransTable( pBase ); - DBG_ASSERT(pPtr->hConvOwner==0,"DDE:Data corrupted"); - USHORT nId = 1; - pPtr++; - while( nId < pBase->nMaxTransCount ) - { - if( pPtr->hConvOwner == (HCONV)0 ) - { - pPtr->hConvOwner = hOwner; - DdeKeepStringHandle( hszItem ); - pPtr->hszItem = hszItem; - pPtr->nType = nTransactionType; - pPtr->nConvst = XST_CONNECTED; - pPtr->nFormat = nFormat; - pBase->nCurTransCount++; - return (ULONG)nId; - } - nId++; - pPtr++; - } - } - return 0; -} - -// static -void ImpDdeMgr::FreeTransaction( ImpDdeMgrData* pBase, ULONG nTransId ) -{ - DBG_ASSERT(pBase,"DDE:No Data"); - if( !pBase ) - return; - - DBG_ASSERT(nTransIdnMaxTransCount,"DDE:Invalid TransactionId"); - if( nTransId >= pBase->nMaxTransCount ) - return; - - Transaction* pPtr = ImpDdeMgr::GetTransTable( pBase ); - pPtr += nTransId; - DBG_ASSERT(pPtr->hConvOwner!=0,"DDE:TransId has no owner"); - if( pPtr->hConvOwner ) - { - //WRITELOG("Freeing transaction"); - DdeFreeStringHandle( pPtr->hszItem ); - memset( pPtr, 0, sizeof(Transaction) ); - DBG_ASSERT(pBase->nCurTransCount,"Dde:Invalid Trans. count"); - pBase->nCurTransCount--; - } -} - -// static -ULONG ImpDdeMgr::GetTransaction( ImpDdeMgrData* pBase, - HCONV hOwner, HSZ hszItem, USHORT nFormat ) -{ - DBG_ASSERT(pBase,"DDE:No Data"); - if( !pBase || !hOwner ) - return 0; - - Transaction* pTrans = ImpDdeMgr::GetTransTable( pBase ); - DBG_ASSERT(pTrans,"DDE:No TransactionTable"); - if( !pTrans ) - return 0; - pTrans++; // NULLHANDLE ueberspringen - - ImpHCONV* pConv = ImpDdeMgr::GetConvTable( pBase ); - pConv += (USHORT)hOwner; - HCONV hConvPartner = pConv->hConvPartner; - - USHORT nCurTransCount = pBase->nCurTransCount; - for( USHORT nTrans=1; nTrans< pBase->nMaxTransCount; nTrans++, pTrans++ ) - { - if( pTrans->hConvOwner ) - { - if(( pTrans->hConvOwner == hOwner || - pTrans->hConvOwner == hConvPartner) && - pTrans->nFormat == nFormat && - pTrans->hszItem == hszItem ) - { - // gefunden! - return (ULONG)nTrans; - } - nCurTransCount--; - if( !nCurTransCount ) - return 0; - } - } - return 0; // narda -} - -// static -HSZ ImpDdeMgr::DdeCreateStringHandle( PSZ pszString, int iCodePage) -{ - if( !pszString || *pszString == '\0' ) - return (HSZ)0; - // Atom-Table beachtet Gross/Kleinschreibung, DDEML aber nicht - - // OV 12.4.96: Services,Topics,Items case-sensitiv!!! - // (Grosskundenanforderung (Reuter-DDE)) - //strlwr( pszString ); - //*pszString = (char)toupper(*pszString); - - HATOMTBL hAtomTable = WinQuerySystemAtomTable(); - ATOM aAtom = WinAddAtom( hAtomTable, pszString ); - return (HSZ)aAtom; -} - -// static -ULONG ImpDdeMgr::DdeQueryString( HSZ hszStr, PSZ pszStr, ULONG cchMax, int iCodePage) -{ - HATOMTBL hAtomTable = WinQuerySystemAtomTable(); - if ( !pszStr ) - return WinQueryAtomLength( hAtomTable, (ATOM)hszStr); - else - { - *pszStr = 0; - return WinQueryAtomName( hAtomTable, (ATOM)hszStr, pszStr, cchMax ); - } -} - -// static -BOOL ImpDdeMgr::DdeFreeStringHandle( HSZ hsz ) -{ - if( !hsz ) - return FALSE; - ATOM aResult = WinDeleteAtom( WinQuerySystemAtomTable(),(ATOM)hsz ); - return (BOOL)(aResult==0); -} - -// static -BOOL ImpDdeMgr::DdeKeepStringHandle( HSZ hsz ) -{ - if( !hsz ) - return TRUE; - HATOMTBL hAtomTable = WinQuerySystemAtomTable(); -#ifdef DBG_UTIL - ULONG nUsageCount=WinQueryAtomUsage(hAtomTable,(ATOM)hsz); -#endif - ULONG nAtom = 0xFFFF0000; - ULONG nPar = (ULONG)hsz; - nAtom |= nPar; - ATOM aAtom = WinAddAtom( hAtomTable, (PSZ)nAtom ); -#ifdef DBG_UTIL - if ( aAtom ) - DBG_ASSERT(WinQueryAtomUsage(hAtomTable,(ATOM)hsz)==nUsageCount+1,"Keep failed"); -#endif - return (BOOL)(aAtom!=0); -} - - -// static -int ImpDdeMgr::DdeCmpStringHandles(HSZ hsz1, HSZ hsz2) -{ - if ( hsz1 == hsz2 ) - return 0; - if ( hsz1 < hsz2 ) - return -1; - return 1; -} - -HDDEDATA ImpDdeMgr::DdeCreateDataHandle( void* pSrc, ULONG cb, - ULONG cbOff, HSZ hszItem, USHORT wFmt, USHORT afCmd) -{ - char* pData = (char*)pSrc; - pData += cbOff; - USHORT nStatus; - if( afCmd & HDATA_APPOWNED ) - nStatus = IMP_HDATAAPPOWNED; - else - nStatus = 0; - PDDESTRUCT hData=MakeDDEObject(0,(ATOM)hszItem,nStatus,wFmt,pData,cb); -// WRITEDATA(hData) - if ( !hData ) - ImpDdeMgr::nLastErrInstance = DMLERR_INVALIDPARAMETER; - return (HDDEDATA)hData; -} - -// static -BYTE* ImpDdeMgr::DdeAccessData(HDDEDATA hData, ULONG* pcbDataSize) -{ - BYTE* pRet = 0; - *pcbDataSize = 0; - if ( hData ) - { - pRet = (BYTE*)hData; - pRet += hData->offabData; - ULONG nLen = hData->cbData; - // nLen -= hData->offabData; - *pcbDataSize = nLen; - } - else - ImpDdeMgr::nLastErrInstance = DMLERR_INVALIDPARAMETER; - return pRet; -} - -// static -BOOL ImpDdeMgr::DdeUnaccessData(HDDEDATA hData) -{ - return TRUE; // nothing to do for us -} - -// static -BOOL ImpDdeMgr::DdeFreeDataHandle(HDDEDATA hData) -{ - DdeUnaccessData( hData ); - MyDosFreeMem( (PSZ)hData, "DdeFreeDataHandle" ); - return TRUE; -} - -// static -HDDEDATA ImpDdeMgr::DdeAddData(HDDEDATA hData,void* pSrc,ULONG cb,ULONG cbOff) -{ - return (HDDEDATA)0; -} - -// static -ULONG ImpDdeMgr::DdeGetData(HDDEDATA hData,void* pDst,ULONG cbMax,ULONG cbOff) -{ - return 0; -} - -BOOL ImpDdeMgr::DisconnectAll() -{ - //WRITESTATUS("Before DisconnectAll()") - USHORT nCurConvCount = pData->nCurConvCount; - if( !nCurConvCount ) - return TRUE; - - BOOL bRet = TRUE; - ImpHCONV* pPtr = pConvTable; - pPtr++; - - for( USHORT nPos=1; nPos < pData->nMaxConvCount; nPos++, pPtr++ ) - { - if( pPtr->hWndThis ) - { - if( !DdeDisconnect( (HCONV)nPos ) ) - bRet = FALSE; - nCurConvCount--; - if( !nCurConvCount ) - break; - } - } - //WRITESTATUS("After DisconnectAll()") - return bRet; -} - -// static -void ImpDdeMgr::FreeTransactions( ImpDdeMgrData* pData,HWND hWndThis, - HWND hWndPartner ) -{ - USHORT nCurTransCount = pData->nCurTransCount; - if( !nCurTransCount ) - return; - - Transaction* pTrans = GetTransTable( pData ); - ImpHCONV* pConvTable = GetConvTable( pData ); - pTrans++; - for( USHORT nPos=1; nPos < pData->nMaxTransCount; nPos++, pTrans++ ) - { - if( pTrans->hConvOwner ) - { - ImpHCONV* pConv = pConvTable + (USHORT)(pTrans->hConvOwner); - if((pConv->hWndThis==hWndThis&& pConv->hWndPartner==hWndPartner)|| - (pConv->hWndThis==hWndPartner && pConv->hWndPartner==hWndThis)) - { - FreeTransaction( pData, (ULONG)nPos ); - } - nCurTransCount--; - if( !nCurTransCount ) - return; - } - } -} - -// static -void ImpDdeMgr::FreeTransactions( ImpDdeMgrData* pData, HCONV hConvOwner ) -{ - USHORT nCurTransCount = pData->nCurTransCount; - if( !nCurTransCount ) - return; - - Transaction* pTrans = GetTransTable( pData ); -// ImpHCONV* pConvTable = GetConvTable( pData ); - pTrans++; - for( USHORT nPos=1; nPos < pData->nMaxTransCount; nPos++, pTrans++ ) - { - if( pTrans->hConvOwner == hConvOwner ) - { - FreeTransaction( pData, (ULONG)nPos ); - nCurTransCount--; - if( !nCurTransCount ) - return; - } - } -} - -// static -void ImpDdeMgr::FreeConversations( ImpDdeMgrData* pData, HWND hWndThis, - HWND hWndPartner ) -{ - USHORT nCurCount = pData->nCurConvCount; - if( !nCurCount ) - return; - - ImpHCONV* pPtr = GetConvTable( pData ); - pPtr++; - for( USHORT nPos=1; nPos < pData->nMaxConvCount; nPos++, pPtr++ ) - { - if( pPtr->hWndThis ) - { - if( hWndThis && pPtr->hWndPartner==hWndPartner ) - FreeConvHandle( pData, (HCONV)nPos ); - nCurCount--; - if( !nCurCount ) - return; - } - } -} - - -BOOL ImpDdeMgr::OwnsConversationHandles() -{ - //WRITESTATUS("OwnsConversationHandles()"); -#if 0 && defined( OV_DEBUG ) - String aStr("OwnsConversationHandles Server:"); - aStr += (ULONG)hWndServer; - WRITELOG((char*)aStr.GetStr()) -#endif - ImpHCONV* pPtr = GetConvTable( pData ); - for( USHORT nCur = 1; nCur < pData->nMaxConvCount; nCur++, pPtr++ ) - { - if( pPtr->hWndThis && pPtr->pidOwner == pidThis ) - { - //WRITELOG("OwnsConversationHandles: TRUE"); - return TRUE; - } - } - // WRITELOG("OwnsConversationHandles: FALSE"); - return FALSE; -} - - - -// ********************************************************************* -// ********************************************************************* -// ********************************************************************* - -USHORT DdeInitialize(ULONG* pidInst, PFNCALLBACK pfnCallback, - ULONG afCmd, ULONG ulRes) -{ - if( (*pidInst)!=0 ) - { - // Reinitialize wird noch nicht unterstuetzt - DBG_ASSERT(0,"DDEML:Reinitialize not supported"); - return DMLERR_INVALIDPARAMETER; - } - - ImpDdeMgr* pMgr = new ImpDdeMgr; - *pidInst = (ULONG)pMgr; - return pMgr->DdeInitialize( pfnCallback, afCmd ); -} - -BOOL DdeUninitialize(ULONG idInst) -{ - if( !idInst ) - return FALSE; - ImpDdeMgr* pMgr = (ImpDdeMgr*)idInst; - // nur loeschen, wenn wir nicht mehr benutzt werden! - if( !pMgr->OwnsConversationHandles() ) - { - WRITELOG("DdeUninitialize: TRUE"); - delete pMgr; - return TRUE; - } - WRITELOG("DdeUninitialize: FALSE"); - return FALSE; -} - - -HCONVLIST DdeConnectList(ULONG idInst, HSZ hszService, HSZ hszTopic, - HCONVLIST hConvList, CONVCONTEXT* pCC) -{ - if( !idInst ) - return 0; - return ((ImpDdeMgr*)idInst)->DdeConnectList(hszService,hszTopic, - hConvList, pCC ); -} - -HCONV DdeQueryNextServer(HCONVLIST hConvList, HCONV hConvPrev) -{ - return ImpDdeMgr::DdeQueryNextServer( hConvList, hConvPrev ); -} - -BOOL DdeDisconnectList(HCONVLIST hConvList) -{ - return ImpDdeMgr::DdeDisconnectList( hConvList ); -} - -HCONV DdeConnect(ULONG idInst, HSZ hszService, HSZ hszTopic, - CONVCONTEXT* pCC) -{ - if( !idInst ) - return 0; - return ((ImpDdeMgr*)idInst)->DdeConnect( hszService, hszTopic, pCC ); -} - -BOOL DdeDisconnect(HCONV hConv) -{ - return ImpDdeMgr::DdeDisconnect( hConv ); -} - -HCONV DdeReconnect(HCONV hConv) -{ - return ImpDdeMgr::DdeReconnect( hConv ); -} - - -USHORT DdeQueryConvInfo(HCONV hConv, ULONG idTransact, CONVINFO* pCI ) -{ - return ImpDdeMgr::DdeQueryConvInfo( hConv, idTransact, pCI ); -} - -BOOL DdeSetUserHandle(HCONV hConv, ULONG id, ULONG hUser) -{ - return ImpDdeMgr::DdeSetUserHandle( hConv, id, hUser ); -} - -BOOL DdeAbandonTransaction(ULONG idInst, HCONV hConv, ULONG idTransaction) -{ - if( !idInst ) - return FALSE; - return ((ImpDdeMgr*)idInst)->DdeAbandonTransaction(hConv,idTransaction); -} - -BOOL DdePostAdvise(ULONG idInst, HSZ hszTopic, HSZ hszItem) -{ - if( !idInst ) - return FALSE; - return ((ImpDdeMgr*)idInst)->DdePostAdvise( hszTopic, hszItem ); -} - -BOOL DdeEnableCallback(ULONG idInst, HCONV hConv, USHORT wCmd) -{ - if( !idInst ) - return FALSE; - return ((ImpDdeMgr*)idInst)->DdeEnableCallback( hConv, wCmd ); -} - -HDDEDATA DdeClientTransaction(void* pData, ULONG cbData, - HCONV hConv, HSZ hszItem, USHORT wFmt, USHORT wType, - ULONG dwTimeout, ULONG* pdwResult) -{ - return ImpDdeMgr::DdeClientTransaction( pData, cbData, - hConv, hszItem, wFmt, wType, dwTimeout, pdwResult ); -} - -HDDEDATA DdeCreateDataHandle(ULONG idInst, void* pSrc, ULONG cb, - ULONG cbOff, HSZ hszItem, USHORT wFmt, USHORT afCmd) -{ - if( !idInst ) - return 0; - return ((ImpDdeMgr*)idInst)->DdeCreateDataHandle( pSrc, cb, - cbOff, hszItem, wFmt, afCmd ); -} - -HDDEDATA DdeAddData(HDDEDATA hData, void* pSrc, ULONG cb, ULONG cbOff) -{ - return ImpDdeMgr::DdeAddData( hData, pSrc, cb, cbOff ); -} - -ULONG DdeGetData(HDDEDATA hData, void* pDst, ULONG cbMax, ULONG cbOff) -{ - return ImpDdeMgr::DdeGetData( hData, pDst, cbMax, cbOff ); -} - -BYTE* DdeAccessData(HDDEDATA hData, ULONG* pcbDataSize) -{ - return ImpDdeMgr::DdeAccessData( hData, pcbDataSize ); -} - -BOOL DdeUnaccessData(HDDEDATA hData) -{ - return ImpDdeMgr::DdeUnaccessData( hData ); -} - -BOOL DdeFreeDataHandle(HDDEDATA hData) -{ - return ImpDdeMgr::DdeFreeDataHandle( hData ); -} - -USHORT DdeGetLastError(ULONG idInst) -{ - if( !idInst ) - return DMLERR_DLL_NOT_INITIALIZED; - return ((ImpDdeMgr*)idInst)->DdeGetLastError(); -} - -HSZ DdeCreateStringHandle(ULONG idInst, PSZ pszString,int iCodePage ) -{ - if( !idInst ) - return 0; - return ((ImpDdeMgr*)idInst)->DdeCreateStringHandle(pszString,iCodePage); -} - -ULONG DdeQueryString( ULONG idInst, HSZ hsz, PSZ pBuf, - ULONG cchMax, int iCodePage ) -{ - if( !idInst ) - return 0; - return ((ImpDdeMgr*)idInst)->DdeQueryString( hsz,pBuf,cchMax,iCodePage); -} - -BOOL DdeFreeStringHandle( ULONG idInst, HSZ hsz) -{ - if( !idInst ) - return FALSE; - return ((ImpDdeMgr*)idInst)->DdeFreeStringHandle( hsz ); -} - -BOOL DdeKeepStringHandle( ULONG idInst, HSZ hsz ) -{ - if( !idInst ) - return FALSE; - return ((ImpDdeMgr*)idInst)->DdeKeepStringHandle( hsz ); -} - -int DdeCmpStringHandles(HSZ hsz1, HSZ hsz2) -{ - return ImpDdeMgr::DdeCmpStringHandles( hsz1, hsz2 ); -} - -HDDEDATA DdeNameService( ULONG idInst, HSZ hsz1, HSZ hszRes, USHORT afCmd ) -{ - if( !idInst ) - return 0; - return ((ImpDdeMgr*)idInst)->DdeNameService( hsz1, afCmd ); -} - - diff --git a/svl/source/svdde/ddemldeb.cxx b/svl/source/svdde/ddemldeb.cxx deleted file mode 100644 index 18da7c07fd3c..000000000000 --- a/svl/source/svdde/ddemldeb.cxx +++ /dev/null @@ -1,283 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: ddemldeb.cxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svl.hxx" - -#include "ddemlimp.hxx" - -#ifdef OV_DEBUG -#include -#endif - -#if defined(OV_DEBUG) - -void ImpAddHSZ( HSZ hszString, String& rStr ) -{ - char aBuf[ 128 ]; - ImpDdeMgr::DdeQueryString( hszString,aBuf,sizeof(aBuf),850); - rStr += " (\""; rStr += aBuf; rStr += "\","; - HATOMTBL hAtomTable = WinQuerySystemAtomTable(); - ULONG nRefCount = 0; - if( hszString ) - nRefCount = WinQueryAtomUsage(hAtomTable, (ATOM)hszString ); - rStr += nRefCount; rStr += ')'; -} - - -void ImpWriteDdeStatus(char* aFilename, char* pAppContext) -{ - char aBuf[ 128 ]; - USHORT nCtr; - HWND* pAppPtr; - ImpHCONV* pConvPtr; - Transaction* pTransPtr; - - ImpDdeMgrData* pData = ImpDdeMgr::AccessMgrData(); - if( !pData ) - return; - SvFileStream aStrm(aFilename, STREAM_READWRITE ); - String aLine; - aStrm.Seek( STREAM_SEEK_TO_END ); - aStrm << endl; - aStrm.WriteLine("********************** DDEML-Log ***********************"); - aStrm << endl; - if( pAppContext ) - { - aLine = Application::GetAppName(); - aLine += ':'; - aLine += "App-Context:"; aLine += pAppContext; - aStrm.WriteLine( aLine ); aStrm << endl; - } - aStrm.WriteLine("----------------- ImpDdeMgrData -------------------"); - aStrm << endl; - aLine= "TotalSize :"; aLine+= pData->nTotalSize; aStrm.WriteLine(aLine); - aLine= "nOffsAppTable :"; aLine+= pData->nOffsAppTable; aStrm.WriteLine(aLine); - aLine= "nOffsConvTable :"; aLine+= pData->nOffsConvTable; aStrm.WriteLine(aLine); - aLine= "nOffsTransTable:"; aLine+= pData->nOffsTransTable; aStrm.WriteLine(aLine); - aLine= "nMaxAppCount :"; aLine+= pData->nMaxAppCount; aStrm.WriteLine(aLine); - aLine= "nMaxConvCount :"; aLine+= pData->nMaxConvCount; aStrm.WriteLine(aLine); - aLine= "nMaxTransCount :"; aLine+= pData->nMaxTransCount; aStrm.WriteLine(aLine); - aLine= "nLastErr :"; aLine+= pData->nLastErr; aStrm.WriteLine(aLine); - aLine= "nCurConvCount :"; aLine+= pData->nCurConvCount; aStrm.WriteLine(aLine); - aLine= "nCurTransCount :"; aLine+= pData->nCurTransCount; aStrm.WriteLine(aLine); - aStrm << endl; - aStrm.WriteLine("---------- Registered DDEML-Applications -----------"); - aStrm << endl; - pAppPtr = ImpDdeMgr::GetAppTable( pData ); - for( nCtr = 0; nCtr < pData->nMaxAppCount; nCtr++, pAppPtr++ ) - { - if( *pAppPtr ) - { - aLine = "App."; aLine += nCtr; aLine += " HWND:"; - aLine += (ULONG)*pAppPtr; aStrm.WriteLine(aLine); - } - } - - aStrm << endl; - aStrm.WriteLine("-------------- Conversation handles ----------------"); - aStrm << endl; - - USHORT nCurCount = pData->nCurConvCount; - - if( nCurCount ) - { - pConvPtr = ImpDdeMgr::GetConvTable( pData ); - for( nCtr = 0; nCtr < pData->nMaxConvCount; nCtr++, pConvPtr++ ) - { - if( pConvPtr->hWndThis ) - { - aLine = "HCONV:"; aLine += nCtr; - aLine += " HCONVpartner: "; aLine += (USHORT)pConvPtr->hConvPartner; - if( !pConvPtr->hConvPartner ) aLine += "(Non-DDEML-App)"; - aLine += " hszPartner: "; aLine += (USHORT)pConvPtr->hszPartner; - ImpAddHSZ( pConvPtr->hszPartner, aLine ); - aStrm.WriteLine( aLine ); - - aLine = "hszService: "; aLine += (USHORT)pConvPtr->hszServiceReq; - ImpAddHSZ( pConvPtr->hszServiceReq, aLine ); - aLine += " hszTopic: "; aLine += (USHORT)pConvPtr->hszTopic; - ImpAddHSZ( pConvPtr->hszTopic, aLine ); - aStrm.WriteLine( aLine ); - - aLine= "Status: "; aLine+= pConvPtr->nStatus; - if( pConvPtr->nStatus & ST_CLIENT ) aLine += " (Client)"; - if( pConvPtr->nStatus & ST_INLIST ) aLine += " (Inlist)"; - aStrm.WriteLine(aLine); - - aLine = "pidOwner: "; aLine += (ULONG)pConvPtr->pidOwner; - aStrm.WriteLine( aLine ); - aLine = "hWndThis: "; aLine += (ULONG)pConvPtr->hWndThis; - aStrm.WriteLine( aLine ); - aLine = "hWndPartner: "; aLine += (ULONG)pConvPtr->hWndPartner; - aStrm.WriteLine( aLine ); - - aLine = "hConvList: "; aLine += (ULONG)pConvPtr->hConvList; - aLine += " Prev: "; aLine += pConvPtr->nPrevHCONV; - aLine += " Next: "; aLine += pConvPtr->nNextHCONV; - aStrm.WriteLine( aLine ); - aStrm.WriteLine("----------------------------------------------------"); - - nCurCount--; - if( !nCurCount ) - break; - } - } - } - - aStrm.WriteLine("----------------- Transaction Ids ------------------"); - - nCurCount = pData->nCurTransCount; - if( nCurCount ) - { - pTransPtr = ImpDdeMgr::GetTransTable( pData ); - for( nCtr = 0; nCtr < pData->nMaxTransCount; nCtr++, pTransPtr++ ) - { - - if( pTransPtr->hConvOwner ) - { - aLine = "TransactionId:"; aLine += nCtr; - aLine += " hConvOwner: "; aLine += (USHORT)pTransPtr->hConvOwner; - aStrm.WriteLine( aLine ); - aLine = "Item: "; aLine += (USHORT)pTransPtr->hszItem; - ImpAddHSZ( pTransPtr->hszItem, aLine ); - aLine += " Format: "; aLine += pTransPtr->nFormat; - aStrm.WriteLine( aLine ); - aLine = "TransactionType: "; aLine += pTransPtr->nType; - aLine += " Convst: "; aLine += pTransPtr->nConvst; - aLine += " LastErr: "; aLine += pTransPtr->nLastError; - aLine += " Userhandle: "; aLine += pTransPtr->nUser; - aStrm.WriteLine( aLine ); - aStrm.WriteLine("--------------------------------------------------"); - - nCurCount--; - if( !nCurCount ) - break; - } - } - } - aStrm << endl; - aStrm.WriteLine("******************* End of DDEML-Log *******************"); -} - -void ImpWriteDdeData(char* aFilename, DDESTRUCT* pData) -{ - char aBuf[ 128 ]; - USHORT nCtr; - SvFileStream aStrm(aFilename, STREAM_READWRITE ); - aStrm.Seek( STREAM_SEEK_TO_END ); - String aLine; - aStrm << endl; - aLine = "cbData:"; aLine += pData->cbData; aStrm.WriteLine( aLine ); - aLine = "fsStatus:"; aLine += pData->fsStatus; aStrm.WriteLine( aLine ); - aLine = "usFormat:"; aLine += pData->usFormat; aStrm.WriteLine( aLine ); - aLine = "ItemName:"; aLine += (char*)((char*)pData+pData->offszItemName); - aStrm.WriteLine( aLine ); - aLine = "offabData:"; aLine += pData->offabData; aStrm.WriteLine(aLine); - char* pBuf = (char*)pData+pData->offabData; - USHORT nLen = pData->cbData; // - pData->offabData; - while( nLen ) - { - aStrm << *pBuf; - nLen--; - pBuf++; - } - aStrm << endl; -} - -void ImpWriteLogFile(char* pFilename, char* pStr) -{ - SvFileStream aStrm(pFilename, STREAM_READWRITE ); - aStrm.Seek( STREAM_SEEK_TO_END ); - String aStr( Application::GetAppName() ); - aStr += ':'; aStr += pStr; - aStrm.WriteLine( (char*)aStr.GetStr() ); -} - -#else - -void ImpWriteDdeStatus(char*, char* ) {} -void ImpWriteDdeData(char*, DDESTRUCT*) {} -void ImpWriteLogFile(char*, char*) {} - -#endif - -APIRET MyDosAllocSharedMem(void** ppBaseAddress, char* pszName, unsigned long ulObjectSize, - unsigned long ulFlags, char* pContextStr ) -{ - APIRET nRet = DosAllocSharedMem(ppBaseAddress,pszName,ulObjectSize,ulFlags ); -#if 0 && defined(OV_DEBUG) && defined(LOGFILE) - String aStr("DosAllocSharedMem:"); - aStr += pContextStr; - aStr += ": "; - aStr += ulObjectSize; - aStr += " ("; - aStr += (ULONG)*((char**)ppBaseAddress); - aStr += ')'; - ImpWriteLogFile("\\ddeml.mem", (char*)aStr.GetStr() ); -#endif - return nRet; -} - -APIRET MyDosAllocMem(void** ppBaseAddress, unsigned long ulObjectSize, - unsigned long ulFlags, char* pContextStr ) -{ - APIRET nRet = DosAllocMem(ppBaseAddress, ulObjectSize,ulFlags ); -#if 0 && defined(OV_DEBUG) && defined(LOGFILE) - String aStr("DosAllocMem:"); - aStr += pContextStr; - aStr += ": "; - aStr += ulObjectSize; - aStr += " ("; - aStr += (ULONG)*((char**)ppBaseAddress); - aStr += ')'; - ImpWriteLogFile("\\ddeml.mem", (char*)aStr.GetStr() ); -#endif - return nRet; -} - - -APIRET MyDosFreeMem( void* pBaseAddress, char* pContextStr ) -{ - APIRET nRet = DosFreeMem( pBaseAddress ); -#if 0 && defined(OV_DEBUG) && defined(LOGFILE) - String aStr("DosFreeMem:"); - aStr += pContextStr; - aStr += ": "; - aStr += (ULONG)pBaseAddress; - ImpWriteLogFile("\\ddeml.mem", (char*)aStr.GetStr()); -#endif - return nRet; -} - - - - - diff --git a/svl/source/svdde/ddemldeb.hxx b/svl/source/svdde/ddemldeb.hxx deleted file mode 100644 index 39d3d836882a..000000000000 --- a/svl/source/svdde/ddemldeb.hxx +++ /dev/null @@ -1,69 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: ddemldeb.hxx,v $ - * $Revision: 1.3 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#if defined(OV_DEBUG) - -void ImpWriteLogFile(char*,char*); -void ImpAddHSZ( HSZ, String& ); -void ImpWriteDdeStatus(char*, char* ); -void ImpWriteDdeData(char*, DDESTRUCT*); - -#ifdef LOGFILE -#define WRITELOG(aString) ImpWriteLogFile("\\ddeml.log",aString); -#else -#define WRITELOG(bla) -#endif -#ifdef STATUSFILE -#define WRITESTATUS(aContext) ImpWriteDdeStatus("\\ddeml.sts",aContext); -#else -#define WRITESTATUS(bla) -#endif -#ifdef DDEDATAFILE -#define WRITEDATA(data) ImpWriteDdeData("\\ddeml.dat",data); -#else -#define WRITEDATA(bla) -#endif - -#else - -#define WRITELOG(bla) -#define WRITESTATUS(bla) -#define WRITEDATA(bla) - -#endif - -APIRET MyDosAllocSharedMem(void** ppBaseAddress, char* pszName, unsigned long ulObjectSize, - unsigned long ulFlags, char* pContextStr ); - -APIRET MyDosAllocMem(void** ppBaseAddress, unsigned long ulObjectSize, - unsigned long ulFlags, char* pContextStr ); - -APIRET MyDosFreeMem( void* pBaseAddress, char* pContextStr ); - diff --git a/svl/source/svdde/ddemlimp.hxx b/svl/source/svdde/ddemlimp.hxx deleted file mode 100644 index 47ad53d0b9fe..000000000000 --- a/svl/source/svdde/ddemlimp.hxx +++ /dev/null @@ -1,436 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: ddemlimp.hxx,v $ - * $Revision: 1.3 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _DDEMLIMP_HXX -#define _DDEMLIMP_HXX - - -#include -#include -#include "ddemlos2.h" - -#define DDEMLSERVICETABLE_INISIZE 8 - -// Bezeichner der systemglobalen DDEML-Tabelle -#define DDEMLDATA "\\SHAREMEM\\OV_DDEML.DAT" - -// vorlaeufig konstante Tabellengroessen -#define CONVTABLECOUNT 2048 /* max count conversations */ -#define TRANSTABLECOUNT 2048 /* transactions */ -#define DDEMLAPPCOUNT 16 /* max count simultaniously running */ - /* ddeml (StarDivision) applications */ - -#define ST_TERMACKREC 0x8000 /* wird im Conversationhandle gesetzt, */ - /* wenn die Partner-App DDE_TERMINATE */ - /* bestaetigt hat */ - -#define XST_TIMEOUT 17 /* Trans. hat Timeout ueberschritten */ -#define XST_WAITING_ACK 18 /* Trans. wartet auf Acknowledge */ -#define XST_WAITING_ADVDATA 19 /* Trans. wartet auf Advise-Daten */ -#define XST_WAITING_REQDATA 20 /* Trans. wartet auf angeforderte Daten */ - - -/* User-Flags DDESTRUCT */ -#define IMP_HDATAAPPOWNED 0x8000 - -#define CONVLISTNAME "DdeConvListId" - -#define XTYPF_MASK (XTYPF_NOBLOCK | XTYPF_NODATA | XTYPF_ACKREQ) - -// -// DDEML-Messages; werden nur an registrierte DDEML-Apps gesendet -// - -// Msg: WM_DDEML_REGISTER -// Empfaenger: wird allen DDEML-Applikationen nach Registrierung -// eines neuen Services gesendet -// Params: nPar1: hszBaseServName -// nPar2: hszInstServName -#define WM_DDEML_REGISTER WM_USER+1 - -// Msg: WM_DDEML_UNREGISTER -// Empfaenger: wird allen DDEML-Applikationen nach Deregistrierung -// eines Services gesendet -// Params: nPar1: hszBaseServName -// nPar2: hszInstServName -#define WM_DDEML_UNREGISTER WM_USER+2 - -// -// -// - -struct ImpHCONV -{ - HCONV hConvPartner; - HSZ hszPartner; // Name of partner application - HSZ hszServiceReq; // Service name - HSZ hszTopic; // Topic name - USHORT nStatus; // ST_* of conversation - HCONVLIST hConvList; // ConvListId , wenn in ConvList - CONVCONTEXT aConvContext; // Conversation context - - // private - HWND hWndThis; // 0 == Handle not used - HWND hWndPartner; - PID pidOwner; // PID des DdeManagers, der - // den Conv-Handle erzeugt hat. - USHORT nPrevHCONV; // 0 == no previous hConv or not in list - USHORT nNextHCONV; // 0 == no next hconv or not in list -}; - -struct Transaction -{ - HSZ hszItem; // Item name - USHORT nFormat; // Data format - USHORT nType; // Transaction type (XTYP_*) - // XTYP_ADVREQ [|XTYPF_NODATA] == Advise-Loop - // [|XTYPF_ACKREQ] - // XTYP_EXECUTE == laufendes Execute - // XTYP_REQUEST - // XTYP_POKE - // XTYP_ADVSTOP - // XTYP_ADVSTART - USHORT nConvst; // Conversation state (XST_*) - // 0 == idle - // XST_REQSENT (fuer XTYP_ADVREQ) - // XST_TIMEOUT (fuer alle Typen!) - // XST_WAITING (alle ausser XTYP_ADVREQ) - USHORT nLastError; // last err in transaction - ULONG nUser; // Userhandle - // private - HCONV hConvOwner; // 0 == Transaction not used -}; - - -struct ImpWndProcParams -{ - HWND hWndReceiver; - MPARAM nPar1; - MPARAM nPar2; -}; - -struct ImpService -{ - HSZ hBaseServName; // Basis-Name des Service - HSZ hInstServName; // Basis-Name + DDEML-Server-HWND der App -}; - -class ImpDdeMgr; - -// Daten eines Conversation-Windows -struct ImpConvWndData -{ - ImpDdeMgr* pThis; - USHORT nRefCount; // Zahl Conversations auf diesem Window -}; - - -// systemglobale Daten der Library (liegen in named shared memory) -struct ImpDdeMgrData -{ - ULONG nTotalSize; - ULONG nOffsAppTable; - ULONG nOffsConvTable; - ULONG nOffsTransTable; - USHORT nMaxAppCount; - USHORT nMaxConvCount; - USHORT nMaxTransCount; - USHORT nLastErr; - USHORT nReserved; - USHORT nCurTransCount; - USHORT nCurConvCount; - HWND aAppTable[ 1 ]; // fuer Broadcast-Messages - ImpHCONV aConvTable[ 1 ]; - Transaction aTransTable[ 1 ]; -}; - - - -class ImpDdeMgr -{ - friend MRESULT EXPENTRY ConvWndProc(HWND hWnd,ULONG nMsg,MPARAM nPar1,MPARAM nPar2); - friend MRESULT EXPENTRY ServerWndProc(HWND hWnd,ULONG nMsg,MPARAM nPar1,MPARAM nPar2); - friend void ImpWriteDdeStatus(char*,char*); - friend void ImpAddHSZ( HSZ, String& ); - - static PSZ AllocAtomName( ATOM hString, ULONG& rBufLen ); - static PDDESTRUCT MakeDDEObject( HWND hwnd, ATOM hItemName, - USHORT fsStatus, USHORT usFormat, PVOID pabData, ULONG usDataLen ); - static APIRET AllocNamedSharedMem( PPVOID ppBaseAddress, PSZ pName, - ULONG nElementSize, ULONG nElementCount ); - - HWND hWndServer; - PID pidThis; - PFNCALLBACK pCallback; - ULONG nTransactFilter; - CONVCONTEXT aDefaultContext; - ImpDdeMgrData* pData; - ImpService* pServices; - USHORT nServiceCount; - - ImpHCONV* pConvTable; // liegt in pData (nicht deleten!) - Transaction* pTransTable; // liegt in pData (nicht deleten!) - HWND* pAppTable; // liegt in pData (nicht deleten!) - - static ImpHCONV* GetConvTable( ImpDdeMgrData* ); - static Transaction* GetTransTable( ImpDdeMgrData* ); - static HWND* GetAppTable( ImpDdeMgrData* ); - - - static HWND NextFrameWin( HENUM hEnum ); - void CreateServerWnd(); - void DestroyServerWnd(); - HWND CreateConversationWnd(); - // Fktn. duerfen nur fuer HCONVs aufgerufen werden, die - // in der eigenen Applikation erzeugt wurden - static void DestroyConversationWnd( HWND hWndConv ); - static USHORT GetConversationWndRefCount( HWND hWndConv ); - static USHORT IncConversationWndRefCount( HWND hWndConv ); - - MRESULT SrvWndProc(HWND hWnd,ULONG nMsg,MPARAM nPar1,MPARAM nPar2); - MRESULT ConvWndProc(HWND hWnd,ULONG nMsg,MPARAM nPar1,MPARAM nPar2); - void RegisterDDEMLApp(); - void UnregisterDDEMLApp(); - void CleanUp(); - ImpDdeMgrData* InitAll(); - static BOOL MyWinDdePostMsg( HWND, HWND, USHORT, PDDESTRUCT, ULONG ); - void MyInitiateDde( HWND hWndServer, HWND hWndClient, - HSZ hszService, HSZ hszTopic, CONVCONTEXT* pCC ); - DDEINIT* CreateDDEInitData( HWND hWndDest, HSZ hszService, - HSZ hszTopic, CONVCONTEXT* pCC ); - // wenn pDDEData==0, muss pCC gesetzt sein - HCONV ConnectWithClient( HWND hWndClient, HSZ hszPartner, - HSZ hszService, HSZ hszTopic, BOOL bSameInst, - DDEINIT* pDDEData, CONVCONTEXT* pCC = 0); - - HCONV CheckIncoming( ImpWndProcParams*, ULONG nTransMask, - HSZ& rhszItem ); - // fuer Serverbetrieb. Ruft Callback-Fkt fuer alle offenen Advises - // auf, deren Owner der uebergebene HCONV ist. - // bFreeTransactions==TRUE: loescht die Transaktionen - // gibt Anzahl der getrennten Transaktionen zurueck - USHORT SendUnadvises( HCONV hConv, - USHORT nFormat, // 0==alle - BOOL bFreeTransactions ); - - BOOL WaitTransState( - Transaction* pTrans, ULONG nTransId, - USHORT nNewState, - ULONG nTimeout ); - - // DDEML ruft Callback mit XTYP_CONNECT-Transaction nur auf, - // wenn die App den angeforderten Service registriert hat - // Standardeinstellung: TRUE - BOOL bServFilterOn; - - // Fehlercode muss noch systemglobal werden (Atom o. ae.) - static USHORT nLastErrInstance; // wenn 0, dann gilt globaler Fehlercode - - static ImpDdeMgrData* AccessMgrData(); - - static HCONV CreateConvHandle( ImpDdeMgrData* pBase, - PID pidOwner, - HWND hWndThis, HWND hWndPartner, - HSZ hszPartner, HSZ hszServiceReq, HSZ hszTopic, - HCONV hPrevHCONV = 0 ); - - static HCONV IsConvHandleAvailable( ImpDdeMgrData* pBase ); - static HCONV GetConvHandle( ImpDdeMgrData* pBase, - HWND hWndThis, HWND hWndPartner ); - static void FreeConvHandle( ImpDdeMgrData*, HCONV, - BOOL bDestroyHWndThis = TRUE ); - - static ULONG CreateTransaction( ImpDdeMgrData* pBase, - HCONV hOwner, HSZ hszItem, USHORT nFormat, - USHORT nTransactionType ); - static ULONG GetTransaction( ImpDdeMgrData* pBase, - HCONV hOwner, HSZ hszItem, USHORT nFormat ); - - static void FreeTransaction( ImpDdeMgrData*, ULONG nTransId ); - - BOOL DisconnectAll(); - // Transaktionen muessen _vor_ den Konversationen geloescht werden! - static void FreeTransactions( ImpDdeMgrData*, HWND hWndThis, - HWND hWndPartner ); - static void FreeTransactions( ImpDdeMgrData*, HCONV hConvOwner ); - - static void FreeConversations( ImpDdeMgrData*,HWND hWndThis, - HWND hWndPartner ); - - ImpService* GetService( HSZ hszService ); - ImpService* PutService( HSZ hszService ); - void BroadcastService( ImpService*, BOOL bRegistered ); - - // rh: Startposition(!) & gefundener Handle - static ImpHCONV* GetFirstServer( ImpDdeMgrData*, HCONVLIST, HCONV& rh); - static ImpHCONV* GetLastServer( ImpDdeMgrData*, HCONVLIST, HCONV& ); - static BOOL CheckConvListId( HCONVLIST hConvListId ); - - BOOL IsSameInstance( HWND hWnd ); - HSZ GetAppName( HWND hWnd ); - - - // Transactions - MRESULT DdeAck( ImpWndProcParams* pParams ); - MRESULT DdeAdvise( ImpWndProcParams* pParams ); - MRESULT DdeData( ImpWndProcParams* pParams ); - MRESULT DdeExecute( ImpWndProcParams* pParams ); - MRESULT DdeInitiate( ImpWndProcParams* pParams ); - MRESULT DdeInitiateAck( ImpWndProcParams* pParams ); - MRESULT DdePoke( ImpWndProcParams* pParams ); - MRESULT DdeRequest( ImpWndProcParams* pParams ); - MRESULT DdeTerminate( ImpWndProcParams* pParams ); - MRESULT DdeUnadvise( ImpWndProcParams* pParams ); - MRESULT DdeRegister( ImpWndProcParams* pParams ); - MRESULT DdeUnregister( ImpWndProcParams* pParams ); - MRESULT DdeTimeout( ImpWndProcParams* pParams ); - - HDDEDATA Callback( - USHORT nTransactionType, - USHORT nClipboardFormat, - HCONV hConversationHandle, - HSZ hsz1, - HSZ hsz2, - HDDEDATA hData, - ULONG nData1, - ULONG nData2 ); - - HCONV DdeConnectImp( HSZ hszService,HSZ hszTopic,CONVCONTEXT* pCC); - - // connection data - HCONV hCurConv; // wird im DdeInitiateAck gesetzt - HCONVLIST hCurListId; // fuer DdeConnectList - USHORT nPrevConv; // .... "" .... - BOOL bListConnect; - - // synchr. transaction data - BOOL bInSyncTrans; - ULONG nSyncTransId; - HDDEDATA hSyncResponseData; - ULONG nSyncResponseMsg; // WM_DDE_ACK, WM_DDE_DATA, WM_TIMER - // TRUE==nach Ende der synchronen Transaktion eine evtl. benutzte - // asynchrone Transaktion beenden (typisch synchroner Request auf - // Advise-Loop) - BOOL bSyncAbandonTrans; - -public: - ImpDdeMgr(); - ~ImpDdeMgr(); - - USHORT DdeInitialize( PFNCALLBACK pCallbackProc, ULONG nTransactionFilter ); - USHORT DdeGetLastError(); - - HCONV DdeConnect( HSZ hszService, HSZ hszTopic, CONVCONTEXT* ); - HCONVLIST DdeConnectList( HSZ hszService, HSZ hszTopic, - HCONVLIST hConvList, CONVCONTEXT* ); - static BOOL DdeDisconnect( HCONV hConv ); - static BOOL DdeDisconnectList( HCONVLIST hConvList ); - static HCONV DdeReconnect(HCONV hConv); - static HCONV DdeQueryNextServer(HCONVLIST hConvList, HCONV hConvPrev); - static USHORT DdeQueryConvInfo(HCONV hConv, ULONG idTrans,CONVINFO* pCI); - static BOOL DdeSetUserHandle(HCONV hConv, ULONG id, ULONG hUser); - BOOL DdeAbandonTransaction( HCONV hConv, ULONG idTransaction); - - BOOL DdePostAdvise( HSZ hszTopic, HSZ hszItem); - BOOL DdeEnableCallback( HCONV hConv, USHORT wCmd); - - HDDEDATA DdeNameService( HSZ hszService, USHORT afCmd); - - static HDDEDATA DdeClientTransaction(void* pData, ULONG cbData, - HCONV hConv, HSZ hszItem, USHORT wFmt, USHORT wType, - ULONG dwTimeout, ULONG* pdwResult); - - // Data handles - - HDDEDATA DdeCreateDataHandle( void* pSrc, ULONG cb, ULONG cbOff, - HSZ hszItem, USHORT wFmt, USHORT afCmd); - static BYTE* DdeAccessData(HDDEDATA hData, ULONG* pcbDataSize); - static BOOL DdeUnaccessData(HDDEDATA hData); - static BOOL DdeFreeDataHandle(HDDEDATA hData); - static HDDEDATA DdeAddData(HDDEDATA hData,void* pSrc,ULONG cb,ULONG cbOff); - static ULONG DdeGetData(HDDEDATA hData,void* pDst,ULONG cbMax,ULONG cbOff); - - // String handles - - static HSZ DdeCreateStringHandle( PSZ pStr, int iCodePage); - static ULONG DdeQueryString(HSZ hsz,PSZ pStr,ULONG cchMax,int iCPage); - static BOOL DdeFreeStringHandle( HSZ hsz ); - static BOOL DdeKeepStringHandle( HSZ hsz ); - static int DdeCmpStringHandles(HSZ hsz1, HSZ hsz2); - - // mit dieser Funktion kann geprueft werden, ob eine - // Applikation schon eine DDEML-Instanz angelegt hat. - // Die aktuelle Impl. unterstuetzt nur eine DDEML-Instanz - // pro Applikation (wg. synchroner Transaktionen) - static ImpDdeMgr* GetImpDdeMgrInstance( HWND hWnd ); - - // gibt TRUE zurueck, wenn mind. ein lebender HCONV - // von diesem DdeMgr erzeugt wurde - BOOL OwnsConversationHandles(); -}; - -// static -inline ImpHCONV* ImpDdeMgr::GetConvTable( ImpDdeMgrData* pData ) -{ - ImpHCONV* pRet; - if( pData ) - pRet = (ImpHCONV*)((ULONG)(pData) + pData->nOffsConvTable); - else - pRet = 0; - return pRet; -} - -// static -inline Transaction* ImpDdeMgr::GetTransTable( ImpDdeMgrData* pData ) -{ - Transaction* pRet; - if( pData ) - pRet = (Transaction*)((ULONG)(pData) + pData->nOffsTransTable); - else - pRet = 0; - return pRet; -} - -// static -inline HWND* ImpDdeMgr::GetAppTable( ImpDdeMgrData* pData ) -{ - HWND* pRet; - if( pData ) - pRet = (HWND*)((ULONG)(pData) + pData->nOffsAppTable); - else - pRet = 0; - return pRet; -} - - - - -#endif - diff --git a/svl/source/svdde/ddemlos2.h b/svl/source/svdde/ddemlos2.h deleted file mode 100644 index fe685e95fecf..000000000000 --- a/svl/source/svdde/ddemlos2.h +++ /dev/null @@ -1,377 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: ddemlos2.h,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _DDEML_H -#define _DDEML_H - -#define INCL_OS2 -#define INCL_WIN - -#include -#include -#include -#include - -typedef LHANDLE HSTR; - -#ifndef CALLBACK -#define CALLBACK -#endif - - -typedef ULONG HCONVLIST; -typedef ULONG HCONV; -typedef ATOM HSZ; -typedef DDESTRUCT* HDDEDATA; - -struct CONVINFO -{ - USHORT nSize; // sizeof(CONVINFO) - ULONG nUser; // Userhandle - HCONV hConvPartner; // - HSZ hszPartner; // Name der Partnerapp - HSZ hszServiceReq; // Name des angeforderten Services - HSZ hszTopic; // -- " -- Topics - HSZ hszItem; // -- " -- Items - USHORT nFormat; // Datenformat der akt. Transaktion - USHORT nType; // Typ der akt. Transaktion (XTYP_*) - USHORT nStatus; // ST_* der Konversation - USHORT nConvst; // XST_* der akt. Transaktion - USHORT nLastError; // letzter Fehler der Transaktion - HCONVLIST hConvList; // ConvListId , wenn in ConvList - CONVCONTEXT aConvCtxt; // conversation context -}; - -/* the following structure is for use with XTYP_WILDCONNECT processing. */ - -struct HSZPAIR -{ - HSZ hszSvc; - HSZ hszTopic; -}; -typedef HSZPAIR *PHSZPAIR; - -/***** conversation states (usState) *****/ - -#define XST_NULL 0 /* quiescent states */ -#define XST_INCOMPLETE 1 -#define XST_CONNECTED 2 -#define XST_INIT1 3 /* mid-initiation states */ -#define XST_INIT2 4 -#define XST_REQSENT 5 /* active conversation states */ -#define XST_DATARCVD 6 -#define XST_POKESENT 7 -#define XST_POKEACKRCVD 8 -#define XST_EXECSENT 9 -#define XST_EXECACKRCVD 10 -#define XST_ADVSENT 11 -#define XST_UNADVSENT 12 -#define XST_ADVACKRCVD 13 -#define XST_UNADVACKRCVD 14 -#define XST_ADVDATASENT 15 -#define XST_ADVDATAACKRCVD 16 - -/* used in LOWORD(dwData1) of XTYP_ADVREQ callbacks... */ -#define CADV_LATEACK 0xFFFF - -/***** conversation status bits (fsStatus) *****/ - -#define ST_CONNECTED 0x0001 -#define ST_ADVISE 0x0002 -#define ST_ISLOCAL 0x0004 -#define ST_BLOCKED 0x0008 -#define ST_CLIENT 0x0010 -#define ST_TERMINATED 0x0020 -#define ST_INLIST 0x0040 -#define ST_BLOCKNEXT 0x0080 -#define ST_ISSELF 0x0100 - - -/* DDE constants for wStatus field */ - -//#define DDE_FACK 0x8000 -//#define DDE_FBUSY 0x4000 -//#define DDE_FDEFERUPD 0x4000 -//#define DDE_FACKREQ 0x8000 -//#define DDE_FRELEASE 0x2000 -//#define DDE_FREQUESTED 0x1000 -//#define DDE_FACKRESERVED 0x3ff0 -//#define DDE_FADVRESERVED 0x3fff -//#define DDE_FDATRESERVED 0x4fff -//#define DDE_FPOKRESERVED 0xdfff -//#define DDE_FAPPSTATUS 0x00ff -#define DDE_FNOTPROCESSED 0x0000 - -/***** message filter hook types *****/ - -#define MSGF_DDEMGR 0x8001 - -/***** codepage constants ****/ - -#define CP_WINANSI 1004 /* default codepage for windows & old DDE convs. */ - -/***** transaction types *****/ - -#define XTYPF_NOBLOCK 0x0002 /* CBR_BLOCK will not work */ -#define XTYPF_NODATA 0x0004 /* DDE_FDEFERUPD */ -#define XTYPF_ACKREQ 0x0008 /* DDE_FACKREQ */ - -#define XCLASS_MASK 0xFC00 -#define XCLASS_BOOL 0x1000 -#define XCLASS_DATA 0x2000 -#define XCLASS_FLAGS 0x4000 -#define XCLASS_NOTIFICATION 0x8000 - -#define XTYP_ERROR (0x0000 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK ) -#define XTYP_ADVDATA (0x0010 | XCLASS_FLAGS ) -#define XTYP_ADVREQ (0x0020 | XCLASS_DATA | XTYPF_NOBLOCK ) -#define XTYP_ADVSTART (0x0030 | XCLASS_BOOL ) -#define XTYP_ADVSTOP (0x0040 | XCLASS_NOTIFICATION) -#define XTYP_EXECUTE (0x0050 | XCLASS_FLAGS ) -#define XTYP_CONNECT (0x0060 | XCLASS_BOOL | XTYPF_NOBLOCK) -#define XTYP_CONNECT_CONFIRM (0x0070 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK) -#define XTYP_XACT_COMPLETE (0x0080 | XCLASS_NOTIFICATION ) -#define XTYP_POKE (0x0090 | XCLASS_FLAGS ) -#define XTYP_REGISTER (0x00A0 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK) -#define XTYP_REQUEST (0x00B0 | XCLASS_DATA ) -#define XTYP_DISCONNECT (0x00C0 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK) -#define XTYP_UNREGISTER (0x00D0 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK) -#define XTYP_WILDCONNECT (0x00E0 | XCLASS_DATA | XTYPF_NOBLOCK) - -#define XTYP_MASK 0x00F0 -#define XTYP_SHIFT 4 /* shift to turn XTYP_ into an index */ - -/***** Timeout constants *****/ - -#define TIMEOUT_ASYNC -1L - -/***** Transaction ID constants *****/ - -#define QID_SYNC -1L - -/****** public strings used in DDE ******/ - -#define SZDDESYS_TOPIC "System" -#define SZDDESYS_ITEM_TOPICS "Topics" -#define SZDDESYS_ITEM_SYSITEMS "SysItems" -#define SZDDESYS_ITEM_RTNMSG "ReturnMessage" -#define SZDDESYS_ITEM_STATUS "Status" -#define SZDDESYS_ITEM_FORMATS "Formats" -#define SZDDESYS_ITEM_HELP "Help" -#define SZDDE_ITEM_ITEMLIST "TopicItemList" - - -/****** API entry points ******/ - -typedef HDDEDATA CALLBACK FNCALLBACK(USHORT wType, USHORT wFmt, HCONV hConv, - HSZ hsz1, HSZ hsz2, HDDEDATA hData, ULONG dwData1, ULONG dwData2); -typedef FNCALLBACK* PFNCALLBACK; - -#define CBR_BLOCK 0xffffffffL - -/* DLL registration functions */ - -USHORT DdeInitialize(ULONG* pidInst, PFNCALLBACK pfnCallback, - ULONG afCmd, ULONG ulRes); - -/* - * Callback filter flags for use with standard apps. - */ - -#define CBF_FAIL_SELFCONNECTIONS 0x00001000 -#define CBF_FAIL_CONNECTIONS 0x00002000 -#define CBF_FAIL_ADVISES 0x00004000 -#define CBF_FAIL_EXECUTES 0x00008000 -#define CBF_FAIL_POKES 0x00010000 -#define CBF_FAIL_REQUESTS 0x00020000 -#define CBF_FAIL_ALLSVRXACTIONS 0x0003f000 - -#define CBF_SKIP_CONNECT_CONFIRMS 0x00040000 -#define CBF_SKIP_REGISTRATIONS 0x00080000 -#define CBF_SKIP_UNREGISTRATIONS 0x00100000 -#define CBF_SKIP_DISCONNECTS 0x00200000 -#define CBF_SKIP_ALLNOTIFICATIONS 0x003c0000 - -/* - * Application command flags - */ -#define APPCMD_CLIENTONLY 0x00000010L -#define APPCMD_FILTERINITS 0x00000020L -#define APPCMD_MASK 0x00000FF0L - -/* - * Application classification flags - */ -#define APPCLASS_STANDARD 0x00000000L -#define APPCLASS_MASK 0x0000000FL - - -BOOL DdeUninitialize(ULONG idInst); - -/* conversation enumeration functions */ - -HCONVLIST DdeConnectList(ULONG idInst, HSZ hszService, HSZ hszTopic, - HCONVLIST hConvList, CONVCONTEXT* pCC); -HCONV DdeQueryNextServer(HCONVLIST hConvList, HCONV hConvPrev); -BOOL DdeDisconnectList(HCONVLIST hConvList); - -/* conversation control functions */ - -HCONV DdeConnect(ULONG idInst, HSZ hszService, HSZ hszTopic, - CONVCONTEXT* pCC); -BOOL DdeDisconnect(HCONV hConv); -HCONV DdeReconnect(HCONV hConv); - -USHORT DdeQueryConvInfo(HCONV hConv, ULONG idTransaction, CONVINFO* pConvInfo); -BOOL DdeSetUserHandle(HCONV hConv, ULONG id, ULONG hUser); - -BOOL DdeAbandonTransaction(ULONG idInst, HCONV hConv, ULONG idTransaction); - - -/* app server interface functions */ - -BOOL DdePostAdvise(ULONG idInst, HSZ hszTopic, HSZ hszItem); -BOOL DdeEnableCallback(ULONG idInst, HCONV hConv, USHORT wCmd); - -#define EC_ENABLEALL 0 -#define EC_ENABLEONE ST_BLOCKNEXT -#define EC_DISABLE ST_BLOCKED -#define EC_QUERYWAITING 2 - -HDDEDATA DdeNameService(ULONG idInst, HSZ hsz1, HSZ hsz2, USHORT afCmd); - -#define DNS_REGISTER 0x0001 -#define DNS_UNREGISTER 0x0002 -#define DNS_FILTERON 0x0004 -#define DNS_FILTEROFF 0x0008 - -/* app client interface functions */ - -HDDEDATA DdeClientTransaction(void* pData, ULONG cbData, - HCONV hConv, HSZ hszItem, USHORT wFmt, USHORT wType, - ULONG dwTimeout, ULONG* pdwResult); - -/* data transfer functions */ - -HDDEDATA DdeCreateDataHandle(ULONG idInst, void* pSrc, ULONG cb, - ULONG cbOff, HSZ hszItem, USHORT wFmt, USHORT afCmd); -// HDDEDATA DdeAddData(HDDEDATA hData, void* pSrc, ULONG cb, ULONG cbOff); -ULONG DdeGetData(HDDEDATA hData, void* pDst, ULONG cbMax, ULONG cbOff); -BYTE* DdeAccessData(HDDEDATA hData, ULONG* pcbDataSize); -BOOL DdeUnaccessData(HDDEDATA hData); -BOOL DdeFreeDataHandle(HDDEDATA hData); - -#define HDATA_APPOWNED 0x0001 - -USHORT DdeGetLastError(ULONG idInst); - -#define DMLERR_NO_ERROR 0 /* must be 0 */ - -#define DMLERR_FIRST 0x4000 - -#define DMLERR_ADVACKTIMEOUT 0x4000 -#define DMLERR_BUSY 0x4001 -#define DMLERR_DATAACKTIMEOUT 0x4002 -#define DMLERR_DLL_NOT_INITIALIZED 0x4003 -#define DMLERR_DLL_USAGE 0x4004 -#define DMLERR_EXECACKTIMEOUT 0x4005 -#define DMLERR_INVALIDPARAMETER 0x4006 -#define DMLERR_LOW_MEMORY 0x4007 -#define DMLERR_MEMORY_ERROR 0x4008 -#define DMLERR_NOTPROCESSED 0x4009 -#define DMLERR_NO_CONV_ESTABLISHED 0x400a -#define DMLERR_POKEACKTIMEOUT 0x400b -#define DMLERR_POSTMSG_FAILED 0x400c -#define DMLERR_REENTRANCY 0x400d -#define DMLERR_SERVER_DIED 0x400e -#define DMLERR_SYS_ERROR 0x400f -#define DMLERR_UNADVACKTIMEOUT 0x4010 -#define DMLERR_UNFOUND_QUEUE_ID 0x4011 - -#define DMLERR_LAST 0x4011 - -HSZ DdeCreateStringHandle(ULONG idInst, PSZ pStr, int iCodePage); -ULONG DdeQueryString(ULONG idInst, HSZ hsz, PSZ pStr, ULONG cchMax, - int iCodePage); -BOOL DdeFreeStringHandle(ULONG idInst, HSZ hsz); -BOOL DdeKeepStringHandle(ULONG idInst, HSZ hsz); -int DdeCmpStringHandles(HSZ hsz1, HSZ hsz2); - - - -/* von OS/2 nicht unterstuetzte Win3.1 Clipboard-Formate */ - -#define CF_NOTSUPPORTED_BASE 0xff00 - -#ifndef CF_DIB -#define CF_DIB CF_NOTSUPPORTED_BASE+1 -#endif - -#ifndef CF_DIF -#define CF_DIF CF_NOTSUPPORTED_BASE+2 -#endif - -#ifndef CF_DSPMETAFILEPICT -#define CF_DSPMETAFILEPICT CF_NOTSUPPORTED_BASE+3 -#endif - -#ifndef CF_METAFILEPICT -#define CF_METAFILEPICT CF_NOTSUPPORTED_BASE+4 -#endif - -#ifndef CF_OEMTEXT -#define CF_OEMTEXT CF_NOTSUPPORTED_BASE+5 -#endif - -#ifndef CF_OWNERDISPLAY -#define CF_OWNERDISPLAY CF_NOTSUPPORTED_BASE+6 -#endif - -#ifndef CF_PENDATA -#define CF_PENDATA CF_NOTSUPPORTED_BASE+7 -#endif - -#ifndef CF_RIFF -#define CF_RIFF CF_NOTSUPPORTED_BASE+8 -#endif - -#ifndef CF_SYLK -#define CF_SYLK CF_NOTSUPPORTED_BASE+9 -#endif - -#ifndef CF_TIFF -#define CF_TIFF CF_NOTSUPPORTED_BASE+10 -#endif - -#ifndef CF_WAVE -#define CF_WAVE CF_NOTSUPPORTED_BASE+11 -#endif - - -#endif /* _DDEML_HXX */ diff --git a/svl/source/svsql/converter.cxx b/svl/source/svsql/converter.cxx index 826b64adc48d..c99e5c11424f 100644 --- a/svl/source/svsql/converter.cxx +++ b/svl/source/svsql/converter.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svl.hxx" -#include "converter.hxx" +#include INT32 SvDbaseConverter::ConvertPrecisionToDbase(INT32 _nLen, INT32 _nScale) { diff --git a/svl/util/makefile.mk b/svl/util/makefile.mk index 47a37a6e9173..ca566bd3c5a2 100644 --- a/svl/util/makefile.mk +++ b/svl/util/makefile.mk @@ -33,7 +33,7 @@ PRJ=.. PRJNAME=svl TARGET=svl -RESTARGETSIMPLE=svs +RESTARGETSIMPLE=svl GEN_HID=TRUE # GEN_HID_OTHER=TRUE ENABLE_EXCEPTIONS=TRUE -- cgit From c2861f6088027581d98ba3720fe58c9c17d30fd0 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 16 Apr 2010 23:00:12 +0200 Subject: CWS gnumake2: move delivered header files in from svtools/inc to svtools/inc/svtools; remove ununsed files; remove svp.res --- svtools/bmpmaker/bmp.cxx | 2 +- svtools/inc/DocumentInfoPreview.hxx | 64 -- svtools/inc/QueryFolderName.hxx | 69 -- svtools/inc/acceleratorexecute.hxx | 290 ------ svtools/inc/addresstemplate.hxx | 166 ---- svtools/inc/apearcfg.hxx | 130 --- svtools/inc/asynclink.hxx | 80 -- svtools/inc/calendar.hxx | 504 ---------- svtools/inc/cliplistener.hxx | 64 -- svtools/inc/collatorres.hxx | 24 - svtools/inc/contextmenuhelper.hxx | 133 --- svtools/inc/controldims.hrc | 105 -- svtools/inc/ctrlbox.hxx | 507 ---------- svtools/inc/ctrltool.hxx | 254 ----- svtools/inc/dialogclosedlistener.hxx | 80 -- svtools/inc/dialogcontrolling.hxx | 309 ------ svtools/inc/expander.hxx | 95 -- svtools/inc/extcolorcfg.hxx | 131 --- svtools/inc/filectrl.hxx | 114 --- svtools/inc/filedlg.hxx | 111 --- svtools/inc/filedlg2.hrc | 44 - svtools/inc/fileview.hxx | 274 ------ svtools/inc/fltdefs.hxx | 155 --- svtools/inc/fontsubstconfig.hxx | 71 -- svtools/inc/framestatuslistener.hxx | 119 --- svtools/inc/helpagentwindow.hxx | 91 -- svtools/inc/htmlkywd.hxx | 804 ---------------- svtools/inc/htmltokn.h | 572 ----------- svtools/inc/imagemgr.hrc | 193 ---- svtools/inc/imagemgr.hxx | 98 -- svtools/inc/imageresourceaccess.hxx | 93 -- svtools/inc/imgdef.hxx | 46 - svtools/inc/indexentryres.hxx | 23 - svtools/inc/inetimg.hxx | 89 -- svtools/inc/itemdel.hxx | 42 - svtools/inc/ivctrl.hxx | 393 -------- svtools/inc/localresaccess.hxx | 85 -- svtools/inc/prgsbar.hxx | 103 -- svtools/inc/roadmap.hxx | 140 --- svtools/inc/rtfkeywd.hxx | 1144 ---------------------- svtools/inc/rtfout.hxx | 70 -- svtools/inc/rtftoken.h | 1276 ------------------------- svtools/inc/ruler.hxx | 877 ----------------- svtools/inc/scriptedtext.hxx | 132 --- svtools/inc/scrwin.hxx | 115 --- svtools/inc/sfxecode.hxx | 121 --- svtools/inc/soerr.hxx | 84 -- svtools/inc/sores.hxx | 182 ---- svtools/inc/statusbarcontroller.hxx | 161 ---- svtools/inc/stdmenu.hxx | 244 ----- svtools/inc/svtools/DocumentInfoPreview.hxx | 64 ++ svtools/inc/svtools/QueryFolderName.hxx | 69 ++ svtools/inc/svtools/acceleratorexecute.hxx | 290 ++++++ svtools/inc/svtools/addresstemplate.hxx | 166 ++++ svtools/inc/svtools/apearcfg.hxx | 130 +++ svtools/inc/svtools/asynclink.hxx | 80 ++ svtools/inc/svtools/calendar.hxx | 504 ++++++++++ svtools/inc/svtools/cliplistener.hxx | 64 ++ svtools/inc/svtools/collatorres.hxx | 24 + svtools/inc/svtools/contextmenuhelper.hxx | 133 +++ svtools/inc/svtools/controldims.hrc | 105 ++ svtools/inc/svtools/ctrlbox.hxx | 507 ++++++++++ svtools/inc/svtools/ctrltool.hxx | 254 +++++ svtools/inc/svtools/dialogclosedlistener.hxx | 80 ++ svtools/inc/svtools/dialogcontrolling.hxx | 309 ++++++ svtools/inc/svtools/expander.hxx | 95 ++ svtools/inc/svtools/extcolorcfg.hxx | 131 +++ svtools/inc/svtools/filectrl.hxx | 114 +++ svtools/inc/svtools/filedlg.hxx | 111 +++ svtools/inc/svtools/filedlg2.hrc | 44 + svtools/inc/svtools/fileview.hxx | 274 ++++++ svtools/inc/svtools/fltdefs.hxx | 155 +++ svtools/inc/svtools/fontsubstconfig.hxx | 71 ++ svtools/inc/svtools/framestatuslistener.hxx | 119 +++ svtools/inc/svtools/helpagentwindow.hxx | 91 ++ svtools/inc/svtools/htmlkywd.hxx | 804 ++++++++++++++++ svtools/inc/svtools/htmltokn.h | 572 +++++++++++ svtools/inc/svtools/imagemgr.hrc | 193 ++++ svtools/inc/svtools/imagemgr.hxx | 98 ++ svtools/inc/svtools/imageresourceaccess.hxx | 93 ++ svtools/inc/svtools/imgdef.hxx | 46 + svtools/inc/svtools/indexentryres.hxx | 23 + svtools/inc/svtools/inetimg.hxx | 89 ++ svtools/inc/svtools/itemdel.hxx | 42 + svtools/inc/svtools/ivctrl.hxx | 393 ++++++++ svtools/inc/svtools/localresaccess.hxx | 85 ++ svtools/inc/svtools/prgsbar.hxx | 103 ++ svtools/inc/svtools/roadmap.hxx | 140 +++ svtools/inc/svtools/rtfkeywd.hxx | 1144 ++++++++++++++++++++++ svtools/inc/svtools/rtfout.hxx | 70 ++ svtools/inc/svtools/rtftoken.h | 1276 +++++++++++++++++++++++++ svtools/inc/svtools/ruler.hxx | 877 +++++++++++++++++ svtools/inc/svtools/scriptedtext.hxx | 132 +++ svtools/inc/svtools/scrwin.hxx | 115 +++ svtools/inc/svtools/sfxecode.hxx | 121 +++ svtools/inc/svtools/soerr.hxx | 84 ++ svtools/inc/svtools/sores.hxx | 182 ++++ svtools/inc/svtools/statusbarcontroller.hxx | 161 ++++ svtools/inc/svtools/stdmenu.hxx | 244 +++++ svtools/inc/svtools/sychconv.hxx | 50 + svtools/inc/svtools/tabbar.hxx | 558 +++++++++++ svtools/inc/svtools/taskbar.hxx | 493 ++++++++++ svtools/inc/svtools/templatefoldercache.hxx | 111 +++ svtools/inc/svtools/templdlg.hxx | 95 ++ svtools/inc/svtools/testtool.hxx | 78 ++ svtools/inc/svtools/tooltiplbox.hxx | 70 ++ svtools/inc/svtools/txtattr.hxx | 238 +++++ svtools/inc/svtools/txtcmp.hxx | 36 + svtools/inc/svtools/unoevent.hxx | 332 +++++++ svtools/inc/svtools/unoimap.hxx | 48 + svtools/inc/svtools/wallitem.hxx | 68 ++ svtools/inc/sychconv.hxx | 50 - svtools/inc/tabbar.hxx | 558 ----------- svtools/inc/taskbar.hxx | 493 ---------- svtools/inc/templatefoldercache.hxx | 111 --- svtools/inc/templdlg.hxx | 95 -- svtools/inc/testtool.hxx | 78 -- svtools/inc/tooltiplbox.hxx | 70 -- svtools/inc/txtattr.hxx | 238 ----- svtools/inc/txtcmp.hxx | 36 - svtools/inc/unoevent.hxx | 332 ------- svtools/inc/unoimap.hxx | 48 - svtools/inc/wallitem.hxx | 68 -- svtools/source/config/apearcfg.cxx | 2 +- svtools/source/config/extcolorcfg.cxx | 2 +- svtools/source/config/fontsubstconfig.cxx | 2 +- svtools/source/config/itemholder2.cxx | 4 +- svtools/source/config/miscopt.cxx | 2 +- svtools/source/contnr/cont_pch.cxx | 44 - svtools/source/contnr/contentenumeration.cxx | 2 +- svtools/source/contnr/fileview.cxx | 8 +- svtools/source/contnr/imivctl.hxx | 2 +- svtools/source/contnr/imivctl1.cxx | 2 +- svtools/source/contnr/ivctrl.cxx | 5 +- svtools/source/contnr/svimpbox.cxx | 10 +- svtools/source/contnr/templwin.cxx | 19 +- svtools/source/contnr/templwin.hxx | 4 +- svtools/source/contnr/templwin.src | 2 +- svtools/source/contnr/tooltiplbox.cxx | 2 +- svtools/source/control/asynclink.cxx | 2 +- svtools/source/control/calendar.cxx | 18 +- svtools/source/control/collatorres.cxx | 4 +- svtools/source/control/ctrlbox.cxx | 8 +- svtools/source/control/ctrltool.cxx | 7 +- svtools/source/control/filectrl.cxx | 7 +- svtools/source/control/filectrl2.cxx | 2 +- svtools/source/control/indexentryres.cxx | 4 +- svtools/source/control/inettbc.cxx | 15 +- svtools/source/control/prgsbar.cxx | 6 +- svtools/source/control/roadmap.cxx | 9 +- svtools/source/control/ruler.cxx | 3 +- svtools/source/control/scriptedtext.cxx | 5 +- svtools/source/control/scrwin.cxx | 2 +- svtools/source/control/stdmenu.cxx | 9 +- svtools/source/control/tabbar.cxx | 2 +- svtools/source/control/taskbar.cxx | 7 +- svtools/source/control/taskbox.cxx | 5 +- svtools/source/control/taskmisc.cxx | 5 +- svtools/source/control/taskstat.cxx | 5 +- svtools/source/dialogs/addresstemplate.cxx | 17 +- svtools/source/dialogs/addresstemplate.src | 8 +- svtools/source/dialogs/filedlg.cxx | 2 +- svtools/source/dialogs/filedlg2.cxx | 7 +- svtools/source/dialogs/filedlg2.src | 3 +- svtools/source/dialogs/formats.src | 2 +- svtools/source/dialogs/insdlg.cxx | 2 +- svtools/source/dialogs/logindlg.cxx | 7 +- svtools/source/dialogs/printdlg.cxx | 11 +- svtools/source/dialogs/propctrl.cxx | 506 ---------- svtools/source/dialogs/propctrl.hxx | 118 --- svtools/source/dialogs/roadmapwizard.cxx | 2 +- svtools/source/dialogs/so3res.src | 5 +- svtools/source/edit/editsyntaxhighlighter.cxx | 2 +- svtools/source/edit/sychconv.cxx | 2 +- svtools/source/edit/textdoc.cxx | 1 - svtools/source/edit/textdoc.hxx | 2 +- svtools/source/edit/txtattr.cxx | 2 +- svtools/source/filter.vcl/filter/filter.cxx | 4 - svtools/source/filter.vcl/filter/gradwrap.cxx | 573 ----------- svtools/source/java/makefile.mk | 4 - svtools/source/java/patchjavaerror.src | 96 -- svtools/source/misc/acceleratorexecute.cxx | 2 +- svtools/source/misc/cliplistener.cxx | 2 +- svtools/source/misc/dialogclosedlistener.cxx | 2 +- svtools/source/misc/dialogcontrolling.cxx | 2 +- svtools/source/misc/ehdl.cxx | 2 +- svtools/source/misc/ehdl.src | 3 +- svtools/source/misc/errtxt.src | 2 +- svtools/source/misc/helpagentwindow.cxx | 9 +- svtools/source/misc/imagemgr.cxx | 7 +- svtools/source/misc/imagemgr.src | 2 +- svtools/source/misc/imageresourceaccess.cxx | 4 +- svtools/source/misc/itemdel.cxx | 2 +- svtools/source/misc/templatefoldercache.cxx | 2 +- svtools/source/misc/transfer.cxx | 12 +- svtools/source/misc/transfer2.cxx | 9 +- svtools/source/misc/wallitem.cxx | 2 +- svtools/source/plugapp/commtest.cxx | 264 ----- svtools/source/plugapp/commtest.hrc | 37 - svtools/source/plugapp/commtest.src | 63 -- svtools/source/plugapp/makefile.mk | 6 - svtools/source/svhtml/htmlkywd.cxx | 4 +- svtools/source/svhtml/htmlout.cxx | 2 +- svtools/source/svhtml/htmlsupp.cxx | 4 +- svtools/source/svhtml/parhtml.cxx | 4 +- svtools/source/svrtf/parrtf.cxx | 4 +- svtools/source/svrtf/rtfkey2.cxx | 1162 ---------------------- svtools/source/svrtf/rtfkeywd.cxx | 4 +- svtools/source/svrtf/rtfout.cxx | 4 +- svtools/source/uno/addrtempuno.cxx | 6 +- svtools/source/uno/contextmenuhelper.cxx | 2 +- svtools/source/uno/framestatuslistener.cxx | 2 +- svtools/source/uno/statusbarcontroller.cxx | 6 +- svtools/source/uno/toolboxcontroller.cxx | 5 +- svtools/source/uno/unoevent.cxx | 6 +- svtools/source/uno/unoiface.cxx | 12 +- svtools/source/uno/unoimap.cxx | 10 +- svtools/source/urlobj/inetimg.cxx | 5 +- svtools/util/makefile.mk | 5 - 219 files changed, 13361 insertions(+), 16431 deletions(-) delete mode 100644 svtools/inc/DocumentInfoPreview.hxx delete mode 100644 svtools/inc/QueryFolderName.hxx delete mode 100644 svtools/inc/acceleratorexecute.hxx delete mode 100644 svtools/inc/addresstemplate.hxx delete mode 100644 svtools/inc/apearcfg.hxx delete mode 100644 svtools/inc/asynclink.hxx delete mode 100644 svtools/inc/calendar.hxx delete mode 100644 svtools/inc/cliplistener.hxx delete mode 100644 svtools/inc/collatorres.hxx delete mode 100644 svtools/inc/contextmenuhelper.hxx delete mode 100644 svtools/inc/controldims.hrc delete mode 100644 svtools/inc/ctrlbox.hxx delete mode 100644 svtools/inc/ctrltool.hxx delete mode 100644 svtools/inc/dialogclosedlistener.hxx delete mode 100644 svtools/inc/dialogcontrolling.hxx delete mode 100644 svtools/inc/expander.hxx delete mode 100644 svtools/inc/extcolorcfg.hxx delete mode 100644 svtools/inc/filectrl.hxx delete mode 100644 svtools/inc/filedlg.hxx delete mode 100644 svtools/inc/filedlg2.hrc delete mode 100644 svtools/inc/fileview.hxx delete mode 100644 svtools/inc/fltdefs.hxx delete mode 100644 svtools/inc/fontsubstconfig.hxx delete mode 100644 svtools/inc/framestatuslistener.hxx delete mode 100644 svtools/inc/helpagentwindow.hxx delete mode 100644 svtools/inc/htmlkywd.hxx delete mode 100644 svtools/inc/htmltokn.h delete mode 100644 svtools/inc/imagemgr.hrc delete mode 100644 svtools/inc/imagemgr.hxx delete mode 100644 svtools/inc/imageresourceaccess.hxx delete mode 100644 svtools/inc/imgdef.hxx delete mode 100644 svtools/inc/indexentryres.hxx delete mode 100644 svtools/inc/inetimg.hxx delete mode 100644 svtools/inc/itemdel.hxx delete mode 100644 svtools/inc/ivctrl.hxx delete mode 100644 svtools/inc/localresaccess.hxx delete mode 100644 svtools/inc/prgsbar.hxx delete mode 100644 svtools/inc/roadmap.hxx delete mode 100644 svtools/inc/rtfkeywd.hxx delete mode 100644 svtools/inc/rtfout.hxx delete mode 100644 svtools/inc/rtftoken.h delete mode 100644 svtools/inc/ruler.hxx delete mode 100644 svtools/inc/scriptedtext.hxx delete mode 100644 svtools/inc/scrwin.hxx delete mode 100644 svtools/inc/sfxecode.hxx delete mode 100644 svtools/inc/soerr.hxx delete mode 100644 svtools/inc/sores.hxx delete mode 100644 svtools/inc/statusbarcontroller.hxx delete mode 100644 svtools/inc/stdmenu.hxx create mode 100644 svtools/inc/svtools/DocumentInfoPreview.hxx create mode 100644 svtools/inc/svtools/QueryFolderName.hxx create mode 100644 svtools/inc/svtools/acceleratorexecute.hxx create mode 100644 svtools/inc/svtools/addresstemplate.hxx create mode 100644 svtools/inc/svtools/apearcfg.hxx create mode 100644 svtools/inc/svtools/asynclink.hxx create mode 100644 svtools/inc/svtools/calendar.hxx create mode 100644 svtools/inc/svtools/cliplistener.hxx create mode 100644 svtools/inc/svtools/collatorres.hxx create mode 100644 svtools/inc/svtools/contextmenuhelper.hxx create mode 100644 svtools/inc/svtools/controldims.hrc create mode 100644 svtools/inc/svtools/ctrlbox.hxx create mode 100644 svtools/inc/svtools/ctrltool.hxx create mode 100644 svtools/inc/svtools/dialogclosedlistener.hxx create mode 100644 svtools/inc/svtools/dialogcontrolling.hxx create mode 100644 svtools/inc/svtools/expander.hxx create mode 100644 svtools/inc/svtools/extcolorcfg.hxx create mode 100644 svtools/inc/svtools/filectrl.hxx create mode 100644 svtools/inc/svtools/filedlg.hxx create mode 100644 svtools/inc/svtools/filedlg2.hrc create mode 100644 svtools/inc/svtools/fileview.hxx create mode 100644 svtools/inc/svtools/fltdefs.hxx create mode 100644 svtools/inc/svtools/fontsubstconfig.hxx create mode 100644 svtools/inc/svtools/framestatuslistener.hxx create mode 100644 svtools/inc/svtools/helpagentwindow.hxx create mode 100644 svtools/inc/svtools/htmlkywd.hxx create mode 100644 svtools/inc/svtools/htmltokn.h create mode 100644 svtools/inc/svtools/imagemgr.hrc create mode 100644 svtools/inc/svtools/imagemgr.hxx create mode 100644 svtools/inc/svtools/imageresourceaccess.hxx create mode 100644 svtools/inc/svtools/imgdef.hxx create mode 100644 svtools/inc/svtools/indexentryres.hxx create mode 100644 svtools/inc/svtools/inetimg.hxx create mode 100644 svtools/inc/svtools/itemdel.hxx create mode 100644 svtools/inc/svtools/ivctrl.hxx create mode 100644 svtools/inc/svtools/localresaccess.hxx create mode 100644 svtools/inc/svtools/prgsbar.hxx create mode 100644 svtools/inc/svtools/roadmap.hxx create mode 100644 svtools/inc/svtools/rtfkeywd.hxx create mode 100644 svtools/inc/svtools/rtfout.hxx create mode 100644 svtools/inc/svtools/rtftoken.h create mode 100644 svtools/inc/svtools/ruler.hxx create mode 100644 svtools/inc/svtools/scriptedtext.hxx create mode 100644 svtools/inc/svtools/scrwin.hxx create mode 100644 svtools/inc/svtools/sfxecode.hxx create mode 100644 svtools/inc/svtools/soerr.hxx create mode 100644 svtools/inc/svtools/sores.hxx create mode 100644 svtools/inc/svtools/statusbarcontroller.hxx create mode 100644 svtools/inc/svtools/stdmenu.hxx create mode 100644 svtools/inc/svtools/sychconv.hxx create mode 100644 svtools/inc/svtools/tabbar.hxx create mode 100644 svtools/inc/svtools/taskbar.hxx create mode 100644 svtools/inc/svtools/templatefoldercache.hxx create mode 100644 svtools/inc/svtools/templdlg.hxx create mode 100644 svtools/inc/svtools/testtool.hxx create mode 100644 svtools/inc/svtools/tooltiplbox.hxx create mode 100644 svtools/inc/svtools/txtattr.hxx create mode 100644 svtools/inc/svtools/txtcmp.hxx create mode 100644 svtools/inc/svtools/unoevent.hxx create mode 100644 svtools/inc/svtools/unoimap.hxx create mode 100644 svtools/inc/svtools/wallitem.hxx delete mode 100644 svtools/inc/sychconv.hxx delete mode 100644 svtools/inc/tabbar.hxx delete mode 100644 svtools/inc/taskbar.hxx delete mode 100644 svtools/inc/templatefoldercache.hxx delete mode 100644 svtools/inc/templdlg.hxx delete mode 100644 svtools/inc/testtool.hxx delete mode 100644 svtools/inc/tooltiplbox.hxx delete mode 100644 svtools/inc/txtattr.hxx delete mode 100644 svtools/inc/txtcmp.hxx delete mode 100644 svtools/inc/unoevent.hxx delete mode 100644 svtools/inc/unoimap.hxx delete mode 100644 svtools/inc/wallitem.hxx delete mode 100644 svtools/source/contnr/cont_pch.cxx delete mode 100644 svtools/source/dialogs/propctrl.cxx delete mode 100644 svtools/source/dialogs/propctrl.hxx delete mode 100644 svtools/source/filter.vcl/filter/gradwrap.cxx delete mode 100644 svtools/source/java/patchjavaerror.src delete mode 100644 svtools/source/plugapp/commtest.cxx delete mode 100644 svtools/source/plugapp/commtest.hrc delete mode 100644 svtools/source/plugapp/commtest.src delete mode 100644 svtools/source/svrtf/rtfkey2.cxx diff --git a/svtools/bmpmaker/bmp.cxx b/svtools/bmpmaker/bmp.cxx index b91dae79bbad..47f667982732 100644 --- a/svtools/bmpmaker/bmp.cxx +++ b/svtools/bmpmaker/bmp.cxx @@ -44,7 +44,7 @@ using namespace std; #include #include "svl/solar.hrc" -#include "filedlg.hxx" +#include #include "bmpcore.hxx" #include "bmp.hrc" diff --git a/svtools/inc/DocumentInfoPreview.hxx b/svtools/inc/DocumentInfoPreview.hxx deleted file mode 100644 index bbb8ab32c1a6..000000000000 --- a/svtools/inc/DocumentInfoPreview.hxx +++ /dev/null @@ -1,64 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: DocumentInfoPreview.hxx,v $ - * $Revision: 1.7 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef SVTOOLS_DOCUMENTINFOPREVIEW_HXX -#define SVTOOLS_DOCUMENTINFOPREVIEW_HXX - -#include "svtools/svtdllapi.h" -#include -#include -#include - -class SvtExtendedMultiLineEdit_Impl; -class SvtDocInfoTable_Impl; - -namespace svtools -{ - class SVT_DLLPUBLIC ODocumentInfoPreview : public Window - { - SvtExtendedMultiLineEdit_Impl* m_pEditWin; - SvtDocInfoTable_Impl* m_pInfoTable; - com::sun::star::lang::Locale m_aLocale; - - public: - ODocumentInfoPreview( Window* pParent ,WinBits _nBits); - virtual ~ODocumentInfoPreview(); - - virtual void Resize(); - void Clear(); - void fill(const ::com::sun::star::uno::Reference< - ::com::sun::star::document::XDocumentProperties>& i_xDocProps - ,const String& i_rURL); - void InsertEntry( const String& rTitle, const String& rValue ); - void SetAutoScroll(BOOL _bAutoScroll); - }; -} - -#endif // SVTOOLS_DOCUMENTINFOPREVIEW_HXX - diff --git a/svtools/inc/QueryFolderName.hxx b/svtools/inc/QueryFolderName.hxx deleted file mode 100644 index eb092b5afc0b..000000000000 --- a/svtools/inc/QueryFolderName.hxx +++ /dev/null @@ -1,69 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: QueryFolderName.hxx,v $ - * $Revision: 1.5 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef SVT_QUERYFOLDER_HXX -#define SVT_QUERYFOLDER_HXX - -#include -#ifndef _SV_BUTTON_HXX -#include -#endif -#include -#include - -//------------------------------------------------------------------------- -namespace svtools { - -//------------------------------------------------------------------------- -// QueryFolderNameDialog -//------------------------------------------------------------------------- - -class QueryFolderNameDialog : public ModalDialog -{ -private: - FixedText aNameText; - Edit aNameEdit; - FixedLine aNameLine; - OKButton aOKBtn; - CancelButton aCancelBtn; - - DECL_LINK( OKHdl, Button * ); - DECL_LINK( NameHdl, Edit * ); - -public: - QueryFolderNameDialog( Window* _pParent, - const String& rTitle, - const String& rDefaultText, - String* pGroupName = NULL ); - String GetName() const { return aNameEdit.GetText(); } -}; - -} -#endif // SVT_QUERYFOLDER_HXX - diff --git a/svtools/inc/acceleratorexecute.hxx b/svtools/inc/acceleratorexecute.hxx deleted file mode 100644 index 744bc87f31c5..000000000000 --- a/svtools/inc/acceleratorexecute.hxx +++ /dev/null @@ -1,290 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: acceleratorexecute.hxx,v $ - * $Revision: 1.13 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef INCLUDED_SVTOOLS_ACCELERATOREXECUTE_HXX -#define INCLUDED_SVTOOLS_ACCELERATOREXECUTE_HXX - -//=============================================== -// includes - -#include "svtools/svtdllapi.h" - -#ifndef INCLUDED_VECTOR -#include -#define INCLUDED_VECTOR -#endif - -#ifndef __COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ -#include -#endif - -#ifndef __COM_SUN_STAR_FRAME_XFRAME_HPP_ -#include -#endif - -#ifndef __COM_SUN_STAR_FRAME_XDISPATCHPROVIDER_HPP_ -#include -#endif - -#ifndef __com_SUN_STAR_UI_XACCELERATORCONFIGURATION_HPP_ -#include -#endif - -#ifndef __COM_SUN_STAR_UTIL_XURLTRANSFORMER_HPP_ -#include -#endif -#include - -#ifndef __COM_SUN_STAR_AWT_KEYEVENT_HPP_ -#include -#endif -#include -#include -#include - -//=============================================== -// namespace - -#ifdef css - #error "Conflict on using css as namespace alias!" -#else - #define css ::com::sun::star -#endif - -namespace svt -{ - -//=============================================== -// definitions - -struct TMutexInit -{ - ::osl::Mutex m_aLock; -}; - -//=============================================== -/** - @descr implements a helper, which can be used to - convert vcl key codes into awt key codes ... - and reverse. - - Further such key code can be triggered. - Doing so different accelerator - configurations are merged together; a suitable - command registered for the given key code is searched - and will be dispatched. - - @attention - - Because exceution of an accelerator command can be dangerous - (in case it force an office shutdown for key "ALT+F4"!) - all internal dispatches are done asynchronous. - Menas that the trigger call doesnt wait till the dispatch - is finished. You can call very often. All requests will be - queued internal and dispatched ASAP. - - Of course this queue will be stopped if the environment - will be destructed ... - */ -class SVT_DLLPUBLIC AcceleratorExecute : private TMutexInit -{ - //------------------------------------------- - // const, types - private: - - /** @deprecated - replaced by internal class AsyncAccelExec ... - remove this resource here if we go forwards to next major */ - typedef ::std::vector< ::std::pair< css::util::URL, css::uno::Reference< css::frame::XDispatch > > > TCommandQueue; - - //------------------------------------------- - // member - private: - - /** TODO document me */ - css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR; - - /** TODO document me */ - css::uno::Reference< css::util::XURLTransformer > m_xURLParser; - - /** TODO document me */ - css::uno::Reference< css::frame::XDispatchProvider > m_xDispatcher; - - /** TODO document me */ - css::uno::Reference< css::ui::XAcceleratorConfiguration > m_xGlobalCfg; - css::uno::Reference< css::ui::XAcceleratorConfiguration > m_xModuleCfg; - css::uno::Reference< css::ui::XAcceleratorConfiguration > m_xDocCfg; - - /** @deprecated - replaced by internal class AsyncAccelExec ... - remove this resource here if we go forwards to next major */ - TCommandQueue m_lCommandQueue; - - /** @deprecated - replaced by internal class AsyncAccelExec ... - remove this resource here if we go forwards to next major */ - ::vcl::EventPoster m_aAsyncCallback; - - //------------------------------------------- - // interface - public: - - //--------------------------------------- - /** @short factory method to create new accelerator - helper instance. - - @descr Such helper instance must be initialized at first. - So it can know its environment (global/module or - document specific). - - Afterwards it can be used to execute incoming - accelerator requests. - - The "end of life" of such helper can be reached as follow: - - - delete the object - => If it stands currently in its execute method, they will - be finished. All further queued requests will be removed - and further not executed! - - - "let it stay alone" - => All currently queued events will be finished. The - helper kills itself afterwards. A shutdown of the - environment will be recognized ... The helper stop its - work immediatly then! - */ - static AcceleratorExecute* createAcceleratorHelper(); - - //--------------------------------------- - /** @short fight against inlining ... */ - virtual ~AcceleratorExecute(); - - //--------------------------------------- - /** @short init this instance. - - @descr It must be called as first method after creation. - And further it can be called more then once ... - but at least its should be used one times only. - Otherwhise nobody can say, which asynchronous - executions will be used inside the old and which one - will be used inside the new environment. - - @param xSMGR - reference to an uno service manager. - - @param xEnv - if it points to a valid frame it will be used - to execute the dispatch there. Further the frame - is used to locate the right module configuration - and use it merged together with the document and - the global configuration. - - If this parameter is set to NULL, the global configuration - is used only. Further the global Desktop instance is - used for dispatch. - */ - virtual void init(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR, - const css::uno::Reference< css::frame::XFrame >& xEnv ); - - //--------------------------------------- - /** @short trigger this accelerator. - - @descr The internal configuartions are used to find - as suitable command for this key code. - This command will be queued and executed later - asynchronous. - - @param aKey - specify the accelerator for execute. - - @return [sal_Bool] - TRUE if this key is configured and match to a command. - Attention: This state does not mean the success state - of the corresponding execute. Because its done asynchronous! - */ - virtual sal_Bool execute(const KeyCode& aKey); - virtual sal_Bool execute(const css::awt::KeyEvent& aKey); - - /** search the command for the given key event. - * - * @param aKey The key event - * @return The command or an empty string if the key event could not be found. - */ - ::rtl::OUString findCommand(const ::com::sun::star::awt::KeyEvent& aKey); - //--------------------------------------- - /** TODO document me */ - static css::awt::KeyEvent st_VCLKey2AWTKey(const KeyCode& aKey); - static KeyCode st_AWTKey2VCLKey(const css::awt::KeyEvent& aKey); - - //--------------------------------------- - /** TODO document me */ - static css::uno::Reference< css::ui::XAcceleratorConfiguration > st_openGlobalConfig(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR); - - //--------------------------------------- - /** TODO document me */ - static css::uno::Reference< css::ui::XAcceleratorConfiguration > st_openModuleConfig(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR , - const css::uno::Reference< css::frame::XFrame >& xFrame); - - //--------------------------------------- - /** TODO document me */ - static css::uno::Reference< css::ui::XAcceleratorConfiguration > st_openDocConfig(const css::uno::Reference< css::frame::XModel >& xModel); - - //------------------------------------------- - // internal - private: - - //--------------------------------------- - /** @short allow creation of instances of this class - by using our factory only! - */ - SVT_DLLPRIVATE AcceleratorExecute(); - - AcceleratorExecute(const AcceleratorExecute& rCopy); - void operator=(const AcceleratorExecute&) {}; - //--------------------------------------- - /** TODO document me */ - SVT_DLLPRIVATE ::rtl::OUString impl_ts_findCommand(const css::awt::KeyEvent& aKey); - - //--------------------------------------- - /** TODO document me */ - SVT_DLLPRIVATE css::uno::Reference< css::util::XURLTransformer > impl_ts_getURLParser(); - - //--------------------------------------- - /** @deprecated - replaced by internal class AsyncAccelExec ... - remove this resource here if we go forwards to next major */ - DECL_DLLPRIVATE_LINK(impl_ts_asyncCallback, void*); -}; - -} // namespace svt - -#undef css - -#endif // INCLUDED_SVTOOLS_ACCELERATOREXECUTE_HXX diff --git a/svtools/inc/addresstemplate.hxx b/svtools/inc/addresstemplate.hxx deleted file mode 100644 index 0ece2d779056..000000000000 --- a/svtools/inc/addresstemplate.hxx +++ /dev/null @@ -1,166 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: addresstemplate.hxx,v $ - * $Revision: 1.9 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVT_ADDRESSTEMPLATE_HXX_ -#define _SVT_ADDRESSTEMPLATE_HXX_ - -#include "svtools/svtdllapi.h" -#include -#include -#include -#include -#include -#include -#include -#include -#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_ -#include -#endif -#include -#include -#include - -// ....................................................................... -namespace svt -{ -// ....................................................................... - - // =================================================================== - // = AddressBookSourceDialog - // =================================================================== - struct AddressBookSourceDialogData; - class SVT_DLLPUBLIC AddressBookSourceDialog : public ModalDialog - { - protected: - // Controls - FixedLine m_aDatasourceFrame; - FixedText m_aDatasourceLabel; - ComboBox m_aDatasource; - PushButton m_aAdministrateDatasources; - FixedText m_aTableLabel; - ComboBox m_aTable; - - FixedText m_aFieldsTitle; - Window m_aFieldsFrame; - - ScrollBar m_aFieldScroller; - OKButton m_aOK; - CancelButton m_aCancel; - HelpButton m_aHelp; - - // string to display for "no selection" - const String m_sNoFieldSelection; - - /// the DatabaseContext for selecting data sources - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > - m_xDatabaseContext; - // the ORB for creating objects - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > - m_xORB; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > - m_xCurrentDatasourceTables; - - AddressBookSourceDialogData* - m_pImpl; - - public: - AddressBookSourceDialog( Window* _pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB ); - - /** if you use this ctor, the dialog -
  • will not store it's data in the configuration (nor initially retrieve it from there)
    • -
  • will not allow to change the data source name
    • -
  • will not allow to change the table name
    • -
  • will not allow to call the data source administration dialog
    • -
- - @param _rxORB - a service factory to use for various UNO related needs - @param _rxTransientDS - the data source to obtain connections from - @param _rDataSourceName - the to-be name of _rxTransientDS. This is only for displaying this - name to the user, since the dialog completely works on _rxTransientDS, - and doesn't allow to change this. - @param _rTable - the table name to display. It must refer to a valid table, relative to a connection - obtained from _rxTransientDS - */ - AddressBookSourceDialog( Window* _pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource >& _rxTransientDS, - const ::rtl::OUString& _rDataSourceName, - const ::rtl::OUString& _rTable, - const ::com::sun::star::uno::Sequence< ::com::sun::star::util::AliasProgrammaticPair >& _rMapping - ); - - ~AddressBookSourceDialog(); - - // to be used if the object was constructed for editing a field mapping only - void getFieldMapping( - ::com::sun::star::uno::Sequence< ::com::sun::star::util::AliasProgrammaticPair >& _rMapping) const; - - protected: - void implConstruct(); - - // Window overridables - virtual long PreNotify( NotifyEvent& _rNEvt ); - - // implementations - void implScrollFields(sal_Int32 _nPos, sal_Bool _bAdjustFocus, sal_Bool _bAdjustScrollbar); - void implSelectField(ListBox* _pBox, const String& _rText); - - void initalizeListBox(ListBox* _pList); - void resetTables(); - void resetFields(); - - // fill in the data sources listbox - void initializeDatasources(); - - // initialize the dialog from the configuration data - void loadConfiguration(); - - DECL_LINK(OnFieldScroll, ScrollBar*); - DECL_LINK(OnFieldSelect, ListBox*); - DECL_LINK(OnAdministrateDatasources, void*); - DECL_LINK(OnComboGetFocus, ComboBox*); - DECL_LINK(OnComboLoseFocus, ComboBox*); - DECL_LINK(OnComboSelect, ComboBox*); - DECL_LINK(OnOkClicked, Button*); - DECL_LINK(OnDelayedInitialize, void*); - }; - - -// ....................................................................... -} // namespace svt -// ....................................................................... - -#endif // _SVT_ADDRESSTEMPLATE_HXX_ - diff --git a/svtools/inc/apearcfg.hxx b/svtools/inc/apearcfg.hxx deleted file mode 100644 index 412faab3107b..000000000000 --- a/svtools/inc/apearcfg.hxx +++ /dev/null @@ -1,130 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: apearcfg.hxx,v $ - * $Revision: 1.5 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVT_APEARCFG_HXX -#define _SVT_APEARCFG_HXX - -#include "svtools/svtdllapi.h" -#include "tools/solar.h" -#include - -class Application; - -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ -typedef enum { - LookStardivision = 0, - LookMotif, - LookWindows, - LookOSTwo, - LookMacintosh -} SystemLook; - -typedef enum { - SnapToButton = 0, - SnapToMiddle, - NoSnap -} SnapType; - -typedef enum { // MUST match the order chosen in ListBox LB_DRAG_MODE in optgdlg.src - DragFullWindow, - DragFrame, - DragSystemDep -} DragMode; - - -class SVT_DLLPUBLIC SvtTabAppearanceCfg : public utl::ConfigItem -{ - short nLookNFeel ; - short nDragMode ; - short nScaleFactor ; - short nSnapMode ; - short nMiddleMouse; -#if defined( UNX ) || defined ( FS_PRIV_DEBUG ) - short nAAMinPixelHeight ; -#endif - - BOOL bMenuMouseFollow ; - BOOL bSingleLineTabCtrl ; - BOOL bColoredTabCtrl ; -#if defined( UNX ) || defined ( FS_PRIV_DEBUG ) - BOOL bFontAntialiasing ; -#endif - - static sal_Bool bInitialized ; - - SVT_DLLPRIVATE const com::sun::star::uno::Sequence& GetPropertyNames(); - -public: - SvtTabAppearanceCfg( ); - ~SvtTabAppearanceCfg( ); - - virtual void Commit(); - virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames); - - USHORT GetLookNFeel () const { return nLookNFeel; } - void SetLookNFeel ( USHORT nSet ); - - USHORT GetDragMode () const { return nDragMode; } - void SetDragMode ( USHORT nSet ); - - USHORT GetScaleFactor () const { return nScaleFactor; } - void SetScaleFactor ( USHORT nSet ); - - USHORT GetSnapMode () const { return nSnapMode; } - void SetSnapMode ( USHORT nSet ); - - USHORT GetMiddleMouseButton () const { return nMiddleMouse; } - void SetMiddleMouseButton ( USHORT nSet ); - - void SetApplicationDefaults ( Application* pApp ); - - void SetMenuMouseFollow(BOOL bSet) {bMenuMouseFollow = bSet; SetModified();} - BOOL IsMenuMouseFollow() const{return bMenuMouseFollow;} - - void SetSingleLineTabCtrl(BOOL bSet) {bSingleLineTabCtrl = bSet; SetModified();} - BOOL IsSingleLineTabCtrl()const {return bSingleLineTabCtrl;} - -#if defined( UNX ) || defined ( FS_PRIV_DEBUG ) - void SetFontAntiAliasing( BOOL bSet ) { bFontAntialiasing = bSet; SetModified(); } - BOOL IsFontAntiAliasing() const { return bFontAntialiasing; } - - USHORT GetFontAntialiasingMinPixelHeight( ) const { return nAAMinPixelHeight; } - void SetFontAntialiasingMinPixelHeight( USHORT _nMinHeight ) { nAAMinPixelHeight = _nMinHeight; SetModified(); } -#endif - - void SetColoredTabCtrl(BOOL bSet) {bColoredTabCtrl = bSet; SetModified();}; - BOOL IsColoredTabCtrl()const {return bColoredTabCtrl;} - - static sal_Bool IsInitialized() { return bInitialized; } - static void SetInitialized() { bInitialized = sal_True; } -}; - -#endif // _OFA_APEARCFG_HXX diff --git a/svtools/inc/asynclink.hxx b/svtools/inc/asynclink.hxx deleted file mode 100644 index 9f6b6c1117ec..000000000000 --- a/svtools/inc/asynclink.hxx +++ /dev/null @@ -1,80 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: asynclink.hxx,v $ - * $Revision: 1.6 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef SVTOOLS_ASYNCLINK_HXX -#define SVTOOLS_ASYNCLINK_HXX - -#include "svtools/svtdllapi.h" -#include -#include - -class Timer; - -namespace vos -{ - class OMutex; -} - -namespace svtools { - -class SVT_DLLPUBLIC AsynchronLink -{ - Link _aLink; - ULONG _nEventId; - Timer* _pTimer; - BOOL _bInCall; - BOOL* _pDeleted; - void* _pArg; - vos::OMutex* _pMutex; - - DECL_DLLPRIVATE_STATIC_LINK( AsynchronLink, HandleCall, void* ); - SVT_DLLPRIVATE void Call_Impl( void* pArg ); - -public: - AsynchronLink( const Link& rLink ) : - _aLink( rLink ), _nEventId( 0 ), _pTimer( 0 ), _bInCall( FALSE ), - _pDeleted( 0 ), _pMutex( 0 ){} - AsynchronLink() : _nEventId( 0 ), _pTimer( 0 ), _bInCall( FALSE ), - _pDeleted( 0 ), _pMutex( 0 ){} - ~AsynchronLink(); - - void CreateMutex(); - void operator=( const Link& rLink ) { _aLink = rLink; } - void Call( void* pObj, BOOL bAllowDoubles = FALSE, - BOOL bUseTimer = FALSE ); - void ForcePendingCall( ); - void ClearPendingCall( ); - BOOL IsSet() const { return _aLink.IsSet(); } - Link GetLink() const { return _aLink; } -}; - -} - -#endif diff --git a/svtools/inc/calendar.hxx b/svtools/inc/calendar.hxx deleted file mode 100644 index 1c81945a669c..000000000000 --- a/svtools/inc/calendar.hxx +++ /dev/null @@ -1,504 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: calendar.hxx,v $ - * $Revision: 1.9 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _CALENDAR_HXX -#define _CALENDAR_HXX - -#include "svtools/svtdllapi.h" -#include -#ifndef _COM_SUN_STAR_I18N_WEEKDAYS_HPP -#include -#endif - -#ifndef _CTRL_HXX -#include -#endif -#include -#ifndef _FIELD_HXX -#include -#endif - -class Table; -class MouseEvent; -class TrackingEvent; -class KeyEvent; -class HelpEvent; -class DataChangedEvent; -class FloatingWindow; -class PushButton; -struct ImplDateInfo; -class ImplDateTable; -class ImplCFieldFloatWin; - -/************************************************************************* - -Beschreibung -============ - -class Calendar - -Diese Klasse erlaubt die Auswahl eines Datum. Der Datumsbereich der -angezeigt wird, ist der, der durch die Klasse Date vorgegeben ist. -Es werden soviele Monate angezeigt, wie die Ausgabeflaeche des -Controls vorgibt. Der Anwender kann zwischen den Monaten ueber ein -ContextMenu (Bei Click auf den Monatstitel) oder durch 2 ScrollButtons -zwischen den Monaten wechseln. - --------------------------------------------------------------------------- - -WinBits - -WB_BORDER Um das Fenster wird ein Border gezeichnet. -WB_TABSTOP Tastatursteuerung ist moeglich. Der Focus wird - sich geholt, wenn mit der Maus in das - Control geklickt wird. -WB_QUICKHELPSHOWSDATEINFO DateInfo auch bei QuickInfo als BalloonHelp zeigen -WB_BOLDTEXT Formatiert wird nach fetten Texten und - DIB_BOLD wird bei AddDateInfo() ausgewertet -WB_FRAMEINFO Formatiert wird so, das Frame-Info angezeigt - werden kann und die FrameColor bei AddDateInfo() - ausgewertet wird -WB_RANGESELECT Es koennen mehrere Tage selektiert werden, die - jedoch alle zusammenhaengend sein muessen -WB_MULTISELECT Es koennen mehrere Tage selektiert werden -WB_WEEKNUMBER Es werden die Wochentage mit angezeigt - --------------------------------------------------------------------------- - -Mit SetCurDate() / GetCurDate() wird das ausgewaehlte Datum gesetzt und -abgefragt. Wenn der Anwnder ein Datum selektiert hat, wird Select() -gerufen. Bei einem Doppelklick auf ein Datum wird DoubleClick() gerufen. - --------------------------------------------------------------------------- - -Mit CalcWindowSizePixel() kann die Groesse des Fensters in Pixel fuer -die Darstellung einer bestimmte Anzahl von Monaten berechnet werden. - --------------------------------------------------------------------------- - -Mit SetSaturdayColor() kann eine spezielle Farbe fuer Sonnabende gesetzt -werden und mit SetSundayColor() eine fuer Sonntage. Mit AddDateInfo() -koennen Tage speziell gekennzeichnet werden. Dabei kann man einem -einzelnen Datum eine andere Farbe geben (zum Beispiel fuer Feiertage) -oder diese Umranden (zum Beispiel fuer Termine). Wenn beim Datum -kein Jahr angegeben wird, wird der Tag in jedem Jahr benutzt. Mit -AddDateInfo() kann auch jedem Datum ein Text mitgegeben werden, der -dann angezeigt wird, wenn Balloon-Hilfe an ist. Um nicht alle Jahre -mit entsprechenden Daten zu versorgen, wird der RequestDateInfo()- -Handler gerufen, wenn ein neues Jahr angezeigt wird. Es kann dann -im Handler mit GetRequestYear() das Jahr abgefragt werden. - --------------------------------------------------------------------------- - -Um ein ContextMenu zu einem Datum anzuzeigen, muss man den Command-Handler -ueberlagern. Mit GetDate() kann zur Mouse-Position das Datum ermittelt -werden. Bei Tastaturausloesung sollte das aktuelle Datum genommen werden. -Wenn ein ContextMenu angezeigt wird, darf der Handler der Basisklasse nicht -gerufen werden. - --------------------------------------------------------------------------- - -Bei Mehrfachselektion WB_RANGESELECT oder WB_MULTISELECT kann mit -SelectDate()/SelectDateRange() Datumsbereiche selektiert/deselektiert -werden. SelectDateRange() gilt inkl. EndDatum. Mit SetNoSelection() kann -alles deselektiert werden. SetCurDate() selektiert bei Mehrfachselektion -jedoch nicht das Datum mit, sondern gibt nur das Focus-Rechteck vor. - -Den selektierten Bereich kann man mit GetSelectDateCount()/GetSelectDate() -abgefragt werden oder der Status von einem Datum kann mit IsDateSelected() -abgefragt werden. - -Waehrend der Anwender am selektieren ist, wird der SelectionChanging()- -Handler gerufen. In diesem kann der selektierte Bereich angepasst werden, -wenn man beispielsweise den Bereich eingrenzen oder erweitern will. Der -Bereich wird mit SelectDate()/SelectDateRange() umgesetzt und mit -GetSelectDateCount()/GetSelectDate() abgefragt. Wenn man wissen moechte, -in welche Richtung selektiert wird, kann dies ueber IsSelectLeft() -abgefragt werden. TRUE bedeutet eine Selektion nach links oder oben, -FALSE eine Selektion nach rechts oder unten. - --------------------------------------------------------------------------- - -Wenn sich der Date-Range-Bereich anpasst und man dort die Selektion -uebernehmen will, sollte dies nur gemacht werden, wenn -IsScrollDateRangeChanged() TRUE zurueckliefert. Denn diese Methode liefert -TRUE zurueck, wenn der Bereich durch Betaetigung von den Scroll-Buttons -ausgeloest wurde. Bei FALSE wurde dies durch Resize(), Methoden-Aufrufen -oder durch Beendigung einer Selektion ausgeloest. - -*************************************************************************/ - -// ------------------ -// - Calendar-Types - -// ------------------ - -#define WB_QUICKHELPSHOWSDATEINFO ((WinBits)0x00004000) -#define WB_BOLDTEXT ((WinBits)0x00008000) -#define WB_FRAMEINFO ((WinBits)0x00010000) -#define WB_WEEKNUMBER ((WinBits)0x00020000) -// Muss mit den WinBits beim TabBar uebereinstimmen oder mal -// nach \vcl\inc\wintypes.hxx verlagert werden -#ifndef WB_RANGESELECT -#define WB_RANGESELECT ((WinBits)0x00200000) -#endif -#ifndef WB_MULTISELECT -#define WB_MULTISELECT ((WinBits)0x00400000) -#endif - -#define DIB_BOLD ((USHORT)0x0001) - -// ------------ -// - Calendar - -// ------------ - -class SVT_DLLPUBLIC Calendar : public Control -{ -private: - ImplDateTable* mpDateTable; - Table* mpSelectTable; - Table* mpOldSelectTable; - Table* mpRestoreSelectTable; - XubString* mpDayText[31]; - XubString maDayText; - XubString maWeekText; - CalendarWrapper maCalendarWrapper; - Rectangle maPrevRect; - Rectangle maNextRect; - String maDayOfWeekText; - sal_Int32 mnDayOfWeekAry[7]; - Date maOldFormatFirstDate; - Date maOldFormatLastDate; - Date maFirstDate; - Date maOldFirstDate; - Date maCurDate; - Date maOldCurDate; - Date maAnchorDate; - Date maDropDate; - Color maSelColor; - Color maOtherColor; - Color* mpStandardColor; - Color* mpSaturdayColor; - Color* mpSundayColor; - ULONG mnDayCount; - long mnDaysOffX; - long mnWeekDayOffY; - long mnDaysOffY; - long mnMonthHeight; - long mnMonthWidth; - long mnMonthPerLine; - long mnLines; - long mnDayWidth; - long mnDayHeight; - long mnWeekWidth; - long mnDummy2; - long mnDummy3; - long mnDummy4; - WinBits mnWinStyle; - USHORT mnFirstYear; - USHORT mnLastYear; - USHORT mnRequestYear; - BOOL mbCalc:1, - mbFormat:1, - mbDrag:1, - mbSelection:1, - mbMultiSelection:1, - mbWeekSel:1, - mbUnSel:1, - mbMenuDown:1, - mbSpinDown:1, - mbPrevIn:1, - mbNextIn:1, - mbDirect:1, - mbInSelChange:1, - mbTravelSelect:1, - mbScrollDateRange:1, - mbSelLeft:1, - mbAllSel:1, - mbDropPos:1; - Link maSelectionChangingHdl; - Link maDateRangeChangedHdl; - Link maRequestDateInfoHdl; - Link maDoubleClickHdl; - Link maSelectHdl; - Timer maDragScrollTimer; - USHORT mnDragScrollHitTest; - -#ifdef _SV_CALENDAR_CXX - using Control::ImplInitSettings; - using Window::ImplInit; - SVT_DLLPRIVATE void ImplInit( WinBits nWinStyle ); - SVT_DLLPRIVATE void ImplInitSettings(); - SVT_DLLPRIVATE void ImplGetWeekFont( Font& rFont ) const; - SVT_DLLPRIVATE void ImplFormat(); - using Window::ImplHitTest; - SVT_DLLPRIVATE USHORT ImplHitTest( const Point& rPos, Date& rDate ) const; - SVT_DLLPRIVATE void ImplDrawSpin( BOOL bDrawPrev = TRUE, BOOL bDrawNext = TRUE ); - SVT_DLLPRIVATE void ImplDrawDate( long nX, long nY, - USHORT nDay, USHORT nMonth, USHORT nYear, - DayOfWeek eDayOfWeek, - BOOL bBack = TRUE, BOOL bOther = FALSE, - ULONG nToday = 0 ); - SVT_DLLPRIVATE void ImplDraw( BOOL bPaint = FALSE ); - SVT_DLLPRIVATE void ImplUpdateDate( const Date& rDate ); - SVT_DLLPRIVATE void ImplUpdateSelection( Table* pOld ); - SVT_DLLPRIVATE void ImplMouseSelect( const Date& rDate, USHORT nHitTest, - BOOL bMove, BOOL bExpand, BOOL bExtended ); - SVT_DLLPRIVATE void ImplUpdate( BOOL bCalcNew = FALSE ); - using Window::ImplScroll; - SVT_DLLPRIVATE void ImplScroll( BOOL bPrev ); - SVT_DLLPRIVATE void ImplInvertDropPos(); - SVT_DLLPRIVATE void ImplShowMenu( const Point& rPos, const Date& rDate ); - SVT_DLLPRIVATE void ImplTracking( const Point& rPos, BOOL bRepeat ); - SVT_DLLPRIVATE void ImplEndTracking( BOOL bCancel ); - SVT_DLLPRIVATE DayOfWeek ImplGetWeekStart() const; -#endif - -protected: - BOOL ShowDropPos( const Point& rPos, Date& rDate ); - void HideDropPos(); - - DECL_STATIC_LINK( Calendar, ScrollHdl, Timer *); - -public: - Calendar( Window* pParent, WinBits nWinStyle = 0 ); - Calendar( Window* pParent, const ResId& rResId ); - ~Calendar(); - - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void Tracking( const TrackingEvent& rMEvt ); - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); - virtual void GetFocus(); - virtual void LoseFocus(); - virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual void Command( const CommandEvent& rCEvt ); - virtual void StateChanged( StateChangedType nStateChange ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - - virtual void SelectionChanging(); - virtual void DateRangeChanged(); - virtual void RequestDateInfo(); - virtual void DoubleClick(); - virtual void Select(); - - const CalendarWrapper& GetCalendarWrapper() const { return maCalendarWrapper; } - - /// Set one of ::com::sun::star::i18n::Weekdays. - void SetWeekStart( sal_Int16 nDay ); - - /// Set how many days of a week must reside in the first week of a year. - void SetMinimumNumberOfDaysInWeek( sal_Int16 nDays ); - - void SelectDate( const Date& rDate, BOOL bSelect = TRUE ); - void SelectDateRange( const Date& rStartDate, const Date& rEndDate, - BOOL bSelect = TRUE ); - void SetNoSelection(); - BOOL IsDateSelected( const Date& rDate ) const; - ULONG GetSelectDateCount() const; - Date GetSelectDate( ULONG nIndex = 0 ) const; - void EnableCallEverySelect( BOOL bEvery = TRUE ) { mbAllSel = bEvery; } - BOOL IsCallEverySelectEnabled() const { return mbAllSel; } - - USHORT GetRequestYear() const { return mnRequestYear; } - void SetCurDate( const Date& rNewDate ); - Date GetCurDate() const { return maCurDate; } - void SetFirstDate( const Date& rNewFirstDate ); - Date GetFirstDate() const { return maFirstDate; } - Date GetLastDate() const { return GetFirstDate() + mnDayCount; } - ULONG GetDayCount() const { return mnDayCount; } - Date GetFirstMonth() const; - Date GetLastMonth() const; - USHORT GetMonthCount() const; - BOOL GetDate( const Point& rPos, Date& rDate ) const; - Rectangle GetDateRect( const Date& rDate ) const; - BOOL GetDropDate( Date& rDate ) const; - - long GetCurMonthPerLine() const { return mnMonthPerLine; } - long GetCurLines() const { return mnLines; } - - void SetStandardColor( const Color& rColor ); - const Color& GetStandardColor() const; - void SetSaturdayColor( const Color& rColor ); - const Color& GetSaturdayColor() const; - void SetSundayColor( const Color& rColor ); - const Color& GetSundayColor() const; - - void AddDateInfo( const Date& rDate, const XubString& rText, - const Color* pTextColor = NULL, - const Color* pFrameColor = NULL, - USHORT nFlags = 0 ); - void RemoveDateInfo( const Date& rDate ); - void ClearDateInfo(); - XubString GetDateInfoText( const Date& rDate ); - - void StartSelection(); - void EndSelection(); - - BOOL IsTravelSelect() const { return mbTravelSelect; } - BOOL IsScrollDateRangeChanged() const { return mbScrollDateRange; } - BOOL IsSelectLeft() const { return mbSelLeft; } - - Size CalcWindowSizePixel( long nCalcMonthPerLine = 1, - long nCalcLines = 1 ) const; - - void SetSelectionChangingHdl( const Link& rLink ) { maSelectionChangingHdl = rLink; } - const Link& GetSelectionChangingHdl() const { return maSelectionChangingHdl; } - void SetDateRangeChangedHdl( const Link& rLink ) { maDateRangeChangedHdl = rLink; } - const Link& GetDateRangeChangedHdl() const { return maDateRangeChangedHdl; } - void SetRequestDateInfoHdl( const Link& rLink ) { maRequestDateInfoHdl = rLink; } - const Link& GetRequestDateInfoHdl() const { return maRequestDateInfoHdl; } - void SetDoubleClickHdl( const Link& rLink ) { maDoubleClickHdl = rLink; } - const Link& GetDoubleClickHdl() const { return maDoubleClickHdl; } - void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } - const Link& GetSelectHdl() const { return maSelectHdl; } -}; - -inline const Color& Calendar::GetStandardColor() const -{ - if ( mpStandardColor ) - return *mpStandardColor; - else - return GetFont().GetColor(); -} - -inline const Color& Calendar::GetSaturdayColor() const -{ - if ( mpSaturdayColor ) - return *mpSaturdayColor; - else - return GetFont().GetColor(); -} - -inline const Color& Calendar::GetSundayColor() const -{ - if ( mpSundayColor ) - return *mpSundayColor; - else - return GetFont().GetColor(); -} - -/************************************************************************* - -Beschreibung -============ - -class CalendarField - -Bei dieser Klasse handelt es sich um ein DateField, wo ueber einen -DropDown-Button ueber das Calendar-Control ein Datum ausgewaehlt werden -kann. - --------------------------------------------------------------------------- - -WinBits - -Siehe DateField - -Die Vorgaben fuer das CalendarControl koennen ueber SetCalendarStyle() -gesetzt werden. - --------------------------------------------------------------------------- - -Mit EnableToday()/EnableNone() kann ein Today-Button und ein None-Button -enabled werden. - --------------------------------------------------------------------------- - -Wenn mit SetCalendarStyle() WB_RANGESELECT gesetzt wird, koennen im -Calendar auch mehrere Tage selektiert werden. Da immer nur das Start-Datum -in das Feld uebernommen wird, sollte dann im Select-Handler mit -GetCalendar() der Calendar abgefragt werden und an dem mit -GetSelectDateCount()/GetSelectDate() der selektierte Bereich abgefragt -werden, um beispielsweise diese dann in ein weiteres Feld zu uebernehmen. - --------------------------------------------------------------------------- - -Wenn ein abgeleiteter Calendar verwendet werden soll, kann am -CalendarField die Methode CreateCalendar() ueberlagert werden und -dort ein eigener Calendar erzeugt werden. - -*************************************************************************/ - -// ----------------- -// - CalendarField - -// ----------------- - -class SVT_DLLPUBLIC CalendarField : public DateField -{ -private: - ImplCFieldFloatWin* mpFloatWin; - Calendar* mpCalendar; - WinBits mnCalendarStyle; - PushButton* mpTodayBtn; - PushButton* mpNoneBtn; - Date maDefaultDate; - BOOL mbToday; - BOOL mbNone; - Link maSelectHdl; - -#ifdef _SV_CALENDAR_CXX - DECL_DLLPRIVATE_LINK( ImplSelectHdl, Calendar* ); - DECL_DLLPRIVATE_LINK( ImplClickHdl, PushButton* ); - DECL_DLLPRIVATE_LINK( ImplPopupModeEndHdl, FloatingWindow* ); -#endif - -public: - CalendarField( Window* pParent, WinBits nWinStyle ); - CalendarField( Window* pParent, const ResId& rResId ); - ~CalendarField(); - - virtual void Select(); - - virtual BOOL ShowDropDown( BOOL bShow ); - virtual Calendar* CreateCalendar( Window* pParent ); - Calendar* GetCalendar(); - - void SetDefaultDate( const Date& rDate ) { maDefaultDate = rDate; } - Date GetDefaultDate() const { return maDefaultDate; } - - void EnableToday( BOOL bToday = TRUE ) { mbToday = bToday; } - BOOL IsTodayEnabled() const { return mbToday; } - void EnableNone( BOOL bNone = TRUE ) { mbNone = bNone; } - BOOL IsNoneEnabled() const { return mbNone; } - - void SetCalendarStyle( WinBits nStyle ) { mnCalendarStyle = nStyle; } - WinBits GetCalendarStyle() const { return mnCalendarStyle; } - - void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } - const Link& GetSelectHdl() const { return maSelectHdl; } - -protected: - virtual void StateChanged( StateChangedType nStateChange ); -}; - -#endif // _CALENDAR_HXX diff --git a/svtools/inc/cliplistener.hxx b/svtools/inc/cliplistener.hxx deleted file mode 100644 index 566b5d98e4b1..000000000000 --- a/svtools/inc/cliplistener.hxx +++ /dev/null @@ -1,64 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: cliplistener.hxx,v $ - * $Revision: 1.5 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _CLIPLISTENER_HXX -#define _CLIPLISTENER_HXX - -#include "svtools/svtdllapi.h" -#include -#include -#include - -class Window; - - -class SVT_DLLPUBLIC TransferableClipboardListener : public ::cppu::WeakImplHelper1< - ::com::sun::star::datatransfer::clipboard::XClipboardListener > -{ - Link aLink; - -public: - // Link is called with a TransferableDataHelper pointer - TransferableClipboardListener( const Link& rCallback ); - ~TransferableClipboardListener(); - - void AddRemoveListener( Window* pWin, BOOL bAdd ); - void ClearCallbackLink(); - - // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw(::com::sun::star::uno::RuntimeException); - // XClipboardListener - virtual void SAL_CALL changedContents( const ::com::sun::star::datatransfer::clipboard::ClipboardEvent& event ) - throw(::com::sun::star::uno::RuntimeException); -}; - -#endif - diff --git a/svtools/inc/collatorres.hxx b/svtools/inc/collatorres.hxx deleted file mode 100644 index 63b4e7ef64f3..000000000000 --- a/svtools/inc/collatorres.hxx +++ /dev/null @@ -1,24 +0,0 @@ - -#ifndef SVTOOLS_COLLATORRESSOURCE_HXX -#define SVTOOLS_COLLATORRESSOURCE_HXX - -#include "svtools/svtdllapi.h" -#include - -class CollatorRessourceData; - -class SVT_DLLPUBLIC CollatorRessource -{ - private: - - CollatorRessourceData *mp_Data; - - public: - CollatorRessource (); - ~CollatorRessource (); - const String& GetTranslation (const String& r_Algorithm); -}; - -#endif /* SVTOOLS_COLLATORRESSOURCE_HXX */ - - diff --git a/svtools/inc/contextmenuhelper.hxx b/svtools/inc/contextmenuhelper.hxx deleted file mode 100644 index 59aa064b6b87..000000000000 --- a/svtools/inc/contextmenuhelper.hxx +++ /dev/null @@ -1,133 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: contextmenuhelper.hxx,v $ - * $Revision: 1.3 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef INCLUDED_SVTOOLS_CONTEXTMENUHELPER_HXX -#define INCLUDED_SVTOOLS_CONTEXTMENUHELPER_HXX - -#include -#include -#include -#include -#include - -#include -#include -#include -#include "svtools/svtdllapi.h" - -namespace svt -{ - -/** - Context menu helper class. - - Fills images and labels for a provided popup menu or - com.sun.star.awt.XPopupMenu. - - PRECONDITION: - All commands must be set via SetItemCommand and are part - of the configuration files - (see org.openoffice.Office.UI.[Module]Commands.xcu) -*/ -struct ExecuteInfo; -class SVT_DLLPUBLIC ContextMenuHelper -{ - public: - // create context menu helper - // ARGS: xFrame = frame defines the context of the context menu - // bAutoRefresh = specifies that the context will be constant or not - ContextMenuHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, bool bAutoRefresh=true ); - ~ContextMenuHelper(); - - // methods to complete a popup menu (set images, labels, enable/disable states) - // ATTENTION: The item ID's must be unique for the whole popup (inclusive the sub menus!) - void completeAndExecute( const Point& aPos, PopupMenu& aPopupMenu ); - void completeAndExecute( const Point& aPos, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >& xPopupMenu ); - - // methods to create a popup menu referenced by resource URL - // NOT IMPLEMENTED YET! - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu > create( const ::rtl::OUString& aPopupMenuResourceURL ); - - // method to create and execute a popup menu referenced by a resource URL - // NOT IMPLEMENTED YET! - bool createAndExecute( const Point& aPos, const ::rtl::OUString& aPopupMenuResourceURL ); - - private: - // asynchronous link to prevent destruction while on stack - DECL_STATIC_LINK( ContextMenuHelper, ExecuteHdl_Impl, ExecuteInfo* ); - - // no copy-ctor and operator= - ContextMenuHelper( const ContextMenuHelper& ); - const ContextMenuHelper& operator=( const ContextMenuHelper& ); - - // show context menu and dispatch command automatically - void executePopupMenu( const Point& aPos, PopupMenu* pMenu ); - - // fill image and label for every menu item on the provided menu - void completeMenuProperties( Menu* pMenu ); - - // dispatch provided command - bool dispatchCommand( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, const ::rtl::OUString& aCommandURL ); - - - // methods to retrieve a single command URL dependent value from a - // ui configuratin manager - Image getImageFromCommandURL( const ::rtl::OUString& aCmdURL, bool bHiContrast ) const; - rtl::OUString getLabelFromCommandURL( const ::rtl::OUString& aCmdURL ) const; - - // creates an association between current module/controller bound to the - // provided frame and their ui configuration managers. - bool associateUIConfigurationManagers(); - - // resets associations to create associations again on-demand. - // Usefull for implementations which recycle frames. Normal - // implementations can profit from caching and should set - // auto refresh on ctor to false (default). - void resetAssociations() - { - if ( m_bAutoRefresh ) - m_bUICfgMgrAssociated = false; - } - - ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XFrame > m_xWeakFrame; - ::rtl::OUString m_aModuleIdentifier; - ::rtl::OUString m_aSelf; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xURLTransformer; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aDefaultArgs; - ::com::sun::star::uno::Reference< ::com::sun::star::ui::XImageManager > m_xDocImageMgr; - ::com::sun::star::uno::Reference< ::com::sun::star::ui::XImageManager > m_xModuleImageMgr; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xUICommandLabels; - bool m_bAutoRefresh; - bool m_bUICfgMgrAssociated; -}; - -} // namespace svt - -#endif // INCLUDED_SVTOOLS_CONTEXTMENUHELPER_HXX diff --git a/svtools/inc/controldims.hrc b/svtools/inc/controldims.hrc deleted file mode 100644 index 805e91e06486..000000000000 --- a/svtools/inc/controldims.hrc +++ /dev/null @@ -1,105 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: controldims.hrc,v $ - * $Revision: 1.5 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVT_CONTROLDIMS_HRC_ -#define _SVT_CONTROLDIMS_HRC_ - -// -// From: Dialogue Specification and Guidelines - Visual Design V1.3 -// by Christian Jansen -// - -// -// Usage: -// ====== -// -// all values have to be mapped by MAP_APPFONT -// - -// Base -#define RSC_BS_CHARHEIGHT 8 -#define RSC_BS_CHARWIDTH 4 - -// control dimensions -#define RSC_CD_PUSHBUTTON_WIDTH 50 -#define RSC_CD_PUSHBUTTON_HEIGHT 14 - -#define RSC_CD_FIXEDTEXT_HEIGHT RSC_BS_CHARHEIGHT -#define RSC_CD_FIXEDLINE_HEIGHT RSC_BS_CHARHEIGHT -#define RSC_CD_FIXEDLINE_WIDTH RSC_BS_CHARWIDTH // for vertical FixedLines - -#define RSC_CD_DROPDOWN_HEIGHT 12 // also combobox and dropdown list -#define RSC_CD_TEXTBOX_HEIGHT 12 // also numeric fields etc. - -#define RSC_CD_CHECKBOX_HEIGHT 10 // also tristate -#define RSC_CD_RADIOBUTTON_HEIGHT 10 - -// spacings -#define RSC_SP_CTRL_X 6 // controls that are unrelated -#define RSC_SP_CTRL_Y 7 -#define RSC_SP_CTRL_GROUP_X 3 // related controls, or controls in a groupbox -#define RSC_SP_CTRL_GROUP_Y 4 -#define RSC_SP_CTRL_DESC_X 3 // between description text and related control -#define RSC_SP_CTRL_DESC_Y 3 - -// overruled spacings between certain controls -#define RSC_SP_FLGR_SPACE_X 6 // between groupings made with FixedLine -#define RSC_SP_FLGR_SPACE_Y 4 -#define RSC_SP_GRP_SPACE_X 6 // between groupings made with GroupBox -#define RSC_SP_GRP_SPACE_Y 6 -#define RSC_SP_TXT_SPACE_X 5 // spacing between text paragraphs -#define RSC_SP_TXT_SPACE_Y 7 -#define RSC_SP_CHK_TEXTINDENT 8 // x indent of text aligned to checkbox title - -// dialog inner border -#define RSC_SP_DLG_INNERBORDER_LEFT 6 -#define RSC_SP_DLG_INNERBORDER_TOP 6 -#define RSC_SP_DLG_INNERBORDER_RIGHT 6 -#define RSC_SP_DLG_INNERBORDER_BOTTOM 6 - -// tab page inner border -#define RSC_SP_TBPG_INNERBORDER_LEFT 6 // for tabpage groupings -#define RSC_SP_TBPG_INNERBORDER_TOP 3 -#define RSC_SP_TBPG_INNERBORDER_RIGHT 6 -#define RSC_SP_TBPG_INNERBORDER_BOTTOM 6 - -// FixedLine group inner border -#define RSC_SP_FLGR_INNERBORDER_LEFT 6 // for FixedLine groupings -#define RSC_SP_FLGR_INNERBORDER_TOP 3 -#define RSC_SP_FLGR_INNERBORDER_RIGHT 0 -#define RSC_SP_FLGR_INNERBORDER_BOTTOM 0 - -// GroupBox inner border -#define RSC_SP_GRP_INNERBORDER_LEFT 6 // for GroupBox groupings -#define RSC_SP_GRP_INNERBORDER_TOP 6 -#define RSC_SP_GRP_INNERBORDER_RIGHT 6 -#define RSC_SP_GRP_INNERBORDER_BOTTOM 6 - -#endif // _SVT_CONTROLDIMS_HRC_ diff --git a/svtools/inc/ctrlbox.hxx b/svtools/inc/ctrlbox.hxx deleted file mode 100644 index a72fd6f2c25c..000000000000 --- a/svtools/inc/ctrlbox.hxx +++ /dev/null @@ -1,507 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: ctrlbox.hxx,v $ - * $Revision: 1.15 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _CTRLBOX_HXX -#define _CTRLBOX_HXX - -#include "svtools/svtdllapi.h" - -#ifndef _LSTBOX_HXX -#include -#endif -#ifndef _COMBOBOX_HXX -#include -#endif -#ifndef _IMAGE_HXX -#include -#endif -#ifndef _VIRDEV_HXX -#include -#endif -#ifndef _METRIC_HXX -#include -#endif -#ifndef _FIELD_HXX -#include -#endif - -class ImplFontList; -class ImpColorList; -class ImpLineList; -class FontList; - -/************************************************************************* - -Beschreibung -============ - -class ColorListBox - -Beschreibung - -Erlaubt die Auswahl von Farben. - --------------------------------------------------------------------------- - -class LineListBox - -Beschreibung - -Erlaubt die Auswahl von Linien-Styles und Groessen. Es ist darauf zu achten, -das vor dem ersten Insert die Units und die Fesntergroesse gesetzt sein -muessen. An Unit wird Point und mm unterstuetzt und als SourceUnit Point, -mm und Twips. Alle Angaben muessen in 100teln der jeweiligen Einheit -vorliegen. - -Line1 ist aeussere, Line2 die innere und Distance die Distanz zwischen -den beiden Linien. Wenn Line2 = 0 ist, wird nur Line1 angezeigt. Als -Default sind sowohl Source als auch Ziel-Unit FUNIT_POINT. - -Mit SetColor() kann die Linienfarbe eingestellt werden. - -Anmerkungen und Ausnahmen - -Gegenueber einer normalen ListBox, koennen keine User-Daten gesetzt -werden. Ausserdem sollte wenn der UpdateMode ausgeschaltet ist, keine -Daten abgefragt oder die Selektion gesetzt werden, da in diesem Zustand -die Daten nicht definiert sind. Wenn der UpdateMode ausgeschaltet ist, -sollte der Rueckgabewert bei Insert nicht ausgewertet werden, da er keine -Bedeutung hat. Ausserdem darf nicht das WinBit WB_SORT gesetzt sein. - --------------------------------------------------------------------------- - -class FontNameBox - -Beschreibung - -Erlaubt die Auswahl von Fonts. Die ListBox wird mit Fill gefuellt, wo -ein Pointer auf eine FontList uebergeben werden muss. - -Mit EnableWYSIWYG() kann man einstellen, das die Fontnamen in Ihrer Schrift -angezeigt werden und mit EnableSymbols() kann eingestellt werden, das -vor dem Namen ueber ein Symbol angezeigt wird, ob es sich um eine -Drucker oder Bildschirmschrift handelt. - -Querverweise - -FontList; FontStyleBox; FontSizeBox; FontNameMenu - --------------------------------------------------------------------------- - -class FontStyleBox - -Beschreibung - -Erlaubt die Auswahl eines FontStyles. Mit Fill wird die ListBox mit -den Styles zum uebergebenen Font gefuellt. Nachgebildete Styles werden -immer mit eingefuegt (kann sich aber noch aendern, da vielleicht -nicht alle Applikationen [StarDraw,Formel,FontWork] mit Syntetic-Fonts -umgehen koennen). Bei Fill bleibt vorherige Name soweit wie moeglich -erhalten. - -Fuer DontKnow sollte die FontStyleBox mit String() gefuellt werden. -Dann enthaellt die Liste die Standardattribute. Der Style, der gerade -angezeigt wird, muss gegebenenfalls noch vom Programm zurueckgesetzt werden. - -Querverweise - -FontList; FontNameBox; FontSizeBox; FontStyleMenu - --------------------------------------------------------------------------- - -class FontSizeBox - -Beschreibung - -Erlaubt die Auswahl von Fontgroessen. Werte werden ueber GetValue() -abgefragt und ueber SetValue() gesetzt. Fill fuellt die ListBox mit den -Groessen zum uebergebenen Font. Alle Groessen werden in 10tel Point -angegeben. Die FontListe, die bei Fill uebergeben wird, muss bis zum -naechsten Fill-Aufruf erhalten bleiben. - -Zusaetzlich erlaubt die FontSizeBox noch einen Relative-Mode. Dieser -dient dazu, Prozent-Werte eingeben zu koennen. Dies kann zum Beispiel -nuetzlich sein, wenn man die Box in einem Vorlagen-Dialog anbietet. -Dieser Modus ist nur anschaltbar, jedoch nicht wieder abschaltbar. - -Fuer DontKnow sollte die FontSizeBox mit FontInfo() gefuellt werden. -Dann enthaellt die Liste die Standardgroessen. Die Groesse, die gerade -angezeigt wird, muss gegebenenfalls noch vom Programm zurueckgesetzt werden. - -Querverweise - -FontList; FontNameBox; FontStyleBox; FontSizeMenu - -*************************************************************************/ - -// ---------------- -// - ColorListBox - -// ---------------- - -class SVT_DLLPUBLIC ColorListBox : public ListBox -{ - ImpColorList* pColorList; // Separate Liste, falls UserDaten von aussen verwendet werden. - Size aImageSize; - -#ifdef _CTRLBOX_CXX - using Window::ImplInit; - SVT_DLLPRIVATE void ImplInit(); - SVT_DLLPRIVATE void ImplDestroyColorEntries(); -#endif -public: - ColorListBox( Window* pParent, - WinBits nWinStyle = WB_BORDER ); - ColorListBox( Window* pParent, const ResId& rResId ); - virtual ~ColorListBox(); - - virtual void UserDraw( const UserDrawEvent& rUDEvt ); - - using ListBox::InsertEntry; - virtual USHORT InsertEntry( const XubString& rStr, - USHORT nPos = LISTBOX_APPEND ); - virtual USHORT InsertEntry( const Color& rColor, const XubString& rStr, - USHORT nPos = LISTBOX_APPEND ); - void InsertAutomaticEntry(); - using ListBox::RemoveEntry; - virtual void RemoveEntry( USHORT nPos ); - virtual void Clear(); - void CopyEntries( const ColorListBox& rBox ); - - using ListBox::GetEntryPos; - virtual USHORT GetEntryPos( const Color& rColor ) const; - virtual Color GetEntryColor( USHORT nPos ) const; - Size GetImageSize() const { return aImageSize; } - - void SelectEntry( const XubString& rStr, BOOL bSelect = TRUE ) - { ListBox::SelectEntry( rStr, bSelect ); } - void SelectEntry( const Color& rColor, BOOL bSelect = TRUE ); - XubString GetSelectEntry( USHORT nSelIndex = 0 ) const - { return ListBox::GetSelectEntry( nSelIndex ); } - Color GetSelectEntryColor( USHORT nSelIndex = 0 ) const; - BOOL IsEntrySelected( const XubString& rStr ) const - { return ListBox::IsEntrySelected( rStr ); } - - BOOL IsEntrySelected( const Color& rColor ) const; - -private: - // declared as private because some compilers would generate the default functions - ColorListBox( const ColorListBox& ); - ColorListBox& operator =( const ColorListBox& ); - - void SetEntryData( USHORT nPos, void* pNewData ); - void* GetEntryData( USHORT nPos ) const; -}; - -inline void ColorListBox::SelectEntry( const Color& rColor, BOOL bSelect ) -{ - USHORT nPos = GetEntryPos( rColor ); - if ( nPos != LISTBOX_ENTRY_NOTFOUND ) - ListBox::SelectEntryPos( nPos, bSelect ); -} - -inline BOOL ColorListBox::IsEntrySelected( const Color& rColor ) const -{ - USHORT nPos = GetEntryPos( rColor ); - if ( nPos != LISTBOX_ENTRY_NOTFOUND ) - return IsEntryPosSelected( nPos ); - else - return FALSE; -} - -inline Color ColorListBox::GetSelectEntryColor( USHORT nSelIndex ) const -{ - USHORT nPos = GetSelectEntryPos( nSelIndex ); - Color aColor; - if ( nPos != LISTBOX_ENTRY_NOTFOUND ) - aColor = GetEntryColor( nPos ); - return aColor; -} - -// --------------- -// - LineListBox - -// --------------- - -class SVT_DLLPUBLIC LineListBox : public ListBox -{ - ImpLineList* pLineList; - VirtualDevice aVirDev; - Size aTxtSize; - Color aColor; - Color maPaintCol; - FieldUnit eUnit; - FieldUnit eSourceUnit; - - SVT_DLLPRIVATE void ImpGetLine( long nLine1, long nLine2, long nDistance, Bitmap& rBmp, XubString& rStr ); - using Window::ImplInit; - SVT_DLLPRIVATE void ImplInit(); - void UpdateLineColors( void ); - BOOL UpdatePaintLineColor( void ); // returns TRUE if maPaintCol has changed - inline const Color& GetPaintColor( void ) const; - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - -public: - LineListBox( Window* pParent, WinBits nWinStyle = WB_BORDER ); - LineListBox( Window* pParent, const ResId& rResId ); - virtual ~LineListBox(); - - using ListBox::InsertEntry; - virtual USHORT InsertEntry( const XubString& rStr, USHORT nPos = LISTBOX_APPEND ); - virtual USHORT InsertEntry( long nLine1, long nLine2 = 0, long nDistance = 0, USHORT nPos = LISTBOX_APPEND ); - using ListBox::RemoveEntry; - virtual void RemoveEntry( USHORT nPos ); - virtual void Clear(); - - using ListBox::GetEntryPos; - USHORT GetEntryPos( long nLine1, long nLine2 = 0, long nDistance = 0 ) const; - long GetEntryLine1( USHORT nPos ) const; - long GetEntryLine2( USHORT nPos ) const; - long GetEntryDistance( USHORT nPos ) const; - - inline void SelectEntry( const XubString& rStr, BOOL bSelect = TRUE ) { ListBox::SelectEntry( rStr, bSelect ); } - void SelectEntry( long nLine1, long nLine2 = 0, long nDistance = 0, BOOL bSelect = TRUE ); - long GetSelectEntryLine1( USHORT nSelIndex = 0 ) const; - long GetSelectEntryLine2( USHORT nSelIndex = 0 ) const; - long GetSelectEntryDistance( USHORT nSelIndex = 0 ) const; - inline BOOL IsEntrySelected( const XubString& rStr ) const { return ListBox::IsEntrySelected( rStr ); } - BOOL IsEntrySelected( long nLine1, long nLine2 = 0, long nDistance = 0 ) const; - - inline void SetUnit( FieldUnit eNewUnit ) { eUnit = eNewUnit; } - inline FieldUnit GetUnit() const { return eUnit; } - inline void SetSourceUnit( FieldUnit eNewUnit ) { eSourceUnit = eNewUnit; } - inline FieldUnit GetSourceUnit() const { return eSourceUnit; } - - void SetColor( const Color& rColor ); - inline Color GetColor( void ) const; - -private: - // declared as private because some compilers would generate the default methods - LineListBox( const LineListBox& ); - LineListBox& operator =( const LineListBox& ); - void SetEntryData( USHORT nPos, void* pNewData ); - void* GetEntryData( USHORT nPos ) const; -}; - -inline void LineListBox::SelectEntry( long nLine1, long nLine2, long nDistance, BOOL bSelect ) -{ - USHORT nPos = GetEntryPos( nLine1, nLine2, nDistance ); - if ( nPos != LISTBOX_ENTRY_NOTFOUND ) - ListBox::SelectEntryPos( nPos, bSelect ); -} - -inline long LineListBox::GetSelectEntryLine1( USHORT nSelIndex ) const -{ - USHORT nPos = GetSelectEntryPos( nSelIndex ); - if ( nPos != LISTBOX_ENTRY_NOTFOUND ) - return GetEntryLine1( nPos ); - else - return 0; -} - -inline long LineListBox::GetSelectEntryLine2( USHORT nSelIndex ) const -{ - USHORT nPos = GetSelectEntryPos( nSelIndex ); - if ( nPos != LISTBOX_ENTRY_NOTFOUND ) - return GetEntryLine2( nPos ); - else - return 0; -} - -inline long LineListBox::GetSelectEntryDistance( USHORT nSelIndex ) const -{ - USHORT nPos = GetSelectEntryPos( nSelIndex ); - if ( nPos != LISTBOX_ENTRY_NOTFOUND ) - return GetEntryDistance( nPos ); - else - return 0; -} - -inline BOOL LineListBox::IsEntrySelected( long nLine1, long nLine2, long nDistance ) const -{ - USHORT nPos = GetEntryPos( nLine1, nLine2, nDistance ); - if ( nPos != LISTBOX_ENTRY_NOTFOUND ) - return IsEntryPosSelected( nPos ); - else - return FALSE; -} - -inline void LineListBox::SetColor( const Color& rColor ) -{ - aColor = rColor; - - UpdateLineColors(); -} - -inline Color LineListBox::GetColor( void ) const -{ - return aColor; -} - - -// --------------- -// - FontNameBox - -// --------------- - -class SVT_DLLPUBLIC FontNameBox : public ComboBox -{ -private: - ImplFontList* mpFontList; - Image maImagePrinterFont; - Image maImageBitmapFont; - Image maImageScalableFont; - BOOL mbWYSIWYG; - BOOL mbSymbols; - -#ifdef _CTRLBOX_CXX - SVT_DLLPRIVATE void ImplCalcUserItemSize(); - SVT_DLLPRIVATE void ImplDestroyFontList(); -#endif - - void InitBitmaps( void ); -protected: - virtual void DataChanged( const DataChangedEvent& rDCEvt ); -public: - FontNameBox( Window* pParent, - WinBits nWinStyle = WB_SORT ); - FontNameBox( Window* pParent, const ResId& rResId ); - virtual ~FontNameBox(); - - virtual void UserDraw( const UserDrawEvent& rUDEvt ); - - void Fill( const FontList* pList ); - - void EnableWYSIWYG( BOOL bEnable = TRUE ); - BOOL IsWYSIWYGEnabled() const { return mbWYSIWYG; } - - void EnableSymbols( BOOL bEnable = TRUE ); - BOOL IsSymbolsEnabled() const { return mbSymbols; } - -private: - // declared as private because some compilers would generate the default functions - FontNameBox( const FontNameBox& ); - FontNameBox& operator =( const FontNameBox& ); -}; - -// ---------------- -// - FontStyleBox - -// ---------------- - -class SVT_DLLPUBLIC FontStyleBox : public ComboBox -{ - XubString aLastStyle; - -private: - using ComboBox::SetText; -public: - FontStyleBox( Window* pParent, WinBits nWinStyle = 0 ); - FontStyleBox( Window* pParent, const ResId& rResId ); - virtual ~FontStyleBox(); - - virtual void Select(); - virtual void LoseFocus(); - virtual void Modify(); - - void SetText( const XubString& rText ); - void Fill( const XubString& rName, const FontList* pList ); - -private: - // declared as private because some compilers would generate the default functions - FontStyleBox( const FontStyleBox& ); - FontStyleBox& operator =( const FontStyleBox& ); -}; - -inline void FontStyleBox::SetText( const XubString& rText ) -{ - aLastStyle = rText; - ComboBox::SetText( rText ); -} - -// --------------- -// - FontSizeBox - -// --------------- - -class SVT_DLLPUBLIC FontSizeBox : public MetricBox -{ - FontInfo aFontInfo; - const FontList* pFontList; - USHORT nRelMin; - USHORT nRelMax; - USHORT nRelStep; - short nPtRelMin; - short nPtRelMax; - short nPtRelStep; - BOOL bRelativeMode:1, - bRelative:1, - bPtRelative:1, - bStdSize:1; - -#ifdef _CTRLBOX_CXX - using Window::ImplInit; - SVT_DLLPRIVATE void ImplInit(); -#endif - -protected: - virtual XubString CreateFieldText( sal_Int64 nValue ) const; - -public: - FontSizeBox( Window* pParent, WinBits nWinStyle = 0 ); - FontSizeBox( Window* pParent, const ResId& rResId ); - virtual ~FontSizeBox(); - - void Reformat(); - void Modify(); - - void Fill( const FontInfo* pInfo, const FontList* pList ); - - void EnableRelativeMode( USHORT nMin = 50, USHORT nMax = 150, - USHORT nStep = 5 ); - void EnablePtRelativeMode( short nMin = -200, short nMax = 200, - short nStep = 10 ); - BOOL IsRelativeMode() const { return bRelativeMode; } - void SetRelative( BOOL bRelative = FALSE ); - BOOL IsRelative() const { return bRelative; } - void SetPtRelative( BOOL bPtRel = TRUE ) - { bPtRelative = bPtRel; SetRelative( TRUE ); } - BOOL IsPtRelative() const { return bPtRelative; } - - virtual void SetValue( sal_Int64 nNewValue, FieldUnit eInUnit ); - virtual void SetValue( sal_Int64 nNewValue ); - virtual sal_Int64 GetValue( FieldUnit eOutUnit ) const; - virtual sal_Int64 GetValue() const; - sal_Int64 GetValue( USHORT nPos, FieldUnit eOutUnit ) const; - void SetUserValue( sal_Int64 nNewValue, FieldUnit eInUnit ); - void SetUserValue( sal_Int64 nNewValue ) { SetUserValue( nNewValue, FUNIT_NONE ); } - -private: - // declared as private because some compilers would generate the default functions - FontSizeBox( const FontSizeBox& ); - FontSizeBox& operator =( const FontSizeBox& ); -}; - -#endif // _CTRLBOX_HXX diff --git a/svtools/inc/ctrltool.hxx b/svtools/inc/ctrltool.hxx deleted file mode 100644 index 21a1fcab76d7..000000000000 --- a/svtools/inc/ctrltool.hxx +++ /dev/null @@ -1,254 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: ctrltool.hxx,v $ - * $Revision: 1.8 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _CTRLTOOL_HXX -#define _CTRLTOOL_HXX - -#include "svtools/svtdllapi.h" - -#ifndef _SAL_TYPES_H -#include -#endif -#include -#ifndef _METRIC_HXX -#include -#endif - -class ImplFontListNameInfo; -class OutputDevice; - -/************************************************************************* - -Beschreibung -============ - -class FontList - -Diese Klasse verwaltet alle Fonts, die auf einem oder zwei Ausgabegeraeten -dargestellt werden koennen. Zusaetzlich bietet die Klasse Methoden an, um -aus Fett und Kursiv den StyleName zu generieren oder aus einem Stylename -die fehlenden Attribute. Zusaetzlich kann diese Klasse syntetisch nachgebildete -Fonts verarbeiten. Diese Klasse kann mit verschiedenen Standard-Controls und -Standard-Menus zusammenarbeiten. - -Querverweise - -class FontNameBox, class FontStyleBox, class FontSizeBox, -class FontNameMenu, class FontStyleMenu, class FontSizeMenu - --------------------------------------------------------------------------- - -FontList::FontList( OutputDevice* pDevice, OutputDevice* pDevice2 = NULL, - BOOL bAll = TRUE ); - -Konstruktor der Klasse FontList. Vom uebergebenen OutputDevice werden die -entsprechenden Fonts abgefragt. Das OutputDevice muss solange existieren, -wie auch die Klasse FontList existiert. Optional kann noch ein 2tes -Ausgabedevice uebergeben werden, damit man zum Beispiel die Fonts von -einem Drucker und dem Bildschirm zusammen in einer FontListe verwalten kann -und somit auch den FontListen und FontMenus die Fonts von beiden OutputDevices -zu uebergeben. Auch das pDevice2 muss solange existieren, wie die Klasse -FontList existiert. - -Das OutputDevice, welches als erstes uebergeben wird, sollte das bevorzugte -sein. Dies sollte im normalfall der Drucker sein. Denn wenn 2 verschiede -Device-Schriften (eine fuer Drucker und eine fuer den Bildschirm) vorhanden -sind, wird die vom uebergebenen Device "pDevice" bevorzugt. - -Mit dem dritten Parameter kann man angeben, ob nur skalierbare Schriften -abgefragt werden sollen oder alle. Wenn TRUE uebergeben wird, werden auch -Bitmap-Schriften mit abgefragt. Bei FALSE werden Vector-Schriften und -scalierbare Schriften abgefragt. - --------------------------------------------------------------------------- - -String FontList::GetStyleName( const FontInfo& rInfo ) const; - -Diese Methode gibt den StyleName von einer FontInfo zurueck. Falls kein -StyleName gesetzt ist, wird aus den gesetzten Attributen ein entsprechender -Name generiert, der dem Anwender praesentiert werden kann. - --------------------------------------------------------------------------- - -XubString FontList::GetFontMapText( const FontInfo& rInfo ) const; - -Diese Methode gibt einen Matchstring zurueck, der dem Anwender -anzeigen soll, welche Probleme es mit diesem Font geben kann. - --------------------------------------------------------------------------- - -FontInfo FontList::Get( const String& rName, const String& rStyleName ) const; - -Diese Methode sucht aus dem uebergebenen Namen und dem uebergebenen StyleName -die entsprechende FontInfo-Struktur raus. Der Stylename kann in dieser -Methode auch ein syntetischer sein. In diesem Fall werden die entsprechenden -Werte in der FontInfo-Struktur entsprechend gesetzt. Wenn ein StyleName -uebergeben wird, kann jedoch eine FontInfo-Struktur ohne Stylename -zurueckgegeben werden. Um den StyleName dem Anwender zu repraesentieren, -muss GetStyleName() mit dieser FontInfo-Struktur aufgerufen werden. - -Querverweise - -FontList::GetStyleName() - --------------------------------------------------------------------------- - -FontInfo FontList::Get( const String& rName, FontWeight eWeight, - FontItalic eItalic ) const; - -Diese Methode sucht aus dem uebergebenen Namen und den uebergebenen Styles -die entsprechende FontInfo-Struktur raus. Diese Methode kann auch eine -FontInfo-Struktur ohne Stylename zurueckgegeben. Um den StyleName dem -Anwender zu repraesentieren, muss GetStyleName() mit dieser FontInfo-Struktur -aufgerufen werden. - -Querverweise - -FontList::GetStyleName() - --------------------------------------------------------------------------- - -const long* FontList::GetSizeAry( const FontInfo& rInfo ) const; - -Diese Methode liefert zum uebergebenen Font die vorhandenen Groessen. -Falls es sich dabei um einen skalierbaren Font handelt, werden Standard- -Groessen zurueckgegeben. Das Array enthaelt die Hoehen des Fonts in 10tel -Point. Der letzte Wert des Array ist 0. Das Array, was zurueckgegeben wird, -wird von der FontList wieder zerstoert. Nach dem Aufruf der naechsten Methode -von der FontList, sollte deshalb das Array nicht mehr referenziert werden. - -*************************************************************************/ - -// ------------ -// - FontList - -// ------------ - -#define FONTLIST_FONTINFO_NOTFOUND ((USHORT)0xFFFF) - -#define FONTLIST_FONTNAMETYPE_PRINTER ((USHORT)0x0001) -#define FONTLIST_FONTNAMETYPE_SCREEN ((USHORT)0x0002) -#define FONTLIST_FONTNAMETYPE_SCALABLE ((USHORT)0x0004) - -class SVT_DLLPUBLIC FontList : private List -{ -private: - XubString maMapBoth; - XubString maMapPrinterOnly; - XubString maMapScreenOnly; - XubString maMapSizeNotAvailable; - XubString maMapStyleNotAvailable; - XubString maMapNotAvailable; - XubString maLight; - XubString maLightItalic; - XubString maNormal; - XubString maNormalItalic; - XubString maBold; - XubString maBoldItalic; - XubString maBlack; - XubString maBlackItalic; - long* mpSizeAry; - OutputDevice* mpDev; - OutputDevice* mpDev2; - -#ifdef CTRLTOOL_CXX - SVT_DLLPRIVATE ImplFontListNameInfo* ImplFind( const XubString& rSearchName, ULONG* pIndex ) const; - SVT_DLLPRIVATE ImplFontListNameInfo* ImplFindByName( const XubString& rStr ) const; - SVT_DLLPRIVATE void ImplInsertFonts( OutputDevice* pDev, BOOL bAll, - BOOL bInsertData ); -#endif - -public: - FontList( OutputDevice* pDevice, - OutputDevice* pDevice2 = NULL, - BOOL bAll = TRUE ); - ~FontList(); - - FontList* Clone() const; - - OutputDevice* GetDevice() const { return mpDev; } - OutputDevice* GetDevice2() const { return mpDev2; } - XubString GetFontMapText( const FontInfo& rInfo ) const; - USHORT GetFontNameType( const XubString& rFontName ) const; - - const XubString& GetNormalStr() const { return maNormal; } - const XubString& GetItalicStr() const { return maNormalItalic; } - const XubString& GetBoldStr() const { return maBold; } - const XubString& GetBoldItalicStr() const { return maBoldItalic; } - const XubString& GetStyleName( FontWeight eWeight, FontItalic eItalic ) const; - XubString GetStyleName( const FontInfo& rInfo ) const; - - FontInfo Get( const XubString& rName, - const XubString& rStyleName ) const; - FontInfo Get( const XubString& rName, - FontWeight eWeight, - FontItalic eItalic ) const; - - BOOL IsAvailable( const XubString& rName ) const; - USHORT GetFontNameCount() const - { return (USHORT)List::Count(); } - const FontInfo& GetFontName( USHORT nFont ) const; - USHORT GetFontNameType( USHORT nFont ) const; - sal_Handle GetFirstFontInfo( const XubString& rName ) const; - sal_Handle GetNextFontInfo( sal_Handle hFontInfo ) const; - const FontInfo& GetFontInfo( sal_Handle hFontInfo ) const; - - const long* GetSizeAry( const FontInfo& rInfo ) const; - static const long* GetStdSizeAry(); - -private: - FontList( const FontList& ); - FontList& operator =( const FontList& ); -}; - - -// ----------------- -// - FontSizeNames - -// ----------------- - -class SVT_DLLPUBLIC FontSizeNames -{ -private: - struct ImplFSNameItem* mpArray; - ULONG mnElem; - -public: - FontSizeNames( LanguageType eLanguage /* = LANGUAGE_DONTKNOW */ ); - - ULONG Count() const { return mnElem; } - BOOL IsEmpty() const { return !mnElem; } - - long Name2Size( const String& ) const; - String Size2Name( long ) const; - - String GetIndexName( ULONG nIndex ) const; - long GetIndexSize( ULONG nIndex ) const; -}; - -#endif // _CTRLTOOL_HXX diff --git a/svtools/inc/dialogclosedlistener.hxx b/svtools/inc/dialogclosedlistener.hxx deleted file mode 100644 index b2d0f68bf59d..000000000000 --- a/svtools/inc/dialogclosedlistener.hxx +++ /dev/null @@ -1,80 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: dialogclosedlistener.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVTOOLS_DIALOGCLOSEDLISTENER_HXX -#define _SVTOOLS_DIALOGCLOSEDLISTENER_HXX - -#include "svtools/svtdllapi.h" -#include -#include -#include - -//......................................................................... -namespace svt -{ -//......................................................................... - - //===================================================================== - //= ODialogClosedListener - //===================================================================== - /** - C++ class to implement a ::com::sun::star::ui::dialogs::XDialogClosedListener - */ - class SVT_DLLPUBLIC DialogClosedListener : - public ::cppu::WeakImplHelper1< ::com::sun::star::ui::dialogs::XDialogClosedListener > - { - private: - /** - This link will be called when the dialog was closed. - - The link must have the type: - DECL_LINK( DialogClosedHdl, ::com::sun::star::ui::dialogs::DialogClosedEvent* ); - */ - Link m_aDialogClosedLink; - - public: - DialogClosedListener(); - DialogClosedListener( const Link& rLink ); - - inline void SetDialogClosedLink( const Link& rLink ) { m_aDialogClosedLink = rLink; } - - // XDialogClosedListener methods - virtual void SAL_CALL dialogClosed( const ::com::sun::star::ui::dialogs::DialogClosedEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException); - - // XEventListener methods - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw( ::com::sun::star::uno::RuntimeException ); - }; - -//......................................................................... -} // namespace svt -//......................................................................... - -#endif// COMPHELPER_DIALOGCLOSEDLISTENER_HXX - diff --git a/svtools/inc/dialogcontrolling.hxx b/svtools/inc/dialogcontrolling.hxx deleted file mode 100644 index edb425f78b00..000000000000 --- a/svtools/inc/dialogcontrolling.hxx +++ /dev/null @@ -1,309 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: dialogcontrolling.hxx,v $ - * $Revision: 1.6 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef SVTOOLS_DIALOGCONTROLLING_HXX -#define SVTOOLS_DIALOGCONTROLLING_HXX - -#include - -#include -#include - -#include -#include - -//........................................................................ -namespace svt -{ -//........................................................................ - - //===================================================================== - //= IWindowOperator - //===================================================================== - /** an abstract interface for operating on a ->Window - */ - class SVT_DLLPUBLIC SAL_NO_VTABLE IWindowOperator - { - public: - /** called when an event happened which should be reacted to - - @param _rTrigger - the event which triggered the call. If the Id of the event is 0, then this is the initial - call which is made when ->_rOperateOn is added to the responsibility of the DialogController. - @param _rOperateOn - the window on which to operate - */ - virtual void operateOn( const VclWindowEvent& _rTrigger, Window& _rOperateOn ) const = 0; - - virtual ~IWindowOperator(); - }; - typedef ::boost::shared_ptr< IWindowOperator > PWindowOperator; - - //===================================================================== - //= IWindowEventFilter - //===================================================================== - /** an abstract interface for deciding whether a ->VclWindowEvent - is worth paying attention to - */ - class SVT_DLLPUBLIC SAL_NO_VTABLE IWindowEventFilter - { - public: - virtual bool payAttentionTo( const VclWindowEvent& _rEvent ) const = 0; - - virtual ~IWindowEventFilter(); - }; - typedef ::boost::shared_ptr< IWindowEventFilter > PWindowEventFilter; - - //===================================================================== - //= DialogController - //===================================================================== - struct DialogController_Data; - /** a class controlling interactions between dialog controls - - An instance of this class listens to all events fired by a certain - ->Control (more precise, a ->Window), the so-called instigator. - - Additionally, the ->DialogController maintains a list of windows which - are affected by changes in the instigator window. Let's call those the - dependent windows. - - Now, by help of an owner-provided ->IWindowEventFilter, the ->DialogController - decides which events are worth attention. By help of an owner-provided - ->IWindowOperator, it handles those events for all dependent windows. - */ - class SVT_DLLPUBLIC DialogController - { - private: - ::std::auto_ptr< DialogController_Data > m_pImpl; - - public: - DialogController( Window& _rInstigator, const PWindowEventFilter& _pEventFilter, const PWindowOperator& _pOperator ); - virtual ~DialogController(); - - /** adds a window to the list of dependent windows - - @param _rWindow - The window to add to the list of dependent windows. - - The caller is responsible for life-time control: The given window - must live at least as long as the ->DialogController instance does. - */ - void addDependentWindow( Window& _rWindow ); - - /** resets the controller so that no actions happend anymore. - - The instances is disfunctional after this method has been called. - */ - void reset(); - - private: - void impl_Init(); - void impl_updateAll( const VclWindowEvent& _rTriggerEvent ); - void impl_update( const VclWindowEvent& _rTriggerEvent, Window& _rWindow ); - - DECL_LINK( OnWindowEvent, const VclWindowEvent* ); - - private: - DialogController( const DialogController& ); // never implemented - DialogController& operator=( const DialogController& ); // never implemented - }; - typedef ::boost::shared_ptr< DialogController > PDialogController; - - //===================================================================== - //= ControlDependencyManager - //===================================================================== - struct ControlDependencyManager_Data; - /** helper class for managing control dependencies - - Instances of this class are intended to be held as members of a dialog/tabpage/whatever - class, with easy administration of inter-control dependencies (such as "Enable - control X if and only if checkbox Y is checked). - */ - class SVT_DLLPUBLIC ControlDependencyManager - { - private: - ::std::auto_ptr< ControlDependencyManager_Data > m_pImpl; - - public: - ControlDependencyManager(); - ~ControlDependencyManager(); - - /** clears all dialog controllers previously added to the manager - */ - void clear(); - - /** ensures that a given window is enabled or disabled, according to the check state - of a given radio button - @param _rRadio - denotes the radio button whose check state is to observe - @param _rDependentWindow - denotes the window which should be enabled when ->_rRadio is checked, and - disabled when it's unchecked - */ - void enableOnRadioCheck( RadioButton& _rRadio, Window& _rDependentWindow ); - void enableOnRadioCheck( RadioButton& _rRadio, Window& _rDependentWindow1, Window& _rDependentWindow2 ); - void enableOnRadioCheck( RadioButton& _rRadio, Window& _rDependentWindow1, Window& _rDependentWindow2, Window& _rDependentWindow3 ); - void enableOnRadioCheck( RadioButton& _rRadio, Window& _rDependentWindow1, Window& _rDependentWindow2, Window& _rDependentWindow3, Window& _rDependentWindow4 ); - void enableOnRadioCheck( RadioButton& _rRadio, Window& _rDependentWindow1, Window& _rDependentWindow2, Window& _rDependentWindow3, Window& _rDependentWindow4, Window& _rDependentWindow5 ); - void enableOnRadioCheck( RadioButton& _rRadio, Window& _rDependentWindow1, Window& _rDependentWindow2, Window& _rDependentWindow3, Window& _rDependentWindow4, Window& _rDependentWindow5, Window& _rDependentWindow6 ); - - /** ensures that a given window is enabled or disabled, according to the mark state - of a given check box - @param _rBox - denotes the check box whose mark state is to observe - @param _rDependentWindow - denotes the window which should be enabled when ->_rBox is marked, and - disabled when it's unmarked - */ - void enableOnCheckMark( CheckBox& _rBox, Window& _rDependentWindow ); - void enableOnCheckMark( CheckBox& _rBox, Window& _rDependentWindow1, Window& _rDependentWindow2 ); - void enableOnCheckMark( CheckBox& _rBox, Window& _rDependentWindow1, Window& _rDependentWindow2, Window& _rDependentWindow3 ); - void enableOnCheckMark( CheckBox& _rBox, Window& _rDependentWindow1, Window& _rDependentWindow2, Window& _rDependentWindow3, Window& _rDependentWindow4 ); - void enableOnCheckMark( CheckBox& _rBox, Window& _rDependentWindow1, Window& _rDependentWindow2, Window& _rDependentWindow3, Window& _rDependentWindow4, Window& _rDependentWindow5 ); - void enableOnCheckMark( CheckBox& _rBox, Window& _rDependentWindow1, Window& _rDependentWindow2, Window& _rDependentWindow3, Window& _rDependentWindow4, Window& _rDependentWindow5, Window& _rDependentWindow6 ); - - /** adds a non-standard controller whose functionality is not covered by the other methods - - @param _pController - the controller to add to the manager. Must not be . - */ - void addController( const PDialogController& _pController ); - - private: - ControlDependencyManager( const ControlDependencyManager& ); // never implemented - ControlDependencyManager& operator=( const ControlDependencyManager& ); // never implemented - }; - - //===================================================================== - //= EnableOnCheck - //===================================================================== - /** a helper class implementing the ->IWindowOperator interface, - which enables a dependent window depending on the check state of - an instigator window. - - @see DialogController - */ - template< class CHECKABLE > - class SVT_DLLPUBLIC EnableOnCheck : public IWindowOperator - { - public: - typedef CHECKABLE SourceType; - - private: - SourceType& m_rCheckable; - - public: - /** constructs the instance - - @param _rCheckable - a ->Window instance which supports a boolean method IsChecked. Usually - a ->RadioButton or ->CheckBox - */ - EnableOnCheck( SourceType& _rCheckable ) - :m_rCheckable( _rCheckable ) - { - } - - virtual void operateOn( const VclWindowEvent& /*_rTrigger*/, Window& _rOperateOn ) const - { - _rOperateOn.Enable( m_rCheckable.IsChecked() ); - } - }; - - //===================================================================== - //= FilterForRadioOrCheckToggle - //===================================================================== - /** a helper class implementing the ->IWindowEventFilter interface, - which filters for radio buttons or check boxes being toggled. - - Technically, the class simply filters for the ->VCLEVENT_RADIOBUTTON_TOGGLE - and the ->VCLEVENT_CHECKBOX_TOGGLE event. - */ - class SVT_DLLPUBLIC FilterForRadioOrCheckToggle : public IWindowEventFilter - { - const Window& m_rWindow; - public: - FilterForRadioOrCheckToggle( const Window& _rWindow ) - :m_rWindow( _rWindow ) - { - } - - bool payAttentionTo( const VclWindowEvent& _rEvent ) const - { - if ( ( _rEvent.GetWindow() == &m_rWindow ) - && ( ( _rEvent.GetId() == VCLEVENT_RADIOBUTTON_TOGGLE ) - || ( _rEvent.GetId() == VCLEVENT_CHECKBOX_TOGGLE ) - ) - ) - return true; - return false; - } - }; - - //===================================================================== - //= RadioDependentEnabler - //===================================================================== - /** a ->DialogController derivee which enables or disables its dependent windows, - depending on the check state of a radio button. - - The usage of this class is as simple as - - pController = new RadioDependentEnabler( m_aOptionSelectSomething ); - pController->addDependentWindow( m_aLabelSelection ); - pController->addDependentWindow( m_aListSelection ); - - - With this, both m_aLabelSelection and m_aListSelection will - be disabled if and only m_aOptionSelectSomething is checked. - */ - class SVT_DLLPUBLIC RadioDependentEnabler : public DialogController - { - public: - RadioDependentEnabler( RadioButton& _rButton ) - :DialogController( _rButton, - PWindowEventFilter( new FilterForRadioOrCheckToggle( _rButton ) ), - PWindowOperator( new EnableOnCheck< RadioButton >( _rButton ) ) ) - { - } - - RadioDependentEnabler( CheckBox& _rBox ) - :DialogController( _rBox, - PWindowEventFilter( new FilterForRadioOrCheckToggle( _rBox ) ), - PWindowOperator( new EnableOnCheck< CheckBox >( _rBox ) ) ) - { - } - }; - -//........................................................................ -} // namespace svt -//........................................................................ - -#endif // SVTOOLS_DIALOGCONTROLLING_HXX - diff --git a/svtools/inc/expander.hxx b/svtools/inc/expander.hxx deleted file mode 100644 index 06a527195780..000000000000 --- a/svtools/inc/expander.hxx +++ /dev/null @@ -1,95 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: expander.hxx,v $ - * $Revision: 1.3 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SV_EXPANDER_HXX -#define _SV_EXPANDER_HXX - -#include -#include - -enum SvExpanderStateType -{ - EST_MIN=1, - EST_PLUS=2, - EST_MIN_DOWN=3, - EST_PLUS_DOWN=4, - EST_NONE=5, - EST_MIN_DIS=6, - EST_PLUS_DIS=7, - EST_MIN_DOWN_DIS=8, - EST_PLUS_DOWN_DIS=9 -}; - -class SvExpander: public Control -{ -private: - Point aImagePos; - Point aTextPos; - Image aActiveImage; - Rectangle maFocusRect; - ImageList maExpanderImages; - BOOL mbIsExpanded; - BOOL mbHasFocusRect; - BOOL mbIsInMouseDown; - Link maToggleHdl; - SvExpanderStateType eType; - -protected: - - virtual long PreNotify( NotifyEvent& rNEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void KeyUp( const KeyEvent& rKEvt ); - - virtual void Click(); - virtual void Resize(); - -public: - SvExpander( Window* pParent, WinBits nStyle = 0 ); - SvExpander( Window* pParent, const ResId& rResId ); - - BOOL IsExpanded() {return mbIsExpanded;} - - void SetToExpanded(BOOL bFlag=TRUE); - - void SetExpanderImage( SvExpanderStateType eType); - Image GetExpanderImage(SvExpanderStateType eType); - Size GetMinSize() const; - - void SetToggleHdl( const Link& rLink ) { maToggleHdl = rLink; } - const Link& GetToggleHdl() const { return maToggleHdl; } -}; - - - -#endif diff --git a/svtools/inc/extcolorcfg.hxx b/svtools/inc/extcolorcfg.hxx deleted file mode 100644 index 228ef9823fd2..000000000000 --- a/svtools/inc/extcolorcfg.hxx +++ /dev/null @@ -1,131 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: extcolorcfg.hxx,v $ - * $Revision: 1.5 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef INCLUDED_SVTOOLS_EXTCOLORCFG_HXX -#define INCLUDED_SVTOOLS_EXTCOLORCFG_HXX - -#include "svtools/svtdllapi.h" -#include -#include -#include -#include -#include - -//----------------------------------------------------------------------------- -namespace svtools{ -/* -----------------------------22.03.2002 15:36------------------------------ - - ---------------------------------------------------------------------------*/ -class ExtendedColorConfig_Impl; -class ExtendedColorConfigValue -{ - ::rtl::OUString m_sName; - ::rtl::OUString m_sDisplayName; - sal_Int32 m_nColor; - sal_Int32 m_nDefaultColor; -public: - ExtendedColorConfigValue() : m_nColor(0),m_nDefaultColor(0){} - ExtendedColorConfigValue(const ::rtl::OUString& _sName - ,const ::rtl::OUString& _sDisplayName - ,sal_Int32 _nColor - ,sal_Int32 _nDefaultColor) - : m_sName(_sName) - ,m_sDisplayName(_sDisplayName) - ,m_nColor(_nColor) - ,m_nDefaultColor(_nDefaultColor) - {} - - inline ::rtl::OUString getName() const { return m_sName; } - inline ::rtl::OUString getDisplayName() const { return m_sDisplayName; } - inline sal_Int32 getColor() const { return m_nColor; } - inline sal_Int32 getDefaultColor() const { return m_nDefaultColor; } - - inline void setColor(sal_Int32 _nColor) { m_nColor = _nColor; } - - sal_Bool operator !=(const ExtendedColorConfigValue& rCmp) const - { return m_nColor != rCmp.m_nColor;} -}; -/* -----------------------------22.03.2002 15:36------------------------------ - - ---------------------------------------------------------------------------*/ -class SVT_DLLPUBLIC ExtendedColorConfig : public SfxBroadcaster, public SfxListener -{ - friend class ExtendedColorConfig_Impl; -private: - static ExtendedColorConfig_Impl* m_pImpl; -public: - ExtendedColorConfig(); - ~ExtendedColorConfig(); - - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); - - // get the configured value - ExtendedColorConfigValue GetColorValue(const ::rtl::OUString& _sComponentName,const ::rtl::OUString& _sName)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& _sComponentName,sal_uInt32 _nPos) const; -}; -/* -----------------------------22.03.2002 15:31------------------------------ - - ---------------------------------------------------------------------------*/ -class SVT_DLLPUBLIC EditableExtendedColorConfig -{ - ExtendedColorConfig_Impl* m_pImpl; - sal_Bool m_bModified; -public: - EditableExtendedColorConfig(); - ~EditableExtendedColorConfig(); - - ::com::sun::star::uno::Sequence< ::rtl::OUString > GetSchemeNames() const; - void DeleteScheme(const ::rtl::OUString& rScheme ); - void AddScheme(const ::rtl::OUString& rScheme ); - sal_Bool LoadScheme(const ::rtl::OUString& rScheme ); - const ::rtl::OUString& GetCurrentSchemeName()const; - void SetCurrentSchemeName(const ::rtl::OUString& rScheme); - - ExtendedColorConfigValue GetColorValue(const ::rtl::OUString& _sComponentName,const ::rtl::OUString& _sName)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; - void SetColorValue(const ::rtl::OUString& _sComponentName, const ExtendedColorConfigValue& rValue); - void SetModified(); - void ClearModified(){m_bModified = sal_False;} - sal_Bool IsModified()const{return m_bModified;} - void Commit(); - - void DisableBroadcast(); - void EnableBroadcast(); -}; -}//namespace svtools -#endif - diff --git a/svtools/inc/filectrl.hxx b/svtools/inc/filectrl.hxx deleted file mode 100644 index a4ad0ad05dce..000000000000 --- a/svtools/inc/filectrl.hxx +++ /dev/null @@ -1,114 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: filectrl.hxx,v $ - * $Revision: 1.6 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SV_FILECTRL_HXX -#define _SV_FILECTRL_HXX - -#include "svtools/svtdllapi.h" -#include -#include -#ifndef _SV_BUTTON_HXX -#include -#endif - - -#define STR_FILECTRL_BUTTONTEXT 333 // ID-Range?! - -// Flags for FileControl -typedef USHORT FileControlMode; -#define FILECTRL_RESIZEBUTTONBYPATHLEN ((USHORT)0x0001)//if this is set, the button will become small as soon as the Text in the Edit Field is to long to be shown completely - - -// Flags for internal use of FileControl -typedef USHORT FileControlMode_Internal; -#define FILECTRL_INRESIZE ((USHORT)0x0001) -#define FILECTRL_ORIGINALBUTTONTEXT ((USHORT)0x0002) - - -class SVT_DLLPUBLIC FileControl : public Window -{ -private: - Edit maEdit; - PushButton maButton; - - String maButtonText; - BOOL mbOpenDlg; - - Link maDialogCreatedHdl; - - FileControlMode mnFlags; - FileControlMode_Internal mnInternalFlags; - -private: - SVT_DLLPRIVATE void ImplBrowseFile( ); - -protected: - SVT_DLLPRIVATE void Resize(); - SVT_DLLPRIVATE void GetFocus(); - SVT_DLLPRIVATE void StateChanged( StateChangedType nType ); - SVT_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); - DECL_DLLPRIVATE_LINK( ButtonHdl, PushButton* ); - -public: - FileControl( Window* pParent, WinBits nStyle, FileControlMode = 0 ); - ~FileControl(); - - Edit& GetEdit() { return maEdit; } - PushButton& GetButton() { return maButton; } - - void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags ); - - void SetOpenDialog( BOOL bOpen ) { mbOpenDlg = bOpen; } - BOOL IsOpenDialog() const { return mbOpenDlg; } - - void SetText( const XubString& rStr ); - XubString GetText() const; - UniString GetSelectedText() const { return maEdit.GetSelected(); } - - void SetSelection( const Selection& rSelection ) { maEdit.SetSelection( rSelection ); } - Selection GetSelection() const { return maEdit.GetSelection(); } - - void SetReadOnly( BOOL bReadOnly = TRUE ) { maEdit.SetReadOnly( bReadOnly ); } - BOOL IsReadOnly() const { return maEdit.IsReadOnly(); } - - //------ - //manipulate the Button-Text: - XubString GetButtonText() const { return maButtonText; } - void SetButtonText( const XubString& rStr ); - void ResetButtonText(); - - //------ - //use this to manipulate the dialog bevore executing it: - void SetDialogCreatedHdl( const Link& rLink ) { maDialogCreatedHdl = rLink; } - const Link& GetDialogCreatedHdl() const { return maDialogCreatedHdl; } -}; - -#endif - diff --git a/svtools/inc/filedlg.hxx b/svtools/inc/filedlg.hxx deleted file mode 100644 index 04cf41130bce..000000000000 --- a/svtools/inc/filedlg.hxx +++ /dev/null @@ -1,111 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: filedlg.hxx,v $ - * $Revision: 1.5 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVT_FILEDLG_HXX -#define _SVT_FILEDLG_HXX - -#include "svtools/svtdllapi.h" - -#ifndef _DIALOG_HXX -#include -#endif - -class Edit; -class ImpSvFileDlg; - -// -------------- -// - SvPathDialog - -// -------------- - -class SVT_DLLPUBLIC PathDialog : public ModalDialog -{ -private: - friend class FileDialog; // Imp... - - ImpSvFileDlg* pImpFileDlg; // Implementation - Link aOKHdlLink; // Link zum OK-Handler - -protected: - UniString aDfltExt; // Default - Extension - -public: - PathDialog( Window* pParent, WinBits nWinStyle = 0, BOOL bCreateDir = TRUE ); - ~PathDialog(); - - virtual long OK(); - - void SetPath( const UniString& rNewPath ); - void SetPath( const Edit& rEdit ); - UniString GetPath() const; - - void SetOKHdl( const Link& rLink ) { aOKHdlLink = rLink; } - const Link& GetOKHdl() const { return aOKHdlLink; } - - virtual short Execute(); -}; - -// -------------- -// - SvFileDialog - -// -------------- - -class SVT_DLLPUBLIC FileDialog : public PathDialog -{ -private: - Link aFileHdlLink; // Link zum FileSelect-Handler - Link aFilterHdlLink; // Link zum FilterSelect-Handler - -public: - FileDialog( Window* pParent, WinBits nWinStyle ); - ~FileDialog(); - - virtual void FileSelect(); - virtual void FilterSelect(); - - void SetDefaultExt( const UniString& rExt ) { aDfltExt = rExt; } - const UniString& GetDefaultExt() const { return aDfltExt; } - void AddFilter( const UniString& rFilter, const UniString& rType ); - void RemoveFilter( const UniString& rFilter ); - void RemoveAllFilter(); - void SetCurFilter( const UniString& rFilter ); - UniString GetCurFilter() const; - USHORT GetFilterCount() const; - UniString GetFilterName( USHORT nPos ) const; - UniString GetFilterType( USHORT nPos ) const; - - void SetFileSelectHdl( const Link& rLink ) { aFileHdlLink = rLink; } - const Link& GetFileSelectHdl() const { return aFileHdlLink; } - void SetFilterSelectHdl( const Link& rLink ) { aFilterHdlLink = rLink; } - const Link& GetFilterSelectHdl() const { return aFilterHdlLink; } - - void SetOkButtonText( const UniString& rText ); - void SetCancelButtonText( const UniString& rText ); -}; - -#endif // _FILEDLG_HXX diff --git a/svtools/inc/filedlg2.hrc b/svtools/inc/filedlg2.hrc deleted file mode 100644 index a75e9047eafb..000000000000 --- a/svtools/inc/filedlg2.hrc +++ /dev/null @@ -1,44 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: filedlg2.hrc,v $ - * $Revision: 1.3 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#define STR_FILEDLG_SELECT 1000 -#define STR_FILEDLG_CANTCHDIR 1001 -#define STR_FILEDLG_OPEN 1002 -#define STR_FILEDLG_FILE 1003 -#define STR_FILEDLG_DIR 1004 -#define STR_FILEDLG_TYPE 1005 -#define STR_FILEDLG_CANTOPENFILE 1006 -#define STR_FILEDLG_CANTOPENDIR 1007 -#define STR_FILEDLG_OVERWRITE 1008 -#define STR_FILEDLG_GOUP 1009 -#define STR_FILEDLG_SAVE 1010 -#define STR_FILEDLG_DRIVES 1011 -#define STR_FILEDLG_HOME 1012 -#define STR_FILEDLG_NEWDIR 1013 -#define STR_FILEDLG_ASKNEWDIR 1014 diff --git a/svtools/inc/fileview.hxx b/svtools/inc/fileview.hxx deleted file mode 100644 index 7527436e0f38..000000000000 --- a/svtools/inc/fileview.hxx +++ /dev/null @@ -1,274 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: fileview.hxx,v $ - * $Revision: 1.21 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVT_FILEVIEW_HXX -#define _SVT_FILEVIEW_HXX - -#include "svtools/svtdllapi.h" -#include -#include -#include -#include -#include -#ifndef _SV_BUTTON_HXX -#include -#endif -#include -#include - -// class SvtFileView ----------------------------------------------------- - -#define FILEVIEW_ONLYFOLDER 0x0001 -#define FILEVIEW_MULTISELECTION 0x0002 - -#define FILEVIEW_SHOW_TITLE 0x0010 -#define FILEVIEW_SHOW_SIZE 0x0020 -#define FILEVIEW_SHOW_DATE 0x0040 -#define FILEVIEW_SHOW_ALL 0x0070 - -class ViewTabListBox_Impl; -class SvtFileView_Impl; -class SvLBoxEntry; -class HeaderBar; -class IUrlFilter; - -/// the result of an action in the FileView -enum FileViewResult -{ - eSuccess, - eFailure, - eTimeout, - eStillRunning -}; - -/// describes parameters for doing an action on the FileView asynchronously -struct FileViewAsyncAction -{ - sal_uInt32 nMinTimeout; /// minimum time to wait for a result, in milliseconds - sal_uInt32 nMaxTimeout; /// maximum time to wait for a result, in milliseconds, until eTimeout is returned - Link aFinishHandler; /// the handler to be called when the action is finished. Called in every case, no matter of the result - - FileViewAsyncAction() - { - nMinTimeout = nMaxTimeout = 0; - } -}; - -class SVT_DLLPUBLIC SvtFileView : public Control -{ -private: - SvtFileView_Impl* mpImp; - - ::com::sun::star::uno::Sequence< ::rtl::OUString > mpBlackList; - - SVT_DLLPRIVATE void OpenFolder( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aContents ); - - DECL_DLLPRIVATE_LINK( HeaderSelect_Impl, HeaderBar * ); - DECL_DLLPRIVATE_LINK( HeaderEndDrag_Impl, HeaderBar * ); - -protected: - virtual void GetFocus(); - -public: - SvtFileView( Window* pParent, const ResId& rResId, sal_Bool bOnlyFolder, sal_Bool bMultiSelection ); - SvtFileView( Window* pParent, const ResId& rResId, sal_Int8 nFlags ); - ~SvtFileView(); - - const String& GetViewURL() const; - String GetURL( SvLBoxEntry* pEntry ) const; - String GetCurrentURL() const; - - sal_Bool GetParentURL( String& _rParentURL ) const; - sal_Bool CreateNewFolder( const String& rNewFolder ); - - void SetHelpId( sal_uInt32 nHelpId ); - sal_uInt32 GetHelpId( ) const; - void SetSizePixel( const Size& rNewSize ); - using Window::SetPosSizePixel; - virtual void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ); - - /** initialize the view with the content of a folder given by URL, and aply an immediate filter - - @param rFolderURL - the URL of the folder whose content is to be read - @param rFilter - the initial filter to be applied - @param pAsyncDescriptor - If not , this struct describes the parameters for doing the - action asynchronously. - */ - FileViewResult Initialize( - const String& rFolderURL, - const String& rFilter, - const FileViewAsyncAction* pAsyncDescriptor, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList - ); - - FileViewResult Initialize( - const String& rFolderURL, - const String& rFilter, - const FileViewAsyncAction* pAsyncDescriptor ); - /** initialze the view with a sequence of contents, which have already been obtained elsewhere - - This method will never return eStillRunning, since it will fill the - view synchronously - */ - sal_Bool Initialize( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aContents ); - - /** initializes the view with the content of a folder given by an UCB content - */ - sal_Bool Initialize( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent>& _xContent, - const String& rFilter ); - - /** reads the current content of the current folder again, and applies the given filter to it - - Note 1: The folder is really read a second time. This implies that any new elements (which were - not present when you called Initialize the last time) are now displayed. - - Note 2: This method must not be called when you previously initialized the view from a sequence - of strings, or a UNO content object. - - @param rFilter - the filter to be applied - @param pAsyncDescriptor - If not , this struct describes the parameters for doing the - action asynchronously. - */ - FileViewResult ExecuteFilter( - const String& rFilter, - const FileViewAsyncAction* pAsyncDescriptor - ); - - /** cancels a running async action (if any) - - @seealso Initialize - @seealso ExecuteFilter - @seealso FileViewAsyncAction - */ - void CancelRunningAsyncAction(); - - /** initializes the view with the parent folder of the current folder - - @param rNewURL - the URL of the folder which we just navigated to - @param pAsyncDescriptor - If not , this struct describes the parameters for doing the - action asynchronously. - */ - FileViewResult PreviousLevel( - const FileViewAsyncAction* pAsyncDescriptor - ); - - void SetNoSelection(); - void ResetCursor(); - - void SetSelectHdl( const Link& rHdl ); - void SetDoubleClickHdl( const Link& rHdl ); - void SetOpenDoneHdl( const Link& rHdl ); - - ULONG GetSelectionCount() const; - SvLBoxEntry* FirstSelected() const; - SvLBoxEntry* NextSelected( SvLBoxEntry* pEntry ) const; - void EnableAutoResize(); - void SetFocus(); - - void EnableContextMenu( sal_Bool bEnable ); - void EnableDelete( sal_Bool bEnable ); - void EnableNameReplacing( sal_Bool bEnable = sal_True ); - // translate folder names or display doc-title instead of file name - // EnableContextMenu( TRUE )/EnableDelete(TRUE) disable name replacing! - - // save and load column size and sort order - String GetConfigString() const; - void SetConfigString( const String& rCfgStr ); - - void SetUrlFilter( const IUrlFilter* _pFilter ); - const IUrlFilter* GetUrlFilter( ) const; - - void EndInplaceEditing( bool _bCancel ); - -protected: - virtual void StateChanged( StateChangedType nStateChange ); -}; - -// struct SvtContentEntry ------------------------------------------------ - -struct SvtContentEntry -{ - sal_Bool mbIsFolder; - UniString maURL; - - SvtContentEntry( const UniString& rURL, sal_Bool bIsFolder ) : - mbIsFolder( bIsFolder ), maURL( rURL ) {} -}; - -namespace svtools { - -// ----------------------------------------------------------------------- -// QueryDeleteDlg_Impl -// ----------------------------------------------------------------------- - -enum QueryDeleteResult_Impl -{ - QUERYDELETE_YES = 0, - QUERYDELETE_NO, - QUERYDELETE_ALL, - QUERYDELETE_CANCEL -}; - -class SVT_DLLPUBLIC QueryDeleteDlg_Impl : public ModalDialog -{ - FixedText _aEntryLabel; - FixedText _aEntry; - FixedText _aQueryMsg; - - PushButton _aYesButton; - PushButton _aAllButton; - PushButton _aNoButton; - CancelButton _aCancelButton; - - QueryDeleteResult_Impl _eResult; - -private: - - DECL_DLLPRIVATE_STATIC_LINK( QueryDeleteDlg_Impl, ClickLink, PushButton* ); - -public: - - QueryDeleteDlg_Impl( Window* pParent, - const String& rName ); - - void EnableAllButton() { _aAllButton.Enable( sal_True ); } - QueryDeleteResult_Impl GetResult() const { return _eResult; } -}; - -} - -#endif // _SVT_FILEVIEW_HXX - diff --git a/svtools/inc/fltdefs.hxx b/svtools/inc/fltdefs.hxx deleted file mode 100644 index d323dada3396..000000000000 --- a/svtools/inc/fltdefs.hxx +++ /dev/null @@ -1,155 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: fltdefs.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include -#include - -#include - -#ifndef _FLTDEFS_HXX -#define _FLTDEFS_HXX - - -#if defined ( WIN ) || defined ( WNT ) - -#define RGBQUAD RGBQUADWIN - -typedef struct RGBQUAD -{ - BYTE rgbBlue; - BYTE rgbGreen; - BYTE rgbRed; - BYTE rgbReserved; - - RGBQUAD( const BYTE cRed = 0, const BYTE cGreen = 0, const BYTE cBlue = 0 ) : - rgbBlue ( cBlue ), - rgbGreen ( cGreen ), - rgbRed ( cRed ), - rgbReserved ( 0 ) {}; -} RGBQUAD; - - -#ifdef WIN -typedef BYTE huge* PDIBBYTE; -#define MEMCPY hmemcpy -#define GLOBALALLOC(nSize) ((PDIBBYTE)GlobalLock(GlobalAlloc(GHND,(nSize)))) -#define GLOBALHANDLE(pPointer) ((HGLOBAL)GlobalHandle((*((size_t*)&(pPointer)+1)))) -#define GLOBALFREE(pPointer) (GlobalUnlock(GLOBALHANDLE((pPointer)))) -#define MEMSET( pDst, cByte, nCount ) \ -{ \ - PDIBBYTE pTmp = (PDIBBYTE) pDst; \ - for ( ULONG i = 0; i < nCount; i++ )\ - *pTmp++ = cByte; \ -} - -#else - -typedef BYTE* PDIBBYTE; -#define MEMCPY memcpy -#define MEMSET memset -#define GLOBALALLOC(nSize) ((PDIBBYTE)GlobalAlloc(GMEM_FIXED,(nSize))) -#define GLOBALFREE(pPointer) (GlobalFree((HGLOBAL)pPointer)) -#define GLOBALHANDLE(pPointer) ((HGLOBAL)(pPointer)) - -#endif -#else - -typedef BYTE* PDIBBYTE; -#define MEMCPY memcpy -#define MEMSET memset -#define GLOBALALLOC(nSize) ((PDIBBYTE)new BYTE[(nSize)]) -#define GLOBALFREE(pPointer) (delete[] (pPointer)) - -#endif - - -#if defined ( OS2 ) || defined ( UNX ) -void ReadBitmap( SvStream& rIStream, Bitmap& rBmp, USHORT nDefaultHeight = 0, ULONG nOffBits = 0 ); -void ReplaceInfoHeader( SvStream& rStm, BYTE* pBuffer ); - -#ifdef OS2 -#define RGBQUAD RGBQUADOS2 -#define BITMAPFILEHEADER BITMAPFILEHEADEROS2 -#define PBITMAPFILEHEADER PBITMAPFILEHEADEROS2 -#define BITMAPINFOHEADER BITMAPINFOHEADEROS2 -#define PBITMAPINFOHEADER PBITMAPINFOHEADEROS2 -#define BITMAPINFO BITMAPINFOOS2 -#define PBITMAPINFO PBITMAPINFOOS2 -#endif - -typedef struct RGBQUAD -{ - BYTE rgbBlue; - BYTE rgbGreen; - BYTE rgbRed; - BYTE rgbReserved; - - RGBQUAD( const BYTE cRed = 0, const BYTE cGreen = 0, const BYTE cBlue = 0 ) : - rgbBlue ( cBlue ), - rgbGreen ( cGreen ), - rgbRed ( cRed ), - rgbReserved ( 0 ) {}; -} RGBQUAD; - -typedef struct BITMAPFILEHEADER -{ - UINT16 bfType; - UINT32 bfSize; - UINT16 bfReserved1; - UINT16 bfReserved2; - UINT32 bfOffBits; -} BITMAPFILEHEADER; -typedef BITMAPFILEHEADER* PBITMAPFILEHEADER; - -typedef struct BITMAPINFOHEADER -{ - UINT32 biSize; - UINT32 biWidth; - UINT32 biHeight; - UINT16 biPlanes; - UINT16 biBitCount; - UINT32 biCompression; - UINT32 biSizeImage; - UINT32 biXPelsPerMeter; - UINT32 biYPelsPerMeter; - UINT32 biClrUsed; - UINT32 biClrImportant; -} BITMAPINFOHEADER; -typedef BITMAPINFOHEADER* PBITMAPINFOHEADER; - -typedef struct BITMAPINFO -{ - BITMAPINFOHEADER bmiHeader; - RGBQUAD bmiColors[1]; -} BITMAPINFO; -typedef BITMAPINFO* PBITMAPINFO; - -#endif -#endif diff --git a/svtools/inc/fontsubstconfig.hxx b/svtools/inc/fontsubstconfig.hxx deleted file mode 100644 index 7ce7e64362b5..000000000000 --- a/svtools/inc/fontsubstconfig.hxx +++ /dev/null @@ -1,71 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: fontsubstconfig.hxx,v $ - * $Revision: 1.5 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVT_FONTSUBSTCONFIG_HXX -#define _SVT_FONTSUBSTCONFIG_HXX - -#include "svtools/svtdllapi.h" -#include - -struct SvtFontSubstConfig_Impl; - -//----------------------------------------------------------------------------- -struct SubstitutionStruct -{ - rtl::OUString sFont; - rtl::OUString sReplaceBy; - sal_Bool bReplaceAlways; - sal_Bool bReplaceOnScreenOnly; -}; -//----------------------------------------------------------------------------- -class SVT_DLLPUBLIC SvtFontSubstConfig : public utl::ConfigItem -{ - sal_Bool bIsEnabled; - SvtFontSubstConfig_Impl* pImpl; -public: - SvtFontSubstConfig(); - virtual ~SvtFontSubstConfig(); - - virtual void Commit(); - virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames); - - sal_Bool IsEnabled() const {return bIsEnabled;} - void Enable(sal_Bool bSet) {bIsEnabled = bSet; SetModified();} - - sal_Int32 SubstitutionCount() const; - void ClearSubstitutions(); - const SubstitutionStruct* GetSubstitution(sal_Int32 nPos); - void AddSubstitution(const SubstitutionStruct& rToAdd); - void Apply(); -}; - -#endif - - - diff --git a/svtools/inc/framestatuslistener.hxx b/svtools/inc/framestatuslistener.hxx deleted file mode 100644 index 63a2f296c753..000000000000 --- a/svtools/inc/framestatuslistener.hxx +++ /dev/null @@ -1,119 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: framestatuslistener.hxx,v $ - * $Revision: 1.5 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVTOOLS_FRAMESTATUSLISTENER_HXX -#define _SVTOOLS_FRAMESTATUSLISTENER_HXX - -#include "svtools/svtdllapi.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifndef INCLUDED_HASH_MAP -#include -#define INCLUDED_HASH_MAP -#endif - -namespace svt -{ - -class SVT_DLLPUBLIC FrameStatusListener : public ::com::sun::star::frame::XStatusListener, - public ::com::sun::star::frame::XFrameActionListener, - public ::com::sun::star::lang::XComponent, - public ::comphelper::OBaseMutex, - public ::cppu::OWeakObject -{ - public: - FrameStatusListener( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame ); - virtual ~FrameStatusListener(); - - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > getFrameInterface() const; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getServiceManager() const; - - void updateStatus( const rtl::OUString aCommandURL ); - - // methods to support status forwarder, known by the old sfx2 toolbox controller implementation - void addStatusListener( const rtl::OUString& aCommandURL ); - void removeStatusListener( const rtl::OUString& aCommandURL ); - void bindListener(); - void unbindListener(); - sal_Bool isBound() const; - - // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire() throw (); - virtual void SAL_CALL release() throw (); - - // XComponent - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); - - // XEventListener - virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException ); - - // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ) = 0; - - // XFrameActionListener - virtual void SAL_CALL frameAction( const com::sun::star::frame::FrameActionEvent& Action ) throw ( ::com::sun::star::uno::RuntimeException ); - - protected: - struct Listener - { - Listener( const ::com::sun::star::util::URL& rURL, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& rDispatch ) : - aURL( rURL ), xDispatch( rDispatch ) {} - - ::com::sun::star::util::URL aURL; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch; - }; - - typedef ::std::hash_map< ::rtl::OUString, - com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >, - ::rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > URLToDispatchMap; - - sal_Bool m_bInitialized : 1, - m_bDisposed : 1; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager; - URLToDispatchMap m_aListenerMap; -}; - -} - -#endif // _SVTOOLS_FRAMESTATUSLISTENER_HXX diff --git a/svtools/inc/helpagentwindow.hxx b/svtools/inc/helpagentwindow.hxx deleted file mode 100644 index b46f3a253f16..000000000000 --- a/svtools/inc/helpagentwindow.hxx +++ /dev/null @@ -1,91 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: helpagentwindow.hxx,v $ - * $Revision: 1.5 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVTOOLS_HELPAGENTWIDNOW_HXX_ -#define _SVTOOLS_HELPAGENTWIDNOW_HXX_ - -#include "svtools/svtdllapi.h" -#include -#include - -//........................................................................ -namespace svt -{ -//........................................................................ - - //==================================================================== - //= IHelpAgentCallback - //==================================================================== - class IHelpAgentCallback - { - public: - virtual void helpRequested() = 0; - virtual void closeAgent() = 0; - }; - - //==================================================================== - //= HelpAgentWindow - //==================================================================== - class SVT_DLLPUBLIC HelpAgentWindow : public FloatingWindow - { - protected: - Window* m_pCloser; - IHelpAgentCallback* m_pCallback; - Size m_aPreferredSize; - Image m_aPicture; - - public: - HelpAgentWindow( Window* _pParent ); - ~HelpAgentWindow(); - - /// returns the preferred size of the window - const Size& getPreferredSizePixel() const { return m_aPreferredSize; } - - // callback handler maintainance - void setCallback(IHelpAgentCallback* _pCB) { m_pCallback = _pCB; } - IHelpAgentCallback* getCallback() const { return m_pCallback; } - - protected: - virtual void Resize(); - virtual void Paint( const Rectangle& rRect ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - - DECL_LINK( OnButtonClicked, Window* ); - - private: - SVT_DLLPRIVATE Size implOptimalButtonSize( const Image& _rButtonImage ); - }; - -//........................................................................ -} // namespace svt -//........................................................................ - -#endif // _SVTOOLS_HELPAGENTWIDNOW_HXX_ - diff --git a/svtools/inc/htmlkywd.hxx b/svtools/inc/htmlkywd.hxx deleted file mode 100644 index ce7cb4dd3e0f..000000000000 --- a/svtools/inc/htmlkywd.hxx +++ /dev/null @@ -1,804 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: htmlkywd.hxx,v $ - * $Revision: 1.8 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _HTMLKYWD_HXX -#define _HTMLKYWD_HXX - -#include "sal/config.h" - -#define OOO_STRING_SVTOOLS_HTML_doctype32 \ - "HTML PUBLIC \"-//W3C//DTD HTML 3.2//EN\"" -#define OOO_STRING_SVTOOLS_HTML_doctype40 \ - "HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\"" - -// diese werden nur eingeschaltet -#define OOO_STRING_SVTOOLS_HTML_area "AREA" -#define OOO_STRING_SVTOOLS_HTML_base "BASE" -#define OOO_STRING_SVTOOLS_HTML_comment "!--" -#define OOO_STRING_SVTOOLS_HTML_doctype "!DOCTYPE" -#define OOO_STRING_SVTOOLS_HTML_embed "EMBED" -#define OOO_STRING_SVTOOLS_HTML_figureoverlay "OVERLAY" -#define OOO_STRING_SVTOOLS_HTML_horzrule "HR" -#define OOO_STRING_SVTOOLS_HTML_horztab "TAB" -#define OOO_STRING_SVTOOLS_HTML_image "IMG" -#define OOO_STRING_SVTOOLS_HTML_image2 "IMAGE" -#define OOO_STRING_SVTOOLS_HTML_input "INPUT" -#define OOO_STRING_SVTOOLS_HTML_isindex "ISINDEX" -#define OOO_STRING_SVTOOLS_HTML_linebreak "BR" -#define OOO_STRING_SVTOOLS_HTML_li "LI" -#define OOO_STRING_SVTOOLS_HTML_link "LINK" -#define OOO_STRING_SVTOOLS_HTML_meta "META" -#define OOO_STRING_SVTOOLS_HTML_nextid "NEXTID" -#define OOO_STRING_SVTOOLS_HTML_nobr "NOBR" -#define OOO_STRING_SVTOOLS_HTML_of "OF" -#define OOO_STRING_SVTOOLS_HTML_option "OPTION" -#define OOO_STRING_SVTOOLS_HTML_param "PARAM" -#define OOO_STRING_SVTOOLS_HTML_range "RANGE" -#define OOO_STRING_SVTOOLS_HTML_spacer "SPACER" -#define OOO_STRING_SVTOOLS_HTML_wbr "WBR" - -// diese werden wieder abgeschaltet -#define OOO_STRING_SVTOOLS_HTML_abbreviation "ABBREV" -#define OOO_STRING_SVTOOLS_HTML_above "ABOVE" -#define OOO_STRING_SVTOOLS_HTML_acronym "ACRONYM" -#define OOO_STRING_SVTOOLS_HTML_address "ADDRESS" -#define OOO_STRING_SVTOOLS_HTML_anchor "A" -#define OOO_STRING_SVTOOLS_HTML_applet "APPLET" -#define OOO_STRING_SVTOOLS_HTML_array "ARRAY" -#define OOO_STRING_SVTOOLS_HTML_author "AU" -#define OOO_STRING_SVTOOLS_HTML_banner "BANNER" -#define OOO_STRING_SVTOOLS_HTML_bar "BAR" -#define OOO_STRING_SVTOOLS_HTML_basefont "BASEFONT" -#define OOO_STRING_SVTOOLS_HTML_below "BELOW" -#define OOO_STRING_SVTOOLS_HTML_bigprint "BIG" -#define OOO_STRING_SVTOOLS_HTML_blink "BLINK" -#define OOO_STRING_SVTOOLS_HTML_blockquote "BLOCKQUOTE" -#define OOO_STRING_SVTOOLS_HTML_blockquote30 "BQ" -#define OOO_STRING_SVTOOLS_HTML_body "BODY" -#define OOO_STRING_SVTOOLS_HTML_bold "B" -#define OOO_STRING_SVTOOLS_HTML_boldtext "BT" -#define OOO_STRING_SVTOOLS_HTML_box "BOX" -#define OOO_STRING_SVTOOLS_HTML_caption "CAPTION" -#define OOO_STRING_SVTOOLS_HTML_center "CENTER" -#define OOO_STRING_SVTOOLS_HTML_citiation "CITE" -#define OOO_STRING_SVTOOLS_HTML_code "CODE" -#define OOO_STRING_SVTOOLS_HTML_col "COL" -#define OOO_STRING_SVTOOLS_HTML_colgroup "COLGROUP" -#define OOO_STRING_SVTOOLS_HTML_credit "CREDIT" -#define OOO_STRING_SVTOOLS_HTML_dd "DD" -#define OOO_STRING_SVTOOLS_HTML_deflist "DL" -#define OOO_STRING_SVTOOLS_HTML_deletedtext "DEL" -#define OOO_STRING_SVTOOLS_HTML_dirlist "DIR" -#define OOO_STRING_SVTOOLS_HTML_division "DIV" -#define OOO_STRING_SVTOOLS_HTML_dot "DOT" -#define OOO_STRING_SVTOOLS_HTML_doubledot "DDOT" -#define OOO_STRING_SVTOOLS_HTML_dt "DT" -#define OOO_STRING_SVTOOLS_HTML_emphasis "EM" -#define OOO_STRING_SVTOOLS_HTML_figure "FIG" -#define OOO_STRING_SVTOOLS_HTML_font "FONT" -#define OOO_STRING_SVTOOLS_HTML_footnote "FN" -#define OOO_STRING_SVTOOLS_HTML_form "FORM" -#define OOO_STRING_SVTOOLS_HTML_frame "FRAME" -#define OOO_STRING_SVTOOLS_HTML_frameset "FRAMESET" -#define OOO_STRING_SVTOOLS_HTML_hat "HAT" -#define OOO_STRING_SVTOOLS_HTML_head1 "H1" -#define OOO_STRING_SVTOOLS_HTML_head2 "H2" -#define OOO_STRING_SVTOOLS_HTML_head3 "H3" -#define OOO_STRING_SVTOOLS_HTML_head4 "H4" -#define OOO_STRING_SVTOOLS_HTML_head5 "H5" -#define OOO_STRING_SVTOOLS_HTML_head6 "H6" -#define OOO_STRING_SVTOOLS_HTML_head "HEAD" -#define OOO_STRING_SVTOOLS_HTML_html "HTML" -#define OOO_STRING_SVTOOLS_HTML_iframe "IFRAME" -#define OOO_STRING_SVTOOLS_HTML_ilayer "ILAYER" -#define OOO_STRING_SVTOOLS_HTML_insertedtext "INS" -#define OOO_STRING_SVTOOLS_HTML_italic "I" -#define OOO_STRING_SVTOOLS_HTML_item "ITEM" -#define OOO_STRING_SVTOOLS_HTML_keyboard "KBD" -#define OOO_STRING_SVTOOLS_HTML_language "LANG" -#define OOO_STRING_SVTOOLS_HTML_layer "LAYER" -#define OOO_STRING_SVTOOLS_HTML_listheader "LH" -#define OOO_STRING_SVTOOLS_HTML_map "MAP" -#define OOO_STRING_SVTOOLS_HTML_math "MATH" -#define OOO_STRING_SVTOOLS_HTML_menulist "MENU" -#define OOO_STRING_SVTOOLS_HTML_multicol "MULTICOL" -#define OOO_STRING_SVTOOLS_HTML_noembed "NOEMBED" -#define OOO_STRING_SVTOOLS_HTML_noframe "NOFRAME" -#define OOO_STRING_SVTOOLS_HTML_noframes "NOFRAMES" -#define OOO_STRING_SVTOOLS_HTML_noscript "NOSCRIPT" -#define OOO_STRING_SVTOOLS_HTML_note "NOTE" -#define OOO_STRING_SVTOOLS_HTML_object "OBJECT" -#define OOO_STRING_SVTOOLS_HTML_orderlist "OL" -#define OOO_STRING_SVTOOLS_HTML_parabreak "P" -#define OOO_STRING_SVTOOLS_HTML_person "PERSON" -#define OOO_STRING_SVTOOLS_HTML_plaintext "T" -#define OOO_STRING_SVTOOLS_HTML_preformtxt "PRE" -#define OOO_STRING_SVTOOLS_HTML_root "ROOT" -#define OOO_STRING_SVTOOLS_HTML_row "ROW" -#define OOO_STRING_SVTOOLS_HTML_sample "SAMP" -#define OOO_STRING_SVTOOLS_HTML_script "SCRIPT" -#define OOO_STRING_SVTOOLS_HTML_select "SELECT" -#define OOO_STRING_SVTOOLS_HTML_shortquote "Q" -#define OOO_STRING_SVTOOLS_HTML_smallprint "SMALL" -#define OOO_STRING_SVTOOLS_HTML_span "SPAN" -#define OOO_STRING_SVTOOLS_HTML_squareroot "AQRT" -#define OOO_STRING_SVTOOLS_HTML_strikethrough "S" -#define OOO_STRING_SVTOOLS_HTML_strong "STRONG" -#define OOO_STRING_SVTOOLS_HTML_style "STYLE" -#define OOO_STRING_SVTOOLS_HTML_subscript "SUB" -#define OOO_STRING_SVTOOLS_HTML_superscript "SUP" -#define OOO_STRING_SVTOOLS_HTML_table "TABLE" -#define OOO_STRING_SVTOOLS_HTML_tablerow "TR" -#define OOO_STRING_SVTOOLS_HTML_tabledata "TD" -#define OOO_STRING_SVTOOLS_HTML_tableheader "TH" -#define OOO_STRING_SVTOOLS_HTML_tbody "TBODY" -#define OOO_STRING_SVTOOLS_HTML_teletype "TT" -#define OOO_STRING_SVTOOLS_HTML_text "TEXT" -#define OOO_STRING_SVTOOLS_HTML_textarea "TEXTAREA" -#define OOO_STRING_SVTOOLS_HTML_textflow "TEXTFLOW" -#define OOO_STRING_SVTOOLS_HTML_tfoot "TFOOT" -#define OOO_STRING_SVTOOLS_HTML_thead "THEAD" -#define OOO_STRING_SVTOOLS_HTML_tilde "TILDE" -#define OOO_STRING_SVTOOLS_HTML_title "TITLE" -#define OOO_STRING_SVTOOLS_HTML_underline "U" -#define OOO_STRING_SVTOOLS_HTML_unorderlist "UL" -#define OOO_STRING_SVTOOLS_HTML_variable "VAR" -#define OOO_STRING_SVTOOLS_HTML_vector "VEC" - -// obsolete features -#define OOO_STRING_SVTOOLS_HTML_xmp "XMP" -#define OOO_STRING_SVTOOLS_HTML_listing "LISTING" - -// proposed features -#define OOO_STRING_SVTOOLS_HTML_definstance "DFN" -#define OOO_STRING_SVTOOLS_HTML_strike "STRIKE" -#define OOO_STRING_SVTOOLS_HTML_bgsound "BGSOUND" -#define OOO_STRING_SVTOOLS_HTML_comment2 "COMMENT" -#define OOO_STRING_SVTOOLS_HTML_marquee "MARQUEE" -#define OOO_STRING_SVTOOLS_HTML_plaintext2 "PLAINTEXT" -#define OOO_STRING_SVTOOLS_HTML_sdfield "SDFIELD" - -// die Namen fuer alle Zeichen -#define OOO_STRING_SVTOOLS_HTML_C_lt "lt" -#define OOO_STRING_SVTOOLS_HTML_C_gt "gt" -#define OOO_STRING_SVTOOLS_HTML_C_amp "amp" -#define OOO_STRING_SVTOOLS_HTML_C_quot "quot" -#define OOO_STRING_SVTOOLS_HTML_C_Aacute "Aacute" -#define OOO_STRING_SVTOOLS_HTML_C_Agrave "Agrave" -#define OOO_STRING_SVTOOLS_HTML_C_Acirc "Acirc" -#define OOO_STRING_SVTOOLS_HTML_C_Atilde "Atilde" -#define OOO_STRING_SVTOOLS_HTML_C_Aring "Aring" -#define OOO_STRING_SVTOOLS_HTML_C_Auml "Auml" -#define OOO_STRING_SVTOOLS_HTML_C_AElig "AElig" -#define OOO_STRING_SVTOOLS_HTML_C_Ccedil "Ccedil" -#define OOO_STRING_SVTOOLS_HTML_C_Eacute "Eacute" -#define OOO_STRING_SVTOOLS_HTML_C_Egrave "Egrave" -#define OOO_STRING_SVTOOLS_HTML_C_Ecirc "Ecirc" -#define OOO_STRING_SVTOOLS_HTML_C_Euml "Euml" -#define OOO_STRING_SVTOOLS_HTML_C_Iacute "Iacute" -#define OOO_STRING_SVTOOLS_HTML_C_Igrave "Igrave" -#define OOO_STRING_SVTOOLS_HTML_C_Icirc "Icirc" -#define OOO_STRING_SVTOOLS_HTML_C_Iuml "Iuml" -#define OOO_STRING_SVTOOLS_HTML_C_ETH "ETH" -#define OOO_STRING_SVTOOLS_HTML_C_Ntilde "Ntilde" -#define OOO_STRING_SVTOOLS_HTML_C_Oacute "Oacute" -#define OOO_STRING_SVTOOLS_HTML_C_Ograve "Ograve" -#define OOO_STRING_SVTOOLS_HTML_C_Ocirc "Ocirc" -#define OOO_STRING_SVTOOLS_HTML_C_Otilde "Otilde" -#define OOO_STRING_SVTOOLS_HTML_C_Ouml "Ouml" -#define OOO_STRING_SVTOOLS_HTML_C_Oslash "Oslash" -#define OOO_STRING_SVTOOLS_HTML_C_Uacute "Uacute" -#define OOO_STRING_SVTOOLS_HTML_C_Ugrave "Ugrave" -#define OOO_STRING_SVTOOLS_HTML_C_Ucirc "Ucirc" -#define OOO_STRING_SVTOOLS_HTML_C_Uuml "Uuml" -#define OOO_STRING_SVTOOLS_HTML_C_Yacute "Yacute" -#define OOO_STRING_SVTOOLS_HTML_C_THORN "THORN" -#define OOO_STRING_SVTOOLS_HTML_C_szlig "szlig" -#define OOO_STRING_SVTOOLS_HTML_S_aacute "aacute" -#define OOO_STRING_SVTOOLS_HTML_S_agrave "agrave" -#define OOO_STRING_SVTOOLS_HTML_S_acirc "acirc" -#define OOO_STRING_SVTOOLS_HTML_S_atilde "atilde" -#define OOO_STRING_SVTOOLS_HTML_S_aring "aring" -#define OOO_STRING_SVTOOLS_HTML_S_auml "auml" -#define OOO_STRING_SVTOOLS_HTML_S_aelig "aelig" -#define OOO_STRING_SVTOOLS_HTML_S_ccedil "ccedil" -#define OOO_STRING_SVTOOLS_HTML_S_eacute "eacute" -#define OOO_STRING_SVTOOLS_HTML_S_egrave "egrave" -#define OOO_STRING_SVTOOLS_HTML_S_ecirc "ecirc" -#define OOO_STRING_SVTOOLS_HTML_S_euml "euml" -#define OOO_STRING_SVTOOLS_HTML_S_iacute "iacute" -#define OOO_STRING_SVTOOLS_HTML_S_igrave "igrave" -#define OOO_STRING_SVTOOLS_HTML_S_icirc "icirc" -#define OOO_STRING_SVTOOLS_HTML_S_iuml "iuml" -#define OOO_STRING_SVTOOLS_HTML_S_eth "eth" -#define OOO_STRING_SVTOOLS_HTML_S_ntilde "ntilde" -#define OOO_STRING_SVTOOLS_HTML_S_oacute "oacute" -#define OOO_STRING_SVTOOLS_HTML_S_ograve "ograve" -#define OOO_STRING_SVTOOLS_HTML_S_ocirc "ocirc" -#define OOO_STRING_SVTOOLS_HTML_S_otilde "otilde" -#define OOO_STRING_SVTOOLS_HTML_S_ouml "ouml" -#define OOO_STRING_SVTOOLS_HTML_S_oslash "oslash" -#define OOO_STRING_SVTOOLS_HTML_S_uacute "uacute" -#define OOO_STRING_SVTOOLS_HTML_S_ugrave "ugrave" -#define OOO_STRING_SVTOOLS_HTML_S_ucirc "ucirc" -#define OOO_STRING_SVTOOLS_HTML_S_uuml "uuml" -#define OOO_STRING_SVTOOLS_HTML_S_yacute "yacute" -#define OOO_STRING_SVTOOLS_HTML_S_thorn "thorn" -#define OOO_STRING_SVTOOLS_HTML_S_yuml "yuml" -#define OOO_STRING_SVTOOLS_HTML_S_acute "acute" -#define OOO_STRING_SVTOOLS_HTML_S_brvbar "brvbar" -#define OOO_STRING_SVTOOLS_HTML_S_cedil "cedil" -#define OOO_STRING_SVTOOLS_HTML_S_cent "cent" -#define OOO_STRING_SVTOOLS_HTML_S_copy "copy" -#define OOO_STRING_SVTOOLS_HTML_S_curren "curren" -#define OOO_STRING_SVTOOLS_HTML_S_deg "deg" -#define OOO_STRING_SVTOOLS_HTML_S_divide "divide" -#define OOO_STRING_SVTOOLS_HTML_S_frac12 "frac12" -#define OOO_STRING_SVTOOLS_HTML_S_frac14 "frac14" -#define OOO_STRING_SVTOOLS_HTML_S_frac34 "frac34" -#define OOO_STRING_SVTOOLS_HTML_S_iexcl "iexcl" -#define OOO_STRING_SVTOOLS_HTML_S_iquest "iquest" -#define OOO_STRING_SVTOOLS_HTML_S_laquo "laquo" -#define OOO_STRING_SVTOOLS_HTML_S_macr "macr" -#define OOO_STRING_SVTOOLS_HTML_S_micro "micro" -#define OOO_STRING_SVTOOLS_HTML_S_middot "middot" -#define OOO_STRING_SVTOOLS_HTML_S_nbsp "nbsp" -#define OOO_STRING_SVTOOLS_HTML_S_not "not" -#define OOO_STRING_SVTOOLS_HTML_S_ordf "ordf" -#define OOO_STRING_SVTOOLS_HTML_S_ordm "ordm" -#define OOO_STRING_SVTOOLS_HTML_S_para "para" -#define OOO_STRING_SVTOOLS_HTML_S_plusmn "plusmn" -#define OOO_STRING_SVTOOLS_HTML_S_pound "pound" -#define OOO_STRING_SVTOOLS_HTML_S_raquo "raquo" -#define OOO_STRING_SVTOOLS_HTML_S_reg "reg" -#define OOO_STRING_SVTOOLS_HTML_S_sect "sect" -#define OOO_STRING_SVTOOLS_HTML_S_shy "shy" -#define OOO_STRING_SVTOOLS_HTML_S_sup1 "sup1" -#define OOO_STRING_SVTOOLS_HTML_S_sup2 "sup2" -#define OOO_STRING_SVTOOLS_HTML_S_sup3 "sup3" -#define OOO_STRING_SVTOOLS_HTML_S_times "times" -#define OOO_STRING_SVTOOLS_HTML_S_uml "uml" -#define OOO_STRING_SVTOOLS_HTML_S_yen "yen" - -// Netscape kennt noch ein paar in Grossbuchstaben ... -#define OOO_STRING_SVTOOLS_HTML_C_LT "LT" -#define OOO_STRING_SVTOOLS_HTML_C_GT "GT" -#define OOO_STRING_SVTOOLS_HTML_C_AMP "AMP" -#define OOO_STRING_SVTOOLS_HTML_C_QUOT "QUOT" -#define OOO_STRING_SVTOOLS_HTML_S_COPY "COPY" -#define OOO_STRING_SVTOOLS_HTML_S_REG "REG" - -// HTML4 -#define OOO_STRING_SVTOOLS_HTML_S_alefsym "alefsym" -#define OOO_STRING_SVTOOLS_HTML_S_Alpha "Alpha" -#define OOO_STRING_SVTOOLS_HTML_S_alpha "alpha" -#define OOO_STRING_SVTOOLS_HTML_S_and "and" -#define OOO_STRING_SVTOOLS_HTML_S_ang "ang" -#define OOO_STRING_SVTOOLS_HTML_S_asymp "asymp" -#define OOO_STRING_SVTOOLS_HTML_S_bdquo "bdquo" -#define OOO_STRING_SVTOOLS_HTML_S_Beta "Beta" -#define OOO_STRING_SVTOOLS_HTML_S_beta "beta" -#define OOO_STRING_SVTOOLS_HTML_S_bull "bull" -#define OOO_STRING_SVTOOLS_HTML_S_cap "cap" -#define OOO_STRING_SVTOOLS_HTML_S_chi "chi" -#define OOO_STRING_SVTOOLS_HTML_S_Chi "Chi" -#define OOO_STRING_SVTOOLS_HTML_S_circ "circ" -#define OOO_STRING_SVTOOLS_HTML_S_clubs "clubs" -#define OOO_STRING_SVTOOLS_HTML_S_cong "cong" -#define OOO_STRING_SVTOOLS_HTML_S_crarr "crarr" -#define OOO_STRING_SVTOOLS_HTML_S_cup "cup" -#define OOO_STRING_SVTOOLS_HTML_S_dagger "dagger" -#define OOO_STRING_SVTOOLS_HTML_S_Dagger "Dagger" -#define OOO_STRING_SVTOOLS_HTML_S_darr "darr" -#define OOO_STRING_SVTOOLS_HTML_S_dArr "dArr" -#define OOO_STRING_SVTOOLS_HTML_S_Delta "Delta" -#define OOO_STRING_SVTOOLS_HTML_S_delta "delta" -#define OOO_STRING_SVTOOLS_HTML_S_diams "diams" -#define OOO_STRING_SVTOOLS_HTML_S_empty "empty" -#define OOO_STRING_SVTOOLS_HTML_S_emsp "emsp" -#define OOO_STRING_SVTOOLS_HTML_S_ensp "ensp" -#define OOO_STRING_SVTOOLS_HTML_S_Epsilon "Epsilon" -#define OOO_STRING_SVTOOLS_HTML_S_epsilon "epsilon" -#define OOO_STRING_SVTOOLS_HTML_S_equiv "equiv" -#define OOO_STRING_SVTOOLS_HTML_S_Eta "Eta" -#define OOO_STRING_SVTOOLS_HTML_S_eta "eta" -#define OOO_STRING_SVTOOLS_HTML_S_euro "euro" -#define OOO_STRING_SVTOOLS_HTML_S_exist "exist" -#define OOO_STRING_SVTOOLS_HTML_S_fnof "fnof" -#define OOO_STRING_SVTOOLS_HTML_S_forall "forall" -#define OOO_STRING_SVTOOLS_HTML_S_frasl "frasl" -#define OOO_STRING_SVTOOLS_HTML_S_Gamma "Gamma" -#define OOO_STRING_SVTOOLS_HTML_S_gamma "gamma" -#define OOO_STRING_SVTOOLS_HTML_S_ge "ge" -#define OOO_STRING_SVTOOLS_HTML_S_harr "harr" -#define OOO_STRING_SVTOOLS_HTML_S_hArr "hArr" -#define OOO_STRING_SVTOOLS_HTML_S_hearts "hearts" -#define OOO_STRING_SVTOOLS_HTML_S_hellip "hellip" -#define OOO_STRING_SVTOOLS_HTML_S_image "image" -#define OOO_STRING_SVTOOLS_HTML_S_infin "infin" -#define OOO_STRING_SVTOOLS_HTML_S_int "int" -#define OOO_STRING_SVTOOLS_HTML_S_Iota "Iota" -#define OOO_STRING_SVTOOLS_HTML_S_iota "iota" -#define OOO_STRING_SVTOOLS_HTML_S_isin "isin" -#define OOO_STRING_SVTOOLS_HTML_S_Kappa "Kappa" -#define OOO_STRING_SVTOOLS_HTML_S_kappa "kappa" -#define OOO_STRING_SVTOOLS_HTML_S_Lambda "Lambda" -#define OOO_STRING_SVTOOLS_HTML_S_lambda "lambda" -#define OOO_STRING_SVTOOLS_HTML_S_lang "lang" -#define OOO_STRING_SVTOOLS_HTML_S_larr "larr" -#define OOO_STRING_SVTOOLS_HTML_S_lArr "lArr" -#define OOO_STRING_SVTOOLS_HTML_S_lceil "lceil" -#define OOO_STRING_SVTOOLS_HTML_S_ldquo "ldquo" -#define OOO_STRING_SVTOOLS_HTML_S_le "le" -#define OOO_STRING_SVTOOLS_HTML_S_lfloor "lfloor" -#define OOO_STRING_SVTOOLS_HTML_S_lowast "lowast" -#define OOO_STRING_SVTOOLS_HTML_S_loz "loz" -#define OOO_STRING_SVTOOLS_HTML_S_lrm "lrm" -#define OOO_STRING_SVTOOLS_HTML_S_lsaquo "lsaquo" -#define OOO_STRING_SVTOOLS_HTML_S_lsquo "lsquo" -#define OOO_STRING_SVTOOLS_HTML_S_mdash "mdash" -#define OOO_STRING_SVTOOLS_HTML_S_minus "minus" -#define OOO_STRING_SVTOOLS_HTML_S_Mu "Mu" -#define OOO_STRING_SVTOOLS_HTML_S_mu "mu" -#define OOO_STRING_SVTOOLS_HTML_S_nabla "nabla" -#define OOO_STRING_SVTOOLS_HTML_S_ndash "ndash" -#define OOO_STRING_SVTOOLS_HTML_S_ne "ne" -#define OOO_STRING_SVTOOLS_HTML_S_ni "ni" -#define OOO_STRING_SVTOOLS_HTML_S_notin "notin" -#define OOO_STRING_SVTOOLS_HTML_S_nsub "nsub" -#define OOO_STRING_SVTOOLS_HTML_S_Nu "Nu" -#define OOO_STRING_SVTOOLS_HTML_S_nu "nu" -#define OOO_STRING_SVTOOLS_HTML_S_OElig "OElig" -#define OOO_STRING_SVTOOLS_HTML_S_oelig "oelig" -#define OOO_STRING_SVTOOLS_HTML_S_oline "oline" -#define OOO_STRING_SVTOOLS_HTML_S_Omega "Omega" -#define OOO_STRING_SVTOOLS_HTML_S_omega "omega" -#define OOO_STRING_SVTOOLS_HTML_S_Omicron "Omicron" -#define OOO_STRING_SVTOOLS_HTML_S_omicron "omicron" -#define OOO_STRING_SVTOOLS_HTML_S_oplus "oplus" -#define OOO_STRING_SVTOOLS_HTML_S_or "or" -#define OOO_STRING_SVTOOLS_HTML_S_otimes "otimes" -#define OOO_STRING_SVTOOLS_HTML_S_part "part" -#define OOO_STRING_SVTOOLS_HTML_S_permil "permil" -#define OOO_STRING_SVTOOLS_HTML_S_perp "perp" -#define OOO_STRING_SVTOOLS_HTML_S_Phi "Phi" -#define OOO_STRING_SVTOOLS_HTML_S_phi "phi" -#define OOO_STRING_SVTOOLS_HTML_S_Pi "Pi" -#define OOO_STRING_SVTOOLS_HTML_S_pi "pi" -#define OOO_STRING_SVTOOLS_HTML_S_piv "piv" -#define OOO_STRING_SVTOOLS_HTML_S_prime "prime" -#define OOO_STRING_SVTOOLS_HTML_S_Prime "Prime" -#define OOO_STRING_SVTOOLS_HTML_S_prod "prod" -#define OOO_STRING_SVTOOLS_HTML_S_prop "prop" -#define OOO_STRING_SVTOOLS_HTML_S_Psi "Psi" -#define OOO_STRING_SVTOOLS_HTML_S_psi "psi" -#define OOO_STRING_SVTOOLS_HTML_S_radic "radic" -#define OOO_STRING_SVTOOLS_HTML_S_rang "rang" -#define OOO_STRING_SVTOOLS_HTML_S_rarr "rarr" -#define OOO_STRING_SVTOOLS_HTML_S_rArr "rArr" -#define OOO_STRING_SVTOOLS_HTML_S_rceil "rceil" -#define OOO_STRING_SVTOOLS_HTML_S_rdquo "rdquo" -#define OOO_STRING_SVTOOLS_HTML_S_real "real" -#define OOO_STRING_SVTOOLS_HTML_S_rfloor "rfloor" -#define OOO_STRING_SVTOOLS_HTML_S_Rho "Rho" -#define OOO_STRING_SVTOOLS_HTML_S_rho "rho" -#define OOO_STRING_SVTOOLS_HTML_S_rlm "rlm" -#define OOO_STRING_SVTOOLS_HTML_S_rsaquo "rsaquo" -#define OOO_STRING_SVTOOLS_HTML_S_rsquo "rsquo" -#define OOO_STRING_SVTOOLS_HTML_S_sbquo "sbquo" -#define OOO_STRING_SVTOOLS_HTML_S_Scaron "Scaron" -#define OOO_STRING_SVTOOLS_HTML_S_scaron "scaron" -#define OOO_STRING_SVTOOLS_HTML_S_sdot "sdot" -#define OOO_STRING_SVTOOLS_HTML_S_Sigma "Sigma" -#define OOO_STRING_SVTOOLS_HTML_S_sigma "sigma" -#define OOO_STRING_SVTOOLS_HTML_S_sigmaf "sigmaf" -#define OOO_STRING_SVTOOLS_HTML_S_sim "sim" -#define OOO_STRING_SVTOOLS_HTML_S_spades "spades" -#define OOO_STRING_SVTOOLS_HTML_S_sub "sub" -#define OOO_STRING_SVTOOLS_HTML_S_sube "sube" -#define OOO_STRING_SVTOOLS_HTML_S_sum "sum" -#define OOO_STRING_SVTOOLS_HTML_S_sup "sup" -#define OOO_STRING_SVTOOLS_HTML_S_supe "supe" -#define OOO_STRING_SVTOOLS_HTML_S_Tau "Tau" -#define OOO_STRING_SVTOOLS_HTML_S_tau "tau" -#define OOO_STRING_SVTOOLS_HTML_S_there4 "there4" -#define OOO_STRING_SVTOOLS_HTML_S_Theta "Theta" -#define OOO_STRING_SVTOOLS_HTML_S_theta "theta" -#define OOO_STRING_SVTOOLS_HTML_S_thetasym "thetasym" -#define OOO_STRING_SVTOOLS_HTML_S_thinsp "thinsp" -#define OOO_STRING_SVTOOLS_HTML_S_tilde "tilde" -#define OOO_STRING_SVTOOLS_HTML_S_trade "trade" -#define OOO_STRING_SVTOOLS_HTML_S_uarr "uarr" -#define OOO_STRING_SVTOOLS_HTML_S_uArr "uArr" -#define OOO_STRING_SVTOOLS_HTML_S_upsih "upsih" -#define OOO_STRING_SVTOOLS_HTML_S_Upsilon "Upsilon" -#define OOO_STRING_SVTOOLS_HTML_S_upsilon "upsilon" -#define OOO_STRING_SVTOOLS_HTML_S_weierp "weierp" -#define OOO_STRING_SVTOOLS_HTML_S_Xi "Xi" -#define OOO_STRING_SVTOOLS_HTML_S_xi "xi" -#define OOO_STRING_SVTOOLS_HTML_S_Yuml "Yuml" -#define OOO_STRING_SVTOOLS_HTML_S_Zeta "Zeta" -#define OOO_STRING_SVTOOLS_HTML_S_zeta "zeta" -#define OOO_STRING_SVTOOLS_HTML_S_zwj "zwj" -#define OOO_STRING_SVTOOLS_HTML_S_zwnj "zwnj" - -// HTML Attribut-Token (=Optionen) - -// Attribute ohne Wert -#define OOO_STRING_SVTOOLS_HTML_O_box "BOX" -#define OOO_STRING_SVTOOLS_HTML_O_checked "CHECKED" -#define OOO_STRING_SVTOOLS_HTML_O_compact "COMPACT" -#define OOO_STRING_SVTOOLS_HTML_O_continue "CONTINUE" -#define OOO_STRING_SVTOOLS_HTML_O_controls "CONTROLS" -#define OOO_STRING_SVTOOLS_HTML_O_declare "DECLARE" -#define OOO_STRING_SVTOOLS_HTML_O_disabled "DISABLED" -#define OOO_STRING_SVTOOLS_HTML_O_folded "FOLDED" -#define OOO_STRING_SVTOOLS_HTML_O_ismap "ISMAP" -#define OOO_STRING_SVTOOLS_HTML_O_mayscript "MAYSCRIPT" -#define OOO_STRING_SVTOOLS_HTML_O_multiple "MULTIPLE" -#define OOO_STRING_SVTOOLS_HTML_O_noflow "NOFLOW" -#define OOO_STRING_SVTOOLS_HTML_O_nohref "NOHREF" -#define OOO_STRING_SVTOOLS_HTML_O_noresize "NORESIZE" -#define OOO_STRING_SVTOOLS_HTML_O_noshade "NOSHADE" -#define OOO_STRING_SVTOOLS_HTML_O_nowrap "NOWRAP" -#define OOO_STRING_SVTOOLS_HTML_O_plain "PLAIN" -#define OOO_STRING_SVTOOLS_HTML_O_sdfixed "SDFIXED" -#define OOO_STRING_SVTOOLS_HTML_O_selected "SELECTED" -#define OOO_STRING_SVTOOLS_HTML_O_shapes "SHAPES" - -// Attribute mit einem String als Wert -#define OOO_STRING_SVTOOLS_HTML_O_above "ABOVE" -#define OOO_STRING_SVTOOLS_HTML_O_accesskey "ACCESSKEY" -#define OOO_STRING_SVTOOLS_HTML_O_accept "ACCEPT" -#define OOO_STRING_SVTOOLS_HTML_O_add_date "ADD_DATE" -#define OOO_STRING_SVTOOLS_HTML_O_alt "ALT" -#define OOO_STRING_SVTOOLS_HTML_O_axes "AXES" -#define OOO_STRING_SVTOOLS_HTML_O_axis "AXIS" -#define OOO_STRING_SVTOOLS_HTML_O_below "BELOW" -#define OOO_STRING_SVTOOLS_HTML_O_char "CHAR" -#define OOO_STRING_SVTOOLS_HTML_O_class "CLASS" -#define OOO_STRING_SVTOOLS_HTML_O_clip "CLIP" -#define OOO_STRING_SVTOOLS_HTML_O_code "CODE" -#define OOO_STRING_SVTOOLS_HTML_O_codetype "CODETYPE" -#define OOO_STRING_SVTOOLS_HTML_O_colspec "COLSPEC" -#define OOO_STRING_SVTOOLS_HTML_O_content "CONTENT" -#define OOO_STRING_SVTOOLS_HTML_O_coords "COORDS" -#define OOO_STRING_SVTOOLS_HTML_O_dp "DP" -#define OOO_STRING_SVTOOLS_HTML_O_enctype "ENCTYPE" -#define OOO_STRING_SVTOOLS_HTML_O_error "ERROR" -#define OOO_STRING_SVTOOLS_HTML_O_face "FACE" -#define OOO_STRING_SVTOOLS_HTML_O_frameborder "FRAMEBORDER" -#define OOO_STRING_SVTOOLS_HTML_O_httpequiv "HTTP-EQUIV" -#define OOO_STRING_SVTOOLS_HTML_O_language "LANGUAGE" -#define OOO_STRING_SVTOOLS_HTML_O_last_modified "LAST_MODIFIED" -#define OOO_STRING_SVTOOLS_HTML_O_last_visit "LAST_VISIT" -#define OOO_STRING_SVTOOLS_HTML_O_md "MD" -#define OOO_STRING_SVTOOLS_HTML_O_n "N" -#define OOO_STRING_SVTOOLS_HTML_O_name "NAME" -#define OOO_STRING_SVTOOLS_HTML_O_notation "NOTATION" -#define OOO_STRING_SVTOOLS_HTML_O_prompt "PROMPT" -#define OOO_STRING_SVTOOLS_HTML_O_shape "SHAPE" -#define OOO_STRING_SVTOOLS_HTML_O_standby "STANDBY" -#define OOO_STRING_SVTOOLS_HTML_O_style "STYLE" -#define OOO_STRING_SVTOOLS_HTML_O_title "TITLE" -#define OOO_STRING_SVTOOLS_HTML_O_value "VALUE" -#define OOO_STRING_SVTOOLS_HTML_O_SDval "SDVAL" -#define OOO_STRING_SVTOOLS_HTML_O_SDnum "SDNUM" -#define OOO_STRING_SVTOOLS_HTML_O_sdlibrary "SDLIBRARY" -#define OOO_STRING_SVTOOLS_HTML_O_sdmodule "SDMODULE" -#define OOO_STRING_SVTOOLS_HTML_O_sdevent "SDEVENT-" -#define OOO_STRING_SVTOOLS_HTML_O_sdaddparam "SDADDPARAM-" - -// Attribute mit einem SGML-Identifier als Wert -#define OOO_STRING_SVTOOLS_HTML_O_from "FROM" -#define OOO_STRING_SVTOOLS_HTML_O_id "ID" -#define OOO_STRING_SVTOOLS_HTML_O_target "TARGET" -#define OOO_STRING_SVTOOLS_HTML_O_to "TO" -#define OOO_STRING_SVTOOLS_HTML_O_until "UNTIL" - -// Attribute mit einem URI als Wert -#define OOO_STRING_SVTOOLS_HTML_O_action "ACTION" -#define OOO_STRING_SVTOOLS_HTML_O_archive "ARCHIVE" -#define OOO_STRING_SVTOOLS_HTML_O_background "BACKGROUND" -#define OOO_STRING_SVTOOLS_HTML_O_classid "CLASSID" -#define OOO_STRING_SVTOOLS_HTML_O_codebase "CODEBASE" -#define OOO_STRING_SVTOOLS_HTML_O_data "DATA" -#define OOO_STRING_SVTOOLS_HTML_O_dynsrc "DYNSRC" -#define OOO_STRING_SVTOOLS_HTML_O_dynsync "DYNSYNC" -#define OOO_STRING_SVTOOLS_HTML_O_imagemap "IMAGEMAP" -#define OOO_STRING_SVTOOLS_HTML_O_href "HREF" -#define OOO_STRING_SVTOOLS_HTML_O_lowsrc "LOWSRC" -#define OOO_STRING_SVTOOLS_HTML_O_script "SCRIPT" -#define OOO_STRING_SVTOOLS_HTML_O_src "SRC" -#define OOO_STRING_SVTOOLS_HTML_O_usemap "USEMAP" - -// Attribute mit Entity-Namen als Wert -#define OOO_STRING_SVTOOLS_HTML_O_dingbat "DINGBAT" -#define OOO_STRING_SVTOOLS_HTML_O_sym "SYM" - -// Attribute mit einer Farbe als Wert (alle Netscape) -#define OOO_STRING_SVTOOLS_HTML_O_alink "ALINK" -#define OOO_STRING_SVTOOLS_HTML_O_bgcolor "BGCOLOR" -#define OOO_STRING_SVTOOLS_HTML_O_bordercolor "BORDERCOLOR" -#define OOO_STRING_SVTOOLS_HTML_O_bordercolorlight "BORDERCOLORLIGHT" -#define OOO_STRING_SVTOOLS_HTML_O_bordercolordark "BORDERCOLORDARK" -#define OOO_STRING_SVTOOLS_HTML_O_color "COLOR" -#define OOO_STRING_SVTOOLS_HTML_O_link "LINK" -#define OOO_STRING_SVTOOLS_HTML_O_text "TEXT" -#define OOO_STRING_SVTOOLS_HTML_O_vlink "VLINK" - -// Attribute mit einem numerischen Wert -#define OOO_STRING_SVTOOLS_HTML_O_border "BORDER" -#define OOO_STRING_SVTOOLS_HTML_O_cellspacing "CELLSPACING" -#define OOO_STRING_SVTOOLS_HTML_O_cellpadding "CELLPADDING" -#define OOO_STRING_SVTOOLS_HTML_O_charoff "CHAROFF" -#define OOO_STRING_SVTOOLS_HTML_O_colspan "COLSPAN" -#define OOO_STRING_SVTOOLS_HTML_O_framespacing "FRAMESPACING" -#define OOO_STRING_SVTOOLS_HTML_O_gutter "GUTTER" -#define OOO_STRING_SVTOOLS_HTML_O_indent "INDENT" -#define OOO_STRING_SVTOOLS_HTML_O_height "HEIGHT" -#define OOO_STRING_SVTOOLS_HTML_O_hspace "HSPACE" -#define OOO_STRING_SVTOOLS_HTML_O_left "LEFT" -#define OOO_STRING_SVTOOLS_HTML_O_leftmargin "LEFTMARGIN" -#define OOO_STRING_SVTOOLS_HTML_O_loop "LOOP" -#define OOO_STRING_SVTOOLS_HTML_O_marginheight "MARGINHEIGHT" -#define OOO_STRING_SVTOOLS_HTML_O_marginwidth "MARGINWIDTH" -#define OOO_STRING_SVTOOLS_HTML_O_max "MAX" -#define OOO_STRING_SVTOOLS_HTML_O_maxlength "MAXLENGTH" -#define OOO_STRING_SVTOOLS_HTML_O_min "MIN" -#define OOO_STRING_SVTOOLS_HTML_O_pagex "PAGEX" -#define OOO_STRING_SVTOOLS_HTML_O_pagey "PAGEY" -#define OOO_STRING_SVTOOLS_HTML_O_pointsize "POINT-SIZE" -#define OOO_STRING_SVTOOLS_HTML_O_rowspan "ROWSPAN" -#define OOO_STRING_SVTOOLS_HTML_O_scrollamount "SCROLLAMOUNT" -#define OOO_STRING_SVTOOLS_HTML_O_scrolldelay "SCROLLDELAY" -#define OOO_STRING_SVTOOLS_HTML_O_seqnum "SEQNUM" -#define OOO_STRING_SVTOOLS_HTML_O_skip "SKIP" -#define OOO_STRING_SVTOOLS_HTML_O_span "SPAN" -#define OOO_STRING_SVTOOLS_HTML_O_tabindex "TABINDEX" -#define OOO_STRING_SVTOOLS_HTML_O_top "TOP" -#define OOO_STRING_SVTOOLS_HTML_O_topmargin "TOPMARGIN" -#define OOO_STRING_SVTOOLS_HTML_O_vspace "VSPACE" -#define OOO_STRING_SVTOOLS_HTML_O_weight "WEIGHT" -#define OOO_STRING_SVTOOLS_HTML_O_width "WIDTH" -#define OOO_STRING_SVTOOLS_HTML_O_x "X" -#define OOO_STRING_SVTOOLS_HTML_O_y "Y" -#define OOO_STRING_SVTOOLS_HTML_O_zindex "Z-INDEX" - -// Attribute mit Enum-Werten -#define OOO_STRING_SVTOOLS_HTML_O_behavior "BEHAVIOR" -#define OOO_STRING_SVTOOLS_HTML_O_bgproperties "BGPROPERTIES" -#define OOO_STRING_SVTOOLS_HTML_O_clear "CLEAR" -#define OOO_STRING_SVTOOLS_HTML_O_dir "DIR" -#define OOO_STRING_SVTOOLS_HTML_O_direction "DIRECTION" -#define OOO_STRING_SVTOOLS_HTML_O_format "FORMAT" -#define OOO_STRING_SVTOOLS_HTML_O_frame "FRAME" -#define OOO_STRING_SVTOOLS_HTML_O_lang "LANG" -#define OOO_STRING_SVTOOLS_HTML_O_method "METHOD" -#define OOO_STRING_SVTOOLS_HTML_O_palette "PALETTE" -#define OOO_STRING_SVTOOLS_HTML_O_rel "REL" -#define OOO_STRING_SVTOOLS_HTML_O_rev "REV" -#define OOO_STRING_SVTOOLS_HTML_O_rules "RULES" -#define OOO_STRING_SVTOOLS_HTML_O_scrolling "SCROLLING" -#define OOO_STRING_SVTOOLS_HTML_O_sdreadonly "READONLY" -#define OOO_STRING_SVTOOLS_HTML_O_subtype "SUBTYPE" -#define OOO_STRING_SVTOOLS_HTML_O_type "TYPE" -#define OOO_STRING_SVTOOLS_HTML_O_valign "VALIGN" -#define OOO_STRING_SVTOOLS_HTML_O_valuetype "VALUETYPE" -#define OOO_STRING_SVTOOLS_HTML_O_visibility "VISIBILITY" -#define OOO_STRING_SVTOOLS_HTML_O_wrap "WRAP" - -// Attribute mit Script-Code als Wert -#define OOO_STRING_SVTOOLS_HTML_O_onblur "ONBLUR" -#define OOO_STRING_SVTOOLS_HTML_O_onchange "ONCHANGE" -#define OOO_STRING_SVTOOLS_HTML_O_onclick "ONCLICK" -#define OOO_STRING_SVTOOLS_HTML_O_onfocus "ONFOCUS" -#define OOO_STRING_SVTOOLS_HTML_O_onload "ONLOAD" -#define OOO_STRING_SVTOOLS_HTML_O_onmouseover "ONMOUSEOVER" -#define OOO_STRING_SVTOOLS_HTML_O_onreset "ONRESET" -#define OOO_STRING_SVTOOLS_HTML_O_onselect "ONSELECT" -#define OOO_STRING_SVTOOLS_HTML_O_onsubmit "ONSUBMIT" -#define OOO_STRING_SVTOOLS_HTML_O_onunload "ONUNLOAD" -#define OOO_STRING_SVTOOLS_HTML_O_onabort "ONABORT" -#define OOO_STRING_SVTOOLS_HTML_O_onerror "ONERROR" -#define OOO_STRING_SVTOOLS_HTML_O_onmouseout "ONMOUSEOUT" -#define OOO_STRING_SVTOOLS_HTML_O_SDonblur "SDONBLUR" -#define OOO_STRING_SVTOOLS_HTML_O_SDonchange "SDONCHANGE" -#define OOO_STRING_SVTOOLS_HTML_O_SDonclick "SDONCLICK" -#define OOO_STRING_SVTOOLS_HTML_O_SDonfocus "SDONFOCUS" -#define OOO_STRING_SVTOOLS_HTML_O_SDonload "SDONLOAD" -#define OOO_STRING_SVTOOLS_HTML_O_SDonmouseover "SDONMOUSEOVER" -#define OOO_STRING_SVTOOLS_HTML_O_SDonreset "SDONRESET" -#define OOO_STRING_SVTOOLS_HTML_O_SDonselect "SDONSELECT" -#define OOO_STRING_SVTOOLS_HTML_O_SDonsubmit "SDONSUBMIT" -#define OOO_STRING_SVTOOLS_HTML_O_SDonunload "SDONUNLOAD" -#define OOO_STRING_SVTOOLS_HTML_O_SDonabort "SDONABORT" -#define OOO_STRING_SVTOOLS_HTML_O_SDonerror "SDONERROR" -#define OOO_STRING_SVTOOLS_HTML_O_SDonmouseout "SDONMOUSEOUT" - -// Attribute mit Kontext-abhaengigen Werten -#define OOO_STRING_SVTOOLS_HTML_O_align "ALIGN" -#define OOO_STRING_SVTOOLS_HTML_O_cols "COLS" -#define OOO_STRING_SVTOOLS_HTML_O_rows "ROWS" -#define OOO_STRING_SVTOOLS_HTML_O_start "START" -#define OOO_STRING_SVTOOLS_HTML_O_size "SIZE" -#define OOO_STRING_SVTOOLS_HTML_O_units "UNITS" - -// Werte von -#define OOO_STRING_SVTOOLS_HTML_IT_text "TEXT" -#define OOO_STRING_SVTOOLS_HTML_IT_password "PASSWORD" -#define OOO_STRING_SVTOOLS_HTML_IT_checkbox "CHECKBOX" -#define OOO_STRING_SVTOOLS_HTML_IT_radio "RADIO" -#define OOO_STRING_SVTOOLS_HTML_IT_range "RANGE" -#define OOO_STRING_SVTOOLS_HTML_IT_scribble "SCRIBBLE" -#define OOO_STRING_SVTOOLS_HTML_IT_file "FILE" -#define OOO_STRING_SVTOOLS_HTML_IT_hidden "HIDDEN" -#define OOO_STRING_SVTOOLS_HTML_IT_submit "SUBMIT" -#define OOO_STRING_SVTOOLS_HTML_IT_image "IMAGE" -#define OOO_STRING_SVTOOLS_HTML_IT_reset "RESET" -#define OOO_STRING_SVTOOLS_HTML_IT_button "BUTTON" - -// Werte von -#define OOO_STRING_SVTOOLS_HTML_TF_void "VOID" -#define OOO_STRING_SVTOOLS_HTML_TF_above "ABOVE" -#define OOO_STRING_SVTOOLS_HTML_TF_below "BELOW" -#define OOO_STRING_SVTOOLS_HTML_TF_hsides "HSIDES" -#define OOO_STRING_SVTOOLS_HTML_TF_lhs "LHS" -#define OOO_STRING_SVTOOLS_HTML_TF_rhs "RHS" -#define OOO_STRING_SVTOOLS_HTML_TF_vsides "VSIDES" -#define OOO_STRING_SVTOOLS_HTML_TF_box "BOX" -#define OOO_STRING_SVTOOLS_HTML_TF_border "BORDER" - -// Werte von
-#define OOO_STRING_SVTOOLS_HTML_TR_none "NONE" -#define OOO_STRING_SVTOOLS_HTML_TR_groups "GROUPS" -#define OOO_STRING_SVTOOLS_HTML_TR_rows "ROWS" -#define OOO_STRING_SVTOOLS_HTML_TR_cols "COLS" -#define OOO_STRING_SVTOOLS_HTML_TR_all "ALL" - -// Werte von -#define OOO_STRING_SVTOOLS_HTML_AL_left "LEFT" -#define OOO_STRING_SVTOOLS_HTML_AL_center "CENTER" -#define OOO_STRING_SVTOOLS_HTML_AL_middle "MIDDLE" -#define OOO_STRING_SVTOOLS_HTML_AL_right "RIGHT" -#define OOO_STRING_SVTOOLS_HTML_AL_justify "JUSTIFY" -#define OOO_STRING_SVTOOLS_HTML_AL_char "CHAR" -#define OOO_STRING_SVTOOLS_HTML_AL_all "ALL" -#define OOO_STRING_SVTOOLS_HTML_AL_none "NONE" - -// Werte von , -#define OOO_STRING_SVTOOLS_HTML_VA_top "TOP" -#define OOO_STRING_SVTOOLS_HTML_VA_middle "MIDDLE" -#define OOO_STRING_SVTOOLS_HTML_VA_bottom "BOTTOM" -#define OOO_STRING_SVTOOLS_HTML_VA_baseline "BASELINE" -#define OOO_STRING_SVTOOLS_HTML_VA_texttop "TEXTTOP" -#define OOO_STRING_SVTOOLS_HTML_VA_absmiddle "ABSMIDDLE" -#define OOO_STRING_SVTOOLS_HTML_VA_absbottom "ABSBOTTOM" - -// Werte von -#define OOO_STRING_SVTOOLS_HTML_SH_rect "RECT" -#define OOO_STRING_SVTOOLS_HTML_SH_rectangle "RECTANGLE" -#define OOO_STRING_SVTOOLS_HTML_SH_circ "CIRC" -#define OOO_STRING_SVTOOLS_HTML_SH_circle "CIRCLE" -#define OOO_STRING_SVTOOLS_HTML_SH_poly "POLY" -#define OOO_STRING_SVTOOLS_HTML_SH_polygon "POLYGON" -#define OOO_STRING_SVTOOLS_HTML_SH_default "DEFAULT" - -#define OOO_STRING_SVTOOLS_HTML_LG_starbasic "STARBASIC" -#define OOO_STRING_SVTOOLS_HTML_LG_javascript "JAVASCRIPT" -#define OOO_STRING_SVTOOLS_HTML_LG_javascript11 "JAVASCRIPT1.1" -#define OOO_STRING_SVTOOLS_HTML_LG_livescript "LIVESCRIPT" - -// ein par Werte fuer unser StarBASIC-Support -#define OOO_STRING_SVTOOLS_HTML_SB_library "$LIBRARY:" -#define OOO_STRING_SVTOOLS_HTML_SB_module "$MODULE:" - -// Werte von -#define OOO_STRING_SVTOOLS_HTML_METHOD_get "GET" -#define OOO_STRING_SVTOOLS_HTML_METHOD_post "POST" - -// Werte von -#define OOO_STRING_SVTOOLS_HTML_META_refresh "REFRESH" -#define OOO_STRING_SVTOOLS_HTML_META_generator "GENERATOR" -#define OOO_STRING_SVTOOLS_HTML_META_author "AUTHOR" -#define OOO_STRING_SVTOOLS_HTML_META_classification "CLASSIFICATION" -#define OOO_STRING_SVTOOLS_HTML_META_description "DESCRIPTION" -#define OOO_STRING_SVTOOLS_HTML_META_keywords "KEYWORDS" -#define OOO_STRING_SVTOOLS_HTML_META_changed "CHANGED" -#define OOO_STRING_SVTOOLS_HTML_META_changedby "CHANGEDBY" -#define OOO_STRING_SVTOOLS_HTML_META_created "CREATED" -#define OOO_STRING_SVTOOLS_HTML_META_content_type "CONTENT-TYPE" -#define OOO_STRING_SVTOOLS_HTML_META_content_script_type "CONTENT-SCRIPT-TYPE" -#define OOO_STRING_SVTOOLS_HTML_META_sdendnote "SDENDNOTE" -#define OOO_STRING_SVTOOLS_HTML_META_sdfootnote "SDFOOTNOTE" - -// Werte von
    -#define OOO_STRING_SVTOOLS_HTML_ULTYPE_disc "DISC" -#define OOO_STRING_SVTOOLS_HTML_ULTYPE_square "SQUARE" -#define OOO_STRING_SVTOOLS_HTML_ULTYPE_circle "CIRCLE" - -// Werte von -#define OOO_STRING_SVTOOLS_HTML_SCROLL_yes "YES" -#define OOO_STRING_SVTOOLS_HTML_SCROLL_no "NO" -#define OOO_STRING_SVTOOLS_HTML_SCROLL_auto "AUTO" - -// Werte von -#define OOO_STRING_SVTOOLS_HTML_MCTYPE_horizontal "HORIZONTAL" -#define OOO_STRING_SVTOOLS_HTML_MCTYPE_vertical "VERTICAL" -#define OOO_STRING_SVTOOLS_HTML_MCTYPE_box "BOX" - -// Werte von -#define OOO_STRING_SVTOOLS_HTML_BEHAV_scroll "SCROLL" -#define OOO_STRING_SVTOOLS_HTML_BEHAV_slide "SLIDE" -#define OOO_STRING_SVTOOLS_HTML_BEHAV_alternate "ALTERNATE" - -// Werte von -#define OOO_STRING_SVTOOLS_HTML_LOOP_infinite "INFINITE" -#define OOO_STRING_SVTOOLS_HTML_SPTYPE_block "BLOCK" -#define OOO_STRING_SVTOOLS_HTML_SPTYPE_horizontal "HORIZONTAL" -#define OOO_STRING_SVTOOLS_HTML_SPTYPE_vertical "VERTICAL" - -// interne Grafik-Namen -#define OOO_STRING_SVTOOLS_HTML_private_image "private:image/" -#define OOO_STRING_SVTOOLS_HTML_internal_gopher "internal-gopher-" -#define OOO_STRING_SVTOOLS_HTML_internal_icon "internal-icon-" -#define OOO_STRING_SVTOOLS_HTML_INT_GOPHER_binary "binary" -#define OOO_STRING_SVTOOLS_HTML_INT_GOPHER_image "image" -#define OOO_STRING_SVTOOLS_HTML_INT_GOPHER_index "index" -#define OOO_STRING_SVTOOLS_HTML_INT_GOPHER_menu "menu" -#define OOO_STRING_SVTOOLS_HTML_INT_GOPHER_movie "movie" -#define OOO_STRING_SVTOOLS_HTML_INT_GOPHER_sound "sound" -#define OOO_STRING_SVTOOLS_HTML_INT_GOPHER_telnet "telnet" -#define OOO_STRING_SVTOOLS_HTML_INT_GOPHER_text "text" -#define OOO_STRING_SVTOOLS_HTML_INT_GOPHER_unknown "unknown" -#define OOO_STRING_SVTOOLS_HTML_INT_ICON_baddata "baddata" -#define OOO_STRING_SVTOOLS_HTML_INT_ICON_delayed "delayed" -#define OOO_STRING_SVTOOLS_HTML_INT_ICON_embed "embed" -#define OOO_STRING_SVTOOLS_HTML_INT_ICON_insecure "insecure" -#define OOO_STRING_SVTOOLS_HTML_INT_ICON_notfound "notfound" -#define OOO_STRING_SVTOOLS_HTML_sdendnote "sdendnote" -#define OOO_STRING_SVTOOLS_HTML_sdendnote_anc "sdendnoteanc" -#define OOO_STRING_SVTOOLS_HTML_sdendnote_sym "sdendnotesym" -#define OOO_STRING_SVTOOLS_HTML_sdfootnote "sdfootnote" -#define OOO_STRING_SVTOOLS_HTML_sdfootnote_anc "sdfootnoteanc" -#define OOO_STRING_SVTOOLS_HTML_sdfootnote_sym "sdfootnotesym" -#define OOO_STRING_SVTOOLS_HTML_FTN_anchor "anc" -#define OOO_STRING_SVTOOLS_HTML_FTN_symbol "sym" -#define OOO_STRING_SVTOOLS_HTML_WW_off "OFF" -#define OOO_STRING_SVTOOLS_HTML_WW_hard "HARD" -#define OOO_STRING_SVTOOLS_HTML_WW_soft "SOFT" -#define OOO_STRING_SVTOOLS_HTML_WW_virtual "VIRTUAL" -#define OOO_STRING_SVTOOLS_HTML_WW_physical "PHYSICAL" -#define OOO_STRING_SVTOOLS_HTML_on "on" -#define OOO_STRING_SVTOOLS_HTML_ET_url "application/x-www-form-urlencoded" -#define OOO_STRING_SVTOOLS_HTML_ET_multipart "multipart/form-data" -#define OOO_STRING_SVTOOLS_HTML_ET_text "text/plain" - -#endif diff --git a/svtools/inc/htmltokn.h b/svtools/inc/htmltokn.h deleted file mode 100644 index 0719f34cd893..000000000000 --- a/svtools/inc/htmltokn.h +++ /dev/null @@ -1,572 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: htmltokn.h,v $ - * $Revision: 1.5 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _HTMLTOKN_H -#define _HTMLTOKN_H - -#include "svtools/svtdllapi.h" -#include -#ifndef _SOLAR_h -#include -#endif - -class String; - -// suche das Char zu dem CharNamen -sal_Unicode GetHTMLCharName( const String& rName ); - -// suche die TokenID zu dem Token -SVT_DLLPUBLIC int GetHTMLToken( const String& rName ); - -// suche die TokenId zu einemm Attribut-Token -int GetHTMLOption( const String& rName ); - -// suche die 24-bit-Farbe zu einem Farbnamen (nicht gefunden = ULONG_MAX) -SVT_DLLPUBLIC ULONG GetHTMLColor( const String& rName ); - -// beginnen immer ab 256, groesser als ein char -const int HTML_TOKEN_START = 0x100; -const int HTML_TOKEN_ONOFF = 0x200; -const int HTML_TOKEN_MICROSOFT = 0x1000; - -enum HTML_TOKEN_IDS -{ - HTML_TEXTTOKEN = HTML_TOKEN_START, - HTML_SINGLECHAR, - HTML_NEWPARA, - HTML_TABCHAR, - HTML_RAWDATA, - HTML_LINEFEEDCHAR, - - // diese werden nur eingeschaltet - HTML_AREA, // Netscape 2.0 - HTML_BASE, // HTML 3.0 - HTML_COMMENT, - HTML_DOCTYPE, - HTML_EMBED, // Netscape 2.0 ignorieren - HTML_FIGUREOVERLAY, // HTML 3.0 - HTML_HORZRULE, // ignorieren - HTML_HORZTAB, // HTML 3.0 - HTML_IMAGE, // ignorieren - HTML_INPUT, // ignorieren - HTML_ISINDEX, // HTML 3.0 - HTML_LINEBREAK, //
    ->
    - HTML_LINK, // HTML 3.0 - HTML_META, // HTML 3.0 ignorieren - HTML_NEXTID, // HTML 3.0 - HTML_OF, // HTML 3.0 - HTML_OPTION, // ignorieren - HTML_PARAM, // HotJava - HTML_RANGE, // HTML 3.0 - HTML_SPACER, // Netscape 3.0b5 // ignorieren - HTML_WBR, // Netscape - - // Tokens, die ueber HTML-Charakter erkannt werden - HTML_NONBREAKSPACE, - HTML_SOFTHYPH, - - // diese werden wieder abgeschaltet, - // der off-Wert liegt immer dahinter (+1) !! - HTML_ABBREVIATION_ON = HTML_TOKEN_ONOFF, // HTML 3.0 - HTML_ABBREVIATION_OFF, // HTML 3.0 - HTML_ABOVE_ON, // HTML 3.0 - HTML_ABOVE_OFF, // HTML 3.0 - HTML_ACRONYM_ON, // HTML 3.0 - HTML_ACRONYM_OFF, // HTML 3.0 - HTML_ADDRESS_ON, - HTML_ADDRESS_OFF, - HTML_ANCHOR_ON, - HTML_ANCHOR_OFF, - HTML_APPLET_ON, // HotJava - HTML_APPLET_OFF, // HotJava - HTML_ARRAY_ON, // HTML 3.0 - HTML_ARRAY_OFF, // HTML 3.0 - HTML_AUTHOR_ON, // HTML 3.0 - HTML_AUTHOR_OFF, // HTML 3.0 - HTML_BANNER_ON, // HTML 3.0 - HTML_BANNER_OFF, // HTML 3.0 - HTML_BAR_ON, // HTML 3.0 - HTML_BAR_OFF, // HTML 3.0 - HTML_BASEFONT_ON, // Netscape - HTML_BASEFONT_OFF, // Netscape - HTML_BELOW_ON, // HTML 3.0 - HTML_BELOW_OFF, // HTML 3.0 - HTML_BIGPRINT_ON, // HTML 3.0 - HTML_BIGPRINT_OFF, // HTML 3.0 - HTML_BLINK_ON, // Netscape - HTML_BLINK_OFF, // Netscape - HTML_BLOCKQUOTE30_ON, // HTML 3.0 - HTML_BLOCKQUOTE30_OFF, // HTML 3.0 - HTML_BLOCKQUOTE_ON, - HTML_BLOCKQUOTE_OFF, - HTML_BODY_ON, - HTML_BODY_OFF, - HTML_BOLDTEXT_ON, // HTML 3.0 - HTML_BOLDTEXT_OFF, // HTML 3.0 - HTML_BOLD_ON, - HTML_BOLD_OFF, - HTML_BOX_ON, // HTML 3.0 - HTML_BOX_OFF, // HTML 3.0 - HTML_CAPTION_ON, // HTML 3.0 - HTML_CAPTION_OFF, // HTML 3.0 - HTML_CENTER_ON, // Netscape - HTML_CENTER_OFF, // Netscape - HTML_CITIATION_ON, - HTML_CITIATION_OFF, - HTML_CODE_ON, - HTML_CODE_OFF, - HTML_COL_ON, // HTML3 Table Model Draft - HTML_COL_OFF, // HTML3 Table Model Draft - HTML_COLGROUP_ON, // HTML3 Table Model Draft - HTML_COLGROUP_OFF, // HTML3 Table Model Draft - HTML_CREDIT_ON, // HTML 3.0 - HTML_CREDIT_OFF, // HTML 3.0 - HTML_DD_ON, - HTML_DD_OFF, - HTML_DEFLIST_ON, - HTML_DEFLIST_OFF, - HTML_DELETEDTEXT_ON, // HTML 3.0 - HTML_DELETEDTEXT_OFF, // HTML 3.0 - HTML_DIRLIST_ON, - HTML_DIRLIST_OFF, - HTML_DIVISION_ON, // HTML 3.0 - HTML_DIVISION_OFF, // HTML 3.0 - HTML_DOT_ON, // HTML 3.0 - HTML_DOT_OFF, // HTML 3.0 - HTML_DOUBLEDOT_ON, // HTML 3.0 - HTML_DOUBLEDOT_OFF, // HTML 3.0 - HTML_DT_ON, - HTML_DT_OFF, - HTML_EMPHASIS_ON, - HTML_EMPHASIS_OFF, - HTML_FIGURE_ON, // HTML 3.0 - HTML_FIGURE_OFF, // HTML 3.0 - HTML_FONT_ON, // Netscape - HTML_FONT_OFF, // Netscape - HTML_FOOTNOTE_ON, // HTML 3.0 - HTML_FOOTNOTE_OFF, // HTML 3.0 - HTML_FORM_ON, - HTML_FORM_OFF, - HTML_FRAME_ON, // Netscape 2.0 - HTML_FRAME_OFF, // Netscape 2.0 - HTML_FRAMESET_ON, // Netscape 2.0 - HTML_FRAMESET_OFF, // Netscape 2.0 - HTML_HAT_ON, // HTML 3.0 - HTML_HAT_OFF, // HTML 3.0 - HTML_HEAD1_ON, - HTML_HEAD1_OFF, - HTML_HEAD2_ON, - HTML_HEAD2_OFF, - HTML_HEAD3_ON, - HTML_HEAD3_OFF, - HTML_HEAD4_ON, - HTML_HEAD4_OFF, - HTML_HEAD5_ON, - HTML_HEAD5_OFF, - HTML_HEAD6_ON, - HTML_HEAD6_OFF, - HTML_HEAD_ON, - HTML_HEAD_OFF, - HTML_HTML_ON, - HTML_HTML_OFF, - HTML_IFRAME_ON, // IE 3.0b2 - HTML_IFRAME_OFF, // IE 3.0b2 - HTML_ILAYER_ON, - HTML_ILAYER_OFF, - HTML_INSERTEDTEXT_ON, // HTML 3.0 - HTML_INSERTEDTEXT_OFF, // HTML 3.0 - HTML_ITALIC_ON, - HTML_ITALIC_OFF, - HTML_ITEM_ON, // HTML 3.0 - HTML_ITEM_OFF, // HTML 3.0 - HTML_KEYBOARD_ON, - HTML_KEYBOARD_OFF, - HTML_LAYER_ON, - HTML_LAYER_OFF, - HTML_LANGUAGE_ON, // HTML 3.0 - HTML_LANGUAGE_OFF, // HTML 3.0 - HTML_LISTHEADER_ON, // HTML 3.0 - HTML_LISTHEADER_OFF, // HTML 3.0 - HTML_LI_ON, - HTML_LI_OFF, - HTML_MAP_ON, // Netscape 2.0 - HTML_MAP_OFF, // Netscape 2.0 - HTML_MATH_ON, // HTML 3.0 - HTML_MATH_OFF, // HTML 3.0 - HTML_MENULIST_ON, - HTML_MENULIST_OFF, - HTML_MULTICOL_ON, // Netscape 3.0b5 - HTML_MULTICOL_OFF, // Netscape 3.0b5 - HTML_NOBR_ON, // Netscape - HTML_NOBR_OFF, // Netscape - HTML_NOEMBED_ON, // Netscape 2.0 - HTML_NOEMBED_OFF, // Netscape 2.0 - HTML_NOFRAMES_ON, // Netscape 2.0 - HTML_NOFRAMES_OFF, // Netscape 2.0 - HTML_NOSCRIPT_ON, // Netscape 2.0 - HTML_NOSCRIPT_OFF, // Netscape 3.0 - HTML_NOTE_ON, // HTML 3.0 - HTML_NOTE_OFF, // HTML 3.0 - HTML_OBJECT_ON, // HotJava - HTML_OBJECT_OFF, // HotJava - HTML_ORDERLIST_ON, - HTML_ORDERLIST_OFF, - HTML_PARABREAK_ON, - HTML_PARABREAK_OFF, - HTML_PERSON_ON, // HTML 3.0 - HTML_PERSON_OFF, // HTML 3.0 - HTML_PLAINTEXT_ON, // HTML 3.0 - HTML_PLAINTEXT_OFF, // HTML 3.0 - HTML_PREFORMTXT_ON, - HTML_PREFORMTXT_OFF, - HTML_ROOT_ON, // HTML 3.0 - HTML_ROOT_OFF, // HTML 3.0 - HTML_ROW_ON, // HTML 3.0 - HTML_ROW_OFF, // HTML 3.0 - HTML_SAMPLE_ON, - HTML_SAMPLE_OFF, - HTML_SCRIPT_ON, // HTML 3.2 - HTML_SCRIPT_OFF, // HTML 3.2 - HTML_SELECT_ON, - HTML_SELECT_OFF, - HTML_SHORTQUOTE_ON, // HTML 3.0 - HTML_SHORTQUOTE_OFF, // HTML 3.0 - HTML_SMALLPRINT_ON, // HTML 3.0 - HTML_SMALLPRINT_OFF, // HTML 3.0 - HTML_SPAN_ON, // Style Sheets - HTML_SPAN_OFF, // Style Sheets - HTML_SQUAREROOT_ON, // HTML 3.0 - HTML_SQUAREROOT_OFF, // HTML 3.0 - HTML_STRIKETHROUGH_ON, // HTML 3.0 - HTML_STRIKETHROUGH_OFF, // HTML 3.0 - HTML_STRONG_ON, - HTML_STRONG_OFF, - HTML_STYLE_ON, // HTML 3.0 - HTML_STYLE_OFF, // HTML 3.0 - HTML_SUBSCRIPT_ON, // HTML 3.0 - HTML_SUBSCRIPT_OFF, // HTML 3.0 - HTML_SUPERSCRIPT_ON, // HTML 3.0 - HTML_SUPERSCRIPT_OFF, // HTML 3.0 - HTML_TABLE_ON, // HTML 3.0 - HTML_TABLE_OFF, // HTML 3.0 - HTML_TABLEDATA_ON, // HTML 3.0 - HTML_TABLEDATA_OFF, // HTML 3.0 - HTML_TABLEHEADER_ON, // HTML 3.0 - HTML_TABLEHEADER_OFF, // HTML 3.0 - HTML_TABLEROW_ON, // HTML 3.0 - HTML_TABLEROW_OFF, // HTML 3.0 - HTML_TBODY_ON, // HTML3 Table Model Draft - HTML_TBODY_OFF, // HTML3 Table Model Draft - HTML_TELETYPE_ON, - HTML_TELETYPE_OFF, - HTML_TEXTAREA_ON, - HTML_TEXTAREA_OFF, - HTML_TEXTFLOW_ON, // HTML 3.2 - HTML_TEXTFLOW_OFF, // HTML 3.2 - HTML_TEXT_ON, // HTML 3.0 - HTML_TEXT_OFF, // HTML 3.0 - HTML_TFOOT_ON, // HTML3 Table Model Draft - HTML_TFOOT_OFF, // HTML3 Table Model Draft - HTML_THEAD_ON, // HTML3 Table Model Draft - HTML_THEAD_OFF, // HTML3 Table Model Draft - HTML_TILDE_ON, // HTML 3.0 - HTML_TILDE_OFF, // HTML 3.0 - HTML_TITLE_ON, - HTML_TITLE_OFF, - HTML_UNDERLINE_ON, - HTML_UNDERLINE_OFF, - HTML_UNORDERLIST_ON, - HTML_UNORDERLIST_OFF, - HTML_VARIABLE_ON, - HTML_VARIABLE_OFF, - HTML_VECTOR_ON, // HTML 3.0 - HTML_VECTOR_OFF, // HTML 3.0 - - // obsolete features - HTML_XMP_ON, - HTML_XMP_OFF, - HTML_LISTING_ON, - HTML_LISTING_OFF, - - // proposed features - HTML_DEFINSTANCE_ON, - HTML_DEFINSTANCE_OFF, - HTML_STRIKE_ON, - HTML_STRIKE_OFF, - - HTML_UNKNOWNCONTROL_ON, - HTML_UNKNOWNCONTROL_OFF, - - HTML_BGSOUND = HTML_TOKEN_MICROSOFT|HTML_TOKEN_START, - - HTML_COMMENT2_ON = HTML_TOKEN_MICROSOFT|HTML_TOKEN_ONOFF, // HTML 2.0 ? - HTML_COMMENT2_OFF, // HTML 2.0 ? - HTML_MARQUEE_ON, - HTML_MARQUEE_OFF, - HTML_PLAINTEXT2_ON, // HTML 2.0 ? - HTML_PLAINTEXT2_OFF, // HTML 2.0 ? - - HTML_SDFIELD_ON, - HTML_SDFIELD_OFF -}; - -// HTML Attribut-Token (=Optionen) - -// beginnen immer ab 256, groesser als ein char -const int HTML_OPTION_START = 0x100; - -enum HTML_OPTION_IDS -{ -HTML_OPTION_BOOL_START = HTML_OPTION_START, - -// Attribute ohne Wert - HTML_O_BOX = HTML_OPTION_BOOL_START, - HTML_O_CHECKED, - HTML_O_COMPACT, - HTML_O_CONTINUE, - HTML_O_CONTROLS, // IExplorer 2.0 - HTML_O_DECLARE, // IExplorer 3.0b5 - HTML_O_DISABLED, - HTML_O_FOLDED, // Netscape internal - HTML_O_ISMAP, - HTML_O_MAYSCRIPT, // Netcape 3.0 - HTML_O_MULTIPLE, - HTML_O_NOFLOW, - HTML_O_NOHREF, // Netscape - HTML_O_NORESIZE, // Netscape 2.0 - HTML_O_NOSHADE, // Netscape - HTML_O_NOWRAP, - HTML_O_PLAIN, - HTML_O_SDFIXED, - HTML_O_SELECTED, - HTML_O_SHAPES, // IExplorer 3.0b5 -HTML_OPTION_BOOL_END, - -// Attribute mit einem String als Wert -HTML_OPTION_STRING_START = HTML_OPTION_BOOL_END, - HTML_O_ABOVE = HTML_OPTION_STRING_START, - HTML_O_ACCEPT, - HTML_O_ACCESSKEY, - HTML_O_ADD_DATE, // Netscape internal - HTML_O_ALT, - HTML_O_AXES, - HTML_O_AXIS, - HTML_O_BELOW, - HTML_O_CHAR, // HTML3 Table Model Draft - HTML_O_CLASS, - HTML_O_CLIP, - HTML_O_CODE, // HotJava - HTML_O_CODETYPE, - HTML_O_COLSPEC, - HTML_O_CONTENT, - HTML_O_COORDS, // Netscape 2.0 - HTML_O_DP, - HTML_O_ENCTYPE, - HTML_O_ERROR, - HTML_O_FACE, // IExplorer 2.0 - HTML_O_FRAMEBORDER, // IExplorer 3.0 - HTML_O_HTTPEQUIV, - HTML_O_LANGUAGE, // JavaScript - HTML_O_LAST_MODIFIED, // Netscape internal - HTML_O_LAST_VISIT, // Netscape internal - HTML_O_MD, - HTML_O_N, - HTML_O_NAME, - HTML_O_NOTATION, - HTML_O_PROMPT, - HTML_O_SHAPE, - HTML_O_STANDBY, - HTML_O_STYLE, // Style Sheets - HTML_O_TITLE, - HTML_O_VALUE, - HTML_O_SDVAL, // StarDiv NumberValue - HTML_O_SDNUM, // StarDiv NumberFormat - HTML_O_SDLIBRARY, - HTML_O_SDMODULE, -HTML_OPTION_STRING_END, - -// Attribute mit einem SGML-Identifier als Wert -HTML_OPTION_SGMLID_START = HTML_OPTION_STRING_END, - HTML_O_FROM = HTML_OPTION_SGMLID_START, - HTML_O_ID, - HTML_O_TARGET, // Netscape 2.0 - HTML_O_TO, - HTML_O_UNTIL, -HTML_OPTION_SGMLID_END, - -// Attribute mit einem URI als Wert -HTML_OPTION_URI_START = HTML_OPTION_SGMLID_END, - HTML_O_ACTION = HTML_OPTION_URI_START, - HTML_O_ARCHIVE, - HTML_O_BACKGROUND, - HTML_O_CLASSID, - HTML_O_CODEBASE, // HotJava - HTML_O_DATA, - HTML_O_DYNSRC, // IExplorer 3.0 - HTML_O_DYNSYNC, // IExplorer 2.0 - HTML_O_IMAGEMAP, - HTML_O_HREF, - HTML_O_LOWSRC, // Netscape 3.0 - HTML_O_SCRIPT, - HTML_O_SRC, - HTML_O_USEMAP, // Netscape 2.0 -HTML_OPTION_URI_END, - -// Attribute mit Entity-Namen als Wert -HTML_OPTION_ENTITY_START = HTML_OPTION_URI_END, - HTML_O_DINGBAT = HTML_OPTION_ENTITY_START, - HTML_O_SYM, -HTML_OPTION_ENTITY_END, - -// Attribute mit einer Farbe als Wert (alle Netscape) -HTML_OPTION_COLOR_START = HTML_OPTION_ENTITY_END, - HTML_O_ALINK = HTML_OPTION_COLOR_START, - HTML_O_BGCOLOR, - HTML_O_BORDERCOLOR, // IExplorer 2.0 - HTML_O_BORDERCOLORLIGHT, // IExplorer 2.0 - HTML_O_BORDERCOLORDARK, // IExplorer 2.0 - HTML_O_COLOR, - HTML_O_LINK, - HTML_O_TEXT, - HTML_O_VLINK, -HTML_OPTION_COLOR_END, - -// Attribute mit einem numerischen Wert -HTML_OPTION_NUMBER_START = HTML_OPTION_COLOR_END, - HTML_O_BORDER = HTML_OPTION_NUMBER_START, - HTML_O_CELLSPACING, // HTML3 Table Model Draft - HTML_O_CELLPADDING, // HTML3 Table Model Draft - HTML_O_CHAROFF, // HTML3 Table Model Draft - HTML_O_COLSPAN, - HTML_O_FRAMESPACING, // IExplorer 3.0 - HTML_O_GUTTER, // Netscape 3.0b5 - HTML_O_INDENT, - HTML_O_HEIGHT, - HTML_O_HSPACE, // Netscape - HTML_O_LEFT, - HTML_O_LEFTMARGIN, // IExplorer 2.0 - HTML_O_LOOP, // IExplorer 2.0 - HTML_O_MARGINWIDTH, // Netscape 2.0 - HTML_O_MARGINHEIGHT, // Netscape 2.0 - HTML_O_MAX, - HTML_O_MAXLENGTH, - HTML_O_MIN, - HTML_O_PAGEX, - HTML_O_PAGEY, - HTML_O_POINTSIZE, - HTML_O_ROWSPAN, - HTML_O_SCROLLAMOUNT, // IExplorer 2.0 - HTML_O_SCROLLDELAY, // IExplorer 2.0 - HTML_O_SEQNUM, - HTML_O_SKIP, - HTML_O_SPAN, // HTML3 Table Model Draft - HTML_O_TABINDEX, - HTML_O_TOP, - HTML_O_TOPMARGIN, // IExplorer 2.0 - HTML_O_VSPACE, // Netscape - HTML_O_WEIGHT, - HTML_O_WIDTH, - HTML_O_X, - HTML_O_Y, - HTML_O_ZINDEX, -HTML_OPTION_NUMBER_END, - -// Attribute mit Enum-Werten -HTML_OPTION_ENUM_START = HTML_OPTION_NUMBER_END, - HTML_O_BEHAVIOR = HTML_OPTION_ENUM_START, // IExplorer 2.0 - HTML_O_BGPROPERTIES, // IExplorer 2.0 - HTML_O_CLEAR, - HTML_O_DIR, - HTML_O_DIRECTION, // IExplorer 2.0 - HTML_O_FORMAT, - HTML_O_FRAME, // HTML3 Table Model Draft - HTML_O_LANG, - HTML_O_METHOD, - HTML_O_PALETTE, - HTML_O_REL, - HTML_O_REV, - HTML_O_RULES, // HTML3 Table Model Draft - HTML_O_SCROLLING, // Netscape 2.0 - HTML_O_SDREADONLY, - HTML_O_SUBTYPE, - HTML_O_TYPE, - HTML_O_VALIGN, - HTML_O_VALUETYPE, - HTML_O_VISIBILITY, - HTML_O_WRAP, -HTML_OPTION_ENUM_END, - -// Attribute mit Script-Code als Wert -HTML_OPTION_SCRIPT_START = HTML_OPTION_ENUM_END, - HTML_O_ONABORT = HTML_OPTION_SCRIPT_START, // JavaScaript - HTML_O_ONBLUR, // JavaScript - HTML_O_ONCHANGE, // JavaScript - HTML_O_ONCLICK, // JavaScript - HTML_O_ONERROR, // JavaScript - HTML_O_ONFOCUS, // JavaScript - HTML_O_ONLOAD, // JavaScript - HTML_O_ONMOUSEOUT, // JavaScript - HTML_O_ONMOUSEOVER, // JavaScript - HTML_O_ONRESET, // JavaScript - HTML_O_ONSELECT, // JavaScript - HTML_O_ONSUBMIT, // JavaScript - HTML_O_ONUNLOAD, // JavaScript - - HTML_O_SDONABORT, // StarBasic - HTML_O_SDONBLUR, // StarBasic - HTML_O_SDONCHANGE, // StarBasic - HTML_O_SDONCLICK, // StarBasic - HTML_O_SDONERROR, // StarBasic - HTML_O_SDONFOCUS, // StarBasic - HTML_O_SDONLOAD, // StarBasic - HTML_O_SDONMOUSEOUT, // StarBasic - HTML_O_SDONMOUSEOVER, // StarBasic - HTML_O_SDONRESET, // StarBasic - HTML_O_SDONSELECT, // StarBasic - HTML_O_SDONSUBMIT, // StarBasic - HTML_O_SDONUNLOAD, // StarBasic -HTML_OPTION_SCRIPT_END, - -// Attribute mit Kontext-abhaengigen Werten -HTML_OPTION_CONTEXT_START = HTML_OPTION_SCRIPT_END, - HTML_O_ALIGN = HTML_OPTION_CONTEXT_START, - HTML_O_COLS, // Netscape 2.0 vs HTML 2.0 - HTML_O_ROWS, // Netscape 2.0 vs HTML 2.0 - HTML_O_SIZE, - HTML_O_START, - HTML_O_UNITS, -HTML_OPTION_CONTEXT_END, - -// eine unbekannte Option -HTML_O_UNKNOWN = HTML_OPTION_CONTEXT_END, -HTML_OPTION_END -}; - -#endif // _HTMLTOKN_H diff --git a/svtools/inc/imagemgr.hrc b/svtools/inc/imagemgr.hrc deleted file mode 100644 index a30660bba3b2..000000000000 --- a/svtools/inc/imagemgr.hrc +++ /dev/null @@ -1,193 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: imagemgr.hrc,v $ - * $Revision: 1.15 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVTOOLS_IMAGEMGR_HRC -#define _SVTOOLS_IMAGEMGR_HRC - -// includes ****************************************************************** - -#define IMAGELIST_START 3076 // must match to old Id's in SFX! - -#define IMG_IMPRESS (IMAGELIST_START + 47) -#define IMG_WORKPLACE (IMAGELIST_START + 48) -#define IMG_BITMAP (IMAGELIST_START + 49) -#define IMG_CALC (IMAGELIST_START + 50) -#define IMG_CALCTEMPLATE (IMAGELIST_START + 51) -#define IMG_CHART (IMAGELIST_START + 52) -#define IMG_DATABASE (IMAGELIST_START + 53) -#define IMG_IMPRESSTEMPLATE (IMAGELIST_START + 54) -#define IMG_EXCEL (IMAGELIST_START + 55) -#define IMG_EXCELTEMPLATE (IMAGELIST_START + 56) -#define IMG_FTPSERVER (IMAGELIST_START + 58) -#define IMG_GALLERY (IMAGELIST_START + 59) -#define IMG_GALLERYTHEME (IMAGELIST_START + 60) -#define IMG_GIF (IMAGELIST_START + 61) -#define IMG_HELP (IMAGELIST_START + 62) -#define IMG_HTML (IMAGELIST_START + 63) -#define IMG_JPG (IMAGELIST_START + 64) -#define IMG_LINK (IMAGELIST_START + 65) -#define IMG_LOTUS (IMAGELIST_START + 66) -#define IMG_MATH (IMAGELIST_START + 68) -#define IMG_MATHTEMPLATE (IMAGELIST_START + 69) -#define IMG_FILE (IMAGELIST_START + 74) -#define IMG_APP (IMAGELIST_START + 75) -#define IMG_PCD (IMAGELIST_START + 76) -#define IMG_PCT (IMAGELIST_START + 77) -#define IMG_PCX (IMAGELIST_START + 78) -#define IMG_SIM (IMAGELIST_START + 79) -#define IMG_TEXTFILE (IMAGELIST_START + 80) -#define IMG_SVHELP (IMAGELIST_START + 81) -#define IMG_TIFF (IMAGELIST_START + 82) -#define IMG_URL (IMAGELIST_START + 83) -#define IMG_WMF (IMAGELIST_START + 84) -#define IMG_WORD (IMAGELIST_START + 85) -#define IMG_WRITER (IMAGELIST_START + 86) -#define IMG_WRITERTEMPLATE (IMAGELIST_START + 87) -#define IMG_FIXEDDEV (IMAGELIST_START + 88) -#define IMG_REMOVEABLEDEV (IMAGELIST_START + 89) -#define IMG_CDROMDEV (IMAGELIST_START + 90) -#define IMG_NETWORKDEV (IMAGELIST_START + 91) -#define IMG_RAMDEV (IMAGELIST_START + 92) -#define IMG_TABLEFOLDER (IMAGELIST_START + 111) -#define IMG_TABLE (IMAGELIST_START + 112) -#define IMG_FOLDER (IMAGELIST_START + 113) -#define IMG_EXPANDEDFOLDER (IMAGELIST_START + 114) -#define IMG_XXX (IMAGELIST_START + 117) -#define IMG_GALLERYIMPORT (IMAGELIST_START + 122) -#define IMG_QUERYFOLDER (IMAGELIST_START + 125) -#define IMG_QUERY (IMAGELIST_START + 126) -#define IMG_FORM (IMAGELIST_START + 127) -#define IMG_FORMFOLDER (IMAGELIST_START + 128) -#define IMG_REPORT (IMAGELIST_START + 129) -#define IMG_REPORTFOLDER (IMAGELIST_START + 130) -#define IMG_OTHERS (IMAGELIST_START + 138) -#define IMG_MACROLIB (IMAGELIST_START + 140) -#define IMG_DXF (IMAGELIST_START + 141) -#define IMG_MET (IMAGELIST_START + 142) -#define IMG_PNG (IMAGELIST_START + 143) -#define IMG_SGF (IMAGELIST_START + 144) -#define IMG_SGV (IMAGELIST_START + 145) -#define IMG_SVM (IMAGELIST_START + 146) -#define IMG_GLOBAL_DOC (IMAGELIST_START + 150) -#define IMG_DRAW (IMAGELIST_START + 151) -#define IMG_DRAWTEMPLATE (IMAGELIST_START + 152) -#define IMG_TASK (IMAGELIST_START + 160) -#define IMG_APPOINTMENT (IMAGELIST_START + 161) -#define IMG_RELATION (IMAGELIST_START + 163) -#define IMG_IMPRESSPACKED (IMAGELIST_START + 165) -#define IMG_NEWFROMTEMPLATE (IMAGELIST_START + 166) -#define IMG_POWERPOINT (IMAGELIST_START + 167) -#define IMG_POWERPOINTTEMPLATE (IMAGELIST_START + 168) -#define IMG_OO_DATABASE_DOC (IMAGELIST_START + 169) -#define IMG_OO_DRAW_DOC (IMAGELIST_START + 170) -#define IMG_OO_MATH_DOC (IMAGELIST_START + 171) -#define IMG_OO_GLOBAL_DOC (IMAGELIST_START + 172) -#define IMG_OO_IMPRESS_DOC (IMAGELIST_START + 173) -#define IMG_OO_CALC_DOC (IMAGELIST_START + 174) -#define IMG_OO_WRITER_DOC (IMAGELIST_START + 175) -#define IMG_OO_DRAW_TEMPLATE (IMAGELIST_START + 176) -#define IMG_OO_IMPRESS_TEMPLATE (IMAGELIST_START + 177) -#define IMG_OO_CALC_TEMPLATE (IMAGELIST_START + 178) -#define IMG_OO_WRITER_TEMPLATE (IMAGELIST_START + 179) -#define IMG_EXTENSION (IMAGELIST_START + 180) - -#define RID_DESCRIPTION_START 256 - -#define STR_DESCRIPTION_SOURCEFILE (RID_DESCRIPTION_START + 0) -#define STR_DESCRIPTION_BOOKMARKFILE (RID_DESCRIPTION_START + 1) -#define STR_DESCRIPTION_GRAPHIC_DOC (RID_DESCRIPTION_START + 2) -#define STR_DESCRIPTION_CFGFILE (RID_DESCRIPTION_START + 3) -#define STR_DESCRIPTION_APPLICATION (RID_DESCRIPTION_START + 4) -#define STR_DESCRIPTION_DATABASE_TABLE (RID_DESCRIPTION_START + 5) -#define STR_DESCRIPTION_SYSFILE (RID_DESCRIPTION_START + 6) -#define STR_DESCRIPTION_WORD_DOC (RID_DESCRIPTION_START + 7) -#define STR_DESCRIPTION_HELP_DOC (RID_DESCRIPTION_START + 8) -#define STR_DESCRIPTION_HTMLFILE (RID_DESCRIPTION_START + 9) -#define STR_DESCRIPTION_ARCHIVFILE (RID_DESCRIPTION_START + 10) -#define STR_DESCRIPTION_LOGFILE (RID_DESCRIPTION_START + 11) -#define STR_DESCRIPTION_SMATH_DOC (RID_DESCRIPTION_START + 12) -#define STR_DESCRIPTION_SCHART_DOC (RID_DESCRIPTION_START + 13) -#define STR_DESCRIPTION_SDRAW_DOC (RID_DESCRIPTION_START + 14) -#define STR_DESCRIPTION_SCALC_DOC (RID_DESCRIPTION_START + 15) -#define STR_DESCRIPTION_SIMPRESS_DOC (RID_DESCRIPTION_START + 16) -#define STR_DESCRIPTION_SWRITER_DOC (RID_DESCRIPTION_START + 17) -#define STR_DESCRIPTION_GLOBALDOC (RID_DESCRIPTION_START + 18) -#define STR_DESCRIPTION_SIMAGE_DOC (RID_DESCRIPTION_START + 19) -#define STR_DESCRIPTION_TEXTFILE (RID_DESCRIPTION_START + 20) -#define STR_DESCRIPTION_LINK (RID_DESCRIPTION_START + 21) -#define STR_DESCRIPTION_SOFFICE_TEMPLATE_DOC (RID_DESCRIPTION_START + 22) -#define STR_DESCRIPTION_EXCEL_DOC (RID_DESCRIPTION_START + 23) -#define STR_DESCRIPTION_EXCEL_TEMPLATE_DOC (RID_DESCRIPTION_START + 24) -#define STR_DESCRIPTION_BATCHFILE (RID_DESCRIPTION_START + 25) -#define STR_DESCRIPTION_FILE (RID_DESCRIPTION_START + 26) -#define STR_DESCRIPTION_FOLDER (RID_DESCRIPTION_START + 27) -#define STR_DESCRIPTION_FACTORY_WRITER (RID_DESCRIPTION_START + 28) -#define STR_DESCRIPTION_FACTORY_CALC (RID_DESCRIPTION_START + 29) -#define STR_DESCRIPTION_FACTORY_IMPRESS (RID_DESCRIPTION_START + 30) -#define STR_DESCRIPTION_FACTORY_DRAW (RID_DESCRIPTION_START + 31) -#define STR_DESCRIPTION_FACTORY_WRITERWEB (RID_DESCRIPTION_START + 32) -#define STR_DESCRIPTION_FACTORY_GLOBALDOC (RID_DESCRIPTION_START + 33) -#define STR_DESCRIPTION_FACTORY_MATH (RID_DESCRIPTION_START + 34) -#define STR_DESCRIPTION_CALC_TEMPLATE (RID_DESCRIPTION_START + 35) -#define STR_DESCRIPTION_DRAW_TEMPLATE (RID_DESCRIPTION_START + 36) -#define STR_DESCRIPTION_IMPRESS_TEMPLATE (RID_DESCRIPTION_START + 37) -#define STR_DESCRIPTION_WRITER_TEMPLATE (RID_DESCRIPTION_START + 38) -#define STR_DESCRIPTION_LOCALE_VOLUME (RID_DESCRIPTION_START + 39) -#define STR_DESCRIPTION_FLOPPY_VOLUME (RID_DESCRIPTION_START + 40) -#define STR_DESCRIPTION_CDROM_VOLUME (RID_DESCRIPTION_START + 41) -#define STR_DESCRIPTION_REMOTE_VOLUME (RID_DESCRIPTION_START + 42) -#define STR_DESCRIPTION_POWERPOINT (RID_DESCRIPTION_START + 43) -#define STR_DESCRIPTION_POWERPOINT_TEMPLATE (RID_DESCRIPTION_START + 44) -#define STR_DESCRIPTION_POWERPOINT_SHOW (RID_DESCRIPTION_START + 45) -#define STR_DESCRIPTION_SXMATH_DOC (RID_DESCRIPTION_START + 46) -#define STR_DESCRIPTION_SXCHART_DOC (RID_DESCRIPTION_START + 47) -#define STR_DESCRIPTION_SXDRAW_DOC (RID_DESCRIPTION_START + 48) -#define STR_DESCRIPTION_SXCALC_DOC (RID_DESCRIPTION_START + 49) -#define STR_DESCRIPTION_SXIMPRESS_DOC (RID_DESCRIPTION_START + 50) -#define STR_DESCRIPTION_SXWRITER_DOC (RID_DESCRIPTION_START + 51) -#define STR_DESCRIPTION_SXGLOBAL_DOC (RID_DESCRIPTION_START + 52) -#define STR_DESCRIPTION_MATHML_DOC (RID_DESCRIPTION_START + 53) -#define STR_DESCRIPTION_SDATABASE_DOC (RID_DESCRIPTION_START + 54) -#define STR_DESCRIPTION_OO_DATABASE_DOC (RID_DESCRIPTION_START + 55) -#define STR_DESCRIPTION_OO_DRAW_DOC (RID_DESCRIPTION_START + 56) -#define STR_DESCRIPTION_OO_MATH_DOC (RID_DESCRIPTION_START + 57) -#define STR_DESCRIPTION_OO_GLOBAL_DOC (RID_DESCRIPTION_START + 58) -#define STR_DESCRIPTION_OO_IMPRESS_DOC (RID_DESCRIPTION_START + 59) -#define STR_DESCRIPTION_OO_CALC_DOC (RID_DESCRIPTION_START + 60) -#define STR_DESCRIPTION_OO_WRITER_DOC (RID_DESCRIPTION_START + 61) -#define STR_DESCRIPTION_OO_DRAW_TEMPLATE (RID_DESCRIPTION_START + 62) -#define STR_DESCRIPTION_OO_IMPRESS_TEMPLATE (RID_DESCRIPTION_START + 63) -#define STR_DESCRIPTION_OO_CALC_TEMPLATE (RID_DESCRIPTION_START + 64) -#define STR_DESCRIPTION_OO_WRITER_TEMPLATE (RID_DESCRIPTION_START + 65) -#define STR_DESCRIPTION_FACTORY_DATABASE (RID_DESCRIPTION_START + 66) -#define STR_DESCRIPTION_EXTENSION (RID_DESCRIPTION_START + 67) - -#endif - diff --git a/svtools/inc/imagemgr.hxx b/svtools/inc/imagemgr.hxx deleted file mode 100644 index 67159de7450d..000000000000 --- a/svtools/inc/imagemgr.hxx +++ /dev/null @@ -1,98 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: imagemgr.hxx,v $ - * $Revision: 1.8 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVTOOLS_IMAGEMGR_HXX -#define _SVTOOLS_IMAGEMGR_HXX - -// includes ****************************************************************** - -#include "svtools/svtdllapi.h" -#include "sal/types.h" - -class Image; -class String; -class INetURLObject; - -namespace svtools { - -struct VolumeInfo -{ - sal_Bool m_bIsVolume; - sal_Bool m_bIsRemote; - sal_Bool m_bIsRemoveable; - sal_Bool m_bIsFloppy; - sal_Bool m_bIsCompactDisc; - - VolumeInfo() : - m_bIsVolume ( sal_False ), - m_bIsRemote ( sal_False ), - m_bIsRemoveable ( sal_False ), - m_bIsFloppy ( sal_False ), - m_bIsCompactDisc( sal_False ) {} - - VolumeInfo( sal_Bool _bIsVolume, - sal_Bool _bIsRemote, - sal_Bool _bIsRemoveable, - sal_Bool _bIsFloppy, - sal_Bool _bIsCompactDisc ) : - m_bIsVolume ( _bIsVolume ), - m_bIsRemote ( _bIsRemote ), - m_bIsRemoveable ( _bIsRemoveable ), - m_bIsFloppy ( _bIsFloppy ), - m_bIsCompactDisc( _bIsCompactDisc ) {} -}; - -} - -class SvFileInformationManager -{ -private: - SVT_DLLPRIVATE static String GetDescription_Impl( const INetURLObject& rObject, sal_Bool bDetectFolder ); - -public: - // depricated, because no high contrast mode - SVT_DLLPUBLIC static Image GetImage( const INetURLObject& rURL, sal_Bool bBig = sal_False ); - static Image GetFileImage( const INetURLObject& rURL, sal_Bool bBig = sal_False ); - static Image GetImageNoDefault( const INetURLObject& rURL, sal_Bool bBig = sal_False ); - SVT_DLLPUBLIC static Image GetFolderImage( const svtools::VolumeInfo& rInfo, sal_Bool bBig = sal_False ); - - // now with high contrast mode - SVT_DLLPUBLIC static Image GetImage( const INetURLObject& rURL, sal_Bool bBig, sal_Bool bHighContrast ); - SVT_DLLPUBLIC static Image GetFileImage( const INetURLObject& rURL, sal_Bool bBig, sal_Bool bHighContrast ); - SVT_DLLPUBLIC static Image GetImageNoDefault( const INetURLObject& rURL, sal_Bool bBig, sal_Bool bHighContrast ); - SVT_DLLPUBLIC static Image GetFolderImage( const svtools::VolumeInfo& rInfo, sal_Bool bBig, sal_Bool bHighContrast ); - - SVT_DLLPUBLIC static String GetDescription( const INetURLObject& rObject ); - SVT_DLLPUBLIC static String GetFileDescription( const INetURLObject& rObject ); - SVT_DLLPUBLIC static String GetFolderDescription( const svtools::VolumeInfo& rInfo ); -}; - -#endif - diff --git a/svtools/inc/imageresourceaccess.hxx b/svtools/inc/imageresourceaccess.hxx deleted file mode 100644 index 5b6767c5f7c9..000000000000 --- a/svtools/inc/imageresourceaccess.hxx +++ /dev/null @@ -1,93 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: imageresourceaccess.hxx,v $ - * $Revision: 1.5 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef SVTOOLS_INC_IMAGERESOURCEACCESS_HXX -#define SVTOOLS_INC_IMAGERESOURCEACCESS_HXX - -#include "svtools/svtdllapi.h" - -/** === begin UNO includes === **/ -#include -#include -/** === end UNO includes === **/ - -class SvStream; -//........................................................................ -namespace svt -{ -//........................................................................ - - //==================================================================== - //= GraphicAccess - //==================================================================== - /** helper class for obtaining streams (which also can be used with the ImageProducer) - from a resource - */ - class GraphicAccess - { - private: - GraphicAccess(); // never implemented - - public: - /** determines whether the given URL denotes an image within a resource - ( or an image specified by a vnd.sun.star.GraphicObject scheme URL ) - */ - SVT_DLLPUBLIC static bool isSupportedURL( const ::rtl::OUString& _rURL ); - - /** for a given URL of an image within a resource ( or an image specified by a vnd.sun.star.GraphicObject scheme URL ), this method retrieves - an SvStream for this image. - - This method works for arbitrary URLs denoting an image, since the - GraphicsProvider service is used - to resolve the URL. However, obtaining the stream is expensive (since - the image must be copied), so you are strongly encouraged to only use it - when you know that the image is small enough. - */ - SVT_DLLPUBLIC static SvStream* getImageStream( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB, - const ::rtl::OUString& _rImageResourceURL - ); - - /** for a given URL of an image within a resource ( or an image specified by a vnd.sun.star.GraphicObject scheme URL ), this method retrieves - an XInputStream for this image. - */ - SVT_DLLPUBLIC static ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > - getImageXStream( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB, - const ::rtl::OUString& _rImageResourceURL - ); - }; - -//........................................................................ -} // namespace svt -//........................................................................ - -#endif // DBA14_SVTOOLS_INC_IMAGERESOURCEACCESS_HXX - diff --git a/svtools/inc/imgdef.hxx b/svtools/inc/imgdef.hxx deleted file mode 100644 index 2881fe5150bc..000000000000 --- a/svtools/inc/imgdef.hxx +++ /dev/null @@ -1,46 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: imgdef.hxx,v $ - * $Revision: 1.8 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVTOOLS_IMGDEF_HXX -#define _SVTOOLS_IMGDEF_HXX - -enum SfxSymbolsSize -{ - SFX_SYMBOLS_SIZE_SMALL, - SFX_SYMBOLS_SIZE_LARGE, - SFX_SYMBOLS_SIZE_AUTO -}; - -#define SFX_TOOLBOX_CHANGESYMBOLSET 0x0001 -#define SFX_TOOLBOX_CHANGEOUTSTYLE 0x0002 -#define SFX_TOOLBOX_CHANGEBUTTONTYPE 0x0004 - -#endif // _SVTOOLS_IMGDEF_HXX - diff --git a/svtools/inc/indexentryres.hxx b/svtools/inc/indexentryres.hxx deleted file mode 100644 index f2c73000ed67..000000000000 --- a/svtools/inc/indexentryres.hxx +++ /dev/null @@ -1,23 +0,0 @@ - -#ifndef SVTOOLS_INDEXENTRYRESSOURCE_HXX -#define SVTOOLS_INDEXENTRYRESSOURCE_HXX - -#include "svtools/svtdllapi.h" -#include - -class IndexEntryRessourceData; - -class SVT_DLLPUBLIC IndexEntryRessource -{ - private: - IndexEntryRessourceData *mp_Data; - - public: - IndexEntryRessource (); - ~IndexEntryRessource (); - const String& GetTranslation (const String& r_Algorithm); -}; - -#endif /* SVTOOLS_INDEXENTRYRESSOURCE_HXX */ - - diff --git a/svtools/inc/inetimg.hxx b/svtools/inc/inetimg.hxx deleted file mode 100644 index 8068f4deda3f..000000000000 --- a/svtools/inc/inetimg.hxx +++ /dev/null @@ -1,89 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: inetimg.hxx,v $ - * $Revision: 1.7 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _INETIMG_HXX -#define _INETIMG_HXX - -#include -#include - -class SvData; -class SotDataObject; -class SotDataMemberObject; - -//========================================================================= - -class INetImage -{ - String aImageURL; - String aTargetURL; - String aTargetFrame; - String aAlternateText; - Size aSizePixel; - -protected: - String CopyExchange() const; - void PasteExchange( const String& rString ); - - void SetImageURL( const String& rS ) { aImageURL = rS; } - void SetTargetURL( const String& rS ) { aTargetURL = rS; } - void SetTargetFrame( const String& rS ) { aTargetFrame = rS; } - void SetAlternateText( const String& rS ){ aAlternateText = rS; } - void SetSizePixel( const Size& rSize ) { aSizePixel = rSize; } - -public: - INetImage( - const String& rImageURL, - const String& rTargetURL, - const String& rTargetFrame, - const String& rAlternateText, - const Size& rSizePixel ) - : aImageURL( rImageURL ), - aTargetURL( rTargetURL ), - aTargetFrame( rTargetFrame ), - aAlternateText( rAlternateText ), - aSizePixel( rSizePixel ) - {} - INetImage() - {} - - const String& GetImageURL() const { return aImageURL; } - const String& GetTargetURL() const { return aTargetURL; } - const String& GetTargetFrame() const { return aTargetFrame; } - const String& GetAlternateText() const { return aAlternateText; } - const Size& GetSizePixel() const { return aSizePixel; } - - // Im-/Export - sal_Bool Write( SvStream& rOStm, ULONG nFormat ) const; - sal_Bool Read( SvStream& rIStm, ULONG nFormat ); -}; - -#endif // #ifndef _INETIMG_HXX - - diff --git a/svtools/inc/itemdel.hxx b/svtools/inc/itemdel.hxx deleted file mode 100644 index 1af9b6e55421..000000000000 --- a/svtools/inc/itemdel.hxx +++ /dev/null @@ -1,42 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: itemdel.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVTOOLS_ITEMDEL_HXX -#define _SVTOOLS_ITEMDEL_HXX - -#include "svtools/svtdllapi.h" - -class SfxPoolItem; - -SVT_DLLPUBLIC SfxPoolItem* DeleteItemOnIdle( SfxPoolItem* pItem ); - -void DeleteOnIdleItems(); - -#endif - diff --git a/svtools/inc/ivctrl.hxx b/svtools/inc/ivctrl.hxx deleted file mode 100644 index 08fe6d57b652..000000000000 --- a/svtools/inc/ivctrl.hxx +++ /dev/null @@ -1,393 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: ivctrl.hxx,v $ - * $Revision: 1.20 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _ICNVW_HXX -#define _ICNVW_HXX - -#include "svtools/svtdllapi.h" -#include -#include -#include -#include -#include - -class SvPtrarr; -class ResId; -class Point; -class SvxIconChoiceCtrl_Impl; -class Image; - -#define ICNVIEW_FLAG_POS_LOCKED 0x0001 -#define ICNVIEW_FLAG_SELECTED 0x0002 -#define ICNVIEW_FLAG_FOCUSED 0x0004 -#define ICNVIEW_FLAG_IN_USE 0x0008 -#define ICNVIEW_FLAG_CURSORED 0x0010 // Rahmen um Image -#define ICNVIEW_FLAG_POS_MOVED 0x0020 // per D&D verschoben aber nicht gelockt -#define ICNVIEW_FLAG_DROP_TARGET 0x0040 // im QueryDrop gesetzt -#define ICNVIEW_FLAG_BLOCK_EMPHASIS 0x0080 // Emphasis nicht painten -#define ICNVIEW_FLAG_USER1 0x0100 -#define ICNVIEW_FLAG_USER2 0x0200 -#define ICNVIEW_FLAG_PRED_SET 0x0400 // Predecessor wurde umgesetzt - -enum SvxIconChoiceCtrlTextMode -{ - IcnShowTextFull = 1, // BoundRect nach unten aufplustern - IcnShowTextShort, // Abkuerzung mit "..." - IcnShowTextSmart, // Text komplett anzeigen, wenn moeglich (n.i.) - IcnShowTextDontKnow // Einstellung der View -}; - -enum SvxIconChoiceCtrlPositionMode -{ - IcnViewPositionModeFree = 0, // freies pixelgenaues Positionieren - IcnViewPositionModeAutoArrange = 1, // automatisches Ausrichten - IcnViewPositionModeAutoAdjust = 2, // automatisches Anordnen - IcnViewPositionModeLast = IcnViewPositionModeAutoAdjust -}; - -class SvxIconChoiceCtrlEntry -{ - Image aImage; - Image aImageHC; - - String aText; - String aQuickHelpText; - void* pUserData; - - friend class SvxIconChoiceCtrl_Impl; - friend class IcnCursor_Impl; - friend class EntryList_Impl; - friend class IcnGridMap_Impl; - - Rectangle aRect; // Bounding-Rect des Entries - Rectangle aGridRect; // nur gesetzt im Grid-Modus - ULONG nPos; - - // die Eintragsposition in der Eintragsliste entspricht der beim Insert vorgegebenen - // [Sortier-]Reihenfolge (->Reihenfolge der Anker in der Ankerliste!). Im AutoArrange-Modus - // kann die sichtbare Reihenfolge aber anders sein. Die Eintraege werden deshalb dann - // verkettet - SvxIconChoiceCtrlEntry* pblink; // backward (linker Nachbar) - SvxIconChoiceCtrlEntry* pflink; // forward (rechter Nachbar) - - SvxIconChoiceCtrlTextMode eTextMode; - USHORT nX,nY; // fuer Tastatursteuerung - USHORT nFlags; - - void ClearFlags( USHORT nMask ) { nFlags &= (~nMask); } - void SetFlags( USHORT nMask ) { nFlags |= nMask; } - void AssignFlags( USHORT _nFlags ) { nFlags = _nFlags; } - - // setzt den linken Nachbarn (A <-> B ==> A <-> this <-> B) - void SetBacklink( SvxIconChoiceCtrlEntry* pA ) - { - pA->pflink->pblink = this; // X <- B - this->pflink = pA->pflink; // X -> B - this->pblink = pA; // A <- X - pA->pflink = this; // A -> X - } - // loest eine Verbindung (A <-> this <-> B ==> A <-> B) - void Unlink() - { - this->pblink->pflink = this->pflink; - this->pflink->pblink = this->pblink; - this->pflink = 0; - this->pblink = 0; - } - -public: - SvxIconChoiceCtrlEntry( USHORT nFlags = 0 ); - SvxIconChoiceCtrlEntry( const String& rText, const Image& rImage, USHORT nFlags = 0 ); - SvxIconChoiceCtrlEntry( const String& rText, const Image& rImage, const Image& rImageHC, USHORT nFlags = 0 ); - ~SvxIconChoiceCtrlEntry () {} - - void SetImage ( const Image& rImage ) { aImage = rImage; } - void SetImageHC ( const Image& rImage ) { aImageHC = rImage; } - Image GetImage () const { return aImage; } - Image GetImageHC () const { return aImageHC; } - void SetText ( const String& rText ) { aText = rText; } - String GetText () const { return aText; } - String SVT_DLLPUBLIC GetDisplayText() const; - void SetQuickHelpText( const String& rText ) { aQuickHelpText = rText; } - String GetQuickHelpText() const { return aQuickHelpText; } - void SetUserData ( void* _pUserData ) { pUserData = _pUserData; } - void* GetUserData () { return pUserData; } - - const Rectangle & GetBoundRect() const { return aRect; } - - void SetFocus ( BOOL bSet ) - { nFlags = ( bSet ? nFlags | ICNVIEW_FLAG_FOCUSED : nFlags & ~ICNVIEW_FLAG_FOCUSED ); } - - SvxIconChoiceCtrlTextMode GetTextMode() const { return eTextMode; } - USHORT GetFlags() const { return nFlags; } - BOOL IsSelected() const { return (BOOL)((nFlags & ICNVIEW_FLAG_SELECTED) !=0); } - BOOL IsFocused() const { return (BOOL)((nFlags & ICNVIEW_FLAG_FOCUSED) !=0); } - BOOL IsInUse() const { return (BOOL)((nFlags & ICNVIEW_FLAG_IN_USE) !=0); } - BOOL IsCursored() const { return (BOOL)((nFlags & ICNVIEW_FLAG_CURSORED) !=0); } - BOOL IsDropTarget() const { return (BOOL)((nFlags & ICNVIEW_FLAG_DROP_TARGET) !=0); } - BOOL IsBlockingEmphasis() const { return (BOOL)((nFlags & ICNVIEW_FLAG_BLOCK_EMPHASIS) !=0); } - BOOL WasMoved() const { return (BOOL)((nFlags & ICNVIEW_FLAG_POS_MOVED) !=0); } - void SetMoved( BOOL bMoved ); - BOOL IsPosLocked() const { return (BOOL)((nFlags & ICNVIEW_FLAG_POS_LOCKED) !=0); } - void LockPos( BOOL bLock ); - // Nur bei AutoArrange gesetzt. Den Kopf der Liste gibts per SvxIconChoiceCtrl::GetPredecessorHead - SvxIconChoiceCtrlEntry* GetSuccessor() const { return pflink; } - SvxIconChoiceCtrlEntry* GetPredecessor() const { return pblink; } - -// sal_Unicode GetMnemonicChar() const; -}; - -enum SvxIconChoiceCtrlColumnAlign -{ - IcnViewAlignLeft = 1, - IcnViewAlignRight, - IcnViewAlignCenter -}; - -class SvxIconChoiceCtrlColumnInfo -{ - String aColText; - Image aColImage; - long nWidth; - SvxIconChoiceCtrlColumnAlign eAlignment; - USHORT nSubItem; - -public: - SvxIconChoiceCtrlColumnInfo( USHORT nSub, long nWd, - SvxIconChoiceCtrlColumnAlign eAlign ) : - nWidth( nWd ), eAlignment( eAlign ), nSubItem( nSub ) {} - SvxIconChoiceCtrlColumnInfo( const SvxIconChoiceCtrlColumnInfo& ); - - void SetText( const String& rText ) { aColText = rText; } - void SetImage( const Image& rImg ) { aColImage = rImg; } - void SetWidth( long nWd ) { nWidth = nWd; } - void SetAlignment( SvxIconChoiceCtrlColumnAlign eAlign ) { eAlignment = eAlign; } - void SetSubItem( USHORT nSub) { nSubItem = nSub; } - - const String& GetText() const { return aColText; } - const Image& GetImage() const { return aColImage; } - long GetWidth() const { return nWidth; } - SvxIconChoiceCtrlColumnAlign GetAlignment() const { return eAlignment; } - USHORT GetSubItem() const { return nSubItem; } -}; - -//################################################################################################################################### -/* - Window-Bits: - WB_ICON // Text unter dem Icon - WB_SMALL_ICON // Text rechts neben Icon, beliebige Positionierung - WB_DETAILS // Text rechts neben Icon, eingeschraenkte Posit. - WB_BORDER - WB_NOHIDESELECTION // Selektion inaktiv zeichnen, wenn kein Fokus - WB_NOHSCROLL - WB_NOVSCROLL - WB_NOSELECTION - WB_SMART_ARRANGE // im Arrange die Vis-Area beibehalten - WB_ALIGN_TOP // Anordnung zeilenweise von links nach rechts - WB_ALIGN_LEFT // Anordnung spaltenweise von oben nach unten - WB_NODRAGSELECTION // Keine Selektion per Tracking-Rect - WB_NOCOLUMNHEADER // keine Headerbar in Detailsview (Headerbar not implemented) - WB_NOPOINTERFOCUS // Kein GrabFocus im MouseButtonDown - WB_HIGHLIGHTFRAME // der unter der Maus befindliche Eintrag wird hervorgehoben - WB_NOASYNCSELECTHDL // Selektionshandler synchron aufrufen, d.h. Events nicht sammeln -*/ - -#define WB_ICON WB_RECTSTYLE -#define WB_SMALLICON WB_SMALLSTYLE -#define WB_DETAILS WB_VCENTER -#define WB_NOHSCROLL WB_SPIN -#define WB_NOVSCROLL WB_DRAG -#define WB_NOSELECTION WB_REPEAT -#define WB_NODRAGSELECTION WB_PATHELLIPSIS -#define WB_SMART_ARRANGE WB_PASSWORD -#define WB_ALIGN_TOP WB_TOP -#define WB_ALIGN_LEFT WB_LEFT -#define WB_NOCOLUMNHEADER WB_CENTER -#define WB_HIGHLIGHTFRAME WB_INFO -#define WB_NOASYNCSELECTHDL WB_NOLABEL - -class MnemonicGenerator; - -class SVT_DLLPUBLIC SvtIconChoiceCtrl : public Control -{ - friend class SvxIconChoiceCtrl_Impl; - - Link _aClickIconHdl; - Link _aDocRectChangedHdl; - Link _aVisRectChangedHdl; - KeyEvent* _pCurKeyEvent; - SvxIconChoiceCtrl_Impl* _pImp; - BOOL _bAutoFontColor; - -protected: - - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual BOOL EditedEntry( SvxIconChoiceCtrlEntry*, const XubString& rNewText, BOOL bCancelled ); - virtual void DocumentRectChanged(); - virtual void VisibleRectChanged(); - virtual BOOL EditingEntry( SvxIconChoiceCtrlEntry* pEntry ); - virtual void Command( const CommandEvent& rCEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void Resize(); - virtual void GetFocus(); - virtual void LoseFocus(); - virtual void ClickIcon(); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual void DrawEntryImage( - SvxIconChoiceCtrlEntry* pEntry, - const Point& rPos, - OutputDevice& rDev ); - - virtual String GetEntryText( - SvxIconChoiceCtrlEntry* pEntry, - BOOL bInplaceEdit ); - - virtual void FillLayoutData() const; - - void CallImplEventListeners(ULONG nEvent, void* pData); - -public: - - SvtIconChoiceCtrl( Window* pParent, WinBits nWinStyle = WB_ICON | WB_BORDER ); - SvtIconChoiceCtrl( Window* pParent, const ResId& rResId ); - virtual ~SvtIconChoiceCtrl(); - - void SetStyle( WinBits nWinStyle ); - WinBits GetStyle() const; - - BOOL SetChoiceWithCursor ( BOOL bDo = TRUE ); - - void SetUpdateMode( BOOL bUpdateMode ); - void SetFont( const Font& rFont ); - void SetPointFont( const Font& rFont ); - - void SetClickHdl( const Link& rLink ) { _aClickIconHdl = rLink; } - const Link& GetClickHdl() const { return _aClickIconHdl; } - - using OutputDevice::SetBackground; - void SetBackground( const Wallpaper& rWallpaper ); - - void ArrangeIcons(); - - - SvxIconChoiceCtrlEntry* InsertEntry( ULONG nPos = LIST_APPEND, - const Point* pPos = 0, - USHORT nFlags = 0 ); - SvxIconChoiceCtrlEntry* InsertEntry( const String& rText, const Image& rImage, - ULONG nPos = LIST_APPEND, - const Point* pPos = 0, - USHORT nFlags = 0 ); - SvxIconChoiceCtrlEntry* InsertEntry( const String& rText, const Image& rImage, const Image& rImageHC, - ULONG nPos = LIST_APPEND, - const Point* pPos = 0, - USHORT nFlags = 0 ); - - /** creates automatic mnemonics for all icon texts in the control - */ - void CreateAutoMnemonics( void ); - - /** creates automatic mnemonics for all icon texts in the control - - @param _rUsedMnemonics - a MnemonicGenerator at which some other mnemonics are already registered. - This can be used if the control needs to share the "mnemonic space" with other elements, - such as a menu bar. - */ - void CreateAutoMnemonics( MnemonicGenerator& _rUsedMnemonics ); - - void RemoveEntry( SvxIconChoiceCtrlEntry* pEntry ); - - BOOL DoKeyInput( const KeyEvent& rKEvt ); - - BOOL IsEntryEditing() const; - void Clear(); - - ULONG GetEntryCount() const; - SvxIconChoiceCtrlEntry* GetEntry( ULONG nPos ) const; - ULONG GetEntryListPos( SvxIconChoiceCtrlEntry* pEntry ) const; - using Window::SetCursor; - void SetCursor( SvxIconChoiceCtrlEntry* pEntry ); - SvxIconChoiceCtrlEntry* GetCursor() const; - - // Neu-Berechnung gecachter View-Daten und Invalidierung im Fenster - void InvalidateEntry( SvxIconChoiceCtrlEntry* pEntry ); - - // bHit==FALSE: Eintrag gilt als getroffen, wenn Position im BoundRect liegt - // ==TRUE : Bitmap oder Text muss getroffen sein - SvxIconChoiceCtrlEntry* GetEntry( const Point& rPosPixel, BOOL bHit = FALSE ) const; - // Gibt den naechsten ueber pCurEntry liegenden Eintrag (ZOrder) - SvxIconChoiceCtrlEntry* GetNextEntry( const Point& rPosPixel, SvxIconChoiceCtrlEntry* pCurEntry, BOOL ) const; - // Gibt den naechsten unter pCurEntry liegenden Eintrag (ZOrder) - SvxIconChoiceCtrlEntry* GetPrevEntry( const Point& rPosPixel, SvxIconChoiceCtrlEntry* pCurEntry, BOOL ) const; - - // in dem ULONG wird die Position in der Liste des gefunden Eintrags zurueckgegeben - SvxIconChoiceCtrlEntry* GetSelectedEntry( ULONG& rPos ) const; - - void SetEntryTextMode( SvxIconChoiceCtrlTextMode eMode, SvxIconChoiceCtrlEntry* pEntry = 0 ); - SvxIconChoiceCtrlTextMode GetEntryTextMode( const SvxIconChoiceCtrlEntry* pEntry = 0 ) const; - - // offene asynchron abzuarbeitende Aktionen ausfuehren. Muss vor dem Speichern von - // Eintragspositionen etc. gerufen werden - void Flush(); - - - virtual BOOL HasBackground() const; - virtual BOOL HasFont() const; - virtual BOOL HasFontTextColor() const; - virtual BOOL HasFontFillColor() const; - - void SetFontColorToBackground ( BOOL bDo = TRUE ) { _bAutoFontColor = bDo; } - BOOL AutoFontColor () { return _bAutoFontColor; } - - Point GetLogicPos( const Point& rPosPixel ) const; - Point GetPixelPos( const Point& rPosLogic ) const; - void SetSelectionMode( SelectionMode eMode ); - - BOOL HandleShortCutKey( const KeyEvent& rKeyEvent ); - - Rectangle GetBoundingBox( SvxIconChoiceCtrlEntry* pEntry ) const; - Rectangle GetEntryCharacterBounds( const sal_Int32 _nEntryPos, const sal_Int32 _nCharacterIndex ) const; - - void SetNoSelection(); - - // ACCESSIBILITY ========================================================== - - /** Creates and returns the accessible object of the Box. */ - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > CreateAccessible(); -}; - -#endif // _ICNVW_HXX - diff --git a/svtools/inc/localresaccess.hxx b/svtools/inc/localresaccess.hxx deleted file mode 100644 index 4d2043d7b992..000000000000 --- a/svtools/inc/localresaccess.hxx +++ /dev/null @@ -1,85 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: localresaccess.hxx,v $ - * $Revision: 1.7 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVTOOLS_LOCALRESACCESS_HXX_ -#define _SVTOOLS_LOCALRESACCESS_HXX_ - -#include -#include -#include - -//......................................................................... -namespace svt -{ -//......................................................................... - - //========================================================================= - //= OLocalResourceAccess - //========================================================================= - /** helper class for acessing local resources - */ - class OLocalResourceAccess : public Resource - { - protected: - ResMgr* m_pManager; - - public: - OLocalResourceAccess( const ResId& _rId ) - :Resource( _rId.SetAutoRelease( sal_False ) ) - ,m_pManager( _rId.GetResMgr() ) - { - } - - OLocalResourceAccess(const ResId& _rId, RESOURCE_TYPE _rType) - :Resource(_rId.SetRT(_rType).SetAutoRelease(sal_False)) - ,m_pManager(_rId.GetResMgr()) - { - OSL_ENSURE( m_pManager != NULL, "OLocalResourceAccess::OLocalResourceAccess: invalid resource manager!" ); - } - - ~OLocalResourceAccess() - { - if ( m_pManager ) - m_pManager->Increment( m_pManager->GetRemainSize() ); - FreeResource(); - } - - inline BOOL IsAvailableRes( const ResId& _rId ) const - { - return Resource::IsAvailableRes( _rId ); - } - }; - -//......................................................................... -} // namespace svt -//......................................................................... - -#endif // _SVTOOLS_LOCALRESACCESS_HXX_ - diff --git a/svtools/inc/prgsbar.hxx b/svtools/inc/prgsbar.hxx deleted file mode 100644 index ca569ac152f4..000000000000 --- a/svtools/inc/prgsbar.hxx +++ /dev/null @@ -1,103 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: prgsbar.hxx,v $ - * $Revision: 1.6 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _PRGSBAR_HXX -#define _PRGSBAR_HXX - -#include "svtools/svtdllapi.h" -#include - -/************************************************************************* - -Beschreibung -============ - -class ProgressBar - -Diese Klasse dient zur Anzeige einer Progress-Anzeige. - --------------------------------------------------------------------------- - -WinBits - -WB_BORDER Border um das Fenster -WB_3DLOOK 3D-Darstellung - --------------------------------------------------------------------------- - -Methoden - -Mit SetValue() setzt man einen Prozent-Wert zwischen 0 und 100. Wenn Werte -groesser 100 gesetzt werden, faengt das letzte Rechteck an zu blinken. - -*************************************************************************/ - -// ----------- -// - WinBits - -// ----------- - -#define WB_STDPROGRESSBAR WB_BORDER - -// --------------- -// - ProgressBar - -// --------------- - -class SVT_DLLPUBLIC ProgressBar : public Window -{ -private: - Point maPos; - long mnPrgsWidth; - long mnPrgsHeight; - USHORT mnPercent; - USHORT mnPercentCount; - BOOL mbCalcNew; - -#ifdef _SV_PRGSBAR_CXX - using Window::ImplInit; - SVT_DLLPRIVATE void ImplInit(); - SVT_DLLPRIVATE void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); - SVT_DLLPRIVATE void ImplDrawProgress( USHORT nOldPerc, USHORT nNewPerc ); -#endif - -public: - ProgressBar( Window* pParent, WinBits nWinBits = WB_STDPROGRESSBAR ); - ProgressBar( Window* pParent, const ResId& rResId ); - ~ProgressBar(); - - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); - virtual void StateChanged( StateChangedType nStateChange ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - - void SetValue( USHORT nNewPercent ); - USHORT GetValue() const { return mnPercent; } -}; - -#endif // _PRGSBAR_HXX diff --git a/svtools/inc/roadmap.hxx b/svtools/inc/roadmap.hxx deleted file mode 100644 index 14ed6abceed6..000000000000 --- a/svtools/inc/roadmap.hxx +++ /dev/null @@ -1,140 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: roadmap.hxx,v $ - * $Revision: 1.10 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVTOOLS_ROADMAP_HXX -#define _SVTOOLS_ROADMAP_HXX - -#include "svtools/svtdllapi.h" -#include -#include - -#ifndef _SVTOOLS_HYPERLABEL_HXX -#include "svtools/hyperlabel.hxx" -#endif - - - - -class Bitmap; -//......................................................................... -namespace svt -{ -//......................................................................... - - struct RoadmapTypes - { - public: - typedef sal_Int16 ItemId; - typedef sal_Int32 ItemIndex; - }; - - class RoadmapImpl; - class RoadmapItem; - - //===================================================================== - //= Roadmap - //===================================================================== - class SVT_DLLPUBLIC ORoadmap : public Control, public RoadmapTypes - { - protected: - RoadmapImpl* m_pImpl; - // Window overridables - void Paint( const Rectangle& _rRect ); - void implInit(); - - public: - ORoadmap( Window* _pParent, const ResId& _rId ); - ORoadmap( Window* _pParent, WinBits _nWinStyle = 0 ); - ~ORoadmap( ); - - void SetRoadmapBitmap( const BitmapEx& maBitmap, sal_Bool _bInvalidate = sal_True ); - const BitmapEx& GetRoadmapBitmap( ) const; - - void EnableRoadmapItem( ItemId _nItemId, sal_Bool _bEnable, ItemIndex _nStartIndex = 0 ); - sal_Bool IsRoadmapItemEnabled( ItemId _nItemId, ItemIndex _nStartIndex = 0 ) const; - - void ChangeRoadmapItemLabel( ItemId _nID, const ::rtl::OUString& sLabel, ItemIndex _nStartIndex = 0 ); - ::rtl::OUString GetRoadmapItemLabel( ItemId _nID, ItemIndex _nStartIndex = 0 ); - void ChangeRoadmapItemID( ItemId _nID, ItemId _NewID, ItemIndex _nStartIndex = 0 ); - - void SetRoadmapInteractive( sal_Bool _bInteractive ); - sal_Bool IsRoadmapInteractive(); - - void SetRoadmapComplete( sal_Bool _bComplete ); - sal_Bool IsRoadmapComplete() const; - - ItemIndex GetItemCount() const; - ItemId GetItemID( ItemIndex _nIndex ) const; - ItemIndex GetItemIndex( ItemId _nID ) const; - - void InsertRoadmapItem( ItemIndex _Index, const ::rtl::OUString& _RoadmapItem, ItemId _nUniqueId, sal_Bool _bEnabled = sal_True ); - void ReplaceRoadmapItem( ItemIndex _Index, const ::rtl::OUString& _RoadmapItem, ItemId _nUniqueId, sal_Bool _bEnabled ); - void DeleteRoadmapItem( ItemIndex _nIndex ); - - ItemId GetCurrentRoadmapItemID() const; - sal_Bool SelectRoadmapItemByID( ItemId _nItemID ); - - void SetItemSelectHdl( const Link& _rHdl ); - Link GetItemSelectHdl( ) const; - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual void GetFocus(); - - - protected: - long PreNotify( NotifyEvent& rNEvt ); - - protected: - /// called when an item has been selected by any means - virtual void Select(); - - private: - DECL_LINK(ImplClickHdl, HyperLabel*); - - RoadmapItem* GetByIndex( ItemIndex _nItemIndex ); - const RoadmapItem* GetByIndex( ItemIndex _nItemIndex ) const; - - RoadmapItem* GetByID( ItemId _nID, ItemIndex _nStartIndex = 0 ); - const RoadmapItem* GetByID( ItemId _nID, ItemIndex _nStartIndex = 0 ) const; - RoadmapItem* GetPreviousHyperLabel( ItemIndex _Index); - - void DrawHeadline(); - void DeselectOldRoadmapItems(); - ItemId GetNextAvailableItemId( ItemIndex _NewIndex ); - ItemId GetPreviousAvailableItemId( ItemIndex _NewIndex ); - RoadmapItem* GetByPointer(Window* pWindow); - RoadmapItem* InsertHyperLabel( ItemIndex _Index, const ::rtl::OUString& _aStr, ItemId _RMID, sal_Bool _bEnabled = sal_True ); - void UpdatefollowingHyperLabels( ItemIndex _Index ); - }; - -//......................................................................... -} // namespace svt -//......................................................................... - -#endif - diff --git a/svtools/inc/rtfkeywd.hxx b/svtools/inc/rtfkeywd.hxx deleted file mode 100644 index f76399ffd824..000000000000 --- a/svtools/inc/rtfkeywd.hxx +++ /dev/null @@ -1,1144 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: rtfkeywd.hxx,v $ - * $Revision: 1.13.134.1 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _RTFKEYWD_HXX -#define _RTFKEYWD_HXX - -#include "sal/config.h" - -#define OOO_STRING_SVTOOLS_RTF_HEXCHAR "\\'" -#define OOO_STRING_SVTOOLS_RTF_IGNORE "\\*" -#define OOO_STRING_SVTOOLS_RTF_OPTHYPH "\\-" -#define OOO_STRING_SVTOOLS_RTF_SUBENTRY "\\:" -#define OOO_STRING_SVTOOLS_RTF_ABSH "\\absh" -#define OOO_STRING_SVTOOLS_RTF_ABSW "\\absw" -#define OOO_STRING_SVTOOLS_RTF_ALT "\\alt" -#define OOO_STRING_SVTOOLS_RTF_ANNOTATION "\\annotation" -#define OOO_STRING_SVTOOLS_RTF_ANSI "\\ansi" -#define OOO_STRING_SVTOOLS_RTF_ATNID "\\atnid" -#define OOO_STRING_SVTOOLS_RTF_AUTHOR "\\author" -#define OOO_STRING_SVTOOLS_RTF_B "\\b" -#define OOO_STRING_SVTOOLS_RTF_BGBDIAG "\\bgbdiag" -#define OOO_STRING_SVTOOLS_RTF_BGCROSS "\\bgcross" -#define OOO_STRING_SVTOOLS_RTF_BGDCROSS "\\bgdcross" -#define OOO_STRING_SVTOOLS_RTF_BGDKBDIAG "\\bgdkbdiag" -#define OOO_STRING_SVTOOLS_RTF_BGDKCROSS "\\bgdkcross" -#define OOO_STRING_SVTOOLS_RTF_BGDKDCROSS "\\bgdkdcross" -#define OOO_STRING_SVTOOLS_RTF_BGDKFDIAG "\\bgdkfdiag" -#define OOO_STRING_SVTOOLS_RTF_BGDKHORIZ "\\bgdkhoriz" -#define OOO_STRING_SVTOOLS_RTF_BGDKVERT "\\bgdkvert" -#define OOO_STRING_SVTOOLS_RTF_BGFDIAG "\\bgfdiag" -#define OOO_STRING_SVTOOLS_RTF_BGHORIZ "\\bghoriz" -#define OOO_STRING_SVTOOLS_RTF_BGVERT "\\bgvert" -#define OOO_STRING_SVTOOLS_RTF_BIN "\\bin" -#define OOO_STRING_SVTOOLS_RTF_BINFSXN "\\binfsxn" -#define OOO_STRING_SVTOOLS_RTF_BINSXN "\\binsxn" -#define OOO_STRING_SVTOOLS_RTF_BKMKCOLF "\\bkmkcolf" -#define OOO_STRING_SVTOOLS_RTF_BKMKCOLL "\\bkmkcoll" -#define OOO_STRING_SVTOOLS_RTF_BKMKEND "\\bkmkend" -#define OOO_STRING_SVTOOLS_RTF_BKMKSTART "\\bkmkstart" -#define OOO_STRING_SVTOOLS_RTF_BLUE "\\blue" -#define OOO_STRING_SVTOOLS_RTF_BOX "\\box" -#define OOO_STRING_SVTOOLS_RTF_BRDRB "\\brdrb" -#define OOO_STRING_SVTOOLS_RTF_BRDRBAR "\\brdrbar" -#define OOO_STRING_SVTOOLS_RTF_BRDRBTW "\\brdrbtw" -#define OOO_STRING_SVTOOLS_RTF_BRDRCF "\\brdrcf" -#define OOO_STRING_SVTOOLS_RTF_BRDRDB "\\brdrdb" -#define OOO_STRING_SVTOOLS_RTF_BRDRDOT "\\brdrdot" -#define OOO_STRING_SVTOOLS_RTF_BRDRHAIR "\\brdrhair" -#define OOO_STRING_SVTOOLS_RTF_BRDRL "\\brdrl" -#define OOO_STRING_SVTOOLS_RTF_BRDRR "\\brdrr" -#define OOO_STRING_SVTOOLS_RTF_BRDRS "\\brdrs" -#define OOO_STRING_SVTOOLS_RTF_BRDRSH "\\brdrsh" -#define OOO_STRING_SVTOOLS_RTF_BRDRT "\\brdrt" -#define OOO_STRING_SVTOOLS_RTF_BRDRTH "\\brdrth" -#define OOO_STRING_SVTOOLS_RTF_BRDRW "\\brdrw" -#define OOO_STRING_SVTOOLS_RTF_BRSP "\\brsp" -#define OOO_STRING_SVTOOLS_RTF_BULLET "\\bullet" -#define OOO_STRING_SVTOOLS_RTF_BUPTIM "\\buptim" -#define OOO_STRING_SVTOOLS_RTF_BXE "\\bxe" -#define OOO_STRING_SVTOOLS_RTF_CAPS "\\caps" -#define OOO_STRING_SVTOOLS_RTF_CB "\\cb" -#define OOO_STRING_SVTOOLS_RTF_CBPAT "\\cbpat" -#define OOO_STRING_SVTOOLS_RTF_CELL "\\cell" -#define OOO_STRING_SVTOOLS_RTF_CELLX "\\cellx" -#define OOO_STRING_SVTOOLS_RTF_CF "\\cf" -#define OOO_STRING_SVTOOLS_RTF_CFPAT "\\cfpat" -#define OOO_STRING_SVTOOLS_RTF_CHATN "\\chatn" -#define OOO_STRING_SVTOOLS_RTF_CHDATE "\\chdate" -#define OOO_STRING_SVTOOLS_RTF_CHDPA "\\chdpa" -#define OOO_STRING_SVTOOLS_RTF_CHDPL "\\chdpl" -#define OOO_STRING_SVTOOLS_RTF_CHFTN "\\chftn" -#define OOO_STRING_SVTOOLS_RTF_CHFTNSEP "\\chftnsep" -#define OOO_STRING_SVTOOLS_RTF_CHFTNSEPC "\\chftnsepc" -#define OOO_STRING_SVTOOLS_RTF_CHPGN "\\chpgn" -#define OOO_STRING_SVTOOLS_RTF_CHTIME "\\chtime" -#define OOO_STRING_SVTOOLS_RTF_CLBGBDIAG "\\clbgbdiag" -#define OOO_STRING_SVTOOLS_RTF_CLBGCROSS "\\clbgcross" -#define OOO_STRING_SVTOOLS_RTF_CLBGDCROSS "\\clbgdcross" -#define OOO_STRING_SVTOOLS_RTF_CLBGDKBDIAG "\\clbgdkbdiag" -#define OOO_STRING_SVTOOLS_RTF_CLBGDKCROSS "\\clbgdkcross" -#define OOO_STRING_SVTOOLS_RTF_CLBGDKDCROSS "\\clbgdkdcross" -#define OOO_STRING_SVTOOLS_RTF_CLBGDKFDIAG "\\clbgdkfdiag" -#define OOO_STRING_SVTOOLS_RTF_CLBGDKHOR "\\clbgdkhor" -#define OOO_STRING_SVTOOLS_RTF_CLBGDKVERT "\\clbgdkvert" -#define OOO_STRING_SVTOOLS_RTF_CLBGFDIAG "\\clbgfdiag" -#define OOO_STRING_SVTOOLS_RTF_CLBGHORIZ "\\clbghoriz" -#define OOO_STRING_SVTOOLS_RTF_CLBGVERT "\\clbgvert" -#define OOO_STRING_SVTOOLS_RTF_CLBRDRB "\\clbrdrb" -#define OOO_STRING_SVTOOLS_RTF_CLBRDRL "\\clbrdrl" -#define OOO_STRING_SVTOOLS_RTF_CLBRDRR "\\clbrdrr" -#define OOO_STRING_SVTOOLS_RTF_CLBRDRT "\\clbrdrt" -#define OOO_STRING_SVTOOLS_RTF_CLCBPAT "\\clcbpat" -#define OOO_STRING_SVTOOLS_RTF_CLCFPAT "\\clcfpat" -#define OOO_STRING_SVTOOLS_RTF_CLMGF "\\clmgf" -#define OOO_STRING_SVTOOLS_RTF_CLMRG "\\clmrg" -#define OOO_STRING_SVTOOLS_RTF_CLSHDNG "\\clshdng" -#define OOO_STRING_SVTOOLS_RTF_COLNO "\\colno" -#define OOO_STRING_SVTOOLS_RTF_COLORTBL "\\colortbl" -#define OOO_STRING_SVTOOLS_RTF_COLS "\\cols" -#define OOO_STRING_SVTOOLS_RTF_COLSR "\\colsr" -#define OOO_STRING_SVTOOLS_RTF_COLSX "\\colsx" -#define OOO_STRING_SVTOOLS_RTF_COLUMN "\\column" -#define OOO_STRING_SVTOOLS_RTF_COLW "\\colw" -#define OOO_STRING_SVTOOLS_RTF_COMMENT "\\comment" -#define OOO_STRING_SVTOOLS_RTF_CREATIM "\\creatim" -#define OOO_STRING_SVTOOLS_RTF_CTRL "\\ctrl" -#define OOO_STRING_SVTOOLS_RTF_DEFF "\\deff" -#define OOO_STRING_SVTOOLS_RTF_DEFFORMAT "\\defformat" -#define OOO_STRING_SVTOOLS_RTF_DEFLANG "\\deflang" -#define OOO_STRING_SVTOOLS_RTF_DEFTAB "\\deftab" -#define OOO_STRING_SVTOOLS_RTF_DELETED "\\deleted" -#define OOO_STRING_SVTOOLS_RTF_DFRMTXTX "\\dfrmtxtx" -#define OOO_STRING_SVTOOLS_RTF_DFRMTXTY "\\dfrmtxty" -#define OOO_STRING_SVTOOLS_RTF_DIBITMAP "\\dibitmap" -#define OOO_STRING_SVTOOLS_RTF_DN "\\dn" -#define OOO_STRING_SVTOOLS_RTF_DOCCOMM "\\doccomm" -#define OOO_STRING_SVTOOLS_RTF_DOCTEMP "\\doctemp" -#define OOO_STRING_SVTOOLS_RTF_DROPCAPLI "\\dropcapli" -#define OOO_STRING_SVTOOLS_RTF_DROPCAPT "\\dropcapt" -#define OOO_STRING_SVTOOLS_RTF_ABSNOOVRLP "\\absnoovrlp" -#define OOO_STRING_SVTOOLS_RTF_DXFRTEXT "\\dxfrtext" -#define OOO_STRING_SVTOOLS_RTF_DY "\\dy" -#define OOO_STRING_SVTOOLS_RTF_EDMINS "\\edmins" -#define OOO_STRING_SVTOOLS_RTF_EMDASH "\\emdash" -#define OOO_STRING_SVTOOLS_RTF_ENDASH "\\endash" -#define OOO_STRING_SVTOOLS_RTF_ENDDOC "\\enddoc" -#define OOO_STRING_SVTOOLS_RTF_ENDNHERE "\\endnhere" -#define OOO_STRING_SVTOOLS_RTF_ENDNOTES "\\endnotes" -#define OOO_STRING_SVTOOLS_RTF_EXPND "\\expnd" -#define OOO_STRING_SVTOOLS_RTF_EXPNDTW "\\expndtw" -#define OOO_STRING_SVTOOLS_RTF_F "\\f" -#define OOO_STRING_SVTOOLS_RTF_FACINGP "\\facingp" -#define OOO_STRING_SVTOOLS_RTF_FACPGSXN "\\facpgsxn" -#define OOO_STRING_SVTOOLS_RTF_FALT "\\falt" -#define OOO_STRING_SVTOOLS_RTF_FCHARSET "\\fcharset" -#define OOO_STRING_SVTOOLS_RTF_FDECOR "\\fdecor" -#define OOO_STRING_SVTOOLS_RTF_FI "\\fi" -#define OOO_STRING_SVTOOLS_RTF_FIELD "\\field" -#define OOO_STRING_SVTOOLS_RTF_FLDDIRTY "\\flddirty" -#define OOO_STRING_SVTOOLS_RTF_FLDEDIT "\\fldedit" -#define OOO_STRING_SVTOOLS_RTF_FLDINST "\\fldinst" -#define OOO_STRING_SVTOOLS_RTF_FLDLOCK "\\fldlock" -#define OOO_STRING_SVTOOLS_RTF_FLDPRIV "\\fldpriv" -#define OOO_STRING_SVTOOLS_RTF_FLDRSLT "\\fldrslt" -#define OOO_STRING_SVTOOLS_RTF_FMODERN "\\fmodern" -#define OOO_STRING_SVTOOLS_RTF_FN "\\fn" -#define OOO_STRING_SVTOOLS_RTF_FNIL "\\fnil" -#define OOO_STRING_SVTOOLS_RTF_FONTTBL "\\fonttbl" -#define OOO_STRING_SVTOOLS_RTF_FOOTER "\\footer" -#define OOO_STRING_SVTOOLS_RTF_FOOTERF "\\footerf" -#define OOO_STRING_SVTOOLS_RTF_FOOTERL "\\footerl" -#define OOO_STRING_SVTOOLS_RTF_FOOTERR "\\footerr" -#define OOO_STRING_SVTOOLS_RTF_FOOTERY "\\footery" -#define OOO_STRING_SVTOOLS_RTF_FOOTNOTE "\\footnote" -#define OOO_STRING_SVTOOLS_RTF_FPRQ "\\fprq" -#define OOO_STRING_SVTOOLS_RTF_FRACWIDTH "\\fracwidth" -#define OOO_STRING_SVTOOLS_RTF_FROMAN "\\froman" -#define OOO_STRING_SVTOOLS_RTF_FS "\\fs" -#define OOO_STRING_SVTOOLS_RTF_FSCRIPT "\\fscript" -#define OOO_STRING_SVTOOLS_RTF_FSWISS "\\fswiss" -#define OOO_STRING_SVTOOLS_RTF_FTECH "\\ftech" -#define OOO_STRING_SVTOOLS_RTF_FTNBJ "\\ftnbj" -#define OOO_STRING_SVTOOLS_RTF_FTNCN "\\ftncn" -#define OOO_STRING_SVTOOLS_RTF_FTNRESTART "\\ftnrestart" -#define OOO_STRING_SVTOOLS_RTF_FTNSEP "\\ftnsep" -#define OOO_STRING_SVTOOLS_RTF_FTNSEPC "\\ftnsepc" -#define OOO_STRING_SVTOOLS_RTF_FTNSTART "\\ftnstart" -#define OOO_STRING_SVTOOLS_RTF_FTNTJ "\\ftntj" -#define OOO_STRING_SVTOOLS_RTF_GREEN "\\green" -#define OOO_STRING_SVTOOLS_RTF_GUTTER "\\gutter" -#define OOO_STRING_SVTOOLS_RTF_GUTTERSXN "\\guttersxn" -#define OOO_STRING_SVTOOLS_RTF_HEADER "\\header" -#define OOO_STRING_SVTOOLS_RTF_HEADERF "\\headerf" -#define OOO_STRING_SVTOOLS_RTF_HEADERL "\\headerl" -#define OOO_STRING_SVTOOLS_RTF_HEADERR "\\headerr" -#define OOO_STRING_SVTOOLS_RTF_HEADERY "\\headery" -#define OOO_STRING_SVTOOLS_RTF_HR "\\hr" -#define OOO_STRING_SVTOOLS_RTF_HYPHHOTZ "\\hyphhotz" -#define OOO_STRING_SVTOOLS_RTF_I "\\i" -#define OOO_STRING_SVTOOLS_RTF_ID "\\id" -#define OOO_STRING_SVTOOLS_RTF_INFO "\\info" -#define OOO_STRING_SVTOOLS_RTF_INTBL "\\intbl" -#define OOO_STRING_SVTOOLS_RTF_IXE "\\ixe" -#define OOO_STRING_SVTOOLS_RTF_KEEP "\\keep" -#define OOO_STRING_SVTOOLS_RTF_KEEPN "\\keepn" -#define OOO_STRING_SVTOOLS_RTF_KERNING "\\kerning" -#define OOO_STRING_SVTOOLS_RTF_KEYCODE "\\keycode" -#define OOO_STRING_SVTOOLS_RTF_KEYWORDS "\\keywords" -#define OOO_STRING_SVTOOLS_RTF_LANDSCAPE "\\landscape" -#define OOO_STRING_SVTOOLS_RTF_LANG "\\lang" -#define OOO_STRING_SVTOOLS_RTF_LDBLQUOTE "\\ldblquote" -#define OOO_STRING_SVTOOLS_RTF_LEVEL "\\level" -#define OOO_STRING_SVTOOLS_RTF_LI "\\li" -#define OOO_STRING_SVTOOLS_RTF_LIN "\\lin" -#define OOO_STRING_SVTOOLS_RTF_LINE "\\line" -#define OOO_STRING_SVTOOLS_RTF_LINEBETCOL "\\linebetcol" -#define OOO_STRING_SVTOOLS_RTF_LINECONT "\\linecont" -#define OOO_STRING_SVTOOLS_RTF_LINEMOD "\\linemod" -#define OOO_STRING_SVTOOLS_RTF_LINEPPAGE "\\lineppage" -#define OOO_STRING_SVTOOLS_RTF_LINERESTART "\\linerestart" -#define OOO_STRING_SVTOOLS_RTF_LINESTART "\\linestart" -#define OOO_STRING_SVTOOLS_RTF_LINESTARTS "\\linestarts" -#define OOO_STRING_SVTOOLS_RTF_LINEX "\\linex" -#define OOO_STRING_SVTOOLS_RTF_LNDSCPSXN "\\lndscpsxn" -#define OOO_STRING_SVTOOLS_RTF_LQUOTE "\\lquote" -#define OOO_STRING_SVTOOLS_RTF_MAC "\\mac" -#define OOO_STRING_SVTOOLS_RTF_MACPICT "\\macpict" -#define OOO_STRING_SVTOOLS_RTF_MAKEBACKUP "\\makebackup" -#define OOO_STRING_SVTOOLS_RTF_MARGB "\\margb" -#define OOO_STRING_SVTOOLS_RTF_MARGBSXN "\\margbsxn" -#define OOO_STRING_SVTOOLS_RTF_MARGL "\\margl" -#define OOO_STRING_SVTOOLS_RTF_MARGLSXN "\\marglsxn" -#define OOO_STRING_SVTOOLS_RTF_MARGMIRROR "\\margmirror" -#define OOO_STRING_SVTOOLS_RTF_MARGR "\\margr" -#define OOO_STRING_SVTOOLS_RTF_MARGRSXN "\\margrsxn" -#define OOO_STRING_SVTOOLS_RTF_MARGT "\\margt" -#define OOO_STRING_SVTOOLS_RTF_MARGTSXN "\\margtsxn" -#define OOO_STRING_SVTOOLS_RTF_MIN "\\min" -#define OOO_STRING_SVTOOLS_RTF_MO "\\mo" -#define OOO_STRING_SVTOOLS_RTF_NEXTCSET "\\nextcset" -#define OOO_STRING_SVTOOLS_RTF_NEXTFILE "\\nextfile" -#define OOO_STRING_SVTOOLS_RTF_NOFCHARS "\\nofchars" -#define OOO_STRING_SVTOOLS_RTF_NOFPAGES "\\nofpages" -#define OOO_STRING_SVTOOLS_RTF_NOFWORDS "\\nofwords" -#define OOO_STRING_SVTOOLS_RTF_NOLINE "\\noline" -#define OOO_STRING_SVTOOLS_RTF_NOSUPERSUB "\\nosupersub" -#define OOO_STRING_SVTOOLS_RTF_NOWRAP "\\nowrap" -#define OOO_STRING_SVTOOLS_RTF_OPERATOR "\\operator" -#define OOO_STRING_SVTOOLS_RTF_OUTL "\\outl" -#define OOO_STRING_SVTOOLS_RTF_PAGE "\\page" -#define OOO_STRING_SVTOOLS_RTF_PAGEBB "\\pagebb" -#define OOO_STRING_SVTOOLS_RTF_PAPERH "\\paperh" -#define OOO_STRING_SVTOOLS_RTF_PAPERW "\\paperw" -#define OOO_STRING_SVTOOLS_RTF_PAR "\\par" -#define OOO_STRING_SVTOOLS_RTF_PARD "\\pard" -#define OOO_STRING_SVTOOLS_RTF_PC "\\pc" -#define OOO_STRING_SVTOOLS_RTF_PCA "\\pca" -#define OOO_STRING_SVTOOLS_RTF_PGHSXN "\\pghsxn" -#define OOO_STRING_SVTOOLS_RTF_PGNCONT "\\pgncont" -#define OOO_STRING_SVTOOLS_RTF_PGNDEC "\\pgndec" -#define OOO_STRING_SVTOOLS_RTF_PGNLCLTR "\\pgnlcltr" -#define OOO_STRING_SVTOOLS_RTF_PGNLCRM "\\pgnlcrm" -#define OOO_STRING_SVTOOLS_RTF_PGNRESTART "\\pgnrestart" -#define OOO_STRING_SVTOOLS_RTF_PGNSTART "\\pgnstart" -#define OOO_STRING_SVTOOLS_RTF_PGNSTARTS "\\pgnstarts" -#define OOO_STRING_SVTOOLS_RTF_PGNUCLTR "\\pgnucltr" -#define OOO_STRING_SVTOOLS_RTF_PGNUCRM "\\pgnucrm" -#define OOO_STRING_SVTOOLS_RTF_PGNX "\\pgnx" -#define OOO_STRING_SVTOOLS_RTF_PGNY "\\pgny" -#define OOO_STRING_SVTOOLS_RTF_PGWSXN "\\pgwsxn" -#define OOO_STRING_SVTOOLS_RTF_PHCOL "\\phcol" -#define OOO_STRING_SVTOOLS_RTF_PHMRG "\\phmrg" -#define OOO_STRING_SVTOOLS_RTF_PHPG "\\phpg" -#define OOO_STRING_SVTOOLS_RTF_PICCROPB "\\piccropb" -#define OOO_STRING_SVTOOLS_RTF_PICCROPL "\\piccropl" -#define OOO_STRING_SVTOOLS_RTF_PICCROPR "\\piccropr" -#define OOO_STRING_SVTOOLS_RTF_PICCROPT "\\piccropt" -#define OOO_STRING_SVTOOLS_RTF_PICH "\\pich" -#define OOO_STRING_SVTOOLS_RTF_PICHGOAL "\\pichgoal" -#define OOO_STRING_SVTOOLS_RTF_PICSCALED "\\picscaled" -#define OOO_STRING_SVTOOLS_RTF_PICSCALEX "\\picscalex" -#define OOO_STRING_SVTOOLS_RTF_PICSCALEY "\\picscaley" -#define OOO_STRING_SVTOOLS_RTF_PICT "\\pict" -#define OOO_STRING_SVTOOLS_RTF_PICW "\\picw" -#define OOO_STRING_SVTOOLS_RTF_PICWGOAL "\\picwgoal" -#define OOO_STRING_SVTOOLS_RTF_PLAIN "\\plain" -#define OOO_STRING_SVTOOLS_RTF_PMMETAFILE "\\pmmetafile" -#define OOO_STRING_SVTOOLS_RTF_POSNEGX "\\posnegx" -#define OOO_STRING_SVTOOLS_RTF_POSNEGY "\\posnegy" -#define OOO_STRING_SVTOOLS_RTF_POSX "\\posx" -#define OOO_STRING_SVTOOLS_RTF_POSXC "\\posxc" -#define OOO_STRING_SVTOOLS_RTF_POSXI "\\posxi" -#define OOO_STRING_SVTOOLS_RTF_POSXL "\\posxl" -#define OOO_STRING_SVTOOLS_RTF_POSXO "\\posxo" -#define OOO_STRING_SVTOOLS_RTF_POSXR "\\posxr" -#define OOO_STRING_SVTOOLS_RTF_POSY "\\posy" -#define OOO_STRING_SVTOOLS_RTF_POSYB "\\posyb" -#define OOO_STRING_SVTOOLS_RTF_POSYC "\\posyc" -#define OOO_STRING_SVTOOLS_RTF_POSYIL "\\posyil" -#define OOO_STRING_SVTOOLS_RTF_POSYT "\\posyt" -#define OOO_STRING_SVTOOLS_RTF_PRINTIM "\\printim" -#define OOO_STRING_SVTOOLS_RTF_PSOVER "\\psover" -#define OOO_STRING_SVTOOLS_RTF_PVMRG "\\pvmrg" -#define OOO_STRING_SVTOOLS_RTF_PVPARA "\\pvpara" -#define OOO_STRING_SVTOOLS_RTF_PVPG "\\pvpg" -#define OOO_STRING_SVTOOLS_RTF_QC "\\qc" -#define OOO_STRING_SVTOOLS_RTF_QJ "\\qj" -#define OOO_STRING_SVTOOLS_RTF_QL "\\ql" -#define OOO_STRING_SVTOOLS_RTF_QR "\\qr" -#define OOO_STRING_SVTOOLS_RTF_RDBLQUOTE "\\rdblquote" -#define OOO_STRING_SVTOOLS_RTF_RED "\\red" -#define OOO_STRING_SVTOOLS_RTF_REVBAR "\\revbar" -#define OOO_STRING_SVTOOLS_RTF_REVISED "\\revised" -#define OOO_STRING_SVTOOLS_RTF_REVISIONS "\\revisions" -#define OOO_STRING_SVTOOLS_RTF_REVPROP "\\revprop" -#define OOO_STRING_SVTOOLS_RTF_REVTIM "\\revtim" -#define OOO_STRING_SVTOOLS_RTF_RI "\\ri" -#define OOO_STRING_SVTOOLS_RTF_RIN "\\rin" -#define OOO_STRING_SVTOOLS_RTF_ROW "\\row" -#define OOO_STRING_SVTOOLS_RTF_RQUOTE "\\rquote" -#define OOO_STRING_SVTOOLS_RTF_RTF "\\rtf" -#define OOO_STRING_SVTOOLS_RTF_RXE "\\rxe" -#define OOO_STRING_SVTOOLS_RTF_S "\\s" -#define OOO_STRING_SVTOOLS_RTF_SA "\\sa" -#define OOO_STRING_SVTOOLS_RTF_SB "\\sb" -#define OOO_STRING_SVTOOLS_RTF_SBASEDON "\\sbasedon" -#define OOO_STRING_SVTOOLS_RTF_SBKCOL "\\sbkcol" -#define OOO_STRING_SVTOOLS_RTF_SBKEVEN "\\sbkeven" -#define OOO_STRING_SVTOOLS_RTF_SBKNONE "\\sbknone" -#define OOO_STRING_SVTOOLS_RTF_SBKODD "\\sbkodd" -#define OOO_STRING_SVTOOLS_RTF_SBKPAGE "\\sbkpage" -#define OOO_STRING_SVTOOLS_RTF_SBYS "\\sbys" -#define OOO_STRING_SVTOOLS_RTF_SCAPS "\\scaps" -#define OOO_STRING_SVTOOLS_RTF_SECT "\\sect" -#define OOO_STRING_SVTOOLS_RTF_SECTD "\\sectd" -#define OOO_STRING_SVTOOLS_RTF_SHAD "\\shad" -#define OOO_STRING_SVTOOLS_RTF_SHADING "\\shading" -#define OOO_STRING_SVTOOLS_RTF_SHIFT "\\shift" -#define OOO_STRING_SVTOOLS_RTF_SL "\\sl" -#define OOO_STRING_SVTOOLS_RTF_SNEXT "\\snext" -#define OOO_STRING_SVTOOLS_RTF_STRIKE "\\strike" -#define OOO_STRING_SVTOOLS_RTF_STYLESHEET "\\stylesheet" -#define OOO_STRING_SVTOOLS_RTF_SUB "\\sub" -#define OOO_STRING_SVTOOLS_RTF_SUBJECT "\\subject" -#define OOO_STRING_SVTOOLS_RTF_SUPER "\\super" -#define OOO_STRING_SVTOOLS_RTF_TAB "\\tab" -#define OOO_STRING_SVTOOLS_RTF_TB "\\tb" -#define OOO_STRING_SVTOOLS_RTF_TC "\\tc" -#define OOO_STRING_SVTOOLS_RTF_TCF "\\tcf" -#define OOO_STRING_SVTOOLS_RTF_TCL "\\tcl" -#define OOO_STRING_SVTOOLS_RTF_TEMPLATE "\\template" -#define OOO_STRING_SVTOOLS_RTF_TITLE "\\title" -#define OOO_STRING_SVTOOLS_RTF_TITLEPG "\\titlepg" -#define OOO_STRING_SVTOOLS_RTF_TLDOT "\\tldot" -#define OOO_STRING_SVTOOLS_RTF_TLEQ "\\tleq" -#define OOO_STRING_SVTOOLS_RTF_TLHYPH "\\tlhyph" -#define OOO_STRING_SVTOOLS_RTF_TLTH "\\tlth" -#define OOO_STRING_SVTOOLS_RTF_TLUL "\\tlul" -#define OOO_STRING_SVTOOLS_RTF_TQC "\\tqc" -#define OOO_STRING_SVTOOLS_RTF_TQDEC "\\tqdec" -#define OOO_STRING_SVTOOLS_RTF_TQR "\\tqr" -#define OOO_STRING_SVTOOLS_RTF_TQL "\\tql" -#define OOO_STRING_SVTOOLS_RTF_TRGAPH "\\trgaph" -#define OOO_STRING_SVTOOLS_RTF_TRLEFT "\\trleft" -#define OOO_STRING_SVTOOLS_RTF_TROWD "\\trowd" -#define OOO_STRING_SVTOOLS_RTF_TRQC "\\trqc" -#define OOO_STRING_SVTOOLS_RTF_TRQL "\\trql" -#define OOO_STRING_SVTOOLS_RTF_TRQR "\\trqr" -#define OOO_STRING_SVTOOLS_RTF_TRRH "\\trrh" -#define OOO_STRING_SVTOOLS_RTF_TX "\\tx" -#define OOO_STRING_SVTOOLS_RTF_TXE "\\txe" -#define OOO_STRING_SVTOOLS_RTF_UL "\\ul" -#define OOO_STRING_SVTOOLS_RTF_ULD "\\uld" -#define OOO_STRING_SVTOOLS_RTF_ULDB "\\uldb" -#define OOO_STRING_SVTOOLS_RTF_ULNONE "\\ulnone" -#define OOO_STRING_SVTOOLS_RTF_ULW "\\ulw" -#define OOO_STRING_SVTOOLS_RTF_UP "\\up" -#define OOO_STRING_SVTOOLS_RTF_V "\\v" -#define OOO_STRING_SVTOOLS_RTF_VERN "\\vern" -#define OOO_STRING_SVTOOLS_RTF_VERSION "\\version" -#define OOO_STRING_SVTOOLS_RTF_VERTALB "\\vertalb" -#define OOO_STRING_SVTOOLS_RTF_VERTALC "\\vertalc" -#define OOO_STRING_SVTOOLS_RTF_VERTALJ "\\vertalj" -#define OOO_STRING_SVTOOLS_RTF_VERTALT "\\vertalt" -#define OOO_STRING_SVTOOLS_RTF_WBITMAP "\\wbitmap" -#define OOO_STRING_SVTOOLS_RTF_WBMBITSPIXEL "\\wbmbitspixel" -#define OOO_STRING_SVTOOLS_RTF_WBMPLANES "\\wbmplanes" -#define OOO_STRING_SVTOOLS_RTF_WBMWIDTHBYTES "\\wbmwidthbytes" -#define OOO_STRING_SVTOOLS_RTF_WIDOWCTRL "\\widowctrl" -#define OOO_STRING_SVTOOLS_RTF_WMETAFILE "\\wmetafile" -#define OOO_STRING_SVTOOLS_RTF_XE "\\xe" -#define OOO_STRING_SVTOOLS_RTF_YR "\\yr" -#define OOO_STRING_SVTOOLS_RTF_NOBRKHYPH "\\_" -#define OOO_STRING_SVTOOLS_RTF_FORMULA "\\|" -#define OOO_STRING_SVTOOLS_RTF_NOBREAK "\\~" -#define OOO_STRING_SVTOOLS_RTF_AB "\\ab" -#define OOO_STRING_SVTOOLS_RTF_ACAPS "\\acaps" -#define OOO_STRING_SVTOOLS_RTF_ACF "\\acf" -#define OOO_STRING_SVTOOLS_RTF_ADDITIVE "\\additive" -#define OOO_STRING_SVTOOLS_RTF_ADN "\\adn" -#define OOO_STRING_SVTOOLS_RTF_AENDDOC "\\aenddoc" -#define OOO_STRING_SVTOOLS_RTF_AENDNOTES "\\aendnotes" -#define OOO_STRING_SVTOOLS_RTF_AEXPND "\\aexpnd" -#define OOO_STRING_SVTOOLS_RTF_AF "\\af" -#define OOO_STRING_SVTOOLS_RTF_AFS "\\afs" -#define OOO_STRING_SVTOOLS_RTF_AFTNBJ "\\aftnbj" -#define OOO_STRING_SVTOOLS_RTF_AFTNCN "\\aftncn" -#define OOO_STRING_SVTOOLS_RTF_AFTNNALC "\\aftnnalc" -#define OOO_STRING_SVTOOLS_RTF_AFTNNAR "\\aftnnar" -#define OOO_STRING_SVTOOLS_RTF_AFTNNAUC "\\aftnnauc" -#define OOO_STRING_SVTOOLS_RTF_AFTNNCHI "\\aftnnchi" -#define OOO_STRING_SVTOOLS_RTF_AFTNNRLC "\\aftnnrlc" -#define OOO_STRING_SVTOOLS_RTF_AFTNNRUC "\\aftnnruc" -#define OOO_STRING_SVTOOLS_RTF_AFTNRESTART "\\aftnrestart" -#define OOO_STRING_SVTOOLS_RTF_AFTNRSTCONT "\\aftnrstcont" -#define OOO_STRING_SVTOOLS_RTF_AFTNSEP "\\aftnsep" -#define OOO_STRING_SVTOOLS_RTF_AFTNSEPC "\\aftnsepc" -#define OOO_STRING_SVTOOLS_RTF_AFTNSTART "\\aftnstart" -#define OOO_STRING_SVTOOLS_RTF_AFTNTJ "\\aftntj" -#define OOO_STRING_SVTOOLS_RTF_AI "\\ai" -#define OOO_STRING_SVTOOLS_RTF_ALANG "\\alang" -#define OOO_STRING_SVTOOLS_RTF_ALLPROT "\\allprot" -#define OOO_STRING_SVTOOLS_RTF_ANNOTPROT "\\annotprot" -#define OOO_STRING_SVTOOLS_RTF_AOUTL "\\aoutl" -#define OOO_STRING_SVTOOLS_RTF_ASCAPS "\\ascaps" -#define OOO_STRING_SVTOOLS_RTF_ASHAD "\\ashad" -#define OOO_STRING_SVTOOLS_RTF_ASTRIKE "\\astrike" -#define OOO_STRING_SVTOOLS_RTF_ATNAUTHOR "\\atnauthor" -#define OOO_STRING_SVTOOLS_RTF_ATNICN "\\atnicn" -#define OOO_STRING_SVTOOLS_RTF_ATNREF "\\atnref" -#define OOO_STRING_SVTOOLS_RTF_ATNTIME "\\atntime" -#define OOO_STRING_SVTOOLS_RTF_ATRFEND "\\atrfend" -#define OOO_STRING_SVTOOLS_RTF_ATRFSTART "\\atrfstart" -#define OOO_STRING_SVTOOLS_RTF_AUL "\\aul" -#define OOO_STRING_SVTOOLS_RTF_AULD "\\auld" -#define OOO_STRING_SVTOOLS_RTF_AULDB "\\auldb" -#define OOO_STRING_SVTOOLS_RTF_AULNONE "\\aulnone" -#define OOO_STRING_SVTOOLS_RTF_AULW "\\aulw" -#define OOO_STRING_SVTOOLS_RTF_AUP "\\aup" -#define OOO_STRING_SVTOOLS_RTF_BKMKPUB "\\bkmkpub" -#define OOO_STRING_SVTOOLS_RTF_BRDRDASH "\\brdrdash" -#define OOO_STRING_SVTOOLS_RTF_BRKFRM "\\brkfrm" -#define OOO_STRING_SVTOOLS_RTF_CCHS "\\cchs" -#define OOO_STRING_SVTOOLS_RTF_CPG "\\cpg" -#define OOO_STRING_SVTOOLS_RTF_CS "\\cs" -#define OOO_STRING_SVTOOLS_RTF_CVMME "\\cvmme" -#define OOO_STRING_SVTOOLS_RTF_DATAFIELD "\\datafield" -#define OOO_STRING_SVTOOLS_RTF_DO "\\do" -#define OOO_STRING_SVTOOLS_RTF_DOBXCOLUMN "\\dobxcolumn" -#define OOO_STRING_SVTOOLS_RTF_DOBXMARGIN "\\dobxmargin" -#define OOO_STRING_SVTOOLS_RTF_DOBXPAGE "\\dobxpage" -#define OOO_STRING_SVTOOLS_RTF_DOBYMARGIN "\\dobymargin" -#define OOO_STRING_SVTOOLS_RTF_DOBYPAGE "\\dobypage" -#define OOO_STRING_SVTOOLS_RTF_DOBYPARA "\\dobypara" -#define OOO_STRING_SVTOOLS_RTF_DODHGT "\\dodhgt" -#define OOO_STRING_SVTOOLS_RTF_DOLOCK "\\dolock" -#define OOO_STRING_SVTOOLS_RTF_DPAENDHOL "\\dpaendhol" -#define OOO_STRING_SVTOOLS_RTF_DPAENDL "\\dpaendl" -#define OOO_STRING_SVTOOLS_RTF_DPAENDSOL "\\dpaendsol" -#define OOO_STRING_SVTOOLS_RTF_DPAENDW "\\dpaendw" -#define OOO_STRING_SVTOOLS_RTF_DPARC "\\dparc" -#define OOO_STRING_SVTOOLS_RTF_DPARCFLIPX "\\dparcflipx" -#define OOO_STRING_SVTOOLS_RTF_DPARCFLIPY "\\dparcflipy" -#define OOO_STRING_SVTOOLS_RTF_DPASTARTHOL "\\dpastarthol" -#define OOO_STRING_SVTOOLS_RTF_DPASTARTL "\\dpastartl" -#define OOO_STRING_SVTOOLS_RTF_DPASTARTSOL "\\dpastartsol" -#define OOO_STRING_SVTOOLS_RTF_DPASTARTW "\\dpastartw" -#define OOO_STRING_SVTOOLS_RTF_DPCALLOUT "\\dpcallout" -#define OOO_STRING_SVTOOLS_RTF_DPCOA "\\dpcoa" -#define OOO_STRING_SVTOOLS_RTF_DPCOACCENT "\\dpcoaccent" -#define OOO_STRING_SVTOOLS_RTF_DPCOBESTFIT "\\dpcobestfit" -#define OOO_STRING_SVTOOLS_RTF_DPCOBORDER "\\dpcoborder" -#define OOO_STRING_SVTOOLS_RTF_DPCODABS "\\dpcodabs" -#define OOO_STRING_SVTOOLS_RTF_DPCODBOTTOM "\\dpcodbottom" -#define OOO_STRING_SVTOOLS_RTF_DPCODCENTER "\\dpcodcenter" -#define OOO_STRING_SVTOOLS_RTF_DPCODTOP "\\dpcodtop" -#define OOO_STRING_SVTOOLS_RTF_DPCOLENGTH "\\dpcolength" -#define OOO_STRING_SVTOOLS_RTF_DPCOMINUSX "\\dpcominusx" -#define OOO_STRING_SVTOOLS_RTF_DPCOMINUSY "\\dpcominusy" -#define OOO_STRING_SVTOOLS_RTF_DPCOOFFSET "\\dpcooffset" -#define OOO_STRING_SVTOOLS_RTF_DPCOSMARTA "\\dpcosmarta" -#define OOO_STRING_SVTOOLS_RTF_DPCOTDOUBLE "\\dpcotdouble" -#define OOO_STRING_SVTOOLS_RTF_DPCOTRIGHT "\\dpcotright" -#define OOO_STRING_SVTOOLS_RTF_DPCOTSINGLE "\\dpcotsingle" -#define OOO_STRING_SVTOOLS_RTF_DPCOTTRIPLE "\\dpcottriple" -#define OOO_STRING_SVTOOLS_RTF_DPCOUNT "\\dpcount" -#define OOO_STRING_SVTOOLS_RTF_DPELLIPSE "\\dpellipse" -#define OOO_STRING_SVTOOLS_RTF_DPENDGROUP "\\dpendgroup" -#define OOO_STRING_SVTOOLS_RTF_DPFILLBGCB "\\dpfillbgcb" -#define OOO_STRING_SVTOOLS_RTF_DPFILLBGCG "\\dpfillbgcg" -#define OOO_STRING_SVTOOLS_RTF_DPFILLBGCR "\\dpfillbgcr" -#define OOO_STRING_SVTOOLS_RTF_DPFILLBGGRAY "\\dpfillbggray" -#define OOO_STRING_SVTOOLS_RTF_DPFILLBGPAL "\\dpfillbgpal" -#define OOO_STRING_SVTOOLS_RTF_DPFILLFGCB "\\dpfillfgcb" -#define OOO_STRING_SVTOOLS_RTF_DPFILLFGCG "\\dpfillfgcg" -#define OOO_STRING_SVTOOLS_RTF_DPFILLFGCR "\\dpfillfgcr" -#define OOO_STRING_SVTOOLS_RTF_DPFILLFGGRAY "\\dpfillfggray" -#define OOO_STRING_SVTOOLS_RTF_DPFILLFGPAL "\\dpfillfgpal" -#define OOO_STRING_SVTOOLS_RTF_DPFILLPAT "\\dpfillpat" -#define OOO_STRING_SVTOOLS_RTF_DPGROUP "\\dpgroup" -#define OOO_STRING_SVTOOLS_RTF_DPLINE "\\dpline" -#define OOO_STRING_SVTOOLS_RTF_DPLINECOB "\\dplinecob" -#define OOO_STRING_SVTOOLS_RTF_DPLINECOG "\\dplinecog" -#define OOO_STRING_SVTOOLS_RTF_DPLINECOR "\\dplinecor" -#define OOO_STRING_SVTOOLS_RTF_DPLINEDADO "\\dplinedado" -#define OOO_STRING_SVTOOLS_RTF_DPLINEDADODO "\\dplinedadodo" -#define OOO_STRING_SVTOOLS_RTF_DPLINEDASH "\\dplinedash" -#define OOO_STRING_SVTOOLS_RTF_DPLINEDOT "\\dplinedot" -#define OOO_STRING_SVTOOLS_RTF_DPLINEGRAY "\\dplinegray" -#define OOO_STRING_SVTOOLS_RTF_DPLINEHOLLOW "\\dplinehollow" -#define OOO_STRING_SVTOOLS_RTF_DPLINEPAL "\\dplinepal" -#define OOO_STRING_SVTOOLS_RTF_DPLINESOLID "\\dplinesolid" -#define OOO_STRING_SVTOOLS_RTF_DPLINEW "\\dplinew" -#define OOO_STRING_SVTOOLS_RTF_DPPOLYCOUNT "\\dppolycount" -#define OOO_STRING_SVTOOLS_RTF_DPPOLYGON "\\dppolygon" -#define OOO_STRING_SVTOOLS_RTF_DPPOLYLINE "\\dppolyline" -#define OOO_STRING_SVTOOLS_RTF_DPPTX "\\dpptx" -#define OOO_STRING_SVTOOLS_RTF_DPPTY "\\dppty" -#define OOO_STRING_SVTOOLS_RTF_DPRECT "\\dprect" -#define OOO_STRING_SVTOOLS_RTF_DPROUNDR "\\dproundr" -#define OOO_STRING_SVTOOLS_RTF_DPSHADOW "\\dpshadow" -#define OOO_STRING_SVTOOLS_RTF_DPSHADX "\\dpshadx" -#define OOO_STRING_SVTOOLS_RTF_DPSHADY "\\dpshady" -#define OOO_STRING_SVTOOLS_RTF_DPTXBX "\\dptxbx" -#define OOO_STRING_SVTOOLS_RTF_DPTXBXMAR "\\dptxbxmar" -#define OOO_STRING_SVTOOLS_RTF_DPTXBXTEXT "\\dptxbxtext" -#define OOO_STRING_SVTOOLS_RTF_DPX "\\dpx" -#define OOO_STRING_SVTOOLS_RTF_DPXSIZE "\\dpxsize" -#define OOO_STRING_SVTOOLS_RTF_DPY "\\dpy" -#define OOO_STRING_SVTOOLS_RTF_DPYSIZE "\\dpysize" -#define OOO_STRING_SVTOOLS_RTF_DS "\\ds" -#define OOO_STRING_SVTOOLS_RTF_EMSPACE "\\emspace" -#define OOO_STRING_SVTOOLS_RTF_ENSPACE "\\enspace" -#define OOO_STRING_SVTOOLS_RTF_FBIDI "\\fbidi" -#define OOO_STRING_SVTOOLS_RTF_FET "\\fet" -#define OOO_STRING_SVTOOLS_RTF_FID "\\fid" -#define OOO_STRING_SVTOOLS_RTF_FILE "\\file" -#define OOO_STRING_SVTOOLS_RTF_FILETBL "\\filetbl" -#define OOO_STRING_SVTOOLS_RTF_FLDALT "\\fldalt" -#define OOO_STRING_SVTOOLS_RTF_FNETWORK "\\fnetwork" -#define OOO_STRING_SVTOOLS_RTF_FONTEMB "\\fontemb" -#define OOO_STRING_SVTOOLS_RTF_FONTFILE "\\fontfile" -#define OOO_STRING_SVTOOLS_RTF_FORMDISP "\\formdisp" -#define OOO_STRING_SVTOOLS_RTF_FORMPROT "\\formprot" -#define OOO_STRING_SVTOOLS_RTF_FORMSHADE "\\formshade" -#define OOO_STRING_SVTOOLS_RTF_FOSNUM "\\fosnum" -#define OOO_STRING_SVTOOLS_RTF_FRELATIVE "\\frelative" -#define OOO_STRING_SVTOOLS_RTF_FTNALT "\\ftnalt" -#define OOO_STRING_SVTOOLS_RTF_FTNIL "\\ftnil" -#define OOO_STRING_SVTOOLS_RTF_FTNNALC "\\ftnnalc" -#define OOO_STRING_SVTOOLS_RTF_FTNNAR "\\ftnnar" -#define OOO_STRING_SVTOOLS_RTF_FTNNAUC "\\ftnnauc" -#define OOO_STRING_SVTOOLS_RTF_FTNNCHI "\\ftnnchi" -#define OOO_STRING_SVTOOLS_RTF_FTNNRLC "\\ftnnrlc" -#define OOO_STRING_SVTOOLS_RTF_FTNNRUC "\\ftnnruc" -#define OOO_STRING_SVTOOLS_RTF_FTNRSTCONT "\\ftnrstcont" -#define OOO_STRING_SVTOOLS_RTF_FTNRSTPG "\\ftnrstpg" -#define OOO_STRING_SVTOOLS_RTF_FTTRUETYPE "\\fttruetype" -#define OOO_STRING_SVTOOLS_RTF_FVALIDDOS "\\fvaliddos" -#define OOO_STRING_SVTOOLS_RTF_FVALIDHPFS "\\fvalidhpfs" -#define OOO_STRING_SVTOOLS_RTF_FVALIDMAC "\\fvalidmac" -#define OOO_STRING_SVTOOLS_RTF_FVALIDNTFS "\\fvalidntfs" -#define OOO_STRING_SVTOOLS_RTF_HYPHAUTO "\\hyphauto" -#define OOO_STRING_SVTOOLS_RTF_HYPHCAPS "\\hyphcaps" -#define OOO_STRING_SVTOOLS_RTF_HYPHCONSEC "\\hyphconsec" -#define OOO_STRING_SVTOOLS_RTF_HYPHPAR "\\hyphpar" -#define OOO_STRING_SVTOOLS_RTF_LINKSELF "\\linkself" -#define OOO_STRING_SVTOOLS_RTF_LINKSTYLES "\\linkstyles" -#define OOO_STRING_SVTOOLS_RTF_LTRCH "\\ltrch" -#define OOO_STRING_SVTOOLS_RTF_LTRDOC "\\ltrdoc" -#define OOO_STRING_SVTOOLS_RTF_LTRMARK "\\ltrmark" -#define OOO_STRING_SVTOOLS_RTF_LTRPAR "\\ltrpar" -#define OOO_STRING_SVTOOLS_RTF_LTRROW "\\ltrrow" -#define OOO_STRING_SVTOOLS_RTF_LTRSECT "\\ltrsect" -#define OOO_STRING_SVTOOLS_RTF_NOCOLBAL "\\nocolbal" -#define OOO_STRING_SVTOOLS_RTF_NOEXTRASPRL "\\noextrasprl" -#define OOO_STRING_SVTOOLS_RTF_NOTABIND "\\notabind" -#define OOO_STRING_SVTOOLS_RTF_NOWIDCTLPAR "\\nowidctlpar" -#define OOO_STRING_SVTOOLS_RTF_OBJALIAS "\\objalias" -#define OOO_STRING_SVTOOLS_RTF_OBJALIGN "\\objalign" -#define OOO_STRING_SVTOOLS_RTF_OBJAUTLINK "\\objautlink" -#define OOO_STRING_SVTOOLS_RTF_OBJCLASS "\\objclass" -#define OOO_STRING_SVTOOLS_RTF_OBJCROPB "\\objcropb" -#define OOO_STRING_SVTOOLS_RTF_OBJCROPL "\\objcropl" -#define OOO_STRING_SVTOOLS_RTF_OBJCROPR "\\objcropr" -#define OOO_STRING_SVTOOLS_RTF_OBJCROPT "\\objcropt" -#define OOO_STRING_SVTOOLS_RTF_OBJDATA "\\objdata" -#define OOO_STRING_SVTOOLS_RTF_OBJECT "\\object" -#define OOO_STRING_SVTOOLS_RTF_OBJEMB "\\objemb" -#define OOO_STRING_SVTOOLS_RTF_OBJH "\\objh" -#define OOO_STRING_SVTOOLS_RTF_OBJICEMB "\\objicemb" -#define OOO_STRING_SVTOOLS_RTF_OBJLINK "\\objlink" -#define OOO_STRING_SVTOOLS_RTF_OBJLOCK "\\objlock" -#define OOO_STRING_SVTOOLS_RTF_OBJNAME "\\objname" -#define OOO_STRING_SVTOOLS_RTF_OBJPUB "\\objpub" -#define OOO_STRING_SVTOOLS_RTF_OBJSCALEX "\\objscalex" -#define OOO_STRING_SVTOOLS_RTF_OBJSCALEY "\\objscaley" -#define OOO_STRING_SVTOOLS_RTF_OBJSECT "\\objsect" -#define OOO_STRING_SVTOOLS_RTF_OBJSETSIZE "\\objsetsize" -#define OOO_STRING_SVTOOLS_RTF_OBJSUB "\\objsub" -#define OOO_STRING_SVTOOLS_RTF_OBJTIME "\\objtime" -#define OOO_STRING_SVTOOLS_RTF_OBJTRANSY "\\objtransy" -#define OOO_STRING_SVTOOLS_RTF_OBJUPDATE "\\objupdate" -#define OOO_STRING_SVTOOLS_RTF_OBJW "\\objw" -#define OOO_STRING_SVTOOLS_RTF_OTBLRUL "\\otblrul" -#define OOO_STRING_SVTOOLS_RTF_PGNHN "\\pgnhn" -#define OOO_STRING_SVTOOLS_RTF_PGNHNSC "\\pgnhnsc" -#define OOO_STRING_SVTOOLS_RTF_PGNHNSH "\\pgnhnsh" -#define OOO_STRING_SVTOOLS_RTF_PGNHNSM "\\pgnhnsm" -#define OOO_STRING_SVTOOLS_RTF_PGNHNSN "\\pgnhnsn" -#define OOO_STRING_SVTOOLS_RTF_PGNHNSP "\\pgnhnsp" -#define OOO_STRING_SVTOOLS_RTF_PICBMP "\\picbmp" -#define OOO_STRING_SVTOOLS_RTF_PICBPP "\\picbpp" -#define OOO_STRING_SVTOOLS_RTF_PN "\\pn" -#define OOO_STRING_SVTOOLS_RTF_PNACROSS "\\pnacross" -#define OOO_STRING_SVTOOLS_RTF_PNB "\\pnb" -#define OOO_STRING_SVTOOLS_RTF_PNCAPS "\\pncaps" -#define OOO_STRING_SVTOOLS_RTF_PNCARD "\\pncard" -#define OOO_STRING_SVTOOLS_RTF_PNCF "\\pncf" -#define OOO_STRING_SVTOOLS_RTF_PNDEC "\\pndec" -#define OOO_STRING_SVTOOLS_RTF_PNF "\\pnf" -#define OOO_STRING_SVTOOLS_RTF_PNFS "\\pnfs" -#define OOO_STRING_SVTOOLS_RTF_PNHANG "\\pnhang" -#define OOO_STRING_SVTOOLS_RTF_PNI "\\pni" -#define OOO_STRING_SVTOOLS_RTF_PNINDENT "\\pnindent" -#define OOO_STRING_SVTOOLS_RTF_PNLCLTR "\\pnlcltr" -#define OOO_STRING_SVTOOLS_RTF_PNLCRM "\\pnlcrm" -#define OOO_STRING_SVTOOLS_RTF_PNLVL "\\pnlvl" -#define OOO_STRING_SVTOOLS_RTF_PNLVLBLT "\\pnlvlblt" -#define OOO_STRING_SVTOOLS_RTF_PNLVLBODY "\\pnlvlbody" -#define OOO_STRING_SVTOOLS_RTF_PNLVLCONT "\\pnlvlcont" -#define OOO_STRING_SVTOOLS_RTF_PNNUMONCE "\\pnnumonce" -#define OOO_STRING_SVTOOLS_RTF_PNORD "\\pnord" -#define OOO_STRING_SVTOOLS_RTF_PNORDT "\\pnordt" -#define OOO_STRING_SVTOOLS_RTF_PNPREV "\\pnprev" -#define OOO_STRING_SVTOOLS_RTF_PNQC "\\pnqc" -#define OOO_STRING_SVTOOLS_RTF_PNQL "\\pnql" -#define OOO_STRING_SVTOOLS_RTF_PNQR "\\pnqr" -#define OOO_STRING_SVTOOLS_RTF_PNRESTART "\\pnrestart" -#define OOO_STRING_SVTOOLS_RTF_PNSCAPS "\\pnscaps" -#define OOO_STRING_SVTOOLS_RTF_PNSECLVL "\\pnseclvl" -#define OOO_STRING_SVTOOLS_RTF_PNSP "\\pnsp" -#define OOO_STRING_SVTOOLS_RTF_PNSTART "\\pnstart" -#define OOO_STRING_SVTOOLS_RTF_PNSTRIKE "\\pnstrike" -#define OOO_STRING_SVTOOLS_RTF_PNTEXT "\\pntext" -#define OOO_STRING_SVTOOLS_RTF_PNTXTA "\\pntxta" -#define OOO_STRING_SVTOOLS_RTF_PNTXTB "\\pntxtb" -#define OOO_STRING_SVTOOLS_RTF_PNUCLTR "\\pnucltr" -#define OOO_STRING_SVTOOLS_RTF_PNUCRM "\\pnucrm" -#define OOO_STRING_SVTOOLS_RTF_PNUL "\\pnul" -#define OOO_STRING_SVTOOLS_RTF_PNULD "\\pnuld" -#define OOO_STRING_SVTOOLS_RTF_PNULDB "\\pnuldb" -#define OOO_STRING_SVTOOLS_RTF_PNULNONE "\\pnulnone" -#define OOO_STRING_SVTOOLS_RTF_PNULW "\\pnulw" -#define OOO_STRING_SVTOOLS_RTF_PRCOLBL "\\prcolbl" -#define OOO_STRING_SVTOOLS_RTF_PRINTDATA "\\printdata" -#define OOO_STRING_SVTOOLS_RTF_PSZ "\\psz" -#define OOO_STRING_SVTOOLS_RTF_PUBAUTO "\\pubauto" -#define OOO_STRING_SVTOOLS_RTF_RESULT "\\result" -#define OOO_STRING_SVTOOLS_RTF_REVAUTH "\\revauth" -#define OOO_STRING_SVTOOLS_RTF_REVDTTM "\\revdttm" -#define OOO_STRING_SVTOOLS_RTF_REVPROT "\\revprot" -#define OOO_STRING_SVTOOLS_RTF_REVTBL "\\revtbl" -#define OOO_STRING_SVTOOLS_RTF_RSLTBMP "\\rsltbmp" -#define OOO_STRING_SVTOOLS_RTF_RSLTMERGE "\\rsltmerge" -#define OOO_STRING_SVTOOLS_RTF_RSLTPICT "\\rsltpict" -#define OOO_STRING_SVTOOLS_RTF_RSLTRTF "\\rsltrtf" -#define OOO_STRING_SVTOOLS_RTF_RSLTTXT "\\rslttxt" -#define OOO_STRING_SVTOOLS_RTF_RTLCH "\\rtlch" -#define OOO_STRING_SVTOOLS_RTF_RTLDOC "\\rtldoc" -#define OOO_STRING_SVTOOLS_RTF_RTLMARK "\\rtlmark" -#define OOO_STRING_SVTOOLS_RTF_RTLPAR "\\rtlpar" -#define OOO_STRING_SVTOOLS_RTF_RTLROW "\\rtlrow" -#define OOO_STRING_SVTOOLS_RTF_RTLSECT "\\rtlsect" -#define OOO_STRING_SVTOOLS_RTF_SEC "\\sec" -#define OOO_STRING_SVTOOLS_RTF_SECTNUM "\\sectnum" -#define OOO_STRING_SVTOOLS_RTF_SECTUNLOCKED "\\sectunlocked" -#define OOO_STRING_SVTOOLS_RTF_SLMULT "\\slmult" -#define OOO_STRING_SVTOOLS_RTF_SOFTCOL "\\softcol" -#define OOO_STRING_SVTOOLS_RTF_SOFTLHEIGHT "\\softlheight" -#define OOO_STRING_SVTOOLS_RTF_SOFTLINE "\\softline" -#define OOO_STRING_SVTOOLS_RTF_SOFTPAGE "\\softpage" -#define OOO_STRING_SVTOOLS_RTF_SPRSSPBF "\\sprsspbf" -#define OOO_STRING_SVTOOLS_RTF_SPRSTSP "\\sprstsp" -#define OOO_STRING_SVTOOLS_RTF_SUBDOCUMENT "\\subdocument" -#define OOO_STRING_SVTOOLS_RTF_SWPBDR "\\swpbdr" -#define OOO_STRING_SVTOOLS_RTF_TCN "\\tcn" -#define OOO_STRING_SVTOOLS_RTF_TRANSMF "\\transmf" -#define OOO_STRING_SVTOOLS_RTF_TRBRDRB "\\trbrdrb" -#define OOO_STRING_SVTOOLS_RTF_TRBRDRH "\\trbrdrh" -#define OOO_STRING_SVTOOLS_RTF_TRBRDRL "\\trbrdrl" -#define OOO_STRING_SVTOOLS_RTF_TRBRDRR "\\trbrdrr" -#define OOO_STRING_SVTOOLS_RTF_TRBRDRT "\\trbrdrt" -#define OOO_STRING_SVTOOLS_RTF_TRBRDRV "\\trbrdrv" -#define OOO_STRING_SVTOOLS_RTF_TRHDR "\\trhdr" -#define OOO_STRING_SVTOOLS_RTF_TRKEEP "\\trkeep" -#define OOO_STRING_SVTOOLS_RTF_TRPADDB "\\trpaddb" -#define OOO_STRING_SVTOOLS_RTF_TRPADDL "\\trpaddl" -#define OOO_STRING_SVTOOLS_RTF_TRPADDR "\\trpaddr" -#define OOO_STRING_SVTOOLS_RTF_TRPADDT "\\trpaddt" -#define OOO_STRING_SVTOOLS_RTF_TRPADDFB "\\trpaddfb" -#define OOO_STRING_SVTOOLS_RTF_TRPADDFL "\\trpaddfl" -#define OOO_STRING_SVTOOLS_RTF_TRPADDFR "\\trpaddfr" -#define OOO_STRING_SVTOOLS_RTF_TRPADDFT "\\trpaddft" -#define OOO_STRING_SVTOOLS_RTF_WRAPTRSP "\\wraptrsp" -#define OOO_STRING_SVTOOLS_RTF_XEF "\\xef" -#define OOO_STRING_SVTOOLS_RTF_ZWJ "\\zwj" -#define OOO_STRING_SVTOOLS_RTF_ZWNJ "\\zwnj" - -// neue Tokens zur 1.5 -#define OOO_STRING_SVTOOLS_RTF_ABSLOCK "\\abslock" -#define OOO_STRING_SVTOOLS_RTF_ADJUSTRIGHT "\\adjustright" -#define OOO_STRING_SVTOOLS_RTF_AFTNNCHOSUNG "\\aftnnchosung" -#define OOO_STRING_SVTOOLS_RTF_AFTNNCNUM "\\aftnncnum" -#define OOO_STRING_SVTOOLS_RTF_AFTNNDBAR "\\aftnndbar" -#define OOO_STRING_SVTOOLS_RTF_AFTNNDBNUM "\\aftnndbnum" -#define OOO_STRING_SVTOOLS_RTF_AFTNNDBNUMD "\\aftnndbnumd" -#define OOO_STRING_SVTOOLS_RTF_AFTNNDBNUMK "\\aftnndbnumk" -#define OOO_STRING_SVTOOLS_RTF_AFTNNDBNUMT "\\aftnndbnumt" -#define OOO_STRING_SVTOOLS_RTF_AFTNNGANADA "\\aftnnganada" -#define OOO_STRING_SVTOOLS_RTF_AFTNNGBNUM "\\aftnngbnum" -#define OOO_STRING_SVTOOLS_RTF_AFTNNGBNUMD "\\aftnngbnumd" -#define OOO_STRING_SVTOOLS_RTF_AFTNNGBNUMK "\\aftnngbnumk" -#define OOO_STRING_SVTOOLS_RTF_AFTNNGBNUML "\\aftnngbnuml" -#define OOO_STRING_SVTOOLS_RTF_AFTNNZODIAC "\\aftnnzodiac" -#define OOO_STRING_SVTOOLS_RTF_AFTNNZODIACD "\\aftnnzodiacd" -#define OOO_STRING_SVTOOLS_RTF_AFTNNZODIACL "\\aftnnzodiacl" -#define OOO_STRING_SVTOOLS_RTF_ANIMTEXT "\\animtext" -#define OOO_STRING_SVTOOLS_RTF_ANSICPG "\\ansicpg" -#define OOO_STRING_SVTOOLS_RTF_BACKGROUND "\\background" -#define OOO_STRING_SVTOOLS_RTF_BDBFHDR "\\bdbfhdr" -#define OOO_STRING_SVTOOLS_RTF_BLIPTAG "\\bliptag" -#define OOO_STRING_SVTOOLS_RTF_BLIPUID "\\blipuid" -#define OOO_STRING_SVTOOLS_RTF_BLIPUPI "\\blipupi" -#define OOO_STRING_SVTOOLS_RTF_BRDRART "\\brdrart" -#define OOO_STRING_SVTOOLS_RTF_BRDRDASHD "\\brdrdashd" -#define OOO_STRING_SVTOOLS_RTF_BRDRDASHDD "\\brdrdashdd" -#define OOO_STRING_SVTOOLS_RTF_BRDRDASHDOTSTR "\\brdrdashdotstr" -#define OOO_STRING_SVTOOLS_RTF_BRDRDASHSM "\\brdrdashsm" -#define OOO_STRING_SVTOOLS_RTF_BRDREMBOSS "\\brdremboss" -#define OOO_STRING_SVTOOLS_RTF_BRDRENGRAVE "\\brdrengrave" -#define OOO_STRING_SVTOOLS_RTF_BRDRFRAME "\\brdrframe" -#define OOO_STRING_SVTOOLS_RTF_BRDRTHTNLG "\\brdrthtnlg" -#define OOO_STRING_SVTOOLS_RTF_BRDRTHTNMG "\\brdrthtnmg" -#define OOO_STRING_SVTOOLS_RTF_BRDRTHTNSG "\\brdrthtnsg" -#define OOO_STRING_SVTOOLS_RTF_BRDRTNTHLG "\\brdrtnthlg" -#define OOO_STRING_SVTOOLS_RTF_BRDRTNTHMG "\\brdrtnthmg" -#define OOO_STRING_SVTOOLS_RTF_BRDRTNTHSG "\\brdrtnthsg" -#define OOO_STRING_SVTOOLS_RTF_BRDRTNTHTNLG "\\brdrtnthtnlg" -#define OOO_STRING_SVTOOLS_RTF_BRDRTNTHTNMG "\\brdrtnthtnmg" -#define OOO_STRING_SVTOOLS_RTF_BRDRTNTHTNSG "\\brdrtnthtnsg" -#define OOO_STRING_SVTOOLS_RTF_BRDRTRIPLE "\\brdrtriple" -#define OOO_STRING_SVTOOLS_RTF_BRDRWAVY "\\brdrwavy" -#define OOO_STRING_SVTOOLS_RTF_BRDRWAVYDB "\\brdrwavydb" -#define OOO_STRING_SVTOOLS_RTF_CATEGORY "\\category" -#define OOO_STRING_SVTOOLS_RTF_CGRID "\\cgrid" -#define OOO_STRING_SVTOOLS_RTF_CHARSCALEX "\\charscalex" -#define OOO_STRING_SVTOOLS_RTF_CHBGBDIAG "\\chbgbdiag" -#define OOO_STRING_SVTOOLS_RTF_CHBGCROSS "\\chbgcross" -#define OOO_STRING_SVTOOLS_RTF_CHBGDCROSS "\\chbgdcross" -#define OOO_STRING_SVTOOLS_RTF_CHBGDKBDIAG "\\chbgdkbdiag" -#define OOO_STRING_SVTOOLS_RTF_CHBGDKCROSS "\\chbgdkcross" -#define OOO_STRING_SVTOOLS_RTF_CHBGDKDCROSS "\\chbgdkdcross" -#define OOO_STRING_SVTOOLS_RTF_CHBGDKFDIAG "\\chbgdkfdiag" -#define OOO_STRING_SVTOOLS_RTF_CHBGDKHORIZ "\\chbgdkhoriz" -#define OOO_STRING_SVTOOLS_RTF_CHBGDKVERT "\\chbgdkvert" -#define OOO_STRING_SVTOOLS_RTF_CHBGFDIAG "\\chbgfdiag" -#define OOO_STRING_SVTOOLS_RTF_CHBGHORIZ "\\chbghoriz" -#define OOO_STRING_SVTOOLS_RTF_CHBGVERT "\\chbgvert" -#define OOO_STRING_SVTOOLS_RTF_CHBRDR "\\chbrdr" -#define OOO_STRING_SVTOOLS_RTF_CHCBPAT "\\chcbpat" -#define OOO_STRING_SVTOOLS_RTF_CHCFPAT "\\chcfpat" -#define OOO_STRING_SVTOOLS_RTF_CHSHDNG "\\chshdng" -#define OOO_STRING_SVTOOLS_RTF_CLPADL "\\clpadl" -#define OOO_STRING_SVTOOLS_RTF_CLPADT "\\clpadt" -#define OOO_STRING_SVTOOLS_RTF_CLPADB "\\clpadb" -#define OOO_STRING_SVTOOLS_RTF_CLPADR "\\clpadr" -#define OOO_STRING_SVTOOLS_RTF_CLPADFL "\\clpadfl" -#define OOO_STRING_SVTOOLS_RTF_CLPADFT "\\clpadft" -#define OOO_STRING_SVTOOLS_RTF_CLPADFB "\\clpadfb" -#define OOO_STRING_SVTOOLS_RTF_CLPADFR "\\clpadfr" -#define OOO_STRING_SVTOOLS_RTF_CLTXLRTB "\\cltxlrtb" -#define OOO_STRING_SVTOOLS_RTF_CLTXTBRL "\\cltxtbrl" -#define OOO_STRING_SVTOOLS_RTF_CLVERTALB "\\clvertalb" -#define OOO_STRING_SVTOOLS_RTF_CLVERTALC "\\clvertalc" -#define OOO_STRING_SVTOOLS_RTF_CLVERTALT "\\clvertalt" -#define OOO_STRING_SVTOOLS_RTF_CLVMGF "\\clvmgf" -#define OOO_STRING_SVTOOLS_RTF_CLVMRG "\\clvmrg" -#define OOO_STRING_SVTOOLS_RTF_CLTXTBRLV "\\cltxtbrlv" -#define OOO_STRING_SVTOOLS_RTF_CLTXBTLR "\\cltxbtlr" -#define OOO_STRING_SVTOOLS_RTF_CLTXLRTBV "\\cltxlrtbv" -#define OOO_STRING_SVTOOLS_RTF_COMPANY "\\company" -#define OOO_STRING_SVTOOLS_RTF_CRAUTH "\\crauth" -#define OOO_STRING_SVTOOLS_RTF_CRDATE "\\crdate" -#define OOO_STRING_SVTOOLS_RTF_DATE "\\date" -#define OOO_STRING_SVTOOLS_RTF_DEFLANGFE "\\deflangfe" -#define OOO_STRING_SVTOOLS_RTF_DFRAUTH "\\dfrauth" -#define OOO_STRING_SVTOOLS_RTF_DFRDATE "\\dfrdate" -#define OOO_STRING_SVTOOLS_RTF_DFRSTART "\\dfrstart" -#define OOO_STRING_SVTOOLS_RTF_DFRSTOP "\\dfrstop" -#define OOO_STRING_SVTOOLS_RTF_DFRXST "\\dfrxst" -#define OOO_STRING_SVTOOLS_RTF_DGMARGIN "\\dgmargin" -#define OOO_STRING_SVTOOLS_RTF_DNTBLNSBDB "\\dntblnsbdb" -#define OOO_STRING_SVTOOLS_RTF_DOCTYPE "\\doctype" -#define OOO_STRING_SVTOOLS_RTF_DOCVAR "\\docvar" -#define OOO_STRING_SVTOOLS_RTF_DPCODESCENT "\\dpcodescent" -#define OOO_STRING_SVTOOLS_RTF_EMBO "\\embo" -#define OOO_STRING_SVTOOLS_RTF_EMFBLIP "\\emfblip" -#define OOO_STRING_SVTOOLS_RTF_EXPSHRTN "\\expshrtn" -#define OOO_STRING_SVTOOLS_RTF_FAAUTO "\\faauto" -#define OOO_STRING_SVTOOLS_RTF_FBIAS "\\fbias" -#define OOO_STRING_SVTOOLS_RTF_FFDEFRES "\\ffdefres" -#define OOO_STRING_SVTOOLS_RTF_FFDEFTEXT "\\ffdeftext" -#define OOO_STRING_SVTOOLS_RTF_FFENTRYMCR "\\ffentrymcr" -#define OOO_STRING_SVTOOLS_RTF_FFEXITMCR "\\ffexitmcr" -#define OOO_STRING_SVTOOLS_RTF_FFFORMAT "\\ffformat" -#define OOO_STRING_SVTOOLS_RTF_FFHASLISTBOX "\\ffhaslistbox" -#define OOO_STRING_SVTOOLS_RTF_FFHELPTEXT "\\ffhelptext" -#define OOO_STRING_SVTOOLS_RTF_FFHPS "\\ffhps" -#define OOO_STRING_SVTOOLS_RTF_FFL "\\ffl" -#define OOO_STRING_SVTOOLS_RTF_FFMAXLEN "\\ffmaxlen" -#define OOO_STRING_SVTOOLS_RTF_FFNAME "\\ffname" -#define OOO_STRING_SVTOOLS_RTF_FFOWNHELP "\\ffownhelp" -#define OOO_STRING_SVTOOLS_RTF_FFOWNSTAT "\\ffownstat" -#define OOO_STRING_SVTOOLS_RTF_FFPROT "\\ffprot" -#define OOO_STRING_SVTOOLS_RTF_FFRECALC "\\ffrecalc" -#define OOO_STRING_SVTOOLS_RTF_FFRES "\\ffres" -#define OOO_STRING_SVTOOLS_RTF_FFSIZE "\\ffsize" -#define OOO_STRING_SVTOOLS_RTF_FFSTATTEXT "\\ffstattext" -#define OOO_STRING_SVTOOLS_RTF_FFTYPE "\\fftype" -#define OOO_STRING_SVTOOLS_RTF_FFTYPETXT "\\fftypetxt" -#define OOO_STRING_SVTOOLS_RTF_FLDTYPE "\\fldtype" -#define OOO_STRING_SVTOOLS_RTF_FNAME "\\fname" -#define OOO_STRING_SVTOOLS_RTF_FORMFIELD "\\formfield" -#define OOO_STRING_SVTOOLS_RTF_FROMTEXT "\\fromtext" -#define OOO_STRING_SVTOOLS_RTF_FTNNCHOSUNG "\\ftnnchosung" -#define OOO_STRING_SVTOOLS_RTF_FTNNCNUM "\\ftnncnum" -#define OOO_STRING_SVTOOLS_RTF_FTNNDBAR "\\ftnndbar" -#define OOO_STRING_SVTOOLS_RTF_FTNNDBNUM "\\ftnndbnum" -#define OOO_STRING_SVTOOLS_RTF_FTNNDBNUMD "\\ftnndbnumd" -#define OOO_STRING_SVTOOLS_RTF_FTNNDBNUMK "\\ftnndbnumk" -#define OOO_STRING_SVTOOLS_RTF_FTNNDBNUMT "\\ftnndbnumt" -#define OOO_STRING_SVTOOLS_RTF_FTNNGANADA "\\ftnnganada" -#define OOO_STRING_SVTOOLS_RTF_FTNNGBNUM "\\ftnngbnum" -#define OOO_STRING_SVTOOLS_RTF_FTNNGBNUMD "\\ftnngbnumd" -#define OOO_STRING_SVTOOLS_RTF_FTNNGBNUMK "\\ftnngbnumk" -#define OOO_STRING_SVTOOLS_RTF_FTNNGBNUML "\\ftnngbnuml" -#define OOO_STRING_SVTOOLS_RTF_FTNNZODIAC "\\ftnnzodiac" -#define OOO_STRING_SVTOOLS_RTF_FTNNZODIACD "\\ftnnzodiacd" -#define OOO_STRING_SVTOOLS_RTF_FTNNZODIACL "\\ftnnzodiacl" -#define OOO_STRING_SVTOOLS_RTF_G "\\g" -#define OOO_STRING_SVTOOLS_RTF_GCW "\\gcw" -#define OOO_STRING_SVTOOLS_RTF_GRIDTBL "\\gridtbl" -#define OOO_STRING_SVTOOLS_RTF_HIGHLIGHT "\\highlight" -#define OOO_STRING_SVTOOLS_RTF_HLFR "\\hlfr" -#define OOO_STRING_SVTOOLS_RTF_HLINKBASE "\\hlinkbase" -#define OOO_STRING_SVTOOLS_RTF_HLLOC "\\hlloc" -#define OOO_STRING_SVTOOLS_RTF_HLSRC "\\hlsrc" -#define OOO_STRING_SVTOOLS_RTF_ILVL "\\ilvl" -#define OOO_STRING_SVTOOLS_RTF_IMPR "\\impr" -#define OOO_STRING_SVTOOLS_RTF_JPEGBLIP "\\jpegblip" -#define OOO_STRING_SVTOOLS_RTF_LEVELFOLLOW "\\levelfollow" -#define OOO_STRING_SVTOOLS_RTF_LEVELINDENT "\\levelindent" -#define OOO_STRING_SVTOOLS_RTF_LEVELJC "\\leveljc" -#define OOO_STRING_SVTOOLS_RTF_LEVELLEGAL "\\levellegal" -#define OOO_STRING_SVTOOLS_RTF_LEVELNFC "\\levelnfc" -#define OOO_STRING_SVTOOLS_RTF_LEVELNORESTART "\\levelnorestart" -#define OOO_STRING_SVTOOLS_RTF_LEVELNUMBERS "\\levelnumbers" -#define OOO_STRING_SVTOOLS_RTF_LEVELOLD "\\levelold" -#define OOO_STRING_SVTOOLS_RTF_LEVELPREV "\\levelprev" -#define OOO_STRING_SVTOOLS_RTF_LEVELPREVSPACE "\\levelprevspace" -#define OOO_STRING_SVTOOLS_RTF_LEVELSPACE "\\levelspace" -#define OOO_STRING_SVTOOLS_RTF_LEVELSTARTAT "\\levelstartat" -#define OOO_STRING_SVTOOLS_RTF_LEVELTEXT "\\leveltext" -#define OOO_STRING_SVTOOLS_RTF_LINKVAL "\\linkval" -#define OOO_STRING_SVTOOLS_RTF_LIST "\\list" -#define OOO_STRING_SVTOOLS_RTF_LISTID "\\listid" -#define OOO_STRING_SVTOOLS_RTF_LISTLEVEL "\\listlevel" -#define OOO_STRING_SVTOOLS_RTF_LISTNAME "\\listname" -#define OOO_STRING_SVTOOLS_RTF_LISTOVERRIDE "\\listoverride" -#define OOO_STRING_SVTOOLS_RTF_LISTOVERRIDECOUNT "\\listoverridecount" -#define OOO_STRING_SVTOOLS_RTF_LISTOVERRIDEFORMAT "\\listoverrideformat" -#define OOO_STRING_SVTOOLS_RTF_LISTOVERRIDESTART "\\listoverridestart" -#define OOO_STRING_SVTOOLS_RTF_LISTOVERRIDETABLE "\\listoverridetable" -#define OOO_STRING_SVTOOLS_RTF_LISTRESTARTHDN "\\listrestarthdn" -#define OOO_STRING_SVTOOLS_RTF_LISTSIMPLE "\\listsimple" -#define OOO_STRING_SVTOOLS_RTF_LISTTABLE "\\listtable" -#define OOO_STRING_SVTOOLS_RTF_LISTTEMPLATEID "\\listtemplateid" -#define OOO_STRING_SVTOOLS_RTF_LISTTEXT "\\listtext" -#define OOO_STRING_SVTOOLS_RTF_LS "\\ls" -#define OOO_STRING_SVTOOLS_RTF_LYTEXCTTP "\\lytexcttp" -#define OOO_STRING_SVTOOLS_RTF_LYTPRTMET "\\lytprtmet" -#define OOO_STRING_SVTOOLS_RTF_MANAGER "\\manager" -#define OOO_STRING_SVTOOLS_RTF_MSMCAP "\\msmcap" -#define OOO_STRING_SVTOOLS_RTF_NOFCHARSWS "\\nofcharsws" -#define OOO_STRING_SVTOOLS_RTF_NOLEAD "\\nolead" -#define OOO_STRING_SVTOOLS_RTF_NONSHPPICT "\\nonshppict" -#define OOO_STRING_SVTOOLS_RTF_NOSECTEXPAND "\\nosectexpand" -#define OOO_STRING_SVTOOLS_RTF_NOSNAPLINEGRID "\\nosnaplinegrid" -#define OOO_STRING_SVTOOLS_RTF_NOSPACEFORUL "\\nospaceforul" -#define OOO_STRING_SVTOOLS_RTF_NOULTRLSPC "\\noultrlspc" -#define OOO_STRING_SVTOOLS_RTF_NOXLATTOYEN "\\noxlattoyen" -#define OOO_STRING_SVTOOLS_RTF_OBJATTPH "\\objattph" -#define OOO_STRING_SVTOOLS_RTF_OBJHTML "\\objhtml" -#define OOO_STRING_SVTOOLS_RTF_OBJOCX "\\objocx" -#define OOO_STRING_SVTOOLS_RTF_OLDLINEWRAP "\\oldlinewrap" -#define OOO_STRING_SVTOOLS_RTF_OUTLINELEVEL "\\outlinelevel" -#define OOO_STRING_SVTOOLS_RTF_OVERLAY "\\overlay" -#define OOO_STRING_SVTOOLS_RTF_PANOSE "\\panose" -#define OOO_STRING_SVTOOLS_RTF_PGBRDRB "\\pgbrdrb" -#define OOO_STRING_SVTOOLS_RTF_PGBRDRFOOT "\\pgbrdrfoot" -#define OOO_STRING_SVTOOLS_RTF_PGBRDRHEAD "\\pgbrdrhead" -#define OOO_STRING_SVTOOLS_RTF_PGBRDRL "\\pgbrdrl" -#define OOO_STRING_SVTOOLS_RTF_PGBRDROPT "\\pgbrdropt" -#define OOO_STRING_SVTOOLS_RTF_PGBRDRR "\\pgbrdrr" -#define OOO_STRING_SVTOOLS_RTF_PGBRDRSNAP "\\pgbrdrsnap" -#define OOO_STRING_SVTOOLS_RTF_PGBRDRT "\\pgbrdrt" -#define OOO_STRING_SVTOOLS_RTF_PGNCHOSUNG "\\pgnchosung" -#define OOO_STRING_SVTOOLS_RTF_PGNCNUM "\\pgncnum" -#define OOO_STRING_SVTOOLS_RTF_PGNDBNUMK "\\pgndbnumk" -#define OOO_STRING_SVTOOLS_RTF_PGNDBNUMT "\\pgndbnumt" -#define OOO_STRING_SVTOOLS_RTF_PGNGANADA "\\pgnganada" -#define OOO_STRING_SVTOOLS_RTF_PGNGBNUM "\\pgngbnum" -#define OOO_STRING_SVTOOLS_RTF_PGNGBNUMD "\\pgngbnumd" -#define OOO_STRING_SVTOOLS_RTF_PGNGBNUMK "\\pgngbnumk" -#define OOO_STRING_SVTOOLS_RTF_PGNGBNUML "\\pgngbnuml" -#define OOO_STRING_SVTOOLS_RTF_PGNZODIAC "\\pgnzodiac" -#define OOO_STRING_SVTOOLS_RTF_PGNZODIACD "\\pgnzodiacd" -#define OOO_STRING_SVTOOLS_RTF_PGNZODIACL "\\pgnzodiacl" -#define OOO_STRING_SVTOOLS_RTF_PICPROP "\\picprop" -#define OOO_STRING_SVTOOLS_RTF_PNAIUEO "\\pnaiueo" -#define OOO_STRING_SVTOOLS_RTF_PNAIUEOD "\\pnaiueod" -#define OOO_STRING_SVTOOLS_RTF_PNCHOSUNG "\\pnchosung" -#define OOO_STRING_SVTOOLS_RTF_PNDBNUMD "\\pndbnumd" -#define OOO_STRING_SVTOOLS_RTF_PNDBNUMK "\\pndbnumk" -#define OOO_STRING_SVTOOLS_RTF_PNDBNUML "\\pndbnuml" -#define OOO_STRING_SVTOOLS_RTF_PNDBNUMT "\\pndbnumt" -#define OOO_STRING_SVTOOLS_RTF_PNGANADA "\\pnganada" -#define OOO_STRING_SVTOOLS_RTF_PNGBLIP "\\pngblip" -#define OOO_STRING_SVTOOLS_RTF_PNGBNUM "\\pngbnum" -#define OOO_STRING_SVTOOLS_RTF_PNGBNUMD "\\pngbnumd" -#define OOO_STRING_SVTOOLS_RTF_PNGBNUMK "\\pngbnumk" -#define OOO_STRING_SVTOOLS_RTF_PNGBNUML "\\pngbnuml" -#define OOO_STRING_SVTOOLS_RTF_PNRAUTH "\\pnrauth" -#define OOO_STRING_SVTOOLS_RTF_PNRDATE "\\pnrdate" -#define OOO_STRING_SVTOOLS_RTF_PNRNFC "\\pnrnfc" -#define OOO_STRING_SVTOOLS_RTF_PNRNOT "\\pnrnot" -#define OOO_STRING_SVTOOLS_RTF_PNRPNBR "\\pnrpnbr" -#define OOO_STRING_SVTOOLS_RTF_PNRRGB "\\pnrrgb" -#define OOO_STRING_SVTOOLS_RTF_PNRSTART "\\pnrstart" -#define OOO_STRING_SVTOOLS_RTF_PNRSTOP "\\pnrstop" -#define OOO_STRING_SVTOOLS_RTF_PNRXST "\\pnrxst" -#define OOO_STRING_SVTOOLS_RTF_PNZODIAC "\\pnzodiac" -#define OOO_STRING_SVTOOLS_RTF_PNZODIACD "\\pnzodiacd" -#define OOO_STRING_SVTOOLS_RTF_PNZODIACL "\\pnzodiacl" -#define OOO_STRING_SVTOOLS_RTF_LFOLEVEL "\\lfolevel" -#define OOO_STRING_SVTOOLS_RTF_POSYIN "\\posyin" -#define OOO_STRING_SVTOOLS_RTF_POSYOUT "\\posyout" -#define OOO_STRING_SVTOOLS_RTF_PRIVATE "\\private" -#define OOO_STRING_SVTOOLS_RTF_PROPNAME "\\propname" -#define OOO_STRING_SVTOOLS_RTF_PROPTYPE "\\proptype" -#define OOO_STRING_SVTOOLS_RTF_REVAUTHDEL "\\revauthdel" -#define OOO_STRING_SVTOOLS_RTF_REVDTTMDEL "\\revdttmdel" -#define OOO_STRING_SVTOOLS_RTF_SAUTOUPD "\\sautoupd" -#define OOO_STRING_SVTOOLS_RTF_SECTDEFAULTCL "\\sectdefaultcl" -#define OOO_STRING_SVTOOLS_RTF_SECTEXPAND "\\sectexpand" -#define OOO_STRING_SVTOOLS_RTF_SECTLINEGRID "\\sectlinegrid" -#define OOO_STRING_SVTOOLS_RTF_SECTSPECIFYCL "\\sectspecifycl" -#define OOO_STRING_SVTOOLS_RTF_SECTSPECIFYL "\\sectspecifyl" -#define OOO_STRING_SVTOOLS_RTF_SHIDDEN "\\shidden" -#define OOO_STRING_SVTOOLS_RTF_SHPBOTTOM "\\shpbottom" -#define OOO_STRING_SVTOOLS_RTF_SHPBXCOLUMN "\\shpbxcolumn" -#define OOO_STRING_SVTOOLS_RTF_SHPBXMARGIN "\\shpbxmargin" -#define OOO_STRING_SVTOOLS_RTF_SHPBXPAGE "\\shpbxpage" -#define OOO_STRING_SVTOOLS_RTF_SHPBYMARGIN "\\shpbymargin" -#define OOO_STRING_SVTOOLS_RTF_SHPBYPAGE "\\shpbypage" -#define OOO_STRING_SVTOOLS_RTF_SHPBYPARA "\\shpbypara" -#define OOO_STRING_SVTOOLS_RTF_SHPFBLWTXT "\\shpfblwtxt" -#define OOO_STRING_SVTOOLS_RTF_SHPFHDR "\\shpfhdr" -#define OOO_STRING_SVTOOLS_RTF_SHPGRP "\\shpgrp" -#define OOO_STRING_SVTOOLS_RTF_SHPLEFT "\\shpleft" -#define OOO_STRING_SVTOOLS_RTF_SHPLID "\\shplid" -#define OOO_STRING_SVTOOLS_RTF_SHPLOCKANCHOR "\\shplockanchor" -#define OOO_STRING_SVTOOLS_RTF_SHPPICT "\\shppict" -#define OOO_STRING_SVTOOLS_RTF_SHPRIGHT "\\shpright" -#define OOO_STRING_SVTOOLS_RTF_SHPRSLT "\\shprslt" -#define OOO_STRING_SVTOOLS_RTF_SHPTOP "\\shptop" -#define OOO_STRING_SVTOOLS_RTF_SHPTXT "\\shptxt" -#define OOO_STRING_SVTOOLS_RTF_SHPWRK "\\shpwrk" -#define OOO_STRING_SVTOOLS_RTF_SHPWR "\\shpwr" -#define OOO_STRING_SVTOOLS_RTF_SHPZ "\\shpz" -#define OOO_STRING_SVTOOLS_RTF_SPRSBSP "\\sprsbsp" -#define OOO_STRING_SVTOOLS_RTF_SPRSLNSP "\\sprslnsp" -#define OOO_STRING_SVTOOLS_RTF_SPRSTSM "\\sprstsm" -#define OOO_STRING_SVTOOLS_RTF_STATICVAL "\\staticval" -#define OOO_STRING_SVTOOLS_RTF_STEXTFLOW "\\stextflow" -#define OOO_STRING_SVTOOLS_RTF_STRIKED "\\striked" -#define OOO_STRING_SVTOOLS_RTF_SUBFONTBYSIZE "\\subfontbysize" -#define OOO_STRING_SVTOOLS_RTF_TCELLD "\\tcelld" -#define OOO_STRING_SVTOOLS_RTF_TIME "\\time" -#define OOO_STRING_SVTOOLS_RTF_TRUNCATEFONTHEIGHT "\\truncatefontheight" -#define OOO_STRING_SVTOOLS_RTF_UC "\\uc" -#define OOO_STRING_SVTOOLS_RTF_UD "\\ud" -#define OOO_STRING_SVTOOLS_RTF_ULDASH "\\uldash" -#define OOO_STRING_SVTOOLS_RTF_ULDASHD "\\uldashd" -#define OOO_STRING_SVTOOLS_RTF_ULDASHDD "\\uldashdd" -#define OOO_STRING_SVTOOLS_RTF_ULTH "\\ulth" -#define OOO_STRING_SVTOOLS_RTF_ULWAVE "\\ulwave" -#define OOO_STRING_SVTOOLS_RTF_ULC "\\ulc" -#define OOO_STRING_SVTOOLS_RTF_U "\\u" -#define OOO_STRING_SVTOOLS_RTF_UPR "\\upr" -#define OOO_STRING_SVTOOLS_RTF_USERPROPS "\\userprops" -#define OOO_STRING_SVTOOLS_RTF_VIEWKIND "\\viewkind" -#define OOO_STRING_SVTOOLS_RTF_VIEWSCALE "\\viewscale" -#define OOO_STRING_SVTOOLS_RTF_VIEWZK "\\viewzk" -#define OOO_STRING_SVTOOLS_RTF_WIDCTLPAR "\\widctlpar" -#define OOO_STRING_SVTOOLS_RTF_WINDOWCAPTION "\\windowcaption" -#define OOO_STRING_SVTOOLS_RTF_WPEQN "\\wpeqn" -#define OOO_STRING_SVTOOLS_RTF_WPJST "\\wpjst" -#define OOO_STRING_SVTOOLS_RTF_WPSP "\\wpsp" -#define OOO_STRING_SVTOOLS_RTF_YXE "\\yxe" -#define OOO_STRING_SVTOOLS_RTF_FRMTXLRTB "\\frmtxlrtb" -#define OOO_STRING_SVTOOLS_RTF_FRMTXTBRL "\\frmtxtbrl" -#define OOO_STRING_SVTOOLS_RTF_FRMTXBTLR "\\frmtxbtlr" -#define OOO_STRING_SVTOOLS_RTF_FRMTXLRTBV "\\frmtxlrtbv" -#define OOO_STRING_SVTOOLS_RTF_FRMTXTBRLV "\\frmtxtbrlv" - -// MS-2000 Tokens -#define OOO_STRING_SVTOOLS_RTF_ULTHD "\\ulthd" -#define OOO_STRING_SVTOOLS_RTF_ULTHDASH "\\ulthdash" -#define OOO_STRING_SVTOOLS_RTF_ULLDASH "\\ulldash" -#define OOO_STRING_SVTOOLS_RTF_ULTHLDASH "\\ulthldash" -#define OOO_STRING_SVTOOLS_RTF_ULTHDASHD "\\ulthdashd" -#define OOO_STRING_SVTOOLS_RTF_ULTHDASHDD "\\ulthdashdd" -#define OOO_STRING_SVTOOLS_RTF_ULHWAVE "\\ulhwave" -#define OOO_STRING_SVTOOLS_RTF_ULULDBWAVE "\\ululdbwave" -#define OOO_STRING_SVTOOLS_RTF_LOCH "\\loch" -#define OOO_STRING_SVTOOLS_RTF_HICH "\\hich" -#define OOO_STRING_SVTOOLS_RTF_DBCH "\\dbch" -#define OOO_STRING_SVTOOLS_RTF_LANGFE "\\langfe" -#define OOO_STRING_SVTOOLS_RTF_ADEFLANG "\\adeflang" -#define OOO_STRING_SVTOOLS_RTF_ADEFF "\\adeff" -#define OOO_STRING_SVTOOLS_RTF_ACCNONE "\\accnone" -#define OOO_STRING_SVTOOLS_RTF_ACCDOT "\\accdot" -#define OOO_STRING_SVTOOLS_RTF_ACCCOMMA "\\acccomma" -#define OOO_STRING_SVTOOLS_RTF_TWOINONE "\\twoinone" -#define OOO_STRING_SVTOOLS_RTF_HORZVERT "\\horzvert" -#define OOO_STRING_SVTOOLS_RTF_FAHANG "\\fahang" -#define OOO_STRING_SVTOOLS_RTF_FAVAR "\\favar" -#define OOO_STRING_SVTOOLS_RTF_FACENTER "\\facenter" -#define OOO_STRING_SVTOOLS_RTF_FAROMAN "\\faroman" -#define OOO_STRING_SVTOOLS_RTF_FAFIXED "\\fafixed" -#define OOO_STRING_SVTOOLS_RTF_NOCWRAP "\\nocwrap" -#define OOO_STRING_SVTOOLS_RTF_NOOVERFLOW "\\nooverflow" -#define OOO_STRING_SVTOOLS_RTF_ASPALPHA "\\aspalpha" - -// SWG spezifische Attribute -#define OOO_STRING_SVTOOLS_RTF_GRFALIGNV "\\grfalignv" -#define OOO_STRING_SVTOOLS_RTF_GRFALIGNH "\\grfalignh" -#define OOO_STRING_SVTOOLS_RTF_GRFMIRROR "\\grfmirror" -#define OOO_STRING_SVTOOLS_RTF_HEADERYB "\\headeryb" -#define OOO_STRING_SVTOOLS_RTF_HEADERXL "\\headerxl" -#define OOO_STRING_SVTOOLS_RTF_HEADERXR "\\headerxr" -#define OOO_STRING_SVTOOLS_RTF_FOOTERYT "\\footeryt" -#define OOO_STRING_SVTOOLS_RTF_FOOTERXL "\\footerxl" -#define OOO_STRING_SVTOOLS_RTF_FOOTERXR "\\footerxr" -#define OOO_STRING_SVTOOLS_RTF_HEADERYH "\\headeryh" -#define OOO_STRING_SVTOOLS_RTF_FOOTERYH "\\footeryh" -#define OOO_STRING_SVTOOLS_RTF_BALANCEDCOLUMN "\\swcolmnblnc" -#define OOO_STRING_SVTOOLS_RTF_UPDNPROP "\\updnprop" -#define OOO_STRING_SVTOOLS_RTF_PRTDATA "\\prtdata" -#define OOO_STRING_SVTOOLS_RTF_BKMKKEY "\\bkmkkey" - -// Attribute fuer die freifliegenden Rahmen -#define OOO_STRING_SVTOOLS_RTF_FLYPRINT "\\flyprint" -#define OOO_STRING_SVTOOLS_RTF_FLYOPAQUE "\\flyopaque" -#define OOO_STRING_SVTOOLS_RTF_FLYPRTCTD "\\flyprtctd" -#define OOO_STRING_SVTOOLS_RTF_FLYMAINCNT "\\flymaincnt" -#define OOO_STRING_SVTOOLS_RTF_FLYVERT "\\flyvert" -#define OOO_STRING_SVTOOLS_RTF_FLYHORZ "\\flyhorz" -#define OOO_STRING_SVTOOLS_RTF_DFRMTXTL "\\dfrmtxtl" -#define OOO_STRING_SVTOOLS_RTF_DFRMTXTR "\\dfrmtxtr" -#define OOO_STRING_SVTOOLS_RTF_DFRMTXTU "\\dfrmtxtu" -#define OOO_STRING_SVTOOLS_RTF_DFRMTXTW "\\dfrmtxtw" -#define OOO_STRING_SVTOOLS_RTF_FLYANCHOR "\\flyanchor" -#define OOO_STRING_SVTOOLS_RTF_FLYCNTNT "\\flycntnt" -#define OOO_STRING_SVTOOLS_RTF_FLYCOLUMN "\\flycolumn" -#define OOO_STRING_SVTOOLS_RTF_FLYPAGE "\\flypage" -#define OOO_STRING_SVTOOLS_RTF_FLYINPARA "\\flyinpara" -#define OOO_STRING_SVTOOLS_RTF_BRDBOX "\\brdbox" -#define OOO_STRING_SVTOOLS_RTF_BRDLNCOL "\\brdlncol" -#define OOO_STRING_SVTOOLS_RTF_BRDLNIN "\\brdlnin" -#define OOO_STRING_SVTOOLS_RTF_BRDLNOUT "\\brdlnout" -#define OOO_STRING_SVTOOLS_RTF_BRDLNDIST "\\brdlndist" -#define OOO_STRING_SVTOOLS_RTF_SHADOW "\\shadow" -#define OOO_STRING_SVTOOLS_RTF_SHDWDIST "\\shdwdist" -#define OOO_STRING_SVTOOLS_RTF_SHDWSTYLE "\\shdwstyle" -#define OOO_STRING_SVTOOLS_RTF_SHDWCOL "\\shdwcol" -#define OOO_STRING_SVTOOLS_RTF_SHDWFCOL "\\shdwfcol" -#define OOO_STRING_SVTOOLS_RTF_PGDSCTBL "\\pgdsctbl" -#define OOO_STRING_SVTOOLS_RTF_PGDSC "\\pgdsc" -#define OOO_STRING_SVTOOLS_RTF_PGDSCUSE "\\pgdscuse" -#define OOO_STRING_SVTOOLS_RTF_PGDSCNXT "\\pgdscnxt" -#define OOO_STRING_SVTOOLS_RTF_HYPHEN "\\hyphen" -#define OOO_STRING_SVTOOLS_RTF_HYPHLEAD "\\hyphlead" -#define OOO_STRING_SVTOOLS_RTF_HYPHTRAIL "\\hyphtrail" -#define OOO_STRING_SVTOOLS_RTF_HYPHMAX "\\hyphmax" -#define OOO_STRING_SVTOOLS_RTF_TLSWG "\\tlswg" -#define OOO_STRING_SVTOOLS_RTF_PGBRK "\\pgbrk" -#define OOO_STRING_SVTOOLS_RTF_PGDSCNO "\\pgdscno" -#define OOO_STRING_SVTOOLS_RTF_SOUTLVL "\\soutlvl" -#define OOO_STRING_SVTOOLS_RTF_SHP "\\shp" -#define OOO_STRING_SVTOOLS_RTF_SN "\\sn" -#define OOO_STRING_SVTOOLS_RTF_SV "\\sv" - -// Support for overline attributes -#define OOO_STRING_SVTOOLS_RTF_OL "\\ol" -#define OOO_STRING_SVTOOLS_RTF_OLD "\\old" -#define OOO_STRING_SVTOOLS_RTF_OLDB "\\oldb" -#define OOO_STRING_SVTOOLS_RTF_OLNONE "\\olnone" -#define OOO_STRING_SVTOOLS_RTF_OLW "\\olw" -#define OOO_STRING_SVTOOLS_RTF_OLDASH "\\oldash" -#define OOO_STRING_SVTOOLS_RTF_OLDASHD "\\oldashd" -#define OOO_STRING_SVTOOLS_RTF_OLDASHDD "\\oldashdd" -#define OOO_STRING_SVTOOLS_RTF_OLTH "\\olth" -#define OOO_STRING_SVTOOLS_RTF_OLWAVE "\\olwave" -#define OOO_STRING_SVTOOLS_RTF_OLC "\\olc" -#define OOO_STRING_SVTOOLS_RTF_OLTHD "\\olthd" -#define OOO_STRING_SVTOOLS_RTF_OLTHDASH "\\olthdash" -#define OOO_STRING_SVTOOLS_RTF_OLLDASH "\\olldash" -#define OOO_STRING_SVTOOLS_RTF_OLTHLDASH "\\olthldash" -#define OOO_STRING_SVTOOLS_RTF_OLTHDASHD "\\olthdashd" -#define OOO_STRING_SVTOOLS_RTF_OLTHDASHDD "\\olthdashdd" -#define OOO_STRING_SVTOOLS_RTF_OLHWAVE "\\olhwave" -#define OOO_STRING_SVTOOLS_RTF_OLOLDBWAVE "\\ololdbwave" - -#endif // _RTFKEYWD_HXX diff --git a/svtools/inc/rtfout.hxx b/svtools/inc/rtfout.hxx deleted file mode 100644 index ba20add1d968..000000000000 --- a/svtools/inc/rtfout.hxx +++ /dev/null @@ -1,70 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: rtfout.hxx,v $ - * $Revision: 1.6 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _RTFOUT_HXX -#define _RTFOUT_HXX - -#include "svtools/svtdllapi.h" -#include - -#ifndef _RTL_TEXTENC_H_ -#include -#endif - -class String; -class SvStream; - -class SVT_DLLPUBLIC RTFOutFuncs -{ -public: -#if defined(MAC) || defined(UNX) - static const sal_Char sNewLine; // nur \012 oder \015 -#else - static const sal_Char __FAR_DATA sNewLine[]; // \015\012 -#endif - - static SvStream& Out_Char( SvStream&, sal_Unicode cChar, - int *pUCMode, - rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252, - BOOL bWriteHelpFile = FALSE ); - static SvStream& Out_String( SvStream&, const String&, - rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252, - BOOL bWriteHelpFile = FALSE ); - static SvStream& Out_Fontname( SvStream&, const String&, - rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252, - BOOL bWriteHelpFile = FALSE ); - - static SvStream& Out_Hex( SvStream&, ULONG nHex, BYTE nLen ); -}; - - -#endif - - diff --git a/svtools/inc/rtftoken.h b/svtools/inc/rtftoken.h deleted file mode 100644 index c7981361ffc9..000000000000 --- a/svtools/inc/rtftoken.h +++ /dev/null @@ -1,1276 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: rtftoken.h,v $ - * $Revision: 1.13.134.1 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ - -#ifndef _RTFTOKEN_H -#define _RTFTOKEN_H - -class String; - -// suche die TokenID zu dem Token -int GetRTFToken( const String& rSearch ); - -enum RTF_TOKEN_RANGES { - RTF_NOGROUP = 0x0100, - RTF_DOCFMT = 0x0200, - RTF_SECTFMT = 0x0300, - RTF_PARFMT = 0x0400, - RTF_TABSTOPDEF = 0x0500, - RTF_BRDRDEF = 0x0600, - RTF_CHRFMT = 0x0700, - RTF_SPECCHAR = 0x0800, - RTF_APOCTL = 0x0900, - RTF_SHADINGDEF = 0x0A00, - // free = 0x0B00, - RTF_DRAWOBJECTS = 0x0C00, - RTF_OBJECTS = 0x0D00, - RTF_NUMBULLETS = 0x0E00, - - // !!! kann hinein verodert werden (Border/Background) !!!! - RTF_TABLEDEF = 0x1000, - - // !!! kann hinein verodert werden (Border/Tab) !!!! - RTF_SWGDEFS = 0x4000 -}; - -enum RTF_TOKEN_IDS { - - RTF_TEXTTOKEN = RTF_NOGROUP, - RTF_SINGLECHAR, - RTF_UNKNOWNCONTROL, - RTF_UNKNOWNDATA, - - RTF_RTF, - RTF_ANSITYPE, - RTF_MACTYPE, - RTF_PCTYPE, - RTF_PCATYPE, - RTF_NEXTTYPE, - - RTF_STYLESHEET, - RTF_SBASEDON, - RTF_SNEXT, - RTF_SHIDDEN, - RTF_SAUTOUPD, - - RTF_KEYCODE, - RTF_FNKEY, - RTF_ALTKEY, - RTF_SHIFTKEY, - RTF_CTRLKEY, - - RTF_FONTTBL, - RTF_DEFF, - RTF_FNIL, - RTF_FROMAN, - RTF_FSWISS, - RTF_FMODERN, - RTF_FSCRIPT, - RTF_FDECOR, - RTF_FTECH, - - RTF_COLORTBL, - RTF_RED, - RTF_GREEN, - RTF_BLUE, - - RTF_INFO, - RTF_TITLE, - RTF_SUBJECT, - RTF_AUTHOR, - RTF_OPERATOR, - RTF_KEYWORDS, - RTF_COMMENT, - RTF_VERSION, - RTF_DOCCOMM, - RTF_VERN, - RTF_CREATIM, - RTF_REVTIM, - RTF_PRINTIM, - RTF_BUPTIM, - RTF_EDMINS, - RTF_NOFPAGES, - RTF_NOFWORDS, - RTF_NOFCHARS, - RTF_ID, - RTF_YR, - RTF_MO, - RTF_DY, - RTF_HR, - RTF_MIN, - RTF_USERPROPS, - RTF_CATEGORY, - RTF_COMPANY, - RTF_MANAGER, - RTF_PROPNAME, - RTF_LINKVAL, - RTF_NOFCHARSWS, - RTF_HLINKBASE, - RTF_STATICVAL, - RTF_PROPTYPE, - - RTF_ANNOTATION, - RTF_ATNID, - - RTF_FOOTNOTE, - - RTF_XE, - RTF_BXE, - RTF_IXE, - RTF_RXE, - RTF_TXE, - RTF_YXE, - - RTF_TC, - RTF_TCF, - RTF_TCL, - - RTF_BKMKSTART, - RTF_BKMKEND, - - RTF_PICT, // Bitmaps - RTF_PICW, - RTF_PICH, - RTF_WBMBITSPIXEL, - RTF_WBMPLANES, - RTF_WBMWIDTHBYTES, - RTF_PICWGOAL, - RTF_PICHGOAL, - RTF_BIN, - RTF_PICSCALEX, - RTF_PICSCALEY, - RTF_PICSCALED, - RTF_WBITMAP, - RTF_WMETAFILE, - RTF_MACPICT, - RTF_OSMETAFILE, - RTF_DIBITMAP, - RTF_PICCROPT, - RTF_PICCROPB, - RTF_PICCROPL, - RTF_PICCROPR, - RTF_PICDATA, - RTF_PICBMP, - RTF_PICBPP, - RTF_PICPROP, - RTF_SHPPICT, - RTF_EMFBLIP, - RTF_PNGBLIP, - RTF_JPEGBLIP, - RTF_NONSHPPICT, - RTF_BLIPTAG, - RTF_BLIPUID, - RTF_BLIPUPI, - - RTF_FIELD, // Felder - RTF_FLDDIRTY, - RTF_FLDEDIT, - RTF_FLDLOCK, - RTF_FLDPRIV, - RTF_FLDINST, - RTF_FLDRSLT, - RTF_FLDTYPE, - RTF_TIME, - RTF_DATE, - RTF_WPEQN, - - RTF_NOLINE, - RTF_REVISED, - - RTF_BKMKCOLF, - RTF_BKMKCOLL, - RTF_PSOVER, - RTF_DOCTEMP, - RTF_DELETED, - - RTF_FCHARSET, - RTF_FALT, - RTF_FPRQ, - RTF_PANOSE, - RTF_FNAME, - RTF_FBIAS, - - RTF_ADDITIVE, - RTF_BKMKPUB, - RTF_CPG, - RTF_DATAFIELD, - - RTF_FBIDI, - RTF_FID, - RTF_FILE, - RTF_FILETBL, - RTF_FNETWORK, - RTF_FONTEMB, - RTF_FONTFILE, - RTF_FOSNUM, - RTF_FRELATIVE, - RTF_FTNIL, - RTF_FTTRUETYPE, - RTF_FVALIDDOS, - RTF_FVALIDHPFS, - RTF_FVALIDMAC, - RTF_FVALIDNTFS, - RTF_LINKSELF, - RTF_PUBAUTO, - RTF_REVTBL, - RTF_RTLMARK, - RTF_SEC, - RTF_TCN, - RTF_XEF, - - RTF_UD, // Unicode - RTF_UPR, - RTF_U, - RTF_UC, - RTF_ANSICPG, - - RTF_FFEXITMCR, // Form Fields - RTF_FFENTRYMCR, - RTF_FFDEFTEXT, - RTF_FFFORMAT, - RTF_FFSTATTEXT, - RTF_FORMFIELD, - RTF_FFNAME, - RTF_FFHELPTEXT, - RTF_FFL, - RTF_FFOWNHELP, - RTF_FFOWNSTAT, - RTF_FFMAXLEN, - RTF_FFHASLISTBOX, - RTF_FFHPS, - RTF_FFPROT, - RTF_FFTYPE, - RTF_FFTYPETXT, - RTF_FFSIZE, - RTF_FFRECALC, - RTF_FFRES, - RTF_FFDEFRES, - - RTF_HIGHLIGHT, - -/* */ - - RTF_DEFTAB = RTF_DOCFMT, - RTF_HYPHHOTZ, - RTF_LINESTART, - RTF_FRACWIDTH, - RTF_NEXTFILE, - RTF_TEMPLATE, - RTF_MAKEBACKUP, - RTF_DEFFORMAT, - RTF_DEFLANG, - RTF_FTNSEP, - RTF_FTNSEPC, - RTF_FTNCN, - RTF_ENDNOTES, - RTF_ENDDOC, - RTF_FTNTJ, - RTF_FTNBJ, - RTF_FTNSTART, - RTF_FTNRESTART, - RTF_PAPERW, - RTF_PAPERH, - RTF_MARGL, - RTF_MARGR, - RTF_MARGT, - RTF_MARGB, - RTF_FACINGP, - RTF_GUTTER, - RTF_MARGMIRROR, - RTF_LANDSCAPE, - RTF_PGNSTART, - RTF_WIDOWCTRL, - RTF_REVISIONS, - RTF_REVPROP, - RTF_REVBAR, - - RTF_AENDDOC, - RTF_AENDNOTES, - RTF_AFTNBJ, - RTF_AFTNCN, - RTF_AFTNNALC, - RTF_AFTNNAR, - RTF_AFTNNAUC, - RTF_AFTNNCHI, - RTF_AFTNNRLC, - RTF_AFTNNRUC, - RTF_AFTNRESTART, - RTF_AFTNRSTCONT, - RTF_AFTNSEP, - RTF_AFTNSEPC, - RTF_AFTNSTART, - RTF_AFTNTJ, - RTF_ALLPROT, - RTF_ANNOTPROT, - RTF_ATNAUTHOR, - RTF_ATNICN, - RTF_ATNREF, - RTF_ATNTIME, - RTF_ATRFEND, - RTF_ATRFSTART, - RTF_BRKFRM, - RTF_CVMME, - RTF_FET, - RTF_FLDALT, - RTF_FORMDISP, - RTF_FORMPROT, - RTF_FORMSHADE, - RTF_FTNALT, - RTF_FTNNALC, - RTF_FTNNAR, - RTF_FTNNAUC, - RTF_FTNNCHI, - RTF_FTNNRLC, - RTF_FTNNRUC, - RTF_FTNRSTCONT, - RTF_FTNRSTPG, - RTF_HYPHAUTO, - RTF_HYPHCAPS, - RTF_HYPHCONSEC, - RTF_LINKSTYLES, - RTF_LTRDOC, - RTF_NOCOLBAL, - RTF_NOEXTRASPRL, - RTF_NOTABIND, - RTF_OTBLRUL, - RTF_PRCOLBL, - RTF_PRINTDATA, - RTF_PSZ, - RTF_REVPROT, - RTF_RTLDOC, - RTF_SPRSSPBF, - RTF_SPRSTSP, - RTF_SWPBDR, - RTF_TRANSMF, - RTF_WRAPTRSP, - - RTF_PRIVATE, - RTF_NOULTRLSPC, - RTF_MSMCAP, - RTF_NOLEAD, - RTF_NOSPACEFORUL, - RTF_LYTEXCTTP, - RTF_LYTPRTMET, - RTF_DNTBLNSBDB, - RTF_FROMTEXT, - RTF_EXPSHRTN, - RTF_PGBRDRT, - RTF_SPRSBSP, - RTF_PGBRDRR, - RTF_PGBRDRSNAP, - RTF_BDBFHDR, - RTF_SUBFONTBYSIZE, - RTF_TRUNCATEFONTHEIGHT, - RTF_SPRSLNSP, - RTF_SPRSTSM, - RTF_PGBRDRL, - RTF_WPJST, - RTF_PGBRDRB, - RTF_WPSP, - RTF_NOXLATTOYEN, - RTF_OLDLINEWRAP, - RTF_PGBRDRFOOT, - RTF_PGBRDRHEAD, - RTF_DEFLANGFE, - RTF_DOCTYPE, - RTF_PGBRDROPT, - RTF_VIEWKIND, - RTF_VIEWSCALE, - RTF_WINDOWCAPTION, - RTF_BRDRART, - RTF_VIEWZK, - RTF_DOCVAR, - - RTF_DGMARGIN, - RTF_AFTNNCHOSUNG, - RTF_AFTNNCNUM, - RTF_AFTNNDBAR, - RTF_AFTNNDBNUM, - RTF_AFTNNDBNUMD, - RTF_AFTNNDBNUMK, - RTF_AFTNNDBNUMT, - RTF_AFTNNGANADA, - RTF_AFTNNGBNUM, - RTF_AFTNNGBNUMD, - RTF_AFTNNGBNUMK, - RTF_AFTNNGBNUML, - RTF_AFTNNZODIAC, - RTF_AFTNNZODIACD, - RTF_AFTNNZODIACL, - RTF_FTNNCHOSUNG, - RTF_FTNNCNUM, - RTF_FTNNDBAR, - RTF_FTNNDBNUM, - RTF_FTNNDBNUMD, - RTF_FTNNDBNUMK, - RTF_FTNNDBNUMT, - RTF_FTNNGANADA, - RTF_FTNNGBNUM, - RTF_FTNNGBNUMD, - RTF_FTNNGBNUMK, - RTF_FTNNGBNUML, - RTF_FTNNZODIAC, - RTF_FTNNZODIACD, - RTF_FTNNZODIACL, - - RTF_ADEFLANG, - RTF_ADEFF, - -/* */ - - RTF_SECTD = RTF_SECTFMT, - RTF_ENDNHERE, - RTF_BINFSXN, - RTF_BINSXN, - RTF_SBKNONE, - RTF_SBKCOL, - RTF_SBKPAGE, - RTF_SBKEVEN, - RTF_SBKODD, - RTF_COLS, - RTF_COLSX, - RTF_COLNO, - RTF_COLSR, - RTF_COLW, - RTF_LINEBETCOL, - RTF_LINEMOD, - RTF_LINEX, - RTF_LINESTARTS, - RTF_LINERESTART, - RTF_LINEPAGE, - RTF_LINECONT, - RTF_PGWSXN, - RTF_PGHSXN, - RTF_MARGLSXN, - RTF_MARGRSXN, - RTF_MARGTSXN, - RTF_MARGBSXN, - RTF_GUTTERSXN, - RTF_LNDSCPSXN, - RTF_FACPGSXN, - RTF_TITLEPG, - RTF_HEADERY, - RTF_FOOTERY, - RTF_PGNSTARTS, - RTF_PGNCONT, - RTF_PGNRESTART, - RTF_PGNX, - RTF_PGNY, - RTF_PGNDEC, - RTF_PGNUCRM, - RTF_PGNLCRM, - RTF_PGNUCLTR, - RTF_PGNLCLTR, - RTF_VERTALT, - RTF_VERTALB, - RTF_VERTALC, - RTF_VERTALJ, - - RTF_FOOTER, - RTF_FOOTERL, - RTF_FOOTERR, - RTF_FOOTERF, - RTF_HEADER, - RTF_HEADERL, - RTF_HEADERR, - RTF_HEADERF, - RTF_DS, - RTF_LTRSECT, - RTF_PGNHN, - RTF_PGNHNSC, - RTF_PGNHNSH, - RTF_PGNHNSM, - RTF_PGNHNSN, - RTF_PGNHNSP, - RTF_RTLSECT, - RTF_SECTUNLOCKED, - RTF_STEXTFLOW, - RTF_PGNCHOSUNG, - RTF_PGNCNUM, - RTF_PGNDBNUMK, - RTF_PGNDBNUMT, - RTF_PGNGANADA, - RTF_PGNGBNUM, - RTF_PGNGBNUMD, - RTF_PGNGBNUMK, - RTF_PGNGBNUML, - RTF_PGNZODIAC, - RTF_PGNZODIACD, - RTF_PGNZODIACL, - RTF_SECTDEFAULTCL, - RTF_SECTEXPAND, - RTF_SECTLINEGRID, - RTF_SECTSPECIFYCL, - RTF_SECTSPECIFYL, - - // Swg-Header/Footer-Tokens - RTF_HEADER_YB = (RTF_SECTFMT|RTF_SWGDEFS), - RTF_HEADER_XL, - RTF_HEADER_XR, - RTF_FOOTER_YT, - RTF_FOOTER_XL, - RTF_FOOTER_XR, - RTF_HEADER_YH, - RTF_FOOTER_YH, - RTF_BALANCED_COLUMN, - - -/* */ - - RTF_PARD = RTF_PARFMT, - RTF_S, - RTF_INTBL, - RTF_KEEP, - RTF_KEEPN, - RTF_LEVEL, - RTF_PAGEBB, - RTF_SBYS, - RTF_QL, - RTF_QR, - RTF_QJ, - RTF_QC, - RTF_FI, - RTF_LI, - RTF_LIN, - RTF_RI, - RTF_RIN, - RTF_SB, - RTF_SA, - RTF_SL, - RTF_HYPHPAR, - RTF_LTRPAR, - RTF_NOWIDCTLPAR, - RTF_RTLPAR, - RTF_SLMULT, - RTF_SUBDOCUMENT, - - RTF_WIDCTLPAR, - - RTF_LISTTEXT, - RTF_POSYIN, - RTF_PNRNOT, - RTF_BRDRDASHDOTSTR, - RTF_POSYOUT, - RTF_BRDRDASHD, - RTF_BRDRDASHDD, - RTF_BRDRENGRAVE, - RTF_BRDRTHTNLG, - RTF_BRDREMBOSS, - RTF_BRDRTNTHTNLG, - RTF_BRDRDASHSM, - RTF_BRDRTHTNMG, - RTF_OVERLAY, - RTF_BRDRTNTHSG, - RTF_BRDRTNTHMG, - RTF_BRDRTHTNSG, - RTF_BRDRTNTHLG, - RTF_BRDRTRIPLE, - RTF_BRDRTNTHTNSG, - RTF_BRDRTNTHTNMG, - RTF_BRDRWAVYDB, - RTF_BRDRWAVY, - RTF_ILVL, - RTF_DFRSTOP, - RTF_DFRXST, - RTF_PNRAUTH, - RTF_DFRSTART, - RTF_OUTLINELEVEL, - RTF_DFRAUTH, - RTF_DFRDATE, - RTF_PNRRGB, - RTF_PNRPNBR, - RTF_PNRSTART, - RTF_PNRXST, - RTF_PNRSTOP, - RTF_PNRDATE, - RTF_PNRNFC, - RTF_NOSNAPLINEGRID, - RTF_FAAUTO, - RTF_FAHANG, - RTF_FAVAR, - RTF_FACENTER, - RTF_FAROMAN, - RTF_FAFIXED, - RTF_ADJUSTRIGHT, - RTF_LS, - RTF_NOCWRAP, - RTF_NOOVERFLOW, - RTF_ASPALPHA, - - -/* */ - - RTF_TX = RTF_TABSTOPDEF, - RTF_TB, - RTF_TQL, - RTF_TQR, - RTF_TQC, - RTF_TQDEC, - RTF_TLDOT, - RTF_TLHYPH, - RTF_TLUL, - RTF_TLTH, - RTF_TLEQ, - - // Swg-TabStop-Tokens - RTF_TLSWG = (RTF_TABSTOPDEF|RTF_SWGDEFS), - -/* */ - - RTF_BRDRT = RTF_BRDRDEF, - RTF_BRDRB, - RTF_BRDRL, - RTF_BRDRR, - RTF_BRDRBTW, - RTF_BRDRBAR, - RTF_BOX, - RTF_BRSP, - RTF_BRDRW, - RTF_BRDRCF, - RTF_BRDRS, - RTF_BRDRTH, - RTF_BRDRSH, - RTF_BRDRDB, - RTF_BRDRDOT, - RTF_BRDRHAIR, - RTF_BRDRDASH, - RTF_BRDRFRAME, - - // Swg-Border-Tokens - RTF_BRDBOX = (RTF_BRDRDEF|RTF_SWGDEFS), - RTF_BRDLINE_COL, - RTF_BRDLINE_IN, - RTF_BRDLINE_OUT, - RTF_BRDLINE_DIST, - -/* */ - - RTF_PLAIN = RTF_CHRFMT, - RTF_B, - RTF_CAPS, - RTF_DN, - RTF_SUB, - RTF_NOSUPERSUB, - RTF_EXPND, - RTF_EXPNDTW, - RTF_KERNING, - RTF_F, - RTF_FS, - RTF_I, - RTF_OUTL, - RTF_SCAPS, - RTF_SHAD, - RTF_STRIKE, - RTF_UL, - RTF_ULD, - RTF_ULDB, - RTF_ULNONE, - RTF_ULW, - RTF_OL, - RTF_OLD, - RTF_OLDB, - RTF_OLNONE, - RTF_OLW, - RTF_UP, - RTF_SUPER, - RTF_V, - RTF_CF, - RTF_CB, - RTF_LANG, - RTF_CCHS, - RTF_CS, - RTF_LTRCH, - RTF_REVAUTH, - RTF_REVDTTM, - RTF_RTLCH, - - RTF_CHBGFDIAG, - RTF_CHBGDKVERT, - RTF_CHBGDKHORIZ, - RTF_CHBRDR, - RTF_CHBGVERT, - RTF_CHBGHORIZ, - RTF_CHBGDKFDIAG, - RTF_CHBGDCROSS, - RTF_CHBGCROSS, - RTF_CHBGBDIAG, - RTF_CHBGDKDCROSS, - RTF_CHBGDKCROSS, - RTF_CHBGDKBDIAG, - RTF_ULDASHD, - RTF_ULDASH, - RTF_ULDASHDD, - RTF_ULWAVE, - RTF_ULC, - RTF_ULTH, - RTF_OLDASHD, - RTF_OLDASH, - RTF_OLDASHDD, - RTF_OLWAVE, - RTF_OLC, - RTF_OLTH, - RTF_EMBO, - RTF_IMPR, - RTF_STRIKED, - RTF_CRDATE, - RTF_CRAUTH, - RTF_CHARSCALEX, - RTF_CHCBPAT, - RTF_CHCFPAT, - RTF_CHSHDNG, - RTF_REVAUTHDEL, - RTF_REVDTTMDEL, - RTF_CGRID, - RTF_GCW, - RTF_NOSECTEXPAND, - RTF_GRIDTBL, - RTF_G, - RTF_ANIMTEXT, - RTF_ULTHD, - RTF_ULTHDASH, - RTF_ULLDASH, - RTF_ULTHLDASH, - RTF_ULTHDASHD, - RTF_ULTHDASHDD, - RTF_ULHWAVE, - RTF_ULULDBWAVE, - RTF_OLTHD, - RTF_OLTHDASH, - RTF_OLLDASH, - RTF_OLTHLDASH, - RTF_OLTHDASHD, - RTF_OLTHDASHDD, - RTF_OLHWAVE, - RTF_OLOLDBWAVE, - - // association control words - RTF_AB, - RTF_ACAPS, - RTF_ACF, - RTF_ADN, - RTF_AEXPND, - RTF_AF, - RTF_AFS, - RTF_AI, - RTF_ALANG, - RTF_AOUTL, - RTF_ASCAPS, - RTF_ASHAD, - RTF_ASTRIKE, - RTF_AUL, - RTF_AULD, - RTF_AULDB, - RTF_AULNONE, - RTF_AULW, - RTF_AUP, - - RTF_LOCH, - RTF_HICH, - RTF_DBCH, - RTF_LANGFE, - RTF_ACCNONE, - RTF_ACCDOT, - RTF_ACCCOMMA, - RTF_TWOINONE, - RTF_HORZVERT, - - // Swg-Border-Tokens - RTF_SWG_ESCPROP = (RTF_CHRFMT|RTF_SWGDEFS), - RTF_HYPHEN, - RTF_HYPHLEAD, - RTF_HYPHTRAIL, - RTF_HYPHMAX, - - -/* */ - - RTF_CHDATE = RTF_SPECCHAR, - RTF_CHDATEL, - RTF_CHDATEA, - RTF_CHTIME, - RTF_CHPGN, - RTF_CHFTN, - RTF_CHATN, - RTF_CHFTNSEP, - RTF_CHFTNSEPC, - RTF_CELL, - RTF_ROW, - RTF_PAR, - RTF_SECT, - RTF_PAGE, - RTF_COLUM, - RTF_LINE, - RTF_TAB, - RTF_EMDASH, - RTF_ENDASH, - RTF_BULLET, - RTF_LQUOTE, - RTF_RQUOTE, - RTF_LDBLQUOTE, - RTF_RDBLQUOTE, - RTF_FORMULA, - RTF_NONBREAKINGSPACE, - RTF_OPTIONALHYPHEN, - RTF_NONBREAKINGHYPHEN, - RTF_SUBENTRYINDEX, - RTF_IGNOREFLAG, - RTF_HEX, - RTF_EMSPACE, - RTF_ENSPACE, - RTF_LTRMARK, - RTF_SECTNUM, - RTF_SOFTCOL, - RTF_SOFTLHEIGHT, - RTF_SOFTLINE, - RTF_SOFTPAGE, - RTF_ZWJ, - RTF_ZWNJ, - -/* */ - - RTF_ABSW = RTF_APOCTL, - RTF_ABSH, - RTF_NOWRAP, - RTF_DXFRTEXT, - RTF_DFRMTXTX, - RTF_DFRMTXTY, - RTF_DROPCAPLI, - RTF_DROPCAPT, - RTF_ABSNOOVRLP, - RTF_PHMRG, - RTF_PHPG, - RTF_PHCOL, - RTF_POSX, - RTF_POSNEGX, - RTF_POSXC, - RTF_POSXI, - RTF_POSXO, - RTF_POSXL, - RTF_POSXR, - RTF_PVMRG, - RTF_PVPG, - RTF_PVPARA, - RTF_POSY, - RTF_POSNEGY, - RTF_POSYT, - RTF_POSYIL, - RTF_POSYB, - RTF_POSYC, - RTF_ABSLOCK, - RTF_FRMTXLRTB, - RTF_FRMTXTBRL, - RTF_FRMTXBTLR, - RTF_FRMTXLRTBV, - RTF_FRMTXTBRLV, - - // Swg-Frame-Tokens - RTF_FLYPRINT = (RTF_APOCTL|RTF_SWGDEFS), - RTF_FLYOPAQUE, - RTF_FLYPRTCTD, - RTF_FLYMAINCNT, - RTF_FLYVERT, - RTF_FLYHORZ, - RTF_FLYOUTLEFT, - RTF_FLYOUTRIGHT, - RTF_FLYOUTUPPER, - RTF_FLYOUTLOWER, - RTF_FLYANCHOR, - RTF_FLY_CNTNT, - RTF_FLY_COLUMN, - RTF_FLY_PAGE, - RTF_FLY_INPARA, - - -/* */ - - RTF_SHADING = RTF_SHADINGDEF, - RTF_CFPAT, - RTF_CBPAT, - RTF_BGHORIZ, - RTF_BGVERT, - RTF_BGFDIAG, - RTF_BGBDIAG, - RTF_BGCROSS, - RTF_BGDCROSS, - RTF_BGDKHORIZ, - RTF_BGDKVERT, - RTF_BGDKFDIAG, - RTF_BGDKBDIAG, - RTF_BGDKCROSS, - RTF_BGDKDCROSS, - -/* */ - - RTF_TROWD = RTF_TABLEDEF, - RTF_TRGAPH, - RTF_TRLEFT, - RTF_TRRH, - - RTF_TRQL, - RTF_TRQR, - RTF_TRQC, - - RTF_CLMGF, - RTF_CLMRG, - RTF_CELLX, - RTF_LTRROW, - RTF_RTLROW, - RTF_TRBRDRB, - RTF_TRBRDRH, - RTF_TRBRDRL, - RTF_TRBRDRR, - RTF_TRBRDRT, - RTF_TRBRDRV, - RTF_TRHDR, - RTF_TRKEEP, - RTF_TRPADDB, - RTF_TRPADDL, - RTF_TRPADDR, - RTF_TRPADDT, - RTF_TRPADDFB, - RTF_TRPADDFL, - RTF_TRPADDFR, - RTF_TRPADDFT, - RTF_TCELLD, - RTF_CLTXTBRL, - RTF_CLTXLRTB, - RTF_CLVERTALB, - RTF_CLVERTALT, - RTF_CLVERTALC, - RTF_CLVMGF, - RTF_CLVMRG, - RTF_CLTXTBRLV, - RTF_CLTXBTLR, - RTF_CLTXLRTBV, - RTF_CLPADL, - RTF_CLPADT, - RTF_CLPADB, - RTF_CLPADR, - RTF_CLPADFL, - RTF_CLPADFT, - RTF_CLPADFB, - RTF_CLPADFR, - - - RTF_CLBRDRT = (RTF_BRDRDEF|RTF_TABLEDEF), - RTF_CLBRDRL, - RTF_CLBRDRB, - RTF_CLBRDRR, - - RTF_CLCFPAT = (RTF_SHADINGDEF|RTF_TABLEDEF), - RTF_CLCBPAT, - RTF_CLSHDNG, - RTF_CLBGHORIZ, - RTF_CLBGVERT, - RTF_CLBGFDIAG, - RTF_CLBGBDIAG, - RTF_CLBGCROSS, - RTF_CLBGDCROSS, - RTF_CLBGDKHOR, - RTF_CLBGDKVERT, - RTF_CLBGDKFDIAG, - RTF_CLBGDKBDIAG, - RTF_CLBGDKCROSS, - RTF_CLBGDKDCROSS, - -/* */ - - -/* */ - - RTF_DO = RTF_DRAWOBJECTS, - RTF_DOBXCOLUMN, - RTF_DOBXMARGIN, - RTF_DOBXPAGE, - RTF_DOBYMARGIN, - RTF_DOBYPAGE, - RTF_DOBYPARA, - RTF_DODHGT, - RTF_DOLOCK, - RTF_DPAENDHOL, - RTF_DPAENDL, - RTF_DPAENDSOL, - RTF_DPAENDW, - RTF_DPARC, - RTF_DPARCFLIPX, - RTF_DPARCFLIPY, - RTF_DPASTARTHOL, - RTF_DPASTARTL, - RTF_DPASTARTSOL, - RTF_DPASTARTW, - RTF_DPCALLOUT, - RTF_DPCOA, - RTF_DPCOACCENT, - RTF_DPCOBESTFIT, - RTF_DPCOBORDER, - RTF_DPCODABS, - RTF_DPCODBOTTOM, - RTF_DPCODCENTER, - RTF_DPCODTOP, - RTF_DPCOLENGTH, - RTF_DPCOMINUSX, - RTF_DPCOMINUSY, - RTF_DPCOOFFSET, - RTF_DPCOSMARTA, - RTF_DPCOTDOUBLE, - RTF_DPCOTRIGHT, - RTF_DPCOTSINGLE, - RTF_DPCOTTRIPLE, - RTF_DPCOUNT, - RTF_DPELLIPSE, - RTF_DPENDGROUP, - RTF_DPFILLBGCB, - RTF_DPFILLBGCG, - RTF_DPFILLBGCR, - RTF_DPFILLBGGRAY, - RTF_DPFILLBGPAL, - RTF_DPFILLFGCB, - RTF_DPFILLFGCG, - RTF_DPFILLFGCR, - RTF_DPFILLFGGRAY, - RTF_DPFILLFGPAL, - RTF_DPFILLPAT, - RTF_DPGROUP, - RTF_DPLINE, - RTF_DPLINECOB, - RTF_DPLINECOG, - RTF_DPLINECOR, - RTF_DPLINEDADO, - RTF_DPLINEDADODO, - RTF_DPLINEDASH, - RTF_DPLINEDOT, - RTF_DPLINEGRAY, - RTF_DPLINEHOLLOW, - RTF_DPLINEPAL, - RTF_DPLINESOLID, - RTF_DPLINEW, - RTF_DPPOLYCOUNT, - RTF_DPPOLYGON, - RTF_DPPOLYLINE, - RTF_DPPTX, - RTF_DPPTY, - RTF_DPRECT, - RTF_DPROUNDR, - RTF_DPSHADOW, - RTF_DPSHADX, - RTF_DPSHADY, - RTF_DPTXBX, - RTF_DPTXBXMAR, - RTF_DPTXBXTEXT, - RTF_DPX, - RTF_DPXSIZE, - RTF_DPY, - RTF_DPYSIZE, - - RTF_DPCODESCENT, - RTF_BACKGROUND, - RTF_SHPBYPAGE, - RTF_SHPBYPARA, - RTF_SHPBYMARGIN, - RTF_SHPBXCOLUMN, - RTF_SHPBXMARGIN, - RTF_SHPBXPAGE, - RTF_SHPLOCKANCHOR, - RTF_SHPWR, - RTF_HLLOC, - RTF_HLSRC, - RTF_SHPWRK, - RTF_SHPTOP, - RTF_SHPRSLT, - RTF_HLFR, - RTF_SHPTXT, - RTF_SHPFHDR, - RTF_SHPGRP, - RTF_SHPRIGHT, - RTF_SHPFBLWTXT, - RTF_SHPZ, - RTF_SHPBOTTOM, - RTF_SHPLEFT, - RTF_SHPLID, - -/* */ - - RTF_OBJALIAS = RTF_OBJECTS, - RTF_OBJALIGN, - RTF_OBJAUTLINK, - RTF_OBJCLASS, - RTF_OBJCROPB, - RTF_OBJCROPL, - RTF_OBJCROPR, - RTF_OBJCROPT, - RTF_OBJDATA, - RTF_OBJECT, - RTF_OBJEMB, - RTF_OBJH, - RTF_OBJICEMB, - RTF_OBJLINK, - RTF_OBJLOCK, - RTF_OBJNAME, - RTF_OBJPUB, - RTF_OBJSCALEX, - RTF_OBJSCALEY, - RTF_OBJSECT, - RTF_OBJSETSIZE, - RTF_OBJSUB, - RTF_OBJTIME, - RTF_OBJTRANSY, - RTF_OBJUPDATE, - RTF_OBJW, - RTF_RESULT, - RTF_RSLTBMP, - RTF_RSLTMERGE, - RTF_RSLTPICT, - RTF_RSLTRTF, - RTF_RSLTTXT, - RTF_OBJOCX, - RTF_OBJHTML, - RTF_OBJATTPH, - -/* */ - - RTF_PN = RTF_NUMBULLETS, - RTF_PNACROSS, - RTF_PNB, - RTF_PNCAPS, - RTF_PNCARD, - RTF_PNCF, - RTF_PNDEC, - RTF_PNF, - RTF_PNFS, - RTF_PNHANG, - RTF_PNI, - RTF_PNINDENT, - RTF_PNLCLTR, - RTF_PNLCRM, - RTF_PNLVL, - RTF_PNLVLBLT, - RTF_PNLVLBODY, - RTF_PNLVLCONT, - RTF_PNNUMONCE, - RTF_PNORD, - RTF_PNORDT, - RTF_PNPREV, - RTF_PNQC, - RTF_PNQL, - RTF_PNQR, - RTF_PNRESTART, - RTF_PNSCAPS, - RTF_PNSECLVL, - RTF_PNSP, - RTF_PNSTART, - RTF_PNSTRIKE, - RTF_PNTEXT, - RTF_PNTXTA, - RTF_PNTXTB, - RTF_PNUCLTR, - RTF_PNUCRM, - RTF_PNUL, - RTF_PNULD, - RTF_PNULDB, - RTF_PNULNONE, - RTF_PNULW, - RTF_LIST, - RTF_LISTLEVEL, - RTF_LISTOVERRIDE, - RTF_LISTOVERRIDETABLE, - RTF_LISTTABLE, - RTF_LISTNAME, - RTF_LEVELNUMBERS, - RTF_LEVELNORESTART, - RTF_LEVELNFC, - RTF_LEVELOLD, - RTF_LISTOVERRIDECOUNT, - RTF_LISTTEMPLATEID, - RTF_LEVELINDENT, - RTF_LEVELFOLLOW, - RTF_LEVELLEGAL, - RTF_LEVELJC, - RTF_LISTOVERRIDESTART, - RTF_LISTID, - RTF_LISTRESTARTHDN, - RTF_LEVELTEXT, - RTF_LISTOVERRIDEFORMAT, - RTF_LEVELPREVSPACE, - RTF_LEVELPREV, - RTF_LEVELSPACE, - RTF_LISTSIMPLE, - RTF_LEVELSTARTAT, - RTF_PNAIUEO, - RTF_PNAIUEOD, - RTF_PNCHOSUNG, - RTF_PNDBNUMD, - RTF_PNDBNUMK, - RTF_PNDBNUML, - RTF_PNDBNUMT, - RTF_PNGANADA, - RTF_PNGBNUM, - RTF_PNGBNUMD, - RTF_PNGBNUMK, - RTF_PNGBNUML, - RTF_PNZODIAC, - RTF_PNZODIACD, - RTF_PNZODIACL, - RTF_LFOLEVEL, - -/* */ - - RTF_GRF_ALIGNV= RTF_SWGDEFS, - RTF_GRF_ALIGNH, - RTF_GRF_MIRROR, - RTF_SWG_PRTDATA, - RTF_BKMK_KEY, - RTF_SHADOW, - RTF_SHDW_DIST, - RTF_SHDW_STYLE, - RTF_SHDW_COL, - RTF_SHDW_FCOL, - RTF_PGDSCTBL, - RTF_PGDSC, - RTF_PGDSCUSE, - RTF_PGDSCNXT, - RTF_PGDSCNO, - RTF_PGBRK, - RTF_SOUTLVL, - -// shapes - RTF_SHP, RTF_SN, RTF_SV -/* - RTF_SHPLEFT, - RTF_SHPTOP, - RTF_SHPBOTTOM, - RTF_SHPRIGHT -*/ - -}; - -#endif // _RTFTOKEN_H - -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/svtools/inc/ruler.hxx b/svtools/inc/ruler.hxx deleted file mode 100644 index 805394999abe..000000000000 --- a/svtools/inc/ruler.hxx +++ /dev/null @@ -1,877 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: ruler.hxx,v $ - * $Revision: 1.13 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _RULER_HXX -#define _RULER_HXX - -#include "svtools/svtdllapi.h" -#include -#include -#ifndef _VIRDEV_HXX -#include -#endif -#include - -class MouseEvent; -class TrackingEvent; -class DataChangedEvent; - -/************************************************************************* - -Beschreibung -============ - -class Ruler - -Diese Klasse dient zur Anzeige eines Lineals. Dabei kann diese Klasse nicht -nur als Anzeige-Control verwendet werden, sondern auch als aktives Control -zum Setzen/Verschieben von Tabulatoren und Raendern. - --------------------------------------------------------------------------- - -WinBits - -WB_HORZ Lineal wird horizontal dargestellt -WB_VERT Lineal wird vertikal dargestellt -WB_3DLOOK 3D-Darstellung -WB_BORDER Border am unteren/rechten Rand -WB_EXTRAFIELD Feld in der linken/oberen Ecke zur Anzeige und - Auswahl von Tabs, Null-Punkt, ... -WB_RIGHT_ALIGNED Marks the vertical ruler as right aligned - --------------------------------------------------------------------------- - -Beim Lineal werden alle Werte als Pixel-Werte eingestellt. Dadurch werden -doppelte Umrechnungen und Rundungsfehler vermieden und die Raender werden -im Lineal auch an der Position angezeigt, den Sie auch im Dokument haben. -Dadurch kann die Applikation zum Beispiel bei Tabellendarstellung auch -eigene Rundungen vornehmen und die Positionen im Lineal passen trotzdem noch -zu denen im Dokument. Damit aber das Lineal weiss, wie das Dokument auf dem -Bildschirm dargestellt wird, muessen noch ein paar zusaetzliche Werte -eingestellt werden. - -Mit SetWinPos() wird der Offset des Edit-Fenster zum Lineal eingestellt. -Dabei kann auch die Breite des Fensters eingestellt werden. Wenn bei den -Werten 0 uebergeben wird, wird die Position/Breite vom Fenster automatisch -so breit gesetzt, wie das Lineal breit ist. - -Mit SetPagePos() wird der Offset der Seite zum Edit-Fenster eingestellt und -die Breite der Seite eingestellt. Wenn bei den Werten 0 uebergeben wird, -wird die Position/Breite automatisch so gesetzt, als ob die Seite das ganze -Editfenster ausfuellen wuerde. - -Mit SetBorderPos() kann der Offset eingestellt werden, ab dem der -Border ausgegeben wird. Die Position bezieht sich auf die linke bzw. obere -Fensterkante. Dies wird gebraucht, wenn ein horizontales und vertikales -Lineal gleichzeitig sichtbar sind. Beispiel: - aHRuler.SetBorderPos( aVRuler.GetSizePixel().Width()-1 ); - -Mit SetNullOffset() wird der Null-Punkt bezogen auf die Seite gesetzt. - -Alle anderen Werte (Raender, Einzug, Tabs, ...) beziehen sich auf den 0 Punkt, -der mit SetNullOffset() eingestellt wird. - -Die Werte werden zum Beispiel folgendermassen berechnet: - -- WinPos (wenn beide Fenster den gleichen Parent haben) - - Point aHRulerPos = aHRuler.GetPosPixel(); - Point aEditWinPos = aEditWin.GetPosPixel(); - aHRuler.SetWinPos( aEditWinPos().X() - aHRulerPos.X() ); - -- PagePos - - Point aPagePos = aEditWin.LogicToPixel( aEditWin.GetPagePos() ); - aHRuler.SetPagePos( aPagePos().X() ); - -- Alle anderen Werte - - Die logischen Werte zusammenaddieren, als Position umrechnen und - die vorher gemerkten Pixel-Positionen (von PagePos und NullOffset) - entsprechend abziehen. - --------------------------------------------------------------------------- - -Mit SetUnit() und SetZoom() wird eingestellt, in welcher Einheit das Lineal -die Werte anzeigt. Folgende Einheiten werden akzeptiert: - - FUNIT_MM - FUNIT_CM (Default) - FUNIT_M - FUNIT_KM - FUNIT_INCH - FUNIT_FOOT - FUNIT_MILE - FUNIT_POINT - FUNIT_PICA - --------------------------------------------------------------------------- - -Mit SetMargin1() kann der linke/obere Rand und mit SetMargin2() kann -der rechte/untere Rand gesetzt werden. Falls diese Methoden ohne Parameter -aufgerufen werden, werden keine Raender angezeigt. Wenn SetMargin1() bzw. -SetMargin2() mit Parametern aufgerufen werden, kann bei diesen -folgendes angegeben werden: - - long nPos - Offset zum NullPunkt in Pixel - USHORT nStyle - Bit-Style: - RULER_MARGIN_SIZEABLE - Rand kann in der Groesse veraendert werden. - - Zu diesen Style's koennen folgende Style- - Bits dazugeodert werden: - RULER_STYLE_INVISIBLE (fuer nicht sichtbar) - - -Mit SetBorders() kann ein Array von Raendern gesetzt werden. Dabei muss -ein Array vom Typ RulerBorder uebergeben werden, wobei folgende Werte -initialisiert werden muessen: - - long nPos - Offset zum NullPunkt in Pixel - long nWidth - Breite des Spaltenabstands in Pixel (kann zum - Beispiel fuer Tabellenspalten auch 0 sein) - USHORT nStyle - Bit-Style: - RULER_BORDER_SIZEABLE - Spaltenabstand kann in der Groesse veraendert - werden. Dieses Flag sollte nur gesetzt werden, - wenn ein Abstand in der Groesse geaendert wird - und nicht die Groesse einer Zelle. - RULER_BORDER_MOVEABLE - Spaltenabstand/Begrenzung kann verschoben - werden. Wenn Tabellenbegrenzungen verschoben - werden, sollte dieses Flag gesetzt werden und - nicht Sizeable. Denn Sizeable gibt an, das - ein Abstand vergroessert werden kann und nicht - eine einzelne Zelle in der Groesse geaendert - werden kann. - RULER_BORDER_VARIABLE - Nicht alle Spaltenabstande sind gleich - RULER_BORDER_TABLE - Tabellenrahmen. Wenn dieser Style gesetzt - wird, muss die Spaltenbreite 0 sein. - RULER_BORDER_SNAP - Hilfslinie / Fanglinie. Wenn dieser Style - gesetzt wird, muss die Spaltenbreite 0 sein. - RULER_BORDER_MARGIN - Margin. Wenn dieser Style gesetzt wird, - muss die Spaltenbreite 0 sein. - - Zu diesen Style's koennen folgende Style- - Bits dazugeodert werden: - RULER_STYLE_INVISIBLE (fuer nicht sichtbar) - -Mit SetIndents() kann ein Array von Indents gesetzt werden. Diese Methode darf -nur angewendet werden, wenn es sich um ein horizontales Lineal handelt. Als -Parameter muss ein Array vom Typ RulerIndent uebergeben werden, wobei folgende -Werte initialisiert werden muessen: - - long nPos - Offset zum NullPunkt in Pixel - USHORT nStyle - Bit-Style: - RULER_INDENT_TOP (Erstzeileneinzug) - RULER_INDENT_BOTTOM (Linker/Rechter Einzug) - RULER_INDENT_BORDER (Verical line that shows the border distance) - Zu diesen Style's koennen folgende Style- - Bits dazugeodert werden: - RULER_STYLE_DONTKNOW (fuer alte Position oder - fuer Uneindeutigkeit) - RULER_STYLE_INVISIBLE (fuer nicht sichtbar) - -Mit SetTabs() kann ein Array von Tabs gesetzt werden. Diese Methode darf nur -angewendet werden, wenn es sich um ein horizontales Lineal handelt. Als -Parameter muss ein Array vom Typ RulerTab uebergeben werden, wobei folgende -Werte initialisiert werden muessen: - - long nPos - Offset zum NullPunkt in Pixel - USHORT nStyle - Bit-Style: - RULER_TAB_DEFAULT (kann nicht selektiert werden) - RULER_TAB_LEFT - RULER_TAB_CENTER - RULER_TAB_RIGHT - RULER_TAB_DECIMAL - Zu diesen Style's koennen folgende Style- - Bits dazugeodert werden: - RULER_STYLE_DONTKNOW (fuer alte Position oder - fuer Uneindeutigkeit) - RULER_STYLE_INVISIBLE (fuer nicht sichtbar) - -Mit SetLines() koennen Positionslinien im Lineal angezeigt werden. Dabei -muss ein Array vom Typ RulerLine uebergeben werden, wobei folgende Werte -initialisiert werden muessen: - - long nPos - Offset zum NullPunkt in Pixel - USHORT nStyle - Bit-Style (muss zur Zeit immer 0 sein) - -Mit SetArrows() koennen Bemassungspfeile im Lineal angezeigt werden. Wenn -Bemassungspfeile gesetzt werden, werden im Lineal auch keine Unterteilungen -mehr angezeigt. Deshalb sollten die Bemassungspfeile immer ueber die ganze -Linealbreite gesetzt werden. Dabei muss ein Array vom Typ RulerArrow -uebergeben werden, wobei folgende Werte initialisiert werden muessen: - - long nPos - Offset zum NullPunkt in Pixel - long nWidth - Breite des Pfeils - long nLogWidth - Breite des Pfeils in logischer Einheit - USHORT nStyle - Bit-Style (muss zur Zeit immer 0 sein) - -Mit SetSourceUnit() wird die Einheit eingestellt, in welcher die logischen -Werte vorliegen, die bei SetArrows() uebergeben werden. Dabei werden nur die -Einheiten MAP_TWIP und MAP_100TH_MM (default) akzeptiert. - --------------------------------------------------------------------------- - -Wenn auch vom Benutzer die Raender, Tabs, Border, ... ueber das Lineal -geaendert werden koennen, muss etwas mehr Aufwand getrieben werden. Dazu -muessen die Methoden StartDrag(), Drag() und EndDrag() ueberlagert werden. -Bei der Methode StartDrag() besteht die Moeglichkeit durch das zurueckgeben -von FALSE das Draggen zu verhindern. Im Drag-Handler muss die Drag-Position -abgefragt werden und die Werte muessen an die neue Position verschoben werden. -Dazu ruft man einfach die einzelnen Set-Methoden auf. Solange man sich -im Drag-Handler befindet, werden sich die Werte nur gemerkt und erst -danach das Lineal neu ausgegeben. Alle Handler koennen auch als Links ueber -entsprechende Set..Hdl()-Methoden gesetzt werden. - - - StartDrag() - Wird gerufen, wenn das Draggen gestartet wird. Wenn FALSE - zurueckgegeben wird, wird das Draggen nicht ausgefuehrt. Bei TRUE - wird das Draggen zugelassen. Wenn der Handler nicht ueberlagert - wird, wird FALSE zurueckgegeben. - - - EndDrag() - Wird gerufen, wenn das Draggen beendet wird. - - - Drag() - Wird gerufen, wenn gedragt wird. - - - Click() - Dieser Handler wird gerufen, wenn kein Element angeklickt wurde. - Die Position kann mit GetClickPos() abgefragt werden. Dadurch - kann man zum Beispiel Tabs in das Lineal setzen. Nach Aufruf des - Click-Handlers wird gegebenenfalls das Drag sofort ausgeloest. Dadurch - ist es moeglich, einen neuen Tab im Click-Handler zu setzen und - danach gleich zu verschieben. - - - DoubleClick() - Dieser Handler wird gerufen, wenn ein DoubleClick ausserhalb des - Extrafeldes gemacht wurde. Was angeklickt wurde, kann mit - GetClickType(), GetClickAryPos() und GetClickPos() abgefragt werden. - Somit kann man zum Beispiel den Tab-Dialog anzeigen, wenn ein - Tab mit einem DoubleClick betaetigt wurde. - -Im Drag-Handler kann man abfragen, was und wohin gedragt wurde. Dazu gibt -es folgende Abfrage-Methoden. - - - GetDragType() - Liefert zurueck, was gedragt wird: - RULER_TYPE_MARGIN1 - RULER_TYPE_MARGIN2 - RULER_TYPE_BORDER - RULER_TYPE_INDENT - RULER_TYPE_TAB - - - GetDragPos() - Liefert die Pixel-Position bezogen auf den eingestellten Null-Offset - zurueck, wohin der Anwender die Maus bewegt hat. - - - GetDragAryPos() - Liefert den Index im Array zurueck, wenn ein Border, Indent oder ein - Tab gedragt wird. Achtung: Es wird die Array-Position waehrend des - gesammten Drag-Vorgangs von dem Item im Array was vor dem Drag gesetzt - war zurueckgeben. Dadurch ist es zum Beispiel auch moeglich, einen - Tab nicht mehr anzuzeigen, wenn die Maus nach unten/rechts aus dem - Lineal gezogen wird. - - - GetDragSize() - Wenn Borders gedragt werden, kann hierueber abgefragt werden, ob - die Groesse bzw. welche Seite oder die Position geaendert werden soll. - RULER_DRAGSIZE_MOVE oder 0 - Move - RULER_DRAGSIZE_1 - Linke/obere Kante - RULER_DRAGSIZE_2 - Rechte/untere Kante - - - IsDragDelete() - Mit dieser Methode kann abgefragt werden, ob beim Draggen die - Maus unten/rechts aus dem Fenster gezogen wurde. Damit kann - zum Beispiel festgestellt werden, ob der Benutzer einen Tab - loeschen will. - - - IsDragCanceled() - Mit dieser Methode kann im EndDrag-Handler abgefragt werden, - ob die Aktion abgebrochen wurde, indem der Anwender die - Maus oben/links vom Fenster losgelassen hat oder ESC gedrueckt - hat. In diesem Fall werden die Werte nicht uebernommen. Wird - waehrend des Draggings die Maus oben/links aus dem Fenster - gezogen, werden automatisch die alten Werte dargestellt, ohne das - der Drag-Handler gerufen wird. - Falls der Benutzer jedoch den Wert auf die alte Position - zurueckgeschoben hat, liefert die Methode trotzdem FALSE. Falls - dies vermieden werden soll, muss sich die Applikation im StartDrag- - Handler den alten Wert merken und im EndDrag-Handler den Wert - vergleichen. - - - GetDragScroll() - Mit dieser Methode kann abgefragt werden, ob gescrollt werden - soll. Es wird einer der folgenden Werte zurueckgegeben: - RULER_SCROLL_NO - Drag-Position befindet sich - an keinem Rand und somit - muss nicht gescrollt werden. - RULER_SCROLL_1 - Drag-Position befindet sich - am linken/oberen Rand und - somit sollte das Programm evt. - ein Srcoll ausloesen. - RULER_SCROLL_2 - Drag-Position befindet sich - am rechten/unteren Rand und - somit sollte das Programm evt. - ein Srcoll ausloesen. - - - GetDragModifier() - Liefert die Modifier-Tasten zurueck, die beim Starten des Drag- - Vorgangs gedrueckt waren. Siehe MouseEvent. - - - GetClickPos() - Liefert die Pixel-Position bezogen auf den eingestellten Null-Offset - zurueck, wo der Anwender die Maus gedrueckt hat. - - - GetClickType() - Liefert zurueck, was per DoubleClick betaetigt wird: - RULER_TYPE_DONTKNOW (kein Element im Linealbereich) - RULER_TYPE_OUTSIDE (ausserhalb des Linealbereichs) - RULER_TYPE_MARGIN1 (nur Margin1-Kante) - RULER_TYPE_MARGIN2 (nur Margin2-Kante) - RULER_TYPE_BORDER (Border: GetClickAryPos()) - RULER_TYPE_INDENT (Einzug: GetClickAryPos()) - RULER_TYPE_TAB (Tab: GetClickAryPos()) - - - GetClickAryPos() - Liefert den Index im Array zurueck, wenn ein Border, Indent oder ein - Tab per DoubleClick betaetigt wird. - - - GetType() - Mit dieser Methode kann man einen HitTest durchfuehren, um - gegebenenfalls ueber das Abfangen des MouseButtonDown-Handlers - auch ueber die rechte Maustaste etwas auf ein Item anzuwenden. Als - Paramter ueber gibt man die Fensterposition und gegebenenfalls - einen Pointer auf einen USHORT, um die Array-Position eines - Tabs, Indent oder Borders mitzubekommen. Als Type werden folgende - Werte zurueckgegeben: - RULER_TYPE_DONTKNOW (kein Element im Linealbereich) - RULER_TYPE_OUTSIDE (ausserhalb des Linealbereichs) - RULER_TYPE_MARGIN1 (nur Margin1-Kante) - RULER_TYPE_MARGIN2 (nur Margin2-Kante) - RULER_TYPE_BORDER (Border: GetClickAryPos()) - RULER_TYPE_INDENT (Einzug: GetClickAryPos()) - RULER_TYPE_TAB (Tab: GetClickAryPos()) - -Wenn der Drag-Vorgang abgebrochen werden soll, kann der Drag-Vorgang -mit CancelDrag() abgebrochen werden. Folgende Methoden gibt es fuer die -Drag-Steuerung: - - - IsDrag() - Liefert TRUE zurueck, wenn sich das Lineal im Drag-Vorgang befindet. - - - CancelDrag() - Bricht den Drag-Vorgang ab, falls einer durchgefuehrt wird. Dabei - werden die alten Werte wieder hergestellt und der Drag und der - EndDrag-Handler gerufen. - -Um vom Dokument ein Drag auszuloesen, gibt es folgende Methoden: - - - StartDocDrag() - Dieser Methode werden der MouseEvent vom Dokumentfenster und - was gedragt werden soll uebergeben. Wenn als DragType - RULER_TYPE_DONTKNOW uebergeben wird, bestimmt das Lineal, was - verschoben werden soll. Bei den anderen, wird der Drag nur dann - gestartet, wenn auch an der uebergebenen Position ein entsprechendes - Element gefunden wurde. Dies ist zun Beispiel dann notwendig, wenn - zum Beispiel Einzuege und Spalten an der gleichen X-Position liegen. - Der Rueckgabewert gibt an, ob der Drag ausgeloest wurde. Wenn ein - Drag ausgeloest wird, uebernimmt das Lineal die normale Drag-Steuerung - und verhaelt sich dann so, wie als wenn direkt in das Lineal geklickt - wurde. So captured das Lineal die Mouse und uebernimmt auch die - Steuerung des Cancel (ueber Tastatur, oder wenn die Mouse ueber - oder links vom Lineal ruasgeschoben wird). Auch alle Handler werden - gerufen (inkl. des StartDrag-Handlers). Wenn ein MouseEvent mit - Click-Count 2 uebergeben wird auch der DoubleClick-Handler - entsprechend gerufen. - - - GetDocType() - Dieser Methode wird die Position vom Dokumentfenster uebergeben und - testet, was sich unter der Position befindet. Dabei kann wie bei - StartDocDrag() der entsprechende Test auf ein bestimmtes Element - eingeschraenkt werden. Im Gegensatz zu GetType() liefert diese - Methode immer DontKnow zurueck, falls kein Element getroffen wurde. - Falls man den HitTest selber durchfuehren moechte, kann man - folgende Defines fuer die Toleranz benutzen (Werte gelten fuer - eine Richtung): - RULER_MOUSE_TABLEWIDTH - fuer Tabellenspalten - RULER_MOUSE_MARGINWIDTH - fuer Margins - --------------------------------------------------------------------------- - -Fuer das Extra-Feld kann der Inhalt bestimmt werden und es gibt Handler, -womit man bestimmte Aktionen abfangen kann. - - - ExtraDown() - Dieser Handler wird gerufen, wenn im Extra-Feld die Maus - gedrueckt wird. - - - SetExtraType() - Mit dieser Methode kann festgelegt werden, was im ExtraFeld - dargestellt werden soll. - - ExtraType Was im Extrafeld dargestellt werden soll - RULER_EXTRA_DONTKNOW (Nichts) - RULER_EXTRA_NULLOFFSET (Koordinaaten-Kreuz) - RULER_EXTRA_TAB (Tab) - - USHORT nStyle Bitfeld als Style: - RULER_STYLE_HIGHLIGHT (selektiert) - RULER_TAB_... (ein Tab-Style) - - - GetExtraClick() - Liefert die Anzahl der Mausclicks zurueck. Dadurch ist es zum - Beispiel auch moeglich, auch durch einen DoubleClick im Extrafeld - eine Aktion auszuloesen. - - - GetExtraModifier() - Liefert die Modifier-Tasten zurueck, die beim Klicken in das Extra- - Feld gedrueckt waren. Siehe MouseEvent. - --------------------------------------------------------------------------- - -Weitere Hilfsfunktionen: - -- static Ruler::DrawTab() - Mit dieser Methode kann ein Tab auf einem OutputDevice ausgegeben - werden. Dadurch ist es moeglich, auch in Dialogen die Tabs so - anzuzeigen, wie Sie im Lineal gemalt werden. - - Diese Methode gibt den Tab zentriert an der uebergebenen Position - aus. Die Groesse der Tabs kann ueber die Defines RULER_TAB_WIDTH und - RULER_TAB_HEIGHT bestimmt werden. - --------------------------------------------------------------------------- - -Tips zur Benutzung des Lineals: - -- Bei dem Lineal muss weder im Drag-Modus noch sonst das Setzen der Werte - in SetUpdateMode() geklammert werden. Denn das Lineal sorgt von sich - aus dafuer, das wenn mehrere Werte gesetzt werden, diese automatisch - zusammengefast werden und flackerfrei ausgegeben werden. - -- Initial sollten beim Lineal zuerst die Groessen, Positionen und Werte - gesetzt werden, bevor es angezeigt wird. Dies ist deshalb wichtig, da - ansonsten viele Werte unnoetig berechnet werden. - -- Wenn das Dokumentfenster, in dem sich das Lineal befindet aktiv bzw. - deaktiv wird, sollten die Methoden Activate() und Deactivate() vom - Lineal gerufen werden. Denn je nach Einstellungen und System wird die - Anzeige entsprechend umgeschaltet. - -- Zum Beispiel sollte beim Drag von Tabs und Einzuegen nach Moeglichkeit die - alten Positionen noch mit angezeigt werden. Dazu sollte zusaetzlich beim - Setzen der Tabs und Einzuege als erstes im Array die alten Positionen - eingetragen werden und mit dem Style RULER_STYLE_DONTKNOW verknuepft - werden. Danach sollte im Array die restlichen Werte eingetragen werden. - -- Bei mehreren markierten Absaetzen und Tabellen-Zellen, sollten die Tabs - und Einzuege in grau von der ersten Zelle, bzw. vom ersten Absatz - angezeigt werden. Dies kann man auch ueber den Style RULER_STYLE_DONTKNOW - erreichen. - -- Die Bemassungspfeile sollten immer dann angezeigt, wenn beim Drag die - Alt-Taste (WW-Like) gedrueckt wird. Vielleicht sollte diese Einstellung - auch immer vornehmbar sein und vielleicht beim Drag immer die - Bemassungspfeile dargestellt werden. Bei allen Einstellung sollten die - Werte immer auf ein vielfaches eines Wertes gerundet werden, da die - Bildschirmausloesung sehr ungenau ist. - -- DoppelKlicks sollten folgendermassen behandelt werden (GetClickType()): - - RULER_TYPE_DONTKNOW - RULER_TYPE_MARGIN1 - RULER_TYPE_MARGIN2 - Wenn die Bedingunden GetClickPos() <= GetMargin1() oder - GetClickPos() >= GetMargin2() oder der Type gleich - RULER_TYPE_MARGIN1 oder RULER_TYPE_MARGIN2 ist, sollte - ein SeitenDialog angezeigt werden, wo der Focus auf dem - entsprechenden Rand steht - - RULER_TYPE_BORDER - Es sollte ein Spalten- oder Tabellen-Dialog angezeigt werden, - wo der Focus auf der entsprechenden Spalte steht, die mit - GetClickAryPos() abgefragt werden kann. - - RULER_TYPE_INDENT - Es sollte der Dialog angezeigt werden, wo die Einzuege eingestellt - werden koennen. Dabei sollte der Focus auf dem Einzug stehen, der - mit GetClickAryPos() ermittelt werden kann. - - RULER_TYPE_TAB - Es sollte ein TabDialog angezeigt werden, wo der Tab selektiert - sein sollte, der ueber GetClickAryPos() abgefragt werden kann. - -*************************************************************************/ - -// ----------- -// - WinBits - -// ----------- - -#define WB_EXTRAFIELD ((WinBits)0x00004000) -#define WB_RIGHT_ALIGNED ((WinBits)0x00008000) -#define WB_STDRULER WB_HORZ - -// --------------- -// - Ruler-Types - -// --------------- - -struct ImplRulerHitTest; - -// -------------- -// - Ruler-Type - -// -------------- - -enum RulerType { RULER_TYPE_DONTKNOW, RULER_TYPE_OUTSIDE, - RULER_TYPE_MARGIN1, RULER_TYPE_MARGIN2, - RULER_TYPE_BORDER, RULER_TYPE_INDENT, RULER_TYPE_TAB }; - -enum RulerExtra { RULER_EXTRA_DONTKNOW, - RULER_EXTRA_NULLOFFSET, RULER_EXTRA_TAB }; - -#define RULER_STYLE_HIGHLIGHT ((USHORT)0x8000) -#define RULER_STYLE_DONTKNOW ((USHORT)0x4000) -#define RULER_STYLE_INVISIBLE ((USHORT)0x2000) - -#define RULER_DRAGSIZE_MOVE 0 -#define RULER_DRAGSIZE_1 1 -#define RULER_DRAGSIZE_2 2 - -#define RULER_MOUSE_BORDERMOVE 5 -#define RULER_MOUSE_BORDERWIDTH 5 -#define RULER_MOUSE_TABLEWIDTH 1 -#define RULER_MOUSE_MARGINWIDTH 3 - -#define RULER_SCROLL_NO 0 -#define RULER_SCROLL_1 1 -#define RULER_SCROLL_2 2 - -// --------------- -// - RulerMargin - -// --------------- - -#define RULER_MARGIN_SIZEABLE ((USHORT)0x0001) - -// --------------- -// - RulerBorder - -// --------------- - -#define RULER_BORDER_SIZEABLE ((USHORT)0x0001) -#define RULER_BORDER_MOVEABLE ((USHORT)0x0002) -#define RULER_BORDER_VARIABLE ((USHORT)0x0004) -#define RULER_BORDER_TABLE ((USHORT)0x0008) -#define RULER_BORDER_SNAP ((USHORT)0x0010) -#define RULER_BORDER_MARGIN ((USHORT)0x0020) - -struct RulerBorder -{ - long nPos; - long nWidth; - USHORT nStyle; - //minimum/maximum position, supported for table borders/rows - long nMinPos; - long nMaxPos; -}; - -// --------------- -// - RulerIndent - -// --------------- - -#define RULER_INDENT_TOP ((USHORT)0x0000) -#define RULER_INDENT_BOTTOM ((USHORT)0x0001) -#define RULER_INDENT_BORDER ((USHORT)0x0002) -#define RULER_INDENT_STYLE ((USHORT)0x000F) - -struct RulerIndent -{ - long nPos; - USHORT nStyle; -}; - -// ------------ -// - RulerTab - -// ------------ - -#define RULER_TAB_LEFT ((USHORT)0x0000) -#define RULER_TAB_RIGHT ((USHORT)0x0001) -#define RULER_TAB_DECIMAL ((USHORT)0x0002) -#define RULER_TAB_CENTER ((USHORT)0x0003) -#define RULER_TAB_DEFAULT ((USHORT)0x0004) -#define RULER_TAB_STYLE ((USHORT)0x000F) -#define RULER_TAB_RTL ((USHORT)0x0010) - -struct RulerTab -{ - long nPos; - USHORT nStyle; -}; - -#define RULER_TAB_WIDTH 7 -#define RULER_TAB_HEIGHT 6 - -// ------------- -// - RulerLine - -// ------------- - -struct RulerLine -{ - long nPos; - USHORT nStyle; -}; - -// -------------- -// - RulerArrow - -// -------------- - -struct RulerArrow -{ - long nPos; - long nWidth; - long nLogWidth; - USHORT nStyle; -}; - -class ImplRulerData; -// --------- -// - Ruler - -// --------- - -class SVT_DLLPUBLIC Ruler : public Window -{ -private: - VirtualDevice maVirDev; - MapMode maMapMode; - long mnBorderOff; - long mnWinOff; - long mnWinWidth; - long mnWidth; - long mnHeight; - long mnVirOff; - long mnVirWidth; - long mnVirHeight; - long mnBorderWidth; - long mnStartDragPos; - long mnDragPos; - ULONG mnUpdateEvtId; - ImplRulerData* mpSaveData; - ImplRulerData* mpData; - ImplRulerData* mpDragData; - Rectangle maExtraRect; - WinBits mnWinStyle; - USHORT mnUnitIndex; - USHORT mnDragAryPos; - USHORT mnDragSize; - USHORT mnDragScroll; - USHORT mnDragModifier; - USHORT mnExtraStyle; - USHORT mnExtraClicks; - USHORT mnExtraModifier; - RulerExtra meExtraType; - RulerType meDragType; - MapUnit meSourceUnit; - FieldUnit meUnit; - Fraction maZoom; - BOOL mbCalc; - BOOL mbFormat; - BOOL mbDrag; - BOOL mbDragDelete; - BOOL mbDragCanceled; - BOOL mbAutoWinWidth; - BOOL mbActive; - BYTE mnUpdateFlags; - Link maStartDragHdl; - Link maDragHdl; - Link maEndDragHdl; - Link maClickHdl; - Link maDoubleClickHdl; - Link maExtraDownHdl; - -#ifdef _SV_RULER_CXX - SVT_DLLPRIVATE void ImplVDrawLine( long nX1, long nY1, long nX2, long nY2 ); - SVT_DLLPRIVATE void ImplVDrawRect( long nX1, long nY1, long nX2, long nY2 ); - SVT_DLLPRIVATE void ImplVDrawText( long nX, long nY, const String& rText ); - - SVT_DLLPRIVATE void ImplDrawTicks( long nMin, long nMax, long nStart, long nCenter ); - SVT_DLLPRIVATE void ImplDrawArrows( long nCenter ); - SVT_DLLPRIVATE void ImplDrawBorders( long nMin, long nMax, long nVirTop, long nVirBottom ); - SVT_DLLPRIVATE void ImplDrawIndent( const Polygon& rPoly, USHORT nStyle ); - SVT_DLLPRIVATE void ImplDrawIndents( long nMin, long nMax, long nVirTop, long nVirBottom ); - SVT_DLLPRIVATE void ImplDrawTab( OutputDevice* pDevice, const Point& rPos, USHORT nStyle ); - SVT_DLLPRIVATE void ImplDrawTabs( long nMin, long nMax, long nVirTop, long nVirBottom ); - using Window::ImplInit; - SVT_DLLPRIVATE void ImplInit( WinBits nWinBits ); - SVT_DLLPRIVATE void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); - SVT_DLLPRIVATE void ImplCalc(); - SVT_DLLPRIVATE void ImplFormat(); - SVT_DLLPRIVATE void ImplInitExtraField( BOOL bUpdate ); - SVT_DLLPRIVATE void ImplInvertLines( BOOL bErase = FALSE ); - SVT_DLLPRIVATE void ImplDraw(); - SVT_DLLPRIVATE void ImplDrawExtra( BOOL bPaint = FALSE ); - SVT_DLLPRIVATE void ImplUpdate( BOOL bMustCalc = FALSE ); - using Window::ImplHitTest; - SVT_DLLPRIVATE BOOL ImplHitTest( const Point& rPos, - ImplRulerHitTest* pHitTest, - BOOL bRequiredStyle = FALSE, - USHORT nRequiredStyle = 0 ) const; - SVT_DLLPRIVATE BOOL ImplDocHitTest( const Point& rPos, RulerType eDragType, ImplRulerHitTest* pHitTest ) const; - SVT_DLLPRIVATE BOOL ImplStartDrag( ImplRulerHitTest* pHitTest, USHORT nModifier ); - SVT_DLLPRIVATE void ImplDrag( const Point& rPos ); - SVT_DLLPRIVATE void ImplEndDrag(); - DECL_DLLPRIVATE_LINK( ImplUpdateHdl, void* ); -#endif - - // Forbidden and not implemented. - Ruler (const Ruler &); - Ruler & operator= (const Ruler &); - -public: - Ruler( Window* pParent, WinBits nWinStyle = WB_STDRULER ); - virtual ~Ruler(); - - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void Tracking( const TrackingEvent& rTEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); - virtual void StateChanged( StateChangedType nStateChange ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - - virtual long StartDrag(); - virtual void Drag(); - virtual void EndDrag(); - virtual void Click(); - virtual void DoubleClick(); - virtual void ExtraDown(); - - void Activate(); - void Deactivate(); - BOOL IsActive() const { return mbActive; } - - void SetWinPos( long nOff = 0, long nWidth = 0 ); - long GetWinOffset() const { return mnWinOff; } - long GetWinWidth() const { return mnWinWidth; } - void SetPagePos( long nOff = 0, long nWidth = 0 ); - long GetPageOffset() const; - long GetPageWidth() const; - void SetBorderPos( long nOff = 0 ); - long GetBorderOffset() const { return mnBorderOff; } - Rectangle GetExtraRect() const { return maExtraRect; } - - void SetUnit( FieldUnit eNewUnit ); - FieldUnit GetUnit() const { return meUnit; } - void SetZoom( const Fraction& rNewZoom ); - Fraction GetZoom() const { return maZoom; } - - void SetSourceUnit( MapUnit eNewUnit ) { meSourceUnit = eNewUnit; } - MapUnit GetSourceUnit() const { return meSourceUnit; } - - void SetExtraType( RulerExtra eNewExtraType, USHORT nStyle = 0 ); - RulerExtra GetExtraType() const { return meExtraType; } - USHORT GetExtraStyle() const { return mnExtraStyle; } - USHORT GetExtraClicks() const { return mnExtraClicks; } - USHORT GetExtraModifier() const { return mnExtraModifier; } - - BOOL StartDocDrag( const MouseEvent& rMEvt, - RulerType eDragType = RULER_TYPE_DONTKNOW ); - RulerType GetDocType( const Point& rPos, - RulerType eDragType = RULER_TYPE_DONTKNOW, - USHORT* pAryPos = NULL ) const; - RulerType GetDragType() const { return meDragType; } - long GetDragPos() const { return mnDragPos; } - USHORT GetDragAryPos() const { return mnDragAryPos; } - USHORT GetDragSize() const { return mnDragSize; } - BOOL IsDragDelete() const { return mbDragDelete; } - BOOL IsDragCanceled() const { return mbDragCanceled; } - USHORT GetDragScroll() const { return mnDragScroll; } - USHORT GetDragModifier() const { return mnDragModifier; } - BOOL IsDrag() const { return mbDrag; } - void CancelDrag(); - long GetClickPos() const { return mnDragPos; } - RulerType GetClickType() const { return meDragType; } - USHORT GetClickAryPos() const { return mnDragAryPos; } - using Window::GetType; - RulerType GetType( const Point& rPos, - USHORT* pAryPos = NULL ) const; - - void SetNullOffset( long nPos ); - long GetNullOffset() const; - void SetMargin1() { SetMargin1( 0, RULER_STYLE_INVISIBLE ); } - void SetMargin1( long nPos, USHORT nMarginStyle = RULER_MARGIN_SIZEABLE ); - long GetMargin1() const; - USHORT GetMargin1Style() const; - void SetMargin2() { SetMargin2( 0, RULER_STYLE_INVISIBLE ); } - void SetMargin2( long nPos, USHORT nMarginStyle = RULER_MARGIN_SIZEABLE ); - long GetMargin2() const; - USHORT GetMargin2Style() const; - - void SetLines( USHORT n = 0, const RulerLine* pLineAry = NULL ); - USHORT GetLineCount() const; - const RulerLine* GetLines() const; - - void SetArrows( USHORT n = 0, const RulerArrow* pArrowAry = NULL ); - USHORT GetArrowCount() const; - const RulerArrow* GetArrows() const; - - void SetBorders( USHORT n = 0, const RulerBorder* pBrdAry = NULL ); - USHORT GetBorderCount() const; - const RulerBorder* GetBorders() const; - - void SetIndents( USHORT n = 0, const RulerIndent* pIndentAry = NULL ); - USHORT GetIndentCount() const; - const RulerIndent* GetIndents() const; - - void SetTabs( USHORT n = 0, const RulerTab* pTabAry = NULL ); - USHORT GetTabCount() const; - const RulerTab* GetTabs() const; - - static void DrawTab( OutputDevice* pDevice, - const Point& rPos, USHORT nStyle ); - - void SetStyle( WinBits nStyle ); - WinBits GetStyle() const { return mnWinStyle; } - - void SetStartDragHdl( const Link& rLink ) { maStartDragHdl = rLink; } - const Link& GetStartDragHdl() const { return maStartDragHdl; } - void SetDragHdl( const Link& rLink ) { maDragHdl = rLink; } - const Link& GetDragHdl() const { return maDragHdl; } - void SetEndDragHdl( const Link& rLink ) { maEndDragHdl = rLink; } - const Link& GetEndDragHdl() const { return maEndDragHdl; } - void SetClickHdl( const Link& rLink ) { maClickHdl = rLink; } - const Link& GetClickHdl() const { return maClickHdl; } - void SetDoubleClickHdl( const Link& rLink ) { maDoubleClickHdl = rLink; } - const Link& GetDoubleClickHdl() const { return maDoubleClickHdl; } - void SetExtraDownHdl( const Link& rLink ) { maExtraDownHdl = rLink; } - const Link& GetExtraDownHdl() const { return maExtraDownHdl; } - - //set text direction right-to-left - void SetTextRTL(BOOL bRTL); -}; - -#endif // _RULER_HXX diff --git a/svtools/inc/scriptedtext.hxx b/svtools/inc/scriptedtext.hxx deleted file mode 100644 index 0bf026b11ced..000000000000 --- a/svtools/inc/scriptedtext.hxx +++ /dev/null @@ -1,132 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: scriptedtext.hxx,v $ - * $Revision: 1.5 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVTOOLS_SCRIPTEDTEXT_HXX -#define _SVTOOLS_SCRIPTEDTEXT_HXX - -#include "svtools/svtdllapi.h" -#include -#include - - -namespace rtl { class OUString; } -class OutputDevice; -class Font; -class SvtScriptedTextHelper_Impl; - - -//_____________________________________________________________________________ - -/** -This class provides drawing text with different script types on any output devices. -*/ -class SVT_DLLPUBLIC SvtScriptedTextHelper -{ -private: - SvtScriptedTextHelper_Impl* mpImpl; /// Implementation of class functionality. - - /** Assignment operator not implemented to prevent usage. */ - SvtScriptedTextHelper& operator=( const SvtScriptedTextHelper& ); - -public: - /** Constructor sets an output device and no fonts. - @param _rOutDevice - A reference to an output device. */ - SvtScriptedTextHelper( OutputDevice& _rOutDevice ); - - /** Constructor sets an output device and fonts for all script types. - @param _rOutDevice - A reference to an output device. - @param _pLatinFont - The font for latin characters. - @param _pAsianFont - The font for asian characters. - @param _pCmplxFont - The font for complex text layout. */ - SvtScriptedTextHelper( - OutputDevice& _rOutDevice, - Font* _pLatinFont, - Font* _pAsianFont, - Font* _pCmplxFont ); - - /** Copy constructor. */ - SvtScriptedTextHelper( - const SvtScriptedTextHelper& _rCopy ); - - /** Destructor. */ - virtual ~SvtScriptedTextHelper(); - - /** Sets new fonts and recalculates the text width. - @param _pLatinFont - The font for latin characters. - @param _pAsianFont - The font for asian characters. - @param _pCmplxFont - The font for complex text layout. */ - void SetFonts( Font* _pLatinFont, Font* _pAsianFont, Font* _pCmplxFont ); - - /** Sets the default font of the current output device to all script types. */ - void SetDefaultFont(); - - /** Sets a new text and calculates all script breaks and the text width. - @param _rText - The new text. - @param _xBreakIter - The break iterator for iterating through the script portions. */ - void SetText( - const ::rtl::OUString& _rText, - const ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator >& _xBreakIter ); - - /** Returns the previously set text. - @return The current text. */ - const ::rtl::OUString& GetText() const; - - /** Returns the calculated width the text will take in the current output device. - @return The calculated text width. */ - sal_Int32 GetTextWidth() const; - - /** Returns the maximum height the text will take in the current output device. - @return The maximum text height. */ - sal_Int32 GetTextHeight() const; - - /** Returns a size struct containing the width and height of the text in the current output device. - @return A size struct with the text dimensions. */ - const Size& GetTextSize() const; - - /** Draws the text in the current output device. - @param _rPos - The position of the top left edge of the text. */ - void DrawText( const Point& _rPos ); -}; - -//_____________________________________________________________________________ - -#endif - diff --git a/svtools/inc/scrwin.hxx b/svtools/inc/scrwin.hxx deleted file mode 100644 index c4c06aeb96ab..000000000000 --- a/svtools/inc/scrwin.hxx +++ /dev/null @@ -1,115 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: scrwin.hxx,v $ - * $Revision: 1.5 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SCRWIN_HXX -#define _SCRWIN_HXX - -#include "svtools/svtdllapi.h" - -#ifndef _SCRBAR_HXX //autogen -#include -#endif - -class DataChangedEvent; - -// ------------------------- -// - ScrollableWindow-Type - -// ------------------------- - -typedef USHORT ScrollableWindowFlags; - -#define SCRWIN_THUMBDRAGGING 1 -#define SCRWIN_VCENTER 2 -#define SCRWIN_HCENTER 4 -#define SCRWIN_DEFAULT (SCRWIN_THUMBDRAGGING | SCRWIN_VCENTER | SCRWIN_HCENTER) - -// -------------------- -// - ScrollableWindow - -// -------------------- - -class SVT_DLLPUBLIC ScrollableWindow: public Window -{ -private: - Point aPixOffset; // offset to virtual window (pixel) - Size aTotPixSz; // total size of virtual window (pixel) - long nLinePixH; // size of a line/column (pixel) - long nColumnPixW; - - ScrollBar aVScroll; // the scrollbars - ScrollBar aHScroll; - ScrollBarBox aCornerWin; // window in the bottom right corner - BOOL bScrolling:1, // user controlled scrolling - bHandleDragging:1, // scroll window while dragging - bHCenter:1, - bVCenter:1; - -#ifdef _SVT_SCRWIN_CXX - SVT_DLLPRIVATE void ImpInitialize( ScrollableWindowFlags nFlags ); - DECL_DLLPRIVATE_LINK( ScrollHdl, ScrollBar * ); - DECL_DLLPRIVATE_LINK( EndScrollHdl, ScrollBar * ); -#endif - -public: - ScrollableWindow( Window* pParent, WinBits nBits = 0, - ScrollableWindowFlags = SCRWIN_DEFAULT ); - ScrollableWindow( Window* pParent, const ResId& rId, - ScrollableWindowFlags = SCRWIN_DEFAULT ); - - virtual void Resize(); - virtual void Command( const CommandEvent& rCEvt ); - virtual void DataChanged( const DataChangedEvent& rDEvt ); - - virtual void StartScroll(); - virtual void EndScroll( long nDeltaX, long nDeltaY ); - - using OutputDevice::SetMapMode; - virtual void SetMapMode( const MapMode& rNewMapMode ); - virtual MapMode GetMapMode() const; - - void SetTotalSize( const Size& rNewSize ); - Size GetTotalSize() { return PixelToLogic( aTotPixSz ); } - - void SetVisibleSize( const Size& rNewSize ); - BOOL MakeVisible( const Rectangle& rTarget, BOOL bSloppy = FALSE ); - Rectangle GetVisibleArea() const; - - void SetLineSize( ULONG nHorz, ULONG nVert ); - using Window::Scroll; - virtual void Scroll( long nDeltaX, long nDeltaY, USHORT nFlags = 0 ); - void ScrollLines( long nLinesX, long nLinesY ); - void ScrollPages( long nPagesX, ULONG nOverlapX, - long nPagesY, ULONG nOverlapY ); - -private: - SVT_DLLPRIVATE Size GetOutputSizePixel() const; - SVT_DLLPRIVATE Size GetOutputSize() const; -}; - -#endif diff --git a/svtools/inc/sfxecode.hxx b/svtools/inc/sfxecode.hxx deleted file mode 100644 index d87fff819748..000000000000 --- a/svtools/inc/sfxecode.hxx +++ /dev/null @@ -1,121 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: sfxecode.hxx,v $ - * $Revision: 1.8 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SFXECODE_HXX -#define _SFXECODE_HXX - -#include - -#define ERRCODE_SFX_NOSTDTEMPLATE (ERRCODE_AREA_SFX|ERRCODE_CLASS_PATH|1) -#define ERRCODE_SFX_NOTATEMPLATE (ERRCODE_AREA_SFX|ERRCODE_CLASS_FORMAT|2) -#define ERRCODE_SFX_GENERAL (ERRCODE_AREA_SFX|ERRCODE_CLASS_GENERAL|3) -#define ERRCODE_SFX_DOLOADFAILED (ERRCODE_AREA_SFX|ERRCODE_CLASS_READ|4) -#define ERRCODE_SFX_DOSAVECOMPLETEDFAILED (ERRCODE_AREA_SFX|ERRCODE_CLASS_WRITE|5) -#define ERRCODE_SFX_COMMITFAILED (ERRCODE_AREA_SFX|ERRCODE_CLASS_WRITE|6) -#define ERRCODE_SFX_HANDSOFFFAILED (ERRCODE_AREA_SFX|ERRCODE_CLASS_GENERAL|7) -#define ERRCODE_SFX_DOINITNEWFAILED (ERRCODE_AREA_SFX|ERRCODE_CLASS_CREATE|8) -#define ERRCODE_SFX_CANTREADDOCINFO (ERRCODE_AREA_SFX|ERRCODE_CLASS_FORMAT|9) -#define ERRCODE_SFX_ALREADYOPEN (ERRCODE_AREA_SFX|ERRCODE_CLASS_ALREADYEXISTS|10) -#define ERRCODE_SFX_WRONGPASSWORD (ERRCODE_AREA_SFX|ERRCODE_CLASS_READ|11) -#define ERRCODE_SFX_DOCUMENTREADONLY (ERRCODE_AREA_SFX|ERRCODE_CLASS_WRITE|12) -#define ERRCODE_SFX_OLEGENERAL (ERRCODE_AREA_SFX|ERRCODE_CLASS_NONE|14) -#define ERRCODE_SFXMSG_STYLEREPLACE (ERRCODE_WARNING_MASK|ERRCODE_AREA_SFX|ERRCODE_CLASS_NONE|13) -#define ERRCODE_SFX_TEMPLATENOTFOUND (ERRCODE_AREA_SFX|ERRCODE_CLASS_NOTEXISTS|15) -#define ERRCODE_SFX_ISRELATIVE (ERRCODE_WARNING_MASK|ERRCODE_AREA_SFX|ERRCODE_CLASS_NOTEXISTS|16) -#define ERRCODE_SFX_FORCEDOCLOAD (ERRCODE_WARNING_MASK|ERRCODE_AREA_SFX|ERRCODE_CLASS_NONE|17) - -#define ERRCODE_SFX_CANTFINDORIGINAL (ERRCODE_AREA_SFX|ERRCODE_CLASS_GENERAL|19) -#define ERRCODE_SFX_RESTART (ERRCODE_AREA_SFX|ERRCODE_CLASS_GENERAL|20) -#define ERRCODE_SFX_CANTCREATECONTENT (ERRCODE_AREA_SFX|ERRCODE_CLASS_CREATE|21) -#define ERRCODE_SFX_CANTCREATELINK (ERRCODE_AREA_SFX|ERRCODE_CLASS_CREATE|22) -#define ERRCODE_SFX_WRONGBMKFORMAT (ERRCODE_AREA_SFX|ERRCODE_CLASS_FORMAT|23) -#define ERRCODE_SFX_WRONGICONFILE (ERRCODE_AREA_SFX|ERRCODE_CLASS_FORMAT|24) -#define ERRCODE_SFX_CANTDELICONFILE (ERRCODE_AREA_SFX|ERRCODE_CLASS_ACCESS|25) -#define ERRCODE_SFX_CANTWRITEICONFILE (ERRCODE_AREA_SFX|ERRCODE_CLASS_ACCESS|26) -#define ERRCODE_SFX_CANTRENAMECONTENT (ERRCODE_AREA_SFX|ERRCODE_CLASS_ACCESS|27) -#define ERRCODE_SFX_INVALIDBMKPATH (ERRCODE_AREA_SFX|ERRCODE_CLASS_PATH|28) -#define ERRCODE_SFX_CANTWRITEURLCFGFILE (ERRCODE_AREA_SFX|ERRCODE_CLASS_ACCESS|29) -#define ERRCODE_SFX_WRONGURLCFGFORMAT (ERRCODE_AREA_SFX|ERRCODE_CLASS_FORMAT|30) -#define ERRCODE_SFX_NODOCUMENT (ERRCODE_AREA_SFX|ERRCODE_CLASS_NOTEXISTS|31) -#define ERRCODE_SFX_INVALIDLINK (ERRCODE_AREA_SFX|ERRCODE_CLASS_NOTEXISTS|32) -#define ERRCODE_SFX_INVALIDTRASHPATH (ERRCODE_AREA_SFX|ERRCODE_CLASS_PATH|33) -#define ERRCODE_SFX_NOTRESTORABLE (ERRCODE_AREA_SFX|ERRCODE_CLASS_CREATE|34) -#define ERRCODE_SFX_NOTRASH (ERRCODE_AREA_SFX|ERRCODE_CLASS_NOTEXISTS|35) -#define ERRCODE_SFX_INVALIDSYNTAX (ERRCODE_AREA_SFX|ERRCODE_CLASS_PATH|36) -#define ERRCODE_SFX_CANTCREATEFOLDER (ERRCODE_AREA_SFX|ERRCODE_CLASS_CREATE|37) -#define ERRCODE_SFX_CANTRENAMEFOLDER (ERRCODE_AREA_SFX|ERRCODE_CLASS_PATH|38) -#define ERRCODE_SFX_WRONG_CDF_FORMAT (ERRCODE_AREA_SFX| ERRCODE_CLASS_READ | 39) -#define ERRCODE_SFX_EMPTY_SERVER (ERRCODE_AREA_SFX|ERRCODE_CLASS_NONE|40) -#define ERRCODE_SFX_NO_ABOBOX (ERRCODE_AREA_SFX| ERRCODE_CLASS_READ | 41) -#define ERRCODE_SFX_CANTGETPASSWD (ERRCODE_AREA_SFX| ERRCODE_CLASS_READ | 42) -#define ERRCODE_SFX_TARGETFILECORRUPTED (ERRCODE_AREA_SFX| ERRCODE_CLASS_READ | 43) -#define ERRCODE_SFX_NOMOREDOCUMENTSALLOWED (ERRCODE_WARNING_MASK | ERRCODE_AREA_SFX | ERRCODE_CLASS_NONE | 44) -#define ERRCODE_SFX_NOFILTER (ERRCODE_AREA_SFX|ERRCODE_CLASS_NOTEXISTS|45) -#define ERRCODE_SFX_FORCEQUIET (ERRCODE_WARNING_MASK|ERRCODE_AREA_SFX|ERRCODE_CLASS_NONE|47) -#define ERRCODE_SFX_CONSULTUSER (ERRCODE_WARNING_MASK|ERRCODE_AREA_SFX|ERRCODE_CLASS_NONE|48) -#define ERRCODE_SFX_NEVERCHECKCONTENT (ERRCODE_AREA_SFX|ERRCODE_CLASS_NONE|49) -#define ERRCODE_SFX_CANTCREATEBACKUP (ERRCODE_AREA_SFX | ERRCODE_CLASS_CREATE | 50) -#define ERRCODE_SFX_MACROS_SUPPORT_DISABLED (ERRCODE_WARNING_MASK | ERRCODE_AREA_SFX | ERRCODE_CLASS_NONE | 51) -#define ERRCODE_SFX_DOCUMENT_MACRO_DISABLED (ERRCODE_WARNING_MASK | ERRCODE_AREA_SFX | ERRCODE_CLASS_NONE | 52) -#define ERRCODE_SFX_BROKENSIGNATURE (ERRCODE_WARNING_MASK | ERRCODE_AREA_SFX | ERRCODE_CLASS_NONE | 53) -#define ERRCODE_SFX_SHARED_NOPASSWORDCHANGE (ERRCODE_WARNING_MASK | ERRCODE_AREA_SFX | ERRCODE_CLASS_NONE | 54) -#define ERRCODE_SFX_INCOMPLETE_ENCRYPTION (ERRCODE_WARNING_MASK | ERRCODE_AREA_SFX | ERRCODE_CLASS_NONE | 55) - - - -//Dies und das -#define ERRCTX_ERROR 21 -#define ERRCTX_WARNING 22 - -//Documentkontexte -#define ERRCTX_SFX_LOADTEMPLATE 1 -#define ERRCTX_SFX_SAVEDOC 2 -#define ERRCTX_SFX_SAVEASDOC 3 -#define ERRCTX_SFX_DOCINFO 4 -#define ERRCTX_SFX_DOCTEMPLATE 5 -#define ERRCTX_SFX_MOVEORCOPYCONTENTS 6 - -//Appkontexte -#define ERRCTX_SFX_DOCMANAGER 50 -#define ERRCTX_SFX_OPENDOC 51 -#define ERRCTX_SFX_NEWDOCDIRECT 52 -#define ERRCTX_SFX_NEWDOC 53 - -//Organizerkontexte -#define ERRCTX_SFX_CREATEOBJSH 70 - -//BASIC-Kontexte -#define ERRCTX_SFX_LOADBASIC 80 - -//Addressbook contexts -#define ERRCTX_SFX_SEARCHADDRESS 90 - -#endif // #ifndef _SFXECODE_HXX - - diff --git a/svtools/inc/soerr.hxx b/svtools/inc/soerr.hxx deleted file mode 100644 index 9d8c9797a79f..000000000000 --- a/svtools/inc/soerr.hxx +++ /dev/null @@ -1,84 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: soerr.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SOERR_HXX -#define _SOERR_HXX - -#include - -// Fehler Codes -#define RID_SO_ERROR_HANDLER 32000 - -#define SO_ERR() (ERRCODE_AREA_SO | ERRCODE_CLASS_SO) -#define SO_WRN() (ERRCODE_AREA_SO | ERRCODE_CLASS_SO | ERRCODE_WARNING_MASK) - -#define ERRCODE_SO_GENERALERROR (SO_ERR() | 1) -#define ERRCODE_SO_CANT_BINDTOSOURCE (SO_ERR() | 2) -#define ERRCODE_SO_NOCACHE_UPDATED (SO_ERR() | 3) -#define ERRCODE_SO_SOMECACHES_NOTUPDATED (SO_WRN() | 4) -#define ERRCODE_SO_MK_UNAVAILABLE (SO_ERR() | 5) -#define ERRCODE_SO_E_CLASSDIFF (SO_ERR() | 6) -#define ERRCODE_SO_MK_NO_OBJECT (SO_ERR() | 7) -#define ERRCODE_SO_MK_EXCEEDED_DEADLINE (SO_ERR() | 8) -#define ERRCODE_SO_MK_CONNECT_MANUALLY (SO_ERR() | 9) -#define ERRCODE_SO_MK_INTERMEDIATE_INTERFACE_NOT_SUPPORTED (SO_ERR() | 10) -#define ERRCODE_SO_NO_INTERFACE (SO_ERR() | 11) -#define ERRCODE_SO_OUT_OF_MEMORY (SO_ERR() | 12) -#define ERRCODE_SO_MK_SYNTAX (SO_ERR() | 13) -#define ERRCODE_SO_MK_REDUCED_TO_SELF (SO_WRN() | 14) -#define ERRCODE_SO_MK_NO_INVERSE (SO_ERR() | 15) -#define ERRCODE_SO_MK_NO_PREFIX (SO_ERR() | 16) -#define ERRCODE_SO_MK_HIM (SO_WRN() | 17) -#define ERRCODE_SO_MK_US (SO_WRN() | 18) -#define ERRCODE_SO_MK_ME (SO_WRN() | 19) -#define ERRCODE_SO_MK_NOT_BINDABLE (SO_ERR() | 20) -#define ERRCODE_SO_NOT_IMPLEMENTED (SO_ERR() | 21) -#define ERRCODE_SO_MK_NO_STORAGE (SO_ERR() | 22) -#define ERRCODE_SO_FALSE (SO_WRN() | 23) -#define ERRCODE_SO_MK_NEED_GENERIC (SO_ERR() | 24) -#define ERRCODE_SO_PENDING (SO_ERR() | 25) -#define ERRCODE_SO_NOT_INPLACEACTIVE (SO_ERR() | 26) -#define ERRCODE_SO_LINDEX (SO_ERR() | 27) -#define ERRCODE_SO_CANNOT_DOVERB_NOW (SO_WRN() | 28) -#define ERRCODE_SO_OLEOBJ_INVALIDHWND (SO_WRN() | 29) -#define ERRCODE_SO_NOVERBS (SO_ERR() | 30) -#define ERRCODE_SO_INVALIDVERB (SO_WRN() | 31) -#define ERRCODE_SO_MK_CONNECT (SO_ERR() | 32) -#define ERRCODE_SO_NOTIMPL (SO_ERR() | 33) -#define ERRCODE_SO_MK_CANTOPENFILE (SO_ERR() | 34) - -// Fehler Contexte -#define RID_SO_ERRCTX 32001 - -#define ERRCTX_SO_DOVERB 1 - - - -#endif - diff --git a/svtools/inc/sores.hxx b/svtools/inc/sores.hxx deleted file mode 100644 index 158810c5b171..000000000000 --- a/svtools/inc/sores.hxx +++ /dev/null @@ -1,182 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: sores.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// Strings -#define STR_INS_OBJECT 32000 -#define STR_INS_OBJECT_ICON 32001 -#define STR_INS_FILE 32002 -#define STR_INS_FILE_ICON 32003 -#define STR_INS_FILE_LINK 32004 -#define STR_INS_FILE_ICON_LINK 32005 -#define STR_PASTE 32012 -#define STR_ERROR_DDE 32013 -#define STR_ERROR_OBJNOCREATE 32014 -#define STR_ERROR_OBJNOCREATE_FROM_FILE 32015 -#define STR_VERB_OPEN 32016 -#define STR_PLUGIN_CANT_SHOW 32017 -#define STR_ERROR_OBJNOCREATE_PLUGIN 32018 -#define STR_INS_PLUGIN 32019 -#define STR_CONVERT_TO 32010 -#define STR_ACTIVATE_AS 32021 -#define STR_QUERYUPDATELINKS 32022 -#define STR_INS_APPLET 32023 -#define STR_VERB_PROPS 32025 -#define STR_FURTHER_OBJECT 32026 -#define STR_EDIT_APPLET 32029 -#define STR_UNKNOWN_SOURCE 32027 - -#define BMP_PLUGIN 32000 -#define BMP_OLEOBJ 32001 -#define MB_PLUGIN 32000 -#define MI_PLUGIN 32000 -#define MI_PLUGIN_DEACTIVATE 1 - -// Sot Format Strings -#define STR_FORMAT_START 32100 -#define STR_FORMAT_STRING (STR_FORMAT_START + 1) -#define STR_FORMAT_BITMAP (STR_FORMAT_START + 2) -#define STR_FORMAT_GDIMETAFILE (STR_FORMAT_START + 3) - // #define STR_FORMAT_PRIVATE (STR_FORMAT_START + 4) - // #define STR_FORMAT_FILE (STR_FORMAT_START + 5) - // #define STR_FORMAT_FILE_LIST (STR_FORMAT_START + 6) -#define STR_FORMAT_RTF (STR_FORMAT_START + 7) -#define STR_FORMAT_ID_DRAWING (STR_FORMAT_START + 8) -#define STR_FORMAT_ID_SVXB (STR_FORMAT_START + 9) - // #define STR_FORMAT_ID_SVIM (STR_FORMAT_START + 10) - // #define STR_FORMAT_ID_XFA (STR_FORMAT_START + 11) - // #define STR_FORMAT_ID_EDITENGINE (STR_FORMAT_START + 12) -#define STR_FORMAT_ID_INTERNALLINK_STATE (STR_FORMAT_START + 13) -#define STR_FORMAT_ID_SOLK (STR_FORMAT_START + 14) -#define STR_FORMAT_ID_NETSCAPE_BOOKMARK (STR_FORMAT_START + 15) - // #define STR_FORMAT_ID_TREELISTBOX (STR_FORMAT_START + 16) - // #define STR_FORMAT_ID_NATIVE (STR_FORMAT_START + 17) - // #define STR_FORMAT_ID_OWNERLINK (STR_FORMAT_START + 18) -#define STR_FORMAT_ID_STARSERVER (STR_FORMAT_START + 19) -#define STR_FORMAT_ID_STAROBJECT (STR_FORMAT_START + 20) -#define STR_FORMAT_ID_APPLETOBJECT (STR_FORMAT_START + 21) -#define STR_FORMAT_ID_PLUGIN_OBJECT (STR_FORMAT_START + 22) -#define STR_FORMAT_ID_STARWRITER_30 (STR_FORMAT_START + 23) -#define STR_FORMAT_ID_STARWRITER_40 (STR_FORMAT_START + 24) -#define STR_FORMAT_ID_STARWRITER_50 (STR_FORMAT_START + 25) -#define STR_FORMAT_ID_STARWRITERWEB_40 (STR_FORMAT_START + 26) -#define STR_FORMAT_ID_STARWRITERWEB_50 (STR_FORMAT_START + 27) -#define STR_FORMAT_ID_STARWRITERGLOB_40 (STR_FORMAT_START + 28) -#define STR_FORMAT_ID_STARWRITERGLOB_50 (STR_FORMAT_START + 29) -#define STR_FORMAT_ID_STARDRAW (STR_FORMAT_START + 30) -#define STR_FORMAT_ID_STARDRAW_40 (STR_FORMAT_START + 31) -#define STR_FORMAT_ID_STARIMPRESS_50 (STR_FORMAT_START + 32) -#define STR_FORMAT_ID_STARDRAW_50 (STR_FORMAT_START + 33) -#define STR_FORMAT_ID_STARCALC (STR_FORMAT_START + 34) -#define STR_FORMAT_ID_STARCALC_40 (STR_FORMAT_START + 35) -#define STR_FORMAT_ID_STARCALC_50 (STR_FORMAT_START + 36) -#define STR_FORMAT_ID_STARCHART (STR_FORMAT_START + 37) -#define STR_FORMAT_ID_STARCHART_40 (STR_FORMAT_START + 38) -#define STR_FORMAT_ID_STARCHART_50 (STR_FORMAT_START + 39) -#define STR_FORMAT_ID_STARIMAGE (STR_FORMAT_START + 40) -#define STR_FORMAT_ID_STARIMAGE_40 (STR_FORMAT_START + 41) -#define STR_FORMAT_ID_STARIMAGE_50 (STR_FORMAT_START + 42) -#define STR_FORMAT_ID_STARMATH (STR_FORMAT_START + 43) -#define STR_FORMAT_ID_STARMATH_40 (STR_FORMAT_START + 44) -#define STR_FORMAT_ID_STARMATH_50 (STR_FORMAT_START + 45) -#define STR_FORMAT_ID_STAROBJECT_PAINTDOC (STR_FORMAT_START + 46) - // #define STR_FORMAT_ID_FILLED_AREA (STR_FORMAT_START + 47) -#define STR_FORMAT_ID_HTML (STR_FORMAT_START + 48) -#define STR_FORMAT_ID_HTML_SIMPLE (STR_FORMAT_START + 49) - // #define STR_FORMAT_ID_CHAOS (STR_FORMAT_START + 50) - // #define STR_FORMAT_ID_CNT_MSGATTACHFILE (STR_FORMAT_START + 51) -#define STR_FORMAT_ID_BIFF_5 (STR_FORMAT_START + 52) -#define STR_FORMAT_ID_BIFF_8 (STR_FORMAT_START + 53) -#define STR_FORMAT_ID_SYLK (STR_FORMAT_START + 54) - // #define STR_FORMAT_ID_SYLK_BIGCAPS (STR_FORMAT_START + 55) -#define STR_FORMAT_ID_LINK (STR_FORMAT_START + 56) -#define STR_FORMAT_ID_DIF (STR_FORMAT_START + 57) - // #define STR_FORMAT_ID_STARDRAW_TABBAR (STR_FORMAT_START + 58) - // #define STR_FORMAT_ID_SONLK (STR_FORMAT_START + 59) -#define STR_FORMAT_ID_MSWORD_DOC (STR_FORMAT_START + 60) -#define STR_FORMAT_ID_STAR_FRAMESET_DOC (STR_FORMAT_START + 61) -#define STR_FORMAT_ID_OFFICE_DOC (STR_FORMAT_START + 62) -#define STR_FORMAT_ID_NOTES_DOCINFO (STR_FORMAT_START + 63) - // #define STR_FORMAT_ID_NOTES_HNOTE (STR_FORMAT_START + 64) - // #define STR_FORMAT_ID_NOTES_NATIVE (STR_FORMAT_START + 65) -#define STR_FORMAT_ID_SFX_DOC (STR_FORMAT_START + 66) - // #define STR_FORMAT_ID_EVDF (STR_FORMAT_START + 67) - // #define STR_FORMAT_ID_ESDF (STR_FORMAT_START + 68) - // #define STR_FORMAT_ID_IDF (STR_FORMAT_START + 69) - // #define STR_FORMAT_ID_EFTP (STR_FORMAT_START + 70) - // #define STR_FORMAT_ID_EFD (STR_FORMAT_START + 71) - // #define STR_FORMAT_ID_SVX_FORMFIELDEXCH (STR_FORMAT_START + 72) - // #define STR_FORMAT_ID_EXTENDED_TABBAR (STR_FORMAT_START + 73) - // #define STR_FORMAT_ID_SBA_DATAEXCHANGE (STR_FORMAT_START + 74) - // #define STR_FORMAT_ID_SBA_FIELDDATAEXCHANGE (STR_FORMAT_START + 75) - // #define STR_FORMAT_ID_SBA_PRIVATE_URL (STR_FORMAT_START + 76) - // #define STR_FORMAT_ID_SBA_TABED (STR_FORMAT_START + 77) - // #define STR_FORMAT_ID_SBA_TABID (STR_FORMAT_START + 78) - // #define STR_FORMAT_ID_SBA_JOIN (STR_FORMAT_START + 79) - // #define STR_FORMAT_ID_OBJECTDESCRIPTOR (STR_FORMAT_START + 80) - // #define STR_FORMAT_ID_LINKSRCDESCRIPTOR (STR_FORMAT_START + 81) - // #define STR_FORMAT_ID_EMBED_SOURCE (STR_FORMAT_START + 82) - // #define STR_FORMAT_ID_LINK_SOURCE (STR_FORMAT_START + 83) - // #define STR_FORMAT_ID_EMBEDDED_OBJ (STR_FORMAT_START + 84) - // #define STR_FORMAT_ID_FILECONTENT (STR_FORMAT_START + 85) -#define STR_FORMAT_ID_FILEGRPDESCRIPTOR (STR_FORMAT_START + 86) - // #define STR_FORMAT_ID_FILENAME (STR_FORMAT_START + 87) - // #define STR_FORMAT_ID_SD_OLE (STR_FORMAT_START + 88) - // #define STR_FORMAT_ID_EMBEDDED_OBJ_OLE (STR_FORMAT_START + 89) - // #define STR_FORMAT_ID_EMBED_SOURCE_OLE (STR_FORMAT_START + 90) - // #define STR_FORMAT_ID_OBJECTDESCRIPTOR_OLE (STR_FORMAT_START + 91) - // #define STR_FORMAT_ID_LINKSRCDESCRIPTOR_OLE (STR_FORMAT_START + 92) - // #define STR_FORMAT_ID_LINK_SOURCE_OLE (STR_FORMAT_START + 93) - // #define STR_FORMAT_ID_SBA_CTRLDATAEXCHANGE (STR_FORMAT_START + 94) - // #define STR_FORMAT_ID_OUTPLACE_OBJ (STR_FORMAT_START + 95) - // #define STR_FORMAT_ID_CNT_OWN_CLIP (STR_FORMAT_START + 96) - // #define STR_FORMAT_ID_INET_IMAGE (STR_FORMAT_START + 97) - // #define STR_FORMAT_ID_NETSCAPE_IMAGE (STR_FORMAT_START + 98) - // #define STR_FORMAT_ID_SBA_FORMEXCHANGE (STR_FORMAT_START + 99) - // #define STR_FORMAT_ID_SBA_REPORTEXCHANGE (STR_FORMAT_START + 100) - // #define STR_FORMAT_ID_UNIFORMRESOURCELOCATOR (STR_FORMAT_START + 101) -#define STR_FORMAT_ID_STARCHARTDOCUMENT_50 (STR_FORMAT_START + 102) -#define STR_FORMAT_ID_GRAPHOBJ (STR_FORMAT_START + 103) -#define STR_FORMAT_ID_STARWRITER_60 (STR_FORMAT_START + 104) -#define STR_FORMAT_ID_STARWRITERWEB_60 (STR_FORMAT_START + 105) -#define STR_FORMAT_ID_STARWRITERGLOB_60 (STR_FORMAT_START + 106) -#define STR_FORMAT_ID_STARDRAW_60 (STR_FORMAT_START + 107) -#define STR_FORMAT_ID_STARIMPRESS_60 (STR_FORMAT_START + 108) -#define STR_FORMAT_ID_STARCALC_60 (STR_FORMAT_START + 109) -#define STR_FORMAT_ID_STARCHART_60 (STR_FORMAT_START + 110) -#define STR_FORMAT_ID_STARMATH_60 (STR_FORMAT_START + 111) -#define STR_FORMAT_ID_WMF (STR_FORMAT_START + 112) -#define STR_FORMAT_ID_DBACCESS_QUERY (STR_FORMAT_START + 113) -#define STR_FORMAT_ID_DBACCESS_TABLE (STR_FORMAT_START + 114) -#define STR_FORMAT_ID_DBACCESS_COMMAND (STR_FORMAT_START + 115) -#define STR_FORMAT_ID_DIALOG_60 (STR_FORMAT_START + 116) - // #define STR_FORMAT_ID_EMF (STR_FORMAT_START + 117) - // #define STR_FORMAT_ID_BIFF_8 (STR_FORMAT_START + 118) -#define STR_FORMAT_ID_HTML_NO_COMMENT (STR_FORMAT_START + 119) -#define STR_FORMAT_END (STR_FORMAT_ID_HTML_NO_COMMENT) diff --git a/svtools/inc/statusbarcontroller.hxx b/svtools/inc/statusbarcontroller.hxx deleted file mode 100644 index a5f4fc1c974c..000000000000 --- a/svtools/inc/statusbarcontroller.hxx +++ /dev/null @@ -1,161 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: statusbarcontroller.hxx,v $ - * $Revision: 1.7 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVTOOLS_STATUSBARCONTROLLER_HXX -#define _SVTOOLS_STATUSBARCONTROLLER_HXX - -#include "svtools/svtdllapi.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifndef INCLUDED_HASH_MAP -#include -#define INCLUDED_HASH_MAP -#endif - -#include - -namespace svt -{ - -class SVT_DLLPUBLIC StatusbarController : public ::com::sun::star::frame::XStatusListener, - public ::com::sun::star::frame::XStatusbarController, - public ::com::sun::star::lang::XInitialization, - public ::com::sun::star::util::XUpdatable, - public ::com::sun::star::lang::XComponent, - public ::comphelper::OBaseMutex, - public ::cppu::OWeakObject -{ - public: - StatusbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, - const rtl::OUString& aCommandURL, - unsigned short nID ); - StatusbarController(); - virtual ~StatusbarController(); - - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > getFrameInterface() const; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getServiceManager() const; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager > getLayoutManager() const; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > getURLTransformer() const; - - void updateStatus( const rtl::OUString aCommandURL ); - void updateStatus(); - - ::Rectangle getControlRect() const; - - // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire() throw (); - virtual void SAL_CALL release() throw (); - - // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - - // XUpdatable - virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException); - - // XComponent - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); - - // XEventListener - virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException ); - - // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ); - - // XStatusbarController - virtual ::sal_Bool SAL_CALL mouseButtonDown( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL mouseMove( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL mouseButtonUp( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL command( const ::com::sun::star::awt::Point& aPos, - ::sal_Int32 nCommand, - ::sal_Bool bMouseEvent, - const ::com::sun::star::uno::Any& aData ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL paint( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xGraphics, - const ::com::sun::star::awt::Rectangle& rOutputRectangle, - ::sal_Int32 nItemId, ::sal_Int32 nStyle ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL click() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL doubleClick() throw (::com::sun::star::uno::RuntimeException); - - protected: - struct Listener - { - Listener( const ::com::sun::star::util::URL& rURL, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& rDispatch ) : - aURL( rURL ), xDispatch( rDispatch ) {} - - ::com::sun::star::util::URL aURL; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch; - }; - - typedef ::std::hash_map< ::rtl::OUString, - com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >, - ::rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > URLToDispatchMap; - - // methods to support status forwarder, known by the old sfx2 toolbox controller implementation - void addStatusListener( const rtl::OUString& aCommandURL ); - void removeStatusListener( const rtl::OUString& aCommandURL ); - void bindListener(); - void unbindListener(); - sal_Bool isBound() const; - - // execute methods - // execute bound status bar controller command/execute various commands - void execute( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ); - void execute( const rtl::OUString& aCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ); - - sal_Bool m_bInitialized : 1, - m_bDisposed : 1; - unsigned short m_nID; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xParentWindow; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager; - rtl::OUString m_aCommandURL; - URLToDispatchMap m_aListenerMap; - ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener - mutable ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xURLTransformer; -}; - -} - -#endif // _SVTOOLS_TOOLBOXCONTROLLER_HXX diff --git a/svtools/inc/stdmenu.hxx b/svtools/inc/stdmenu.hxx deleted file mode 100644 index fb7d69476d92..000000000000 --- a/svtools/inc/stdmenu.hxx +++ /dev/null @@ -1,244 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: stdmenu.hxx,v $ - * $Revision: 1.8 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _STDMENU_HXX -#define _STDMENU_HXX - -#include "svtools/svtdllapi.h" -#include -#ifndef _MENU_HXX -#include -#endif - -class FontList; -class FontInfo; - -/************************************************************************* - -Beschreibung -============ - -class FontNameMenu - -Beschreibung - -Erlaubt die Auswahl von Fonts. Das Menu wird ueber Fill mit den FontNamen -gefuellt. Fill sortiert automatisch die FontNamen (inkl. aller Umlaute und -sprachabhaengig). Mit SetCurName()/GetCurName() kann der aktuelle Fontname -gesetzt/abgefragt werden. Wenn SetCurName() mit einem leeren String -aufgerufen wird, wird kein Eintrag als aktueller angezeigt (fuer DontKnow). -Vor dem Selectaufruf wird der ausgewaehlte Name automatisch als aktueller -gesetzt und wuerde beim naechsten Aufruf auch als aktueller Name angezeigt -werden. Deshalb sollte vor PopupMenu::Execute() gegebenenfalls mit -SetCurName() der aktuelle Fontname gesetzt werden. - -Da die Id's und der interne Aufbau des Menus nicht bekannt ist, muss ein -Select-Handler gesetzt werden, um die Auswahl eines Namens mitzubekommen. - -In dieses Menu koennen keine weiteren Items eingefuegt werden. - -Spaeter soll auch das Menu die gleichen Bitmaps anzeigen, wie die -FontNameBox. Auf den Systemen, wo Menues nicht automatisch scrollen, -wird spaeter wohl ein A-Z Menu ziwschengeschaltet. Da ein Menu bei vielen -installierten Fonts bisher schon immer lange gebraucht hat, sollte dieses -Menu schon jetzt nur einmal erzeugt werden (da sonst das Kontextmenu bis -zu 10-Sekunden fuer die Erzeugung brauchen koennte). - -Querverweise - -FontList; FontStyleMenu; FontSizeMenu; FontNameBox - --------------------------------------------------------------------------- - -class FontStyleMenu - -Beschreibung - -Erlaubt die Auswahl eines FontStyles. Mit Fill wird das FontStyleMenu mit -den Styles zum uebergebenen Font gefuellt. Nachgebildete Styles werden -immer mit eingefuegt (kann sich aber noch aendern, da vielleicht -nicht alle Applikationen [StarDraw,Formel,FontWork] mit Syntetic-Fonts -umgehen koennen). Mit SetCurStyle()/GetCurStyle() kann der aktuelle Fontstyle -gesetzt/abgefragt werden. Der Stylename muss mit FontList::GetStyleName() -ermittelt werden. Wenn SetCurStyle() mit einem leeren String aufgerufen wird, -wird kein Eintrag als aktueller angezeigt (fuer DontKnow). Vor dem Selectaufruf -wird der ausgewaehlte Style automatisch als aktueller gesetzt und wuerde beim -naechsten Aufruf auch als aktueller Style angezeigt werden. Deshalb sollte vor -PopupMenu::Execute() gegebenenfalls mit SetCurStyle() der aktuelle Style -gesetzt werden. Da die Styles vom ausgewaehlten Font abhaengen, sollte -nach einer Aenderung des Fontnamen das Menu mit Fill mit den Styles des -Fonts neu gefuellt werden. - -Mit GetCurStyle() kann der ausgewaehlte Style abgefragt -werden. Mit Check wird der Style gecheckt/uncheckt, welcher aktiv -ist. Der Stylename muss mit FontList::GetStyleName() ermittelt werden. Vor -dem Selectaufruf wird der ausgewaehlte Style automatisch gecheckt. Mit -UncheckAllStyles() koennen alle Fontstyles geuncheckt werden (zum Beispiel -fuer DontKnow). - -Da die Id's und der interne Aufbau des Menus nicht bekannt ist, muss ein -Select-Handler gesetzt werden, um die Auswahl eines Styles mitzubekommen. - -An dieses Menu kann ueber MENU_APPEND weitere Items eingefuegt werden. -Bei Fill werden nur Items entfernt, die die Id zwischen FONTSTYLEMENU_FIRSTID -und FONTSTYLEMENU_LASTID haben. - -Querverweise - -FontList; FontNameMenu; FontSizeMenu; FontStyleBox - --------------------------------------------------------------------------- - -class FontSizeMenu - -Beschreibung - -Erlaubt die Auswahl von Fontgroessen. Ueber Fill wird das FontSizeMenu -gefuellt und ueber GetCurHeight() kann die ausgewaehlte Fontgroesse -abgefragt werden. Mit SetCurHeight()/GetCurHeight() kann die aktuelle -Fontgroesse gesetzt/abgefragt werden. Wenn SetCurHeight() mit 0 aufgerufen -wird, wird kein Eintrag als aktueller angezeigt (fuer DontKnow). Vor dem -Selectaufruf wird die ausgewaehlte Groesse automatisch als aktuelle gesetzt -und wuerde beim naechsten Aufruf auch als aktuelle Groesse angezeigt werden. -Deshalb sollte vor PopupMenu::Execute() gegebenenfalls mit SetCurHeight() -die aktuelle Groesse gesetzt werden. Da die Groessen vom ausgewaehlten Font -abhaengen, sollte nach einer Aenderung des Fontnamen das Menu mit Fill mit -den Groessen des Fonts neu gefuellt werden. - -Da die Id's und der interne Aufbau des Menus nicht bekannt ist, muss ein -Select-Handler gesetzt werden, um die Auswahl einer Groesse mitzubekommen. - -Alle Groessen werden in 10tel Point angegeben. - -In dieses Menu koennen keine weiteren Items eingefuegt werden. - -Spaeter soll das Menu je nach System die Groessen anders darstelllen. Zum -Beispiel koennte der Mac spaeter vielleicht einmal die Groessen als Outline -darstellen, die als Bitmap-Fonts vorhanden sind. - -Querverweise - -FontList; FontNameMenu; FontStyleMenu; FontSizeBox - -*************************************************************************/ - -// ---------------- -// - FontNameMenu - -// ---------------- - -class SVT_DLLPUBLIC FontNameMenu : public PopupMenu -{ -private: - XubString maCurName; - Link maSelectHdl; - Link maHighlightHdl; - -public: - FontNameMenu(); - virtual ~FontNameMenu(); - - virtual void Select(); - virtual void Highlight(); - - void Fill( const FontList* pList ); - - void SetCurName( const XubString& rName ); - const XubString& GetCurName() const { return maCurName; } - - void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } - const Link& GetSelectHdl() const { return maSelectHdl; } - void SetHighlightHdl( const Link& rLink ) { maHighlightHdl = rLink; } - const Link& GetHighlightHdl() const { return maHighlightHdl; } -}; - -// ----------------- -// - FontStyleMenu - -// ----------------- - -#define FONTSTYLEMENU_FIRSTID 62000 -#define FONTSTYLEMENU_LASTID 62999 - -class SVT_DLLPUBLIC FontStyleMenu : public PopupMenu -{ -private: - XubString maCurStyle; - Link maSelectHdl; - Link maHighlightHdl; - - SVT_DLLPRIVATE BOOL ImplIsAlreadyInserted( const XubString& rStyleName, USHORT nCount ); - -public: - FontStyleMenu(); - virtual ~FontStyleMenu(); - - virtual void Select(); - virtual void Highlight(); - - void Fill( const XubString& rName, const FontList* pList ); - void SetCurStyle( const XubString& rStyle ); - const XubString& GetCurStyle() const { return maCurStyle; } - - void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } - const Link& GetSelectHdl() const { return maSelectHdl; } - void SetHighlightHdl( const Link& rLink ) { maHighlightHdl = rLink; } - const Link& GetHighlightHdl() const { return maHighlightHdl; } -}; - -// ---------------- -// - FontSizeMenu - -// ---------------- - -class SVT_DLLPUBLIC FontSizeMenu : public PopupMenu -{ -private: - long* mpHeightAry; - long mnCurHeight; - Link maSelectHdl; - Link maHighlightHdl; - -public: - FontSizeMenu(); - ~FontSizeMenu(); - - virtual void Select(); - virtual void Highlight(); - - void Fill( const FontInfo& rInfo, const FontList* pList ); - - void SetCurHeight( long nHeight ); - long GetCurHeight() const { return mnCurHeight; } - - void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } - const Link& GetSelectHdl() const { return maSelectHdl; } - void SetHighlightHdl( const Link& rLink ) { maHighlightHdl = rLink; } - const Link& GetHighlightHdl() const { return maHighlightHdl; } -}; - -#endif // _STDMENU_HXX diff --git a/svtools/inc/svtools/DocumentInfoPreview.hxx b/svtools/inc/svtools/DocumentInfoPreview.hxx new file mode 100644 index 000000000000..bbb8ab32c1a6 --- /dev/null +++ b/svtools/inc/svtools/DocumentInfoPreview.hxx @@ -0,0 +1,64 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: DocumentInfoPreview.hxx,v $ + * $Revision: 1.7 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef SVTOOLS_DOCUMENTINFOPREVIEW_HXX +#define SVTOOLS_DOCUMENTINFOPREVIEW_HXX + +#include "svtools/svtdllapi.h" +#include +#include +#include + +class SvtExtendedMultiLineEdit_Impl; +class SvtDocInfoTable_Impl; + +namespace svtools +{ + class SVT_DLLPUBLIC ODocumentInfoPreview : public Window + { + SvtExtendedMultiLineEdit_Impl* m_pEditWin; + SvtDocInfoTable_Impl* m_pInfoTable; + com::sun::star::lang::Locale m_aLocale; + + public: + ODocumentInfoPreview( Window* pParent ,WinBits _nBits); + virtual ~ODocumentInfoPreview(); + + virtual void Resize(); + void Clear(); + void fill(const ::com::sun::star::uno::Reference< + ::com::sun::star::document::XDocumentProperties>& i_xDocProps + ,const String& i_rURL); + void InsertEntry( const String& rTitle, const String& rValue ); + void SetAutoScroll(BOOL _bAutoScroll); + }; +} + +#endif // SVTOOLS_DOCUMENTINFOPREVIEW_HXX + diff --git a/svtools/inc/svtools/QueryFolderName.hxx b/svtools/inc/svtools/QueryFolderName.hxx new file mode 100644 index 000000000000..eb092b5afc0b --- /dev/null +++ b/svtools/inc/svtools/QueryFolderName.hxx @@ -0,0 +1,69 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: QueryFolderName.hxx,v $ + * $Revision: 1.5 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef SVT_QUERYFOLDER_HXX +#define SVT_QUERYFOLDER_HXX + +#include +#ifndef _SV_BUTTON_HXX +#include +#endif +#include +#include + +//------------------------------------------------------------------------- +namespace svtools { + +//------------------------------------------------------------------------- +// QueryFolderNameDialog +//------------------------------------------------------------------------- + +class QueryFolderNameDialog : public ModalDialog +{ +private: + FixedText aNameText; + Edit aNameEdit; + FixedLine aNameLine; + OKButton aOKBtn; + CancelButton aCancelBtn; + + DECL_LINK( OKHdl, Button * ); + DECL_LINK( NameHdl, Edit * ); + +public: + QueryFolderNameDialog( Window* _pParent, + const String& rTitle, + const String& rDefaultText, + String* pGroupName = NULL ); + String GetName() const { return aNameEdit.GetText(); } +}; + +} +#endif // SVT_QUERYFOLDER_HXX + diff --git a/svtools/inc/svtools/acceleratorexecute.hxx b/svtools/inc/svtools/acceleratorexecute.hxx new file mode 100644 index 000000000000..744bc87f31c5 --- /dev/null +++ b/svtools/inc/svtools/acceleratorexecute.hxx @@ -0,0 +1,290 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: acceleratorexecute.hxx,v $ + * $Revision: 1.13 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef INCLUDED_SVTOOLS_ACCELERATOREXECUTE_HXX +#define INCLUDED_SVTOOLS_ACCELERATOREXECUTE_HXX + +//=============================================== +// includes + +#include "svtools/svtdllapi.h" + +#ifndef INCLUDED_VECTOR +#include +#define INCLUDED_VECTOR +#endif + +#ifndef __COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ +#include +#endif + +#ifndef __COM_SUN_STAR_FRAME_XFRAME_HPP_ +#include +#endif + +#ifndef __COM_SUN_STAR_FRAME_XDISPATCHPROVIDER_HPP_ +#include +#endif + +#ifndef __com_SUN_STAR_UI_XACCELERATORCONFIGURATION_HPP_ +#include +#endif + +#ifndef __COM_SUN_STAR_UTIL_XURLTRANSFORMER_HPP_ +#include +#endif +#include + +#ifndef __COM_SUN_STAR_AWT_KEYEVENT_HPP_ +#include +#endif +#include +#include +#include + +//=============================================== +// namespace + +#ifdef css + #error "Conflict on using css as namespace alias!" +#else + #define css ::com::sun::star +#endif + +namespace svt +{ + +//=============================================== +// definitions + +struct TMutexInit +{ + ::osl::Mutex m_aLock; +}; + +//=============================================== +/** + @descr implements a helper, which can be used to + convert vcl key codes into awt key codes ... + and reverse. + + Further such key code can be triggered. + Doing so different accelerator + configurations are merged together; a suitable + command registered for the given key code is searched + and will be dispatched. + + @attention + + Because exceution of an accelerator command can be dangerous + (in case it force an office shutdown for key "ALT+F4"!) + all internal dispatches are done asynchronous. + Menas that the trigger call doesnt wait till the dispatch + is finished. You can call very often. All requests will be + queued internal and dispatched ASAP. + + Of course this queue will be stopped if the environment + will be destructed ... + */ +class SVT_DLLPUBLIC AcceleratorExecute : private TMutexInit +{ + //------------------------------------------- + // const, types + private: + + /** @deprecated + replaced by internal class AsyncAccelExec ... + remove this resource here if we go forwards to next major */ + typedef ::std::vector< ::std::pair< css::util::URL, css::uno::Reference< css::frame::XDispatch > > > TCommandQueue; + + //------------------------------------------- + // member + private: + + /** TODO document me */ + css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR; + + /** TODO document me */ + css::uno::Reference< css::util::XURLTransformer > m_xURLParser; + + /** TODO document me */ + css::uno::Reference< css::frame::XDispatchProvider > m_xDispatcher; + + /** TODO document me */ + css::uno::Reference< css::ui::XAcceleratorConfiguration > m_xGlobalCfg; + css::uno::Reference< css::ui::XAcceleratorConfiguration > m_xModuleCfg; + css::uno::Reference< css::ui::XAcceleratorConfiguration > m_xDocCfg; + + /** @deprecated + replaced by internal class AsyncAccelExec ... + remove this resource here if we go forwards to next major */ + TCommandQueue m_lCommandQueue; + + /** @deprecated + replaced by internal class AsyncAccelExec ... + remove this resource here if we go forwards to next major */ + ::vcl::EventPoster m_aAsyncCallback; + + //------------------------------------------- + // interface + public: + + //--------------------------------------- + /** @short factory method to create new accelerator + helper instance. + + @descr Such helper instance must be initialized at first. + So it can know its environment (global/module or + document specific). + + Afterwards it can be used to execute incoming + accelerator requests. + + The "end of life" of such helper can be reached as follow: + + - delete the object + => If it stands currently in its execute method, they will + be finished. All further queued requests will be removed + and further not executed! + + - "let it stay alone" + => All currently queued events will be finished. The + helper kills itself afterwards. A shutdown of the + environment will be recognized ... The helper stop its + work immediatly then! + */ + static AcceleratorExecute* createAcceleratorHelper(); + + //--------------------------------------- + /** @short fight against inlining ... */ + virtual ~AcceleratorExecute(); + + //--------------------------------------- + /** @short init this instance. + + @descr It must be called as first method after creation. + And further it can be called more then once ... + but at least its should be used one times only. + Otherwhise nobody can say, which asynchronous + executions will be used inside the old and which one + will be used inside the new environment. + + @param xSMGR + reference to an uno service manager. + + @param xEnv + if it points to a valid frame it will be used + to execute the dispatch there. Further the frame + is used to locate the right module configuration + and use it merged together with the document and + the global configuration. + + If this parameter is set to NULL, the global configuration + is used only. Further the global Desktop instance is + used for dispatch. + */ + virtual void init(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR, + const css::uno::Reference< css::frame::XFrame >& xEnv ); + + //--------------------------------------- + /** @short trigger this accelerator. + + @descr The internal configuartions are used to find + as suitable command for this key code. + This command will be queued and executed later + asynchronous. + + @param aKey + specify the accelerator for execute. + + @return [sal_Bool] + TRUE if this key is configured and match to a command. + Attention: This state does not mean the success state + of the corresponding execute. Because its done asynchronous! + */ + virtual sal_Bool execute(const KeyCode& aKey); + virtual sal_Bool execute(const css::awt::KeyEvent& aKey); + + /** search the command for the given key event. + * + * @param aKey The key event + * @return The command or an empty string if the key event could not be found. + */ + ::rtl::OUString findCommand(const ::com::sun::star::awt::KeyEvent& aKey); + //--------------------------------------- + /** TODO document me */ + static css::awt::KeyEvent st_VCLKey2AWTKey(const KeyCode& aKey); + static KeyCode st_AWTKey2VCLKey(const css::awt::KeyEvent& aKey); + + //--------------------------------------- + /** TODO document me */ + static css::uno::Reference< css::ui::XAcceleratorConfiguration > st_openGlobalConfig(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR); + + //--------------------------------------- + /** TODO document me */ + static css::uno::Reference< css::ui::XAcceleratorConfiguration > st_openModuleConfig(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR , + const css::uno::Reference< css::frame::XFrame >& xFrame); + + //--------------------------------------- + /** TODO document me */ + static css::uno::Reference< css::ui::XAcceleratorConfiguration > st_openDocConfig(const css::uno::Reference< css::frame::XModel >& xModel); + + //------------------------------------------- + // internal + private: + + //--------------------------------------- + /** @short allow creation of instances of this class + by using our factory only! + */ + SVT_DLLPRIVATE AcceleratorExecute(); + + AcceleratorExecute(const AcceleratorExecute& rCopy); + void operator=(const AcceleratorExecute&) {}; + //--------------------------------------- + /** TODO document me */ + SVT_DLLPRIVATE ::rtl::OUString impl_ts_findCommand(const css::awt::KeyEvent& aKey); + + //--------------------------------------- + /** TODO document me */ + SVT_DLLPRIVATE css::uno::Reference< css::util::XURLTransformer > impl_ts_getURLParser(); + + //--------------------------------------- + /** @deprecated + replaced by internal class AsyncAccelExec ... + remove this resource here if we go forwards to next major */ + DECL_DLLPRIVATE_LINK(impl_ts_asyncCallback, void*); +}; + +} // namespace svt + +#undef css + +#endif // INCLUDED_SVTOOLS_ACCELERATOREXECUTE_HXX diff --git a/svtools/inc/svtools/addresstemplate.hxx b/svtools/inc/svtools/addresstemplate.hxx new file mode 100644 index 000000000000..0ece2d779056 --- /dev/null +++ b/svtools/inc/svtools/addresstemplate.hxx @@ -0,0 +1,166 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: addresstemplate.hxx,v $ + * $Revision: 1.9 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _SVT_ADDRESSTEMPLATE_HXX_ +#define _SVT_ADDRESSTEMPLATE_HXX_ + +#include "svtools/svtdllapi.h" +#include +#include +#include +#include +#include +#include +#include +#include +#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_ +#include +#endif +#include +#include +#include + +// ....................................................................... +namespace svt +{ +// ....................................................................... + + // =================================================================== + // = AddressBookSourceDialog + // =================================================================== + struct AddressBookSourceDialogData; + class SVT_DLLPUBLIC AddressBookSourceDialog : public ModalDialog + { + protected: + // Controls + FixedLine m_aDatasourceFrame; + FixedText m_aDatasourceLabel; + ComboBox m_aDatasource; + PushButton m_aAdministrateDatasources; + FixedText m_aTableLabel; + ComboBox m_aTable; + + FixedText m_aFieldsTitle; + Window m_aFieldsFrame; + + ScrollBar m_aFieldScroller; + OKButton m_aOK; + CancelButton m_aCancel; + HelpButton m_aHelp; + + // string to display for "no selection" + const String m_sNoFieldSelection; + + /// the DatabaseContext for selecting data sources + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > + m_xDatabaseContext; + // the ORB for creating objects + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > + m_xORB; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > + m_xCurrentDatasourceTables; + + AddressBookSourceDialogData* + m_pImpl; + + public: + AddressBookSourceDialog( Window* _pParent, + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB ); + + /** if you use this ctor, the dialog +
    • will not store it's data in the configuration (nor initially retrieve it from there)
      • +
    • will not allow to change the data source name
      • +
    • will not allow to change the table name
      • +
    • will not allow to call the data source administration dialog
      • +
    + + @param _rxORB + a service factory to use for various UNO related needs + @param _rxTransientDS + the data source to obtain connections from + @param _rDataSourceName + the to-be name of _rxTransientDS. This is only for displaying this + name to the user, since the dialog completely works on _rxTransientDS, + and doesn't allow to change this. + @param _rTable + the table name to display. It must refer to a valid table, relative to a connection + obtained from _rxTransientDS + */ + AddressBookSourceDialog( Window* _pParent, + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB, + const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource >& _rxTransientDS, + const ::rtl::OUString& _rDataSourceName, + const ::rtl::OUString& _rTable, + const ::com::sun::star::uno::Sequence< ::com::sun::star::util::AliasProgrammaticPair >& _rMapping + ); + + ~AddressBookSourceDialog(); + + // to be used if the object was constructed for editing a field mapping only + void getFieldMapping( + ::com::sun::star::uno::Sequence< ::com::sun::star::util::AliasProgrammaticPair >& _rMapping) const; + + protected: + void implConstruct(); + + // Window overridables + virtual long PreNotify( NotifyEvent& _rNEvt ); + + // implementations + void implScrollFields(sal_Int32 _nPos, sal_Bool _bAdjustFocus, sal_Bool _bAdjustScrollbar); + void implSelectField(ListBox* _pBox, const String& _rText); + + void initalizeListBox(ListBox* _pList); + void resetTables(); + void resetFields(); + + // fill in the data sources listbox + void initializeDatasources(); + + // initialize the dialog from the configuration data + void loadConfiguration(); + + DECL_LINK(OnFieldScroll, ScrollBar*); + DECL_LINK(OnFieldSelect, ListBox*); + DECL_LINK(OnAdministrateDatasources, void*); + DECL_LINK(OnComboGetFocus, ComboBox*); + DECL_LINK(OnComboLoseFocus, ComboBox*); + DECL_LINK(OnComboSelect, ComboBox*); + DECL_LINK(OnOkClicked, Button*); + DECL_LINK(OnDelayedInitialize, void*); + }; + + +// ....................................................................... +} // namespace svt +// ....................................................................... + +#endif // _SVT_ADDRESSTEMPLATE_HXX_ + diff --git a/svtools/inc/svtools/apearcfg.hxx b/svtools/inc/svtools/apearcfg.hxx new file mode 100644 index 000000000000..412faab3107b --- /dev/null +++ b/svtools/inc/svtools/apearcfg.hxx @@ -0,0 +1,130 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: apearcfg.hxx,v $ + * $Revision: 1.5 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _SVT_APEARCFG_HXX +#define _SVT_APEARCFG_HXX + +#include "svtools/svtdllapi.h" +#include "tools/solar.h" +#include + +class Application; + +/*-------------------------------------------------------------------- + Beschreibung: + --------------------------------------------------------------------*/ +typedef enum { + LookStardivision = 0, + LookMotif, + LookWindows, + LookOSTwo, + LookMacintosh +} SystemLook; + +typedef enum { + SnapToButton = 0, + SnapToMiddle, + NoSnap +} SnapType; + +typedef enum { // MUST match the order chosen in ListBox LB_DRAG_MODE in optgdlg.src + DragFullWindow, + DragFrame, + DragSystemDep +} DragMode; + + +class SVT_DLLPUBLIC SvtTabAppearanceCfg : public utl::ConfigItem +{ + short nLookNFeel ; + short nDragMode ; + short nScaleFactor ; + short nSnapMode ; + short nMiddleMouse; +#if defined( UNX ) || defined ( FS_PRIV_DEBUG ) + short nAAMinPixelHeight ; +#endif + + BOOL bMenuMouseFollow ; + BOOL bSingleLineTabCtrl ; + BOOL bColoredTabCtrl ; +#if defined( UNX ) || defined ( FS_PRIV_DEBUG ) + BOOL bFontAntialiasing ; +#endif + + static sal_Bool bInitialized ; + + SVT_DLLPRIVATE const com::sun::star::uno::Sequence& GetPropertyNames(); + +public: + SvtTabAppearanceCfg( ); + ~SvtTabAppearanceCfg( ); + + virtual void Commit(); + virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames); + + USHORT GetLookNFeel () const { return nLookNFeel; } + void SetLookNFeel ( USHORT nSet ); + + USHORT GetDragMode () const { return nDragMode; } + void SetDragMode ( USHORT nSet ); + + USHORT GetScaleFactor () const { return nScaleFactor; } + void SetScaleFactor ( USHORT nSet ); + + USHORT GetSnapMode () const { return nSnapMode; } + void SetSnapMode ( USHORT nSet ); + + USHORT GetMiddleMouseButton () const { return nMiddleMouse; } + void SetMiddleMouseButton ( USHORT nSet ); + + void SetApplicationDefaults ( Application* pApp ); + + void SetMenuMouseFollow(BOOL bSet) {bMenuMouseFollow = bSet; SetModified();} + BOOL IsMenuMouseFollow() const{return bMenuMouseFollow;} + + void SetSingleLineTabCtrl(BOOL bSet) {bSingleLineTabCtrl = bSet; SetModified();} + BOOL IsSingleLineTabCtrl()const {return bSingleLineTabCtrl;} + +#if defined( UNX ) || defined ( FS_PRIV_DEBUG ) + void SetFontAntiAliasing( BOOL bSet ) { bFontAntialiasing = bSet; SetModified(); } + BOOL IsFontAntiAliasing() const { return bFontAntialiasing; } + + USHORT GetFontAntialiasingMinPixelHeight( ) const { return nAAMinPixelHeight; } + void SetFontAntialiasingMinPixelHeight( USHORT _nMinHeight ) { nAAMinPixelHeight = _nMinHeight; SetModified(); } +#endif + + void SetColoredTabCtrl(BOOL bSet) {bColoredTabCtrl = bSet; SetModified();}; + BOOL IsColoredTabCtrl()const {return bColoredTabCtrl;} + + static sal_Bool IsInitialized() { return bInitialized; } + static void SetInitialized() { bInitialized = sal_True; } +}; + +#endif // _OFA_APEARCFG_HXX diff --git a/svtools/inc/svtools/asynclink.hxx b/svtools/inc/svtools/asynclink.hxx new file mode 100644 index 000000000000..9f6b6c1117ec --- /dev/null +++ b/svtools/inc/svtools/asynclink.hxx @@ -0,0 +1,80 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: asynclink.hxx,v $ + * $Revision: 1.6 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef SVTOOLS_ASYNCLINK_HXX +#define SVTOOLS_ASYNCLINK_HXX + +#include "svtools/svtdllapi.h" +#include +#include + +class Timer; + +namespace vos +{ + class OMutex; +} + +namespace svtools { + +class SVT_DLLPUBLIC AsynchronLink +{ + Link _aLink; + ULONG _nEventId; + Timer* _pTimer; + BOOL _bInCall; + BOOL* _pDeleted; + void* _pArg; + vos::OMutex* _pMutex; + + DECL_DLLPRIVATE_STATIC_LINK( AsynchronLink, HandleCall, void* ); + SVT_DLLPRIVATE void Call_Impl( void* pArg ); + +public: + AsynchronLink( const Link& rLink ) : + _aLink( rLink ), _nEventId( 0 ), _pTimer( 0 ), _bInCall( FALSE ), + _pDeleted( 0 ), _pMutex( 0 ){} + AsynchronLink() : _nEventId( 0 ), _pTimer( 0 ), _bInCall( FALSE ), + _pDeleted( 0 ), _pMutex( 0 ){} + ~AsynchronLink(); + + void CreateMutex(); + void operator=( const Link& rLink ) { _aLink = rLink; } + void Call( void* pObj, BOOL bAllowDoubles = FALSE, + BOOL bUseTimer = FALSE ); + void ForcePendingCall( ); + void ClearPendingCall( ); + BOOL IsSet() const { return _aLink.IsSet(); } + Link GetLink() const { return _aLink; } +}; + +} + +#endif diff --git a/svtools/inc/svtools/calendar.hxx b/svtools/inc/svtools/calendar.hxx new file mode 100644 index 000000000000..1c81945a669c --- /dev/null +++ b/svtools/inc/svtools/calendar.hxx @@ -0,0 +1,504 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: calendar.hxx,v $ + * $Revision: 1.9 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _CALENDAR_HXX +#define _CALENDAR_HXX + +#include "svtools/svtdllapi.h" +#include +#ifndef _COM_SUN_STAR_I18N_WEEKDAYS_HPP +#include +#endif + +#ifndef _CTRL_HXX +#include +#endif +#include +#ifndef _FIELD_HXX +#include +#endif + +class Table; +class MouseEvent; +class TrackingEvent; +class KeyEvent; +class HelpEvent; +class DataChangedEvent; +class FloatingWindow; +class PushButton; +struct ImplDateInfo; +class ImplDateTable; +class ImplCFieldFloatWin; + +/************************************************************************* + +Beschreibung +============ + +class Calendar + +Diese Klasse erlaubt die Auswahl eines Datum. Der Datumsbereich der +angezeigt wird, ist der, der durch die Klasse Date vorgegeben ist. +Es werden soviele Monate angezeigt, wie die Ausgabeflaeche des +Controls vorgibt. Der Anwender kann zwischen den Monaten ueber ein +ContextMenu (Bei Click auf den Monatstitel) oder durch 2 ScrollButtons +zwischen den Monaten wechseln. + +-------------------------------------------------------------------------- + +WinBits + +WB_BORDER Um das Fenster wird ein Border gezeichnet. +WB_TABSTOP Tastatursteuerung ist moeglich. Der Focus wird + sich geholt, wenn mit der Maus in das + Control geklickt wird. +WB_QUICKHELPSHOWSDATEINFO DateInfo auch bei QuickInfo als BalloonHelp zeigen +WB_BOLDTEXT Formatiert wird nach fetten Texten und + DIB_BOLD wird bei AddDateInfo() ausgewertet +WB_FRAMEINFO Formatiert wird so, das Frame-Info angezeigt + werden kann und die FrameColor bei AddDateInfo() + ausgewertet wird +WB_RANGESELECT Es koennen mehrere Tage selektiert werden, die + jedoch alle zusammenhaengend sein muessen +WB_MULTISELECT Es koennen mehrere Tage selektiert werden +WB_WEEKNUMBER Es werden die Wochentage mit angezeigt + +-------------------------------------------------------------------------- + +Mit SetCurDate() / GetCurDate() wird das ausgewaehlte Datum gesetzt und +abgefragt. Wenn der Anwnder ein Datum selektiert hat, wird Select() +gerufen. Bei einem Doppelklick auf ein Datum wird DoubleClick() gerufen. + +-------------------------------------------------------------------------- + +Mit CalcWindowSizePixel() kann die Groesse des Fensters in Pixel fuer +die Darstellung einer bestimmte Anzahl von Monaten berechnet werden. + +-------------------------------------------------------------------------- + +Mit SetSaturdayColor() kann eine spezielle Farbe fuer Sonnabende gesetzt +werden und mit SetSundayColor() eine fuer Sonntage. Mit AddDateInfo() +koennen Tage speziell gekennzeichnet werden. Dabei kann man einem +einzelnen Datum eine andere Farbe geben (zum Beispiel fuer Feiertage) +oder diese Umranden (zum Beispiel fuer Termine). Wenn beim Datum +kein Jahr angegeben wird, wird der Tag in jedem Jahr benutzt. Mit +AddDateInfo() kann auch jedem Datum ein Text mitgegeben werden, der +dann angezeigt wird, wenn Balloon-Hilfe an ist. Um nicht alle Jahre +mit entsprechenden Daten zu versorgen, wird der RequestDateInfo()- +Handler gerufen, wenn ein neues Jahr angezeigt wird. Es kann dann +im Handler mit GetRequestYear() das Jahr abgefragt werden. + +-------------------------------------------------------------------------- + +Um ein ContextMenu zu einem Datum anzuzeigen, muss man den Command-Handler +ueberlagern. Mit GetDate() kann zur Mouse-Position das Datum ermittelt +werden. Bei Tastaturausloesung sollte das aktuelle Datum genommen werden. +Wenn ein ContextMenu angezeigt wird, darf der Handler der Basisklasse nicht +gerufen werden. + +-------------------------------------------------------------------------- + +Bei Mehrfachselektion WB_RANGESELECT oder WB_MULTISELECT kann mit +SelectDate()/SelectDateRange() Datumsbereiche selektiert/deselektiert +werden. SelectDateRange() gilt inkl. EndDatum. Mit SetNoSelection() kann +alles deselektiert werden. SetCurDate() selektiert bei Mehrfachselektion +jedoch nicht das Datum mit, sondern gibt nur das Focus-Rechteck vor. + +Den selektierten Bereich kann man mit GetSelectDateCount()/GetSelectDate() +abgefragt werden oder der Status von einem Datum kann mit IsDateSelected() +abgefragt werden. + +Waehrend der Anwender am selektieren ist, wird der SelectionChanging()- +Handler gerufen. In diesem kann der selektierte Bereich angepasst werden, +wenn man beispielsweise den Bereich eingrenzen oder erweitern will. Der +Bereich wird mit SelectDate()/SelectDateRange() umgesetzt und mit +GetSelectDateCount()/GetSelectDate() abgefragt. Wenn man wissen moechte, +in welche Richtung selektiert wird, kann dies ueber IsSelectLeft() +abgefragt werden. TRUE bedeutet eine Selektion nach links oder oben, +FALSE eine Selektion nach rechts oder unten. + +-------------------------------------------------------------------------- + +Wenn sich der Date-Range-Bereich anpasst und man dort die Selektion +uebernehmen will, sollte dies nur gemacht werden, wenn +IsScrollDateRangeChanged() TRUE zurueckliefert. Denn diese Methode liefert +TRUE zurueck, wenn der Bereich durch Betaetigung von den Scroll-Buttons +ausgeloest wurde. Bei FALSE wurde dies durch Resize(), Methoden-Aufrufen +oder durch Beendigung einer Selektion ausgeloest. + +*************************************************************************/ + +// ------------------ +// - Calendar-Types - +// ------------------ + +#define WB_QUICKHELPSHOWSDATEINFO ((WinBits)0x00004000) +#define WB_BOLDTEXT ((WinBits)0x00008000) +#define WB_FRAMEINFO ((WinBits)0x00010000) +#define WB_WEEKNUMBER ((WinBits)0x00020000) +// Muss mit den WinBits beim TabBar uebereinstimmen oder mal +// nach \vcl\inc\wintypes.hxx verlagert werden +#ifndef WB_RANGESELECT +#define WB_RANGESELECT ((WinBits)0x00200000) +#endif +#ifndef WB_MULTISELECT +#define WB_MULTISELECT ((WinBits)0x00400000) +#endif + +#define DIB_BOLD ((USHORT)0x0001) + +// ------------ +// - Calendar - +// ------------ + +class SVT_DLLPUBLIC Calendar : public Control +{ +private: + ImplDateTable* mpDateTable; + Table* mpSelectTable; + Table* mpOldSelectTable; + Table* mpRestoreSelectTable; + XubString* mpDayText[31]; + XubString maDayText; + XubString maWeekText; + CalendarWrapper maCalendarWrapper; + Rectangle maPrevRect; + Rectangle maNextRect; + String maDayOfWeekText; + sal_Int32 mnDayOfWeekAry[7]; + Date maOldFormatFirstDate; + Date maOldFormatLastDate; + Date maFirstDate; + Date maOldFirstDate; + Date maCurDate; + Date maOldCurDate; + Date maAnchorDate; + Date maDropDate; + Color maSelColor; + Color maOtherColor; + Color* mpStandardColor; + Color* mpSaturdayColor; + Color* mpSundayColor; + ULONG mnDayCount; + long mnDaysOffX; + long mnWeekDayOffY; + long mnDaysOffY; + long mnMonthHeight; + long mnMonthWidth; + long mnMonthPerLine; + long mnLines; + long mnDayWidth; + long mnDayHeight; + long mnWeekWidth; + long mnDummy2; + long mnDummy3; + long mnDummy4; + WinBits mnWinStyle; + USHORT mnFirstYear; + USHORT mnLastYear; + USHORT mnRequestYear; + BOOL mbCalc:1, + mbFormat:1, + mbDrag:1, + mbSelection:1, + mbMultiSelection:1, + mbWeekSel:1, + mbUnSel:1, + mbMenuDown:1, + mbSpinDown:1, + mbPrevIn:1, + mbNextIn:1, + mbDirect:1, + mbInSelChange:1, + mbTravelSelect:1, + mbScrollDateRange:1, + mbSelLeft:1, + mbAllSel:1, + mbDropPos:1; + Link maSelectionChangingHdl; + Link maDateRangeChangedHdl; + Link maRequestDateInfoHdl; + Link maDoubleClickHdl; + Link maSelectHdl; + Timer maDragScrollTimer; + USHORT mnDragScrollHitTest; + +#ifdef _SV_CALENDAR_CXX + using Control::ImplInitSettings; + using Window::ImplInit; + SVT_DLLPRIVATE void ImplInit( WinBits nWinStyle ); + SVT_DLLPRIVATE void ImplInitSettings(); + SVT_DLLPRIVATE void ImplGetWeekFont( Font& rFont ) const; + SVT_DLLPRIVATE void ImplFormat(); + using Window::ImplHitTest; + SVT_DLLPRIVATE USHORT ImplHitTest( const Point& rPos, Date& rDate ) const; + SVT_DLLPRIVATE void ImplDrawSpin( BOOL bDrawPrev = TRUE, BOOL bDrawNext = TRUE ); + SVT_DLLPRIVATE void ImplDrawDate( long nX, long nY, + USHORT nDay, USHORT nMonth, USHORT nYear, + DayOfWeek eDayOfWeek, + BOOL bBack = TRUE, BOOL bOther = FALSE, + ULONG nToday = 0 ); + SVT_DLLPRIVATE void ImplDraw( BOOL bPaint = FALSE ); + SVT_DLLPRIVATE void ImplUpdateDate( const Date& rDate ); + SVT_DLLPRIVATE void ImplUpdateSelection( Table* pOld ); + SVT_DLLPRIVATE void ImplMouseSelect( const Date& rDate, USHORT nHitTest, + BOOL bMove, BOOL bExpand, BOOL bExtended ); + SVT_DLLPRIVATE void ImplUpdate( BOOL bCalcNew = FALSE ); + using Window::ImplScroll; + SVT_DLLPRIVATE void ImplScroll( BOOL bPrev ); + SVT_DLLPRIVATE void ImplInvertDropPos(); + SVT_DLLPRIVATE void ImplShowMenu( const Point& rPos, const Date& rDate ); + SVT_DLLPRIVATE void ImplTracking( const Point& rPos, BOOL bRepeat ); + SVT_DLLPRIVATE void ImplEndTracking( BOOL bCancel ); + SVT_DLLPRIVATE DayOfWeek ImplGetWeekStart() const; +#endif + +protected: + BOOL ShowDropPos( const Point& rPos, Date& rDate ); + void HideDropPos(); + + DECL_STATIC_LINK( Calendar, ScrollHdl, Timer *); + +public: + Calendar( Window* pParent, WinBits nWinStyle = 0 ); + Calendar( Window* pParent, const ResId& rResId ); + ~Calendar(); + + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void Tracking( const TrackingEvent& rMEvt ); + virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void Paint( const Rectangle& rRect ); + virtual void Resize(); + virtual void GetFocus(); + virtual void LoseFocus(); + virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void Command( const CommandEvent& rCEvt ); + virtual void StateChanged( StateChangedType nStateChange ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); + + virtual void SelectionChanging(); + virtual void DateRangeChanged(); + virtual void RequestDateInfo(); + virtual void DoubleClick(); + virtual void Select(); + + const CalendarWrapper& GetCalendarWrapper() const { return maCalendarWrapper; } + + /// Set one of ::com::sun::star::i18n::Weekdays. + void SetWeekStart( sal_Int16 nDay ); + + /// Set how many days of a week must reside in the first week of a year. + void SetMinimumNumberOfDaysInWeek( sal_Int16 nDays ); + + void SelectDate( const Date& rDate, BOOL bSelect = TRUE ); + void SelectDateRange( const Date& rStartDate, const Date& rEndDate, + BOOL bSelect = TRUE ); + void SetNoSelection(); + BOOL IsDateSelected( const Date& rDate ) const; + ULONG GetSelectDateCount() const; + Date GetSelectDate( ULONG nIndex = 0 ) const; + void EnableCallEverySelect( BOOL bEvery = TRUE ) { mbAllSel = bEvery; } + BOOL IsCallEverySelectEnabled() const { return mbAllSel; } + + USHORT GetRequestYear() const { return mnRequestYear; } + void SetCurDate( const Date& rNewDate ); + Date GetCurDate() const { return maCurDate; } + void SetFirstDate( const Date& rNewFirstDate ); + Date GetFirstDate() const { return maFirstDate; } + Date GetLastDate() const { return GetFirstDate() + mnDayCount; } + ULONG GetDayCount() const { return mnDayCount; } + Date GetFirstMonth() const; + Date GetLastMonth() const; + USHORT GetMonthCount() const; + BOOL GetDate( const Point& rPos, Date& rDate ) const; + Rectangle GetDateRect( const Date& rDate ) const; + BOOL GetDropDate( Date& rDate ) const; + + long GetCurMonthPerLine() const { return mnMonthPerLine; } + long GetCurLines() const { return mnLines; } + + void SetStandardColor( const Color& rColor ); + const Color& GetStandardColor() const; + void SetSaturdayColor( const Color& rColor ); + const Color& GetSaturdayColor() const; + void SetSundayColor( const Color& rColor ); + const Color& GetSundayColor() const; + + void AddDateInfo( const Date& rDate, const XubString& rText, + const Color* pTextColor = NULL, + const Color* pFrameColor = NULL, + USHORT nFlags = 0 ); + void RemoveDateInfo( const Date& rDate ); + void ClearDateInfo(); + XubString GetDateInfoText( const Date& rDate ); + + void StartSelection(); + void EndSelection(); + + BOOL IsTravelSelect() const { return mbTravelSelect; } + BOOL IsScrollDateRangeChanged() const { return mbScrollDateRange; } + BOOL IsSelectLeft() const { return mbSelLeft; } + + Size CalcWindowSizePixel( long nCalcMonthPerLine = 1, + long nCalcLines = 1 ) const; + + void SetSelectionChangingHdl( const Link& rLink ) { maSelectionChangingHdl = rLink; } + const Link& GetSelectionChangingHdl() const { return maSelectionChangingHdl; } + void SetDateRangeChangedHdl( const Link& rLink ) { maDateRangeChangedHdl = rLink; } + const Link& GetDateRangeChangedHdl() const { return maDateRangeChangedHdl; } + void SetRequestDateInfoHdl( const Link& rLink ) { maRequestDateInfoHdl = rLink; } + const Link& GetRequestDateInfoHdl() const { return maRequestDateInfoHdl; } + void SetDoubleClickHdl( const Link& rLink ) { maDoubleClickHdl = rLink; } + const Link& GetDoubleClickHdl() const { return maDoubleClickHdl; } + void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } + const Link& GetSelectHdl() const { return maSelectHdl; } +}; + +inline const Color& Calendar::GetStandardColor() const +{ + if ( mpStandardColor ) + return *mpStandardColor; + else + return GetFont().GetColor(); +} + +inline const Color& Calendar::GetSaturdayColor() const +{ + if ( mpSaturdayColor ) + return *mpSaturdayColor; + else + return GetFont().GetColor(); +} + +inline const Color& Calendar::GetSundayColor() const +{ + if ( mpSundayColor ) + return *mpSundayColor; + else + return GetFont().GetColor(); +} + +/************************************************************************* + +Beschreibung +============ + +class CalendarField + +Bei dieser Klasse handelt es sich um ein DateField, wo ueber einen +DropDown-Button ueber das Calendar-Control ein Datum ausgewaehlt werden +kann. + +-------------------------------------------------------------------------- + +WinBits + +Siehe DateField + +Die Vorgaben fuer das CalendarControl koennen ueber SetCalendarStyle() +gesetzt werden. + +-------------------------------------------------------------------------- + +Mit EnableToday()/EnableNone() kann ein Today-Button und ein None-Button +enabled werden. + +-------------------------------------------------------------------------- + +Wenn mit SetCalendarStyle() WB_RANGESELECT gesetzt wird, koennen im +Calendar auch mehrere Tage selektiert werden. Da immer nur das Start-Datum +in das Feld uebernommen wird, sollte dann im Select-Handler mit +GetCalendar() der Calendar abgefragt werden und an dem mit +GetSelectDateCount()/GetSelectDate() der selektierte Bereich abgefragt +werden, um beispielsweise diese dann in ein weiteres Feld zu uebernehmen. + +-------------------------------------------------------------------------- + +Wenn ein abgeleiteter Calendar verwendet werden soll, kann am +CalendarField die Methode CreateCalendar() ueberlagert werden und +dort ein eigener Calendar erzeugt werden. + +*************************************************************************/ + +// ----------------- +// - CalendarField - +// ----------------- + +class SVT_DLLPUBLIC CalendarField : public DateField +{ +private: + ImplCFieldFloatWin* mpFloatWin; + Calendar* mpCalendar; + WinBits mnCalendarStyle; + PushButton* mpTodayBtn; + PushButton* mpNoneBtn; + Date maDefaultDate; + BOOL mbToday; + BOOL mbNone; + Link maSelectHdl; + +#ifdef _SV_CALENDAR_CXX + DECL_DLLPRIVATE_LINK( ImplSelectHdl, Calendar* ); + DECL_DLLPRIVATE_LINK( ImplClickHdl, PushButton* ); + DECL_DLLPRIVATE_LINK( ImplPopupModeEndHdl, FloatingWindow* ); +#endif + +public: + CalendarField( Window* pParent, WinBits nWinStyle ); + CalendarField( Window* pParent, const ResId& rResId ); + ~CalendarField(); + + virtual void Select(); + + virtual BOOL ShowDropDown( BOOL bShow ); + virtual Calendar* CreateCalendar( Window* pParent ); + Calendar* GetCalendar(); + + void SetDefaultDate( const Date& rDate ) { maDefaultDate = rDate; } + Date GetDefaultDate() const { return maDefaultDate; } + + void EnableToday( BOOL bToday = TRUE ) { mbToday = bToday; } + BOOL IsTodayEnabled() const { return mbToday; } + void EnableNone( BOOL bNone = TRUE ) { mbNone = bNone; } + BOOL IsNoneEnabled() const { return mbNone; } + + void SetCalendarStyle( WinBits nStyle ) { mnCalendarStyle = nStyle; } + WinBits GetCalendarStyle() const { return mnCalendarStyle; } + + void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } + const Link& GetSelectHdl() const { return maSelectHdl; } + +protected: + virtual void StateChanged( StateChangedType nStateChange ); +}; + +#endif // _CALENDAR_HXX diff --git a/svtools/inc/svtools/cliplistener.hxx b/svtools/inc/svtools/cliplistener.hxx new file mode 100644 index 000000000000..566b5d98e4b1 --- /dev/null +++ b/svtools/inc/svtools/cliplistener.hxx @@ -0,0 +1,64 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: cliplistener.hxx,v $ + * $Revision: 1.5 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _CLIPLISTENER_HXX +#define _CLIPLISTENER_HXX + +#include "svtools/svtdllapi.h" +#include +#include +#include + +class Window; + + +class SVT_DLLPUBLIC TransferableClipboardListener : public ::cppu::WeakImplHelper1< + ::com::sun::star::datatransfer::clipboard::XClipboardListener > +{ + Link aLink; + +public: + // Link is called with a TransferableDataHelper pointer + TransferableClipboardListener( const Link& rCallback ); + ~TransferableClipboardListener(); + + void AddRemoveListener( Window* pWin, BOOL bAdd ); + void ClearCallbackLink(); + + // XEventListener + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) + throw(::com::sun::star::uno::RuntimeException); + // XClipboardListener + virtual void SAL_CALL changedContents( const ::com::sun::star::datatransfer::clipboard::ClipboardEvent& event ) + throw(::com::sun::star::uno::RuntimeException); +}; + +#endif + diff --git a/svtools/inc/svtools/collatorres.hxx b/svtools/inc/svtools/collatorres.hxx new file mode 100644 index 000000000000..63b4e7ef64f3 --- /dev/null +++ b/svtools/inc/svtools/collatorres.hxx @@ -0,0 +1,24 @@ + +#ifndef SVTOOLS_COLLATORRESSOURCE_HXX +#define SVTOOLS_COLLATORRESSOURCE_HXX + +#include "svtools/svtdllapi.h" +#include + +class CollatorRessourceData; + +class SVT_DLLPUBLIC CollatorRessource +{ + private: + + CollatorRessourceData *mp_Data; + + public: + CollatorRessource (); + ~CollatorRessource (); + const String& GetTranslation (const String& r_Algorithm); +}; + +#endif /* SVTOOLS_COLLATORRESSOURCE_HXX */ + + diff --git a/svtools/inc/svtools/contextmenuhelper.hxx b/svtools/inc/svtools/contextmenuhelper.hxx new file mode 100644 index 000000000000..59aa064b6b87 --- /dev/null +++ b/svtools/inc/svtools/contextmenuhelper.hxx @@ -0,0 +1,133 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: contextmenuhelper.hxx,v $ + * $Revision: 1.3 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef INCLUDED_SVTOOLS_CONTEXTMENUHELPER_HXX +#define INCLUDED_SVTOOLS_CONTEXTMENUHELPER_HXX + +#include +#include +#include +#include +#include + +#include +#include +#include +#include "svtools/svtdllapi.h" + +namespace svt +{ + +/** + Context menu helper class. + + Fills images and labels for a provided popup menu or + com.sun.star.awt.XPopupMenu. + + PRECONDITION: + All commands must be set via SetItemCommand and are part + of the configuration files + (see org.openoffice.Office.UI.[Module]Commands.xcu) +*/ +struct ExecuteInfo; +class SVT_DLLPUBLIC ContextMenuHelper +{ + public: + // create context menu helper + // ARGS: xFrame = frame defines the context of the context menu + // bAutoRefresh = specifies that the context will be constant or not + ContextMenuHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, bool bAutoRefresh=true ); + ~ContextMenuHelper(); + + // methods to complete a popup menu (set images, labels, enable/disable states) + // ATTENTION: The item ID's must be unique for the whole popup (inclusive the sub menus!) + void completeAndExecute( const Point& aPos, PopupMenu& aPopupMenu ); + void completeAndExecute( const Point& aPos, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu >& xPopupMenu ); + + // methods to create a popup menu referenced by resource URL + // NOT IMPLEMENTED YET! + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu > create( const ::rtl::OUString& aPopupMenuResourceURL ); + + // method to create and execute a popup menu referenced by a resource URL + // NOT IMPLEMENTED YET! + bool createAndExecute( const Point& aPos, const ::rtl::OUString& aPopupMenuResourceURL ); + + private: + // asynchronous link to prevent destruction while on stack + DECL_STATIC_LINK( ContextMenuHelper, ExecuteHdl_Impl, ExecuteInfo* ); + + // no copy-ctor and operator= + ContextMenuHelper( const ContextMenuHelper& ); + const ContextMenuHelper& operator=( const ContextMenuHelper& ); + + // show context menu and dispatch command automatically + void executePopupMenu( const Point& aPos, PopupMenu* pMenu ); + + // fill image and label for every menu item on the provided menu + void completeMenuProperties( Menu* pMenu ); + + // dispatch provided command + bool dispatchCommand( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, const ::rtl::OUString& aCommandURL ); + + + // methods to retrieve a single command URL dependent value from a + // ui configuratin manager + Image getImageFromCommandURL( const ::rtl::OUString& aCmdURL, bool bHiContrast ) const; + rtl::OUString getLabelFromCommandURL( const ::rtl::OUString& aCmdURL ) const; + + // creates an association between current module/controller bound to the + // provided frame and their ui configuration managers. + bool associateUIConfigurationManagers(); + + // resets associations to create associations again on-demand. + // Usefull for implementations which recycle frames. Normal + // implementations can profit from caching and should set + // auto refresh on ctor to false (default). + void resetAssociations() + { + if ( m_bAutoRefresh ) + m_bUICfgMgrAssociated = false; + } + + ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XFrame > m_xWeakFrame; + ::rtl::OUString m_aModuleIdentifier; + ::rtl::OUString m_aSelf; + ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xURLTransformer; + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aDefaultArgs; + ::com::sun::star::uno::Reference< ::com::sun::star::ui::XImageManager > m_xDocImageMgr; + ::com::sun::star::uno::Reference< ::com::sun::star::ui::XImageManager > m_xModuleImageMgr; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xUICommandLabels; + bool m_bAutoRefresh; + bool m_bUICfgMgrAssociated; +}; + +} // namespace svt + +#endif // INCLUDED_SVTOOLS_CONTEXTMENUHELPER_HXX diff --git a/svtools/inc/svtools/controldims.hrc b/svtools/inc/svtools/controldims.hrc new file mode 100644 index 000000000000..805e91e06486 --- /dev/null +++ b/svtools/inc/svtools/controldims.hrc @@ -0,0 +1,105 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: controldims.hrc,v $ + * $Revision: 1.5 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _SVT_CONTROLDIMS_HRC_ +#define _SVT_CONTROLDIMS_HRC_ + +// +// From: Dialogue Specification and Guidelines - Visual Design V1.3 +// by Christian Jansen +// + +// +// Usage: +// ====== +// +// all values have to be mapped by MAP_APPFONT +// + +// Base +#define RSC_BS_CHARHEIGHT 8 +#define RSC_BS_CHARWIDTH 4 + +// control dimensions +#define RSC_CD_PUSHBUTTON_WIDTH 50 +#define RSC_CD_PUSHBUTTON_HEIGHT 14 + +#define RSC_CD_FIXEDTEXT_HEIGHT RSC_BS_CHARHEIGHT +#define RSC_CD_FIXEDLINE_HEIGHT RSC_BS_CHARHEIGHT +#define RSC_CD_FIXEDLINE_WIDTH RSC_BS_CHARWIDTH // for vertical FixedLines + +#define RSC_CD_DROPDOWN_HEIGHT 12 // also combobox and dropdown list +#define RSC_CD_TEXTBOX_HEIGHT 12 // also numeric fields etc. + +#define RSC_CD_CHECKBOX_HEIGHT 10 // also tristate +#define RSC_CD_RADIOBUTTON_HEIGHT 10 + +// spacings +#define RSC_SP_CTRL_X 6 // controls that are unrelated +#define RSC_SP_CTRL_Y 7 +#define RSC_SP_CTRL_GROUP_X 3 // related controls, or controls in a groupbox +#define RSC_SP_CTRL_GROUP_Y 4 +#define RSC_SP_CTRL_DESC_X 3 // between description text and related control +#define RSC_SP_CTRL_DESC_Y 3 + +// overruled spacings between certain controls +#define RSC_SP_FLGR_SPACE_X 6 // between groupings made with FixedLine +#define RSC_SP_FLGR_SPACE_Y 4 +#define RSC_SP_GRP_SPACE_X 6 // between groupings made with GroupBox +#define RSC_SP_GRP_SPACE_Y 6 +#define RSC_SP_TXT_SPACE_X 5 // spacing between text paragraphs +#define RSC_SP_TXT_SPACE_Y 7 +#define RSC_SP_CHK_TEXTINDENT 8 // x indent of text aligned to checkbox title + +// dialog inner border +#define RSC_SP_DLG_INNERBORDER_LEFT 6 +#define RSC_SP_DLG_INNERBORDER_TOP 6 +#define RSC_SP_DLG_INNERBORDER_RIGHT 6 +#define RSC_SP_DLG_INNERBORDER_BOTTOM 6 + +// tab page inner border +#define RSC_SP_TBPG_INNERBORDER_LEFT 6 // for tabpage groupings +#define RSC_SP_TBPG_INNERBORDER_TOP 3 +#define RSC_SP_TBPG_INNERBORDER_RIGHT 6 +#define RSC_SP_TBPG_INNERBORDER_BOTTOM 6 + +// FixedLine group inner border +#define RSC_SP_FLGR_INNERBORDER_LEFT 6 // for FixedLine groupings +#define RSC_SP_FLGR_INNERBORDER_TOP 3 +#define RSC_SP_FLGR_INNERBORDER_RIGHT 0 +#define RSC_SP_FLGR_INNERBORDER_BOTTOM 0 + +// GroupBox inner border +#define RSC_SP_GRP_INNERBORDER_LEFT 6 // for GroupBox groupings +#define RSC_SP_GRP_INNERBORDER_TOP 6 +#define RSC_SP_GRP_INNERBORDER_RIGHT 6 +#define RSC_SP_GRP_INNERBORDER_BOTTOM 6 + +#endif // _SVT_CONTROLDIMS_HRC_ diff --git a/svtools/inc/svtools/ctrlbox.hxx b/svtools/inc/svtools/ctrlbox.hxx new file mode 100644 index 000000000000..a72fd6f2c25c --- /dev/null +++ b/svtools/inc/svtools/ctrlbox.hxx @@ -0,0 +1,507 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: ctrlbox.hxx,v $ + * $Revision: 1.15 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _CTRLBOX_HXX +#define _CTRLBOX_HXX + +#include "svtools/svtdllapi.h" + +#ifndef _LSTBOX_HXX +#include +#endif +#ifndef _COMBOBOX_HXX +#include +#endif +#ifndef _IMAGE_HXX +#include +#endif +#ifndef _VIRDEV_HXX +#include +#endif +#ifndef _METRIC_HXX +#include +#endif +#ifndef _FIELD_HXX +#include +#endif + +class ImplFontList; +class ImpColorList; +class ImpLineList; +class FontList; + +/************************************************************************* + +Beschreibung +============ + +class ColorListBox + +Beschreibung + +Erlaubt die Auswahl von Farben. + +-------------------------------------------------------------------------- + +class LineListBox + +Beschreibung + +Erlaubt die Auswahl von Linien-Styles und Groessen. Es ist darauf zu achten, +das vor dem ersten Insert die Units und die Fesntergroesse gesetzt sein +muessen. An Unit wird Point und mm unterstuetzt und als SourceUnit Point, +mm und Twips. Alle Angaben muessen in 100teln der jeweiligen Einheit +vorliegen. + +Line1 ist aeussere, Line2 die innere und Distance die Distanz zwischen +den beiden Linien. Wenn Line2 = 0 ist, wird nur Line1 angezeigt. Als +Default sind sowohl Source als auch Ziel-Unit FUNIT_POINT. + +Mit SetColor() kann die Linienfarbe eingestellt werden. + +Anmerkungen und Ausnahmen + +Gegenueber einer normalen ListBox, koennen keine User-Daten gesetzt +werden. Ausserdem sollte wenn der UpdateMode ausgeschaltet ist, keine +Daten abgefragt oder die Selektion gesetzt werden, da in diesem Zustand +die Daten nicht definiert sind. Wenn der UpdateMode ausgeschaltet ist, +sollte der Rueckgabewert bei Insert nicht ausgewertet werden, da er keine +Bedeutung hat. Ausserdem darf nicht das WinBit WB_SORT gesetzt sein. + +-------------------------------------------------------------------------- + +class FontNameBox + +Beschreibung + +Erlaubt die Auswahl von Fonts. Die ListBox wird mit Fill gefuellt, wo +ein Pointer auf eine FontList uebergeben werden muss. + +Mit EnableWYSIWYG() kann man einstellen, das die Fontnamen in Ihrer Schrift +angezeigt werden und mit EnableSymbols() kann eingestellt werden, das +vor dem Namen ueber ein Symbol angezeigt wird, ob es sich um eine +Drucker oder Bildschirmschrift handelt. + +Querverweise + +FontList; FontStyleBox; FontSizeBox; FontNameMenu + +-------------------------------------------------------------------------- + +class FontStyleBox + +Beschreibung + +Erlaubt die Auswahl eines FontStyles. Mit Fill wird die ListBox mit +den Styles zum uebergebenen Font gefuellt. Nachgebildete Styles werden +immer mit eingefuegt (kann sich aber noch aendern, da vielleicht +nicht alle Applikationen [StarDraw,Formel,FontWork] mit Syntetic-Fonts +umgehen koennen). Bei Fill bleibt vorherige Name soweit wie moeglich +erhalten. + +Fuer DontKnow sollte die FontStyleBox mit String() gefuellt werden. +Dann enthaellt die Liste die Standardattribute. Der Style, der gerade +angezeigt wird, muss gegebenenfalls noch vom Programm zurueckgesetzt werden. + +Querverweise + +FontList; FontNameBox; FontSizeBox; FontStyleMenu + +-------------------------------------------------------------------------- + +class FontSizeBox + +Beschreibung + +Erlaubt die Auswahl von Fontgroessen. Werte werden ueber GetValue() +abgefragt und ueber SetValue() gesetzt. Fill fuellt die ListBox mit den +Groessen zum uebergebenen Font. Alle Groessen werden in 10tel Point +angegeben. Die FontListe, die bei Fill uebergeben wird, muss bis zum +naechsten Fill-Aufruf erhalten bleiben. + +Zusaetzlich erlaubt die FontSizeBox noch einen Relative-Mode. Dieser +dient dazu, Prozent-Werte eingeben zu koennen. Dies kann zum Beispiel +nuetzlich sein, wenn man die Box in einem Vorlagen-Dialog anbietet. +Dieser Modus ist nur anschaltbar, jedoch nicht wieder abschaltbar. + +Fuer DontKnow sollte die FontSizeBox mit FontInfo() gefuellt werden. +Dann enthaellt die Liste die Standardgroessen. Die Groesse, die gerade +angezeigt wird, muss gegebenenfalls noch vom Programm zurueckgesetzt werden. + +Querverweise + +FontList; FontNameBox; FontStyleBox; FontSizeMenu + +*************************************************************************/ + +// ---------------- +// - ColorListBox - +// ---------------- + +class SVT_DLLPUBLIC ColorListBox : public ListBox +{ + ImpColorList* pColorList; // Separate Liste, falls UserDaten von aussen verwendet werden. + Size aImageSize; + +#ifdef _CTRLBOX_CXX + using Window::ImplInit; + SVT_DLLPRIVATE void ImplInit(); + SVT_DLLPRIVATE void ImplDestroyColorEntries(); +#endif +public: + ColorListBox( Window* pParent, + WinBits nWinStyle = WB_BORDER ); + ColorListBox( Window* pParent, const ResId& rResId ); + virtual ~ColorListBox(); + + virtual void UserDraw( const UserDrawEvent& rUDEvt ); + + using ListBox::InsertEntry; + virtual USHORT InsertEntry( const XubString& rStr, + USHORT nPos = LISTBOX_APPEND ); + virtual USHORT InsertEntry( const Color& rColor, const XubString& rStr, + USHORT nPos = LISTBOX_APPEND ); + void InsertAutomaticEntry(); + using ListBox::RemoveEntry; + virtual void RemoveEntry( USHORT nPos ); + virtual void Clear(); + void CopyEntries( const ColorListBox& rBox ); + + using ListBox::GetEntryPos; + virtual USHORT GetEntryPos( const Color& rColor ) const; + virtual Color GetEntryColor( USHORT nPos ) const; + Size GetImageSize() const { return aImageSize; } + + void SelectEntry( const XubString& rStr, BOOL bSelect = TRUE ) + { ListBox::SelectEntry( rStr, bSelect ); } + void SelectEntry( const Color& rColor, BOOL bSelect = TRUE ); + XubString GetSelectEntry( USHORT nSelIndex = 0 ) const + { return ListBox::GetSelectEntry( nSelIndex ); } + Color GetSelectEntryColor( USHORT nSelIndex = 0 ) const; + BOOL IsEntrySelected( const XubString& rStr ) const + { return ListBox::IsEntrySelected( rStr ); } + + BOOL IsEntrySelected( const Color& rColor ) const; + +private: + // declared as private because some compilers would generate the default functions + ColorListBox( const ColorListBox& ); + ColorListBox& operator =( const ColorListBox& ); + + void SetEntryData( USHORT nPos, void* pNewData ); + void* GetEntryData( USHORT nPos ) const; +}; + +inline void ColorListBox::SelectEntry( const Color& rColor, BOOL bSelect ) +{ + USHORT nPos = GetEntryPos( rColor ); + if ( nPos != LISTBOX_ENTRY_NOTFOUND ) + ListBox::SelectEntryPos( nPos, bSelect ); +} + +inline BOOL ColorListBox::IsEntrySelected( const Color& rColor ) const +{ + USHORT nPos = GetEntryPos( rColor ); + if ( nPos != LISTBOX_ENTRY_NOTFOUND ) + return IsEntryPosSelected( nPos ); + else + return FALSE; +} + +inline Color ColorListBox::GetSelectEntryColor( USHORT nSelIndex ) const +{ + USHORT nPos = GetSelectEntryPos( nSelIndex ); + Color aColor; + if ( nPos != LISTBOX_ENTRY_NOTFOUND ) + aColor = GetEntryColor( nPos ); + return aColor; +} + +// --------------- +// - LineListBox - +// --------------- + +class SVT_DLLPUBLIC LineListBox : public ListBox +{ + ImpLineList* pLineList; + VirtualDevice aVirDev; + Size aTxtSize; + Color aColor; + Color maPaintCol; + FieldUnit eUnit; + FieldUnit eSourceUnit; + + SVT_DLLPRIVATE void ImpGetLine( long nLine1, long nLine2, long nDistance, Bitmap& rBmp, XubString& rStr ); + using Window::ImplInit; + SVT_DLLPRIVATE void ImplInit(); + void UpdateLineColors( void ); + BOOL UpdatePaintLineColor( void ); // returns TRUE if maPaintCol has changed + inline const Color& GetPaintColor( void ) const; + virtual void DataChanged( const DataChangedEvent& rDCEvt ); + +public: + LineListBox( Window* pParent, WinBits nWinStyle = WB_BORDER ); + LineListBox( Window* pParent, const ResId& rResId ); + virtual ~LineListBox(); + + using ListBox::InsertEntry; + virtual USHORT InsertEntry( const XubString& rStr, USHORT nPos = LISTBOX_APPEND ); + virtual USHORT InsertEntry( long nLine1, long nLine2 = 0, long nDistance = 0, USHORT nPos = LISTBOX_APPEND ); + using ListBox::RemoveEntry; + virtual void RemoveEntry( USHORT nPos ); + virtual void Clear(); + + using ListBox::GetEntryPos; + USHORT GetEntryPos( long nLine1, long nLine2 = 0, long nDistance = 0 ) const; + long GetEntryLine1( USHORT nPos ) const; + long GetEntryLine2( USHORT nPos ) const; + long GetEntryDistance( USHORT nPos ) const; + + inline void SelectEntry( const XubString& rStr, BOOL bSelect = TRUE ) { ListBox::SelectEntry( rStr, bSelect ); } + void SelectEntry( long nLine1, long nLine2 = 0, long nDistance = 0, BOOL bSelect = TRUE ); + long GetSelectEntryLine1( USHORT nSelIndex = 0 ) const; + long GetSelectEntryLine2( USHORT nSelIndex = 0 ) const; + long GetSelectEntryDistance( USHORT nSelIndex = 0 ) const; + inline BOOL IsEntrySelected( const XubString& rStr ) const { return ListBox::IsEntrySelected( rStr ); } + BOOL IsEntrySelected( long nLine1, long nLine2 = 0, long nDistance = 0 ) const; + + inline void SetUnit( FieldUnit eNewUnit ) { eUnit = eNewUnit; } + inline FieldUnit GetUnit() const { return eUnit; } + inline void SetSourceUnit( FieldUnit eNewUnit ) { eSourceUnit = eNewUnit; } + inline FieldUnit GetSourceUnit() const { return eSourceUnit; } + + void SetColor( const Color& rColor ); + inline Color GetColor( void ) const; + +private: + // declared as private because some compilers would generate the default methods + LineListBox( const LineListBox& ); + LineListBox& operator =( const LineListBox& ); + void SetEntryData( USHORT nPos, void* pNewData ); + void* GetEntryData( USHORT nPos ) const; +}; + +inline void LineListBox::SelectEntry( long nLine1, long nLine2, long nDistance, BOOL bSelect ) +{ + USHORT nPos = GetEntryPos( nLine1, nLine2, nDistance ); + if ( nPos != LISTBOX_ENTRY_NOTFOUND ) + ListBox::SelectEntryPos( nPos, bSelect ); +} + +inline long LineListBox::GetSelectEntryLine1( USHORT nSelIndex ) const +{ + USHORT nPos = GetSelectEntryPos( nSelIndex ); + if ( nPos != LISTBOX_ENTRY_NOTFOUND ) + return GetEntryLine1( nPos ); + else + return 0; +} + +inline long LineListBox::GetSelectEntryLine2( USHORT nSelIndex ) const +{ + USHORT nPos = GetSelectEntryPos( nSelIndex ); + if ( nPos != LISTBOX_ENTRY_NOTFOUND ) + return GetEntryLine2( nPos ); + else + return 0; +} + +inline long LineListBox::GetSelectEntryDistance( USHORT nSelIndex ) const +{ + USHORT nPos = GetSelectEntryPos( nSelIndex ); + if ( nPos != LISTBOX_ENTRY_NOTFOUND ) + return GetEntryDistance( nPos ); + else + return 0; +} + +inline BOOL LineListBox::IsEntrySelected( long nLine1, long nLine2, long nDistance ) const +{ + USHORT nPos = GetEntryPos( nLine1, nLine2, nDistance ); + if ( nPos != LISTBOX_ENTRY_NOTFOUND ) + return IsEntryPosSelected( nPos ); + else + return FALSE; +} + +inline void LineListBox::SetColor( const Color& rColor ) +{ + aColor = rColor; + + UpdateLineColors(); +} + +inline Color LineListBox::GetColor( void ) const +{ + return aColor; +} + + +// --------------- +// - FontNameBox - +// --------------- + +class SVT_DLLPUBLIC FontNameBox : public ComboBox +{ +private: + ImplFontList* mpFontList; + Image maImagePrinterFont; + Image maImageBitmapFont; + Image maImageScalableFont; + BOOL mbWYSIWYG; + BOOL mbSymbols; + +#ifdef _CTRLBOX_CXX + SVT_DLLPRIVATE void ImplCalcUserItemSize(); + SVT_DLLPRIVATE void ImplDestroyFontList(); +#endif + + void InitBitmaps( void ); +protected: + virtual void DataChanged( const DataChangedEvent& rDCEvt ); +public: + FontNameBox( Window* pParent, + WinBits nWinStyle = WB_SORT ); + FontNameBox( Window* pParent, const ResId& rResId ); + virtual ~FontNameBox(); + + virtual void UserDraw( const UserDrawEvent& rUDEvt ); + + void Fill( const FontList* pList ); + + void EnableWYSIWYG( BOOL bEnable = TRUE ); + BOOL IsWYSIWYGEnabled() const { return mbWYSIWYG; } + + void EnableSymbols( BOOL bEnable = TRUE ); + BOOL IsSymbolsEnabled() const { return mbSymbols; } + +private: + // declared as private because some compilers would generate the default functions + FontNameBox( const FontNameBox& ); + FontNameBox& operator =( const FontNameBox& ); +}; + +// ---------------- +// - FontStyleBox - +// ---------------- + +class SVT_DLLPUBLIC FontStyleBox : public ComboBox +{ + XubString aLastStyle; + +private: + using ComboBox::SetText; +public: + FontStyleBox( Window* pParent, WinBits nWinStyle = 0 ); + FontStyleBox( Window* pParent, const ResId& rResId ); + virtual ~FontStyleBox(); + + virtual void Select(); + virtual void LoseFocus(); + virtual void Modify(); + + void SetText( const XubString& rText ); + void Fill( const XubString& rName, const FontList* pList ); + +private: + // declared as private because some compilers would generate the default functions + FontStyleBox( const FontStyleBox& ); + FontStyleBox& operator =( const FontStyleBox& ); +}; + +inline void FontStyleBox::SetText( const XubString& rText ) +{ + aLastStyle = rText; + ComboBox::SetText( rText ); +} + +// --------------- +// - FontSizeBox - +// --------------- + +class SVT_DLLPUBLIC FontSizeBox : public MetricBox +{ + FontInfo aFontInfo; + const FontList* pFontList; + USHORT nRelMin; + USHORT nRelMax; + USHORT nRelStep; + short nPtRelMin; + short nPtRelMax; + short nPtRelStep; + BOOL bRelativeMode:1, + bRelative:1, + bPtRelative:1, + bStdSize:1; + +#ifdef _CTRLBOX_CXX + using Window::ImplInit; + SVT_DLLPRIVATE void ImplInit(); +#endif + +protected: + virtual XubString CreateFieldText( sal_Int64 nValue ) const; + +public: + FontSizeBox( Window* pParent, WinBits nWinStyle = 0 ); + FontSizeBox( Window* pParent, const ResId& rResId ); + virtual ~FontSizeBox(); + + void Reformat(); + void Modify(); + + void Fill( const FontInfo* pInfo, const FontList* pList ); + + void EnableRelativeMode( USHORT nMin = 50, USHORT nMax = 150, + USHORT nStep = 5 ); + void EnablePtRelativeMode( short nMin = -200, short nMax = 200, + short nStep = 10 ); + BOOL IsRelativeMode() const { return bRelativeMode; } + void SetRelative( BOOL bRelative = FALSE ); + BOOL IsRelative() const { return bRelative; } + void SetPtRelative( BOOL bPtRel = TRUE ) + { bPtRelative = bPtRel; SetRelative( TRUE ); } + BOOL IsPtRelative() const { return bPtRelative; } + + virtual void SetValue( sal_Int64 nNewValue, FieldUnit eInUnit ); + virtual void SetValue( sal_Int64 nNewValue ); + virtual sal_Int64 GetValue( FieldUnit eOutUnit ) const; + virtual sal_Int64 GetValue() const; + sal_Int64 GetValue( USHORT nPos, FieldUnit eOutUnit ) const; + void SetUserValue( sal_Int64 nNewValue, FieldUnit eInUnit ); + void SetUserValue( sal_Int64 nNewValue ) { SetUserValue( nNewValue, FUNIT_NONE ); } + +private: + // declared as private because some compilers would generate the default functions + FontSizeBox( const FontSizeBox& ); + FontSizeBox& operator =( const FontSizeBox& ); +}; + +#endif // _CTRLBOX_HXX diff --git a/svtools/inc/svtools/ctrltool.hxx b/svtools/inc/svtools/ctrltool.hxx new file mode 100644 index 000000000000..21a1fcab76d7 --- /dev/null +++ b/svtools/inc/svtools/ctrltool.hxx @@ -0,0 +1,254 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: ctrltool.hxx,v $ + * $Revision: 1.8 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _CTRLTOOL_HXX +#define _CTRLTOOL_HXX + +#include "svtools/svtdllapi.h" + +#ifndef _SAL_TYPES_H +#include +#endif +#include +#ifndef _METRIC_HXX +#include +#endif + +class ImplFontListNameInfo; +class OutputDevice; + +/************************************************************************* + +Beschreibung +============ + +class FontList + +Diese Klasse verwaltet alle Fonts, die auf einem oder zwei Ausgabegeraeten +dargestellt werden koennen. Zusaetzlich bietet die Klasse Methoden an, um +aus Fett und Kursiv den StyleName zu generieren oder aus einem Stylename +die fehlenden Attribute. Zusaetzlich kann diese Klasse syntetisch nachgebildete +Fonts verarbeiten. Diese Klasse kann mit verschiedenen Standard-Controls und +Standard-Menus zusammenarbeiten. + +Querverweise + +class FontNameBox, class FontStyleBox, class FontSizeBox, +class FontNameMenu, class FontStyleMenu, class FontSizeMenu + +-------------------------------------------------------------------------- + +FontList::FontList( OutputDevice* pDevice, OutputDevice* pDevice2 = NULL, + BOOL bAll = TRUE ); + +Konstruktor der Klasse FontList. Vom uebergebenen OutputDevice werden die +entsprechenden Fonts abgefragt. Das OutputDevice muss solange existieren, +wie auch die Klasse FontList existiert. Optional kann noch ein 2tes +Ausgabedevice uebergeben werden, damit man zum Beispiel die Fonts von +einem Drucker und dem Bildschirm zusammen in einer FontListe verwalten kann +und somit auch den FontListen und FontMenus die Fonts von beiden OutputDevices +zu uebergeben. Auch das pDevice2 muss solange existieren, wie die Klasse +FontList existiert. + +Das OutputDevice, welches als erstes uebergeben wird, sollte das bevorzugte +sein. Dies sollte im normalfall der Drucker sein. Denn wenn 2 verschiede +Device-Schriften (eine fuer Drucker und eine fuer den Bildschirm) vorhanden +sind, wird die vom uebergebenen Device "pDevice" bevorzugt. + +Mit dem dritten Parameter kann man angeben, ob nur skalierbare Schriften +abgefragt werden sollen oder alle. Wenn TRUE uebergeben wird, werden auch +Bitmap-Schriften mit abgefragt. Bei FALSE werden Vector-Schriften und +scalierbare Schriften abgefragt. + +-------------------------------------------------------------------------- + +String FontList::GetStyleName( const FontInfo& rInfo ) const; + +Diese Methode gibt den StyleName von einer FontInfo zurueck. Falls kein +StyleName gesetzt ist, wird aus den gesetzten Attributen ein entsprechender +Name generiert, der dem Anwender praesentiert werden kann. + +-------------------------------------------------------------------------- + +XubString FontList::GetFontMapText( const FontInfo& rInfo ) const; + +Diese Methode gibt einen Matchstring zurueck, der dem Anwender +anzeigen soll, welche Probleme es mit diesem Font geben kann. + +-------------------------------------------------------------------------- + +FontInfo FontList::Get( const String& rName, const String& rStyleName ) const; + +Diese Methode sucht aus dem uebergebenen Namen und dem uebergebenen StyleName +die entsprechende FontInfo-Struktur raus. Der Stylename kann in dieser +Methode auch ein syntetischer sein. In diesem Fall werden die entsprechenden +Werte in der FontInfo-Struktur entsprechend gesetzt. Wenn ein StyleName +uebergeben wird, kann jedoch eine FontInfo-Struktur ohne Stylename +zurueckgegeben werden. Um den StyleName dem Anwender zu repraesentieren, +muss GetStyleName() mit dieser FontInfo-Struktur aufgerufen werden. + +Querverweise + +FontList::GetStyleName() + +-------------------------------------------------------------------------- + +FontInfo FontList::Get( const String& rName, FontWeight eWeight, + FontItalic eItalic ) const; + +Diese Methode sucht aus dem uebergebenen Namen und den uebergebenen Styles +die entsprechende FontInfo-Struktur raus. Diese Methode kann auch eine +FontInfo-Struktur ohne Stylename zurueckgegeben. Um den StyleName dem +Anwender zu repraesentieren, muss GetStyleName() mit dieser FontInfo-Struktur +aufgerufen werden. + +Querverweise + +FontList::GetStyleName() + +-------------------------------------------------------------------------- + +const long* FontList::GetSizeAry( const FontInfo& rInfo ) const; + +Diese Methode liefert zum uebergebenen Font die vorhandenen Groessen. +Falls es sich dabei um einen skalierbaren Font handelt, werden Standard- +Groessen zurueckgegeben. Das Array enthaelt die Hoehen des Fonts in 10tel +Point. Der letzte Wert des Array ist 0. Das Array, was zurueckgegeben wird, +wird von der FontList wieder zerstoert. Nach dem Aufruf der naechsten Methode +von der FontList, sollte deshalb das Array nicht mehr referenziert werden. + +*************************************************************************/ + +// ------------ +// - FontList - +// ------------ + +#define FONTLIST_FONTINFO_NOTFOUND ((USHORT)0xFFFF) + +#define FONTLIST_FONTNAMETYPE_PRINTER ((USHORT)0x0001) +#define FONTLIST_FONTNAMETYPE_SCREEN ((USHORT)0x0002) +#define FONTLIST_FONTNAMETYPE_SCALABLE ((USHORT)0x0004) + +class SVT_DLLPUBLIC FontList : private List +{ +private: + XubString maMapBoth; + XubString maMapPrinterOnly; + XubString maMapScreenOnly; + XubString maMapSizeNotAvailable; + XubString maMapStyleNotAvailable; + XubString maMapNotAvailable; + XubString maLight; + XubString maLightItalic; + XubString maNormal; + XubString maNormalItalic; + XubString maBold; + XubString maBoldItalic; + XubString maBlack; + XubString maBlackItalic; + long* mpSizeAry; + OutputDevice* mpDev; + OutputDevice* mpDev2; + +#ifdef CTRLTOOL_CXX + SVT_DLLPRIVATE ImplFontListNameInfo* ImplFind( const XubString& rSearchName, ULONG* pIndex ) const; + SVT_DLLPRIVATE ImplFontListNameInfo* ImplFindByName( const XubString& rStr ) const; + SVT_DLLPRIVATE void ImplInsertFonts( OutputDevice* pDev, BOOL bAll, + BOOL bInsertData ); +#endif + +public: + FontList( OutputDevice* pDevice, + OutputDevice* pDevice2 = NULL, + BOOL bAll = TRUE ); + ~FontList(); + + FontList* Clone() const; + + OutputDevice* GetDevice() const { return mpDev; } + OutputDevice* GetDevice2() const { return mpDev2; } + XubString GetFontMapText( const FontInfo& rInfo ) const; + USHORT GetFontNameType( const XubString& rFontName ) const; + + const XubString& GetNormalStr() const { return maNormal; } + const XubString& GetItalicStr() const { return maNormalItalic; } + const XubString& GetBoldStr() const { return maBold; } + const XubString& GetBoldItalicStr() const { return maBoldItalic; } + const XubString& GetStyleName( FontWeight eWeight, FontItalic eItalic ) const; + XubString GetStyleName( const FontInfo& rInfo ) const; + + FontInfo Get( const XubString& rName, + const XubString& rStyleName ) const; + FontInfo Get( const XubString& rName, + FontWeight eWeight, + FontItalic eItalic ) const; + + BOOL IsAvailable( const XubString& rName ) const; + USHORT GetFontNameCount() const + { return (USHORT)List::Count(); } + const FontInfo& GetFontName( USHORT nFont ) const; + USHORT GetFontNameType( USHORT nFont ) const; + sal_Handle GetFirstFontInfo( const XubString& rName ) const; + sal_Handle GetNextFontInfo( sal_Handle hFontInfo ) const; + const FontInfo& GetFontInfo( sal_Handle hFontInfo ) const; + + const long* GetSizeAry( const FontInfo& rInfo ) const; + static const long* GetStdSizeAry(); + +private: + FontList( const FontList& ); + FontList& operator =( const FontList& ); +}; + + +// ----------------- +// - FontSizeNames - +// ----------------- + +class SVT_DLLPUBLIC FontSizeNames +{ +private: + struct ImplFSNameItem* mpArray; + ULONG mnElem; + +public: + FontSizeNames( LanguageType eLanguage /* = LANGUAGE_DONTKNOW */ ); + + ULONG Count() const { return mnElem; } + BOOL IsEmpty() const { return !mnElem; } + + long Name2Size( const String& ) const; + String Size2Name( long ) const; + + String GetIndexName( ULONG nIndex ) const; + long GetIndexSize( ULONG nIndex ) const; +}; + +#endif // _CTRLTOOL_HXX diff --git a/svtools/inc/svtools/dialogclosedlistener.hxx b/svtools/inc/svtools/dialogclosedlistener.hxx new file mode 100644 index 000000000000..b2d0f68bf59d --- /dev/null +++ b/svtools/inc/svtools/dialogclosedlistener.hxx @@ -0,0 +1,80 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: dialogclosedlistener.hxx,v $ + * $Revision: 1.4 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _SVTOOLS_DIALOGCLOSEDLISTENER_HXX +#define _SVTOOLS_DIALOGCLOSEDLISTENER_HXX + +#include "svtools/svtdllapi.h" +#include +#include +#include + +//......................................................................... +namespace svt +{ +//......................................................................... + + //===================================================================== + //= ODialogClosedListener + //===================================================================== + /** + C++ class to implement a ::com::sun::star::ui::dialogs::XDialogClosedListener + */ + class SVT_DLLPUBLIC DialogClosedListener : + public ::cppu::WeakImplHelper1< ::com::sun::star::ui::dialogs::XDialogClosedListener > + { + private: + /** + This link will be called when the dialog was closed. + + The link must have the type: + DECL_LINK( DialogClosedHdl, ::com::sun::star::ui::dialogs::DialogClosedEvent* ); + */ + Link m_aDialogClosedLink; + + public: + DialogClosedListener(); + DialogClosedListener( const Link& rLink ); + + inline void SetDialogClosedLink( const Link& rLink ) { m_aDialogClosedLink = rLink; } + + // XDialogClosedListener methods + virtual void SAL_CALL dialogClosed( const ::com::sun::star::ui::dialogs::DialogClosedEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException); + + // XEventListener methods + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw( ::com::sun::star::uno::RuntimeException ); + }; + +//......................................................................... +} // namespace svt +//......................................................................... + +#endif// COMPHELPER_DIALOGCLOSEDLISTENER_HXX + diff --git a/svtools/inc/svtools/dialogcontrolling.hxx b/svtools/inc/svtools/dialogcontrolling.hxx new file mode 100644 index 000000000000..edb425f78b00 --- /dev/null +++ b/svtools/inc/svtools/dialogcontrolling.hxx @@ -0,0 +1,309 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: dialogcontrolling.hxx,v $ + * $Revision: 1.6 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef SVTOOLS_DIALOGCONTROLLING_HXX +#define SVTOOLS_DIALOGCONTROLLING_HXX + +#include + +#include +#include + +#include +#include + +//........................................................................ +namespace svt +{ +//........................................................................ + + //===================================================================== + //= IWindowOperator + //===================================================================== + /** an abstract interface for operating on a ->Window + */ + class SVT_DLLPUBLIC SAL_NO_VTABLE IWindowOperator + { + public: + /** called when an event happened which should be reacted to + + @param _rTrigger + the event which triggered the call. If the Id of the event is 0, then this is the initial + call which is made when ->_rOperateOn is added to the responsibility of the DialogController. + @param _rOperateOn + the window on which to operate + */ + virtual void operateOn( const VclWindowEvent& _rTrigger, Window& _rOperateOn ) const = 0; + + virtual ~IWindowOperator(); + }; + typedef ::boost::shared_ptr< IWindowOperator > PWindowOperator; + + //===================================================================== + //= IWindowEventFilter + //===================================================================== + /** an abstract interface for deciding whether a ->VclWindowEvent + is worth paying attention to + */ + class SVT_DLLPUBLIC SAL_NO_VTABLE IWindowEventFilter + { + public: + virtual bool payAttentionTo( const VclWindowEvent& _rEvent ) const = 0; + + virtual ~IWindowEventFilter(); + }; + typedef ::boost::shared_ptr< IWindowEventFilter > PWindowEventFilter; + + //===================================================================== + //= DialogController + //===================================================================== + struct DialogController_Data; + /** a class controlling interactions between dialog controls + + An instance of this class listens to all events fired by a certain + ->Control (more precise, a ->Window), the so-called instigator. + + Additionally, the ->DialogController maintains a list of windows which + are affected by changes in the instigator window. Let's call those the + dependent windows. + + Now, by help of an owner-provided ->IWindowEventFilter, the ->DialogController + decides which events are worth attention. By help of an owner-provided + ->IWindowOperator, it handles those events for all dependent windows. + */ + class SVT_DLLPUBLIC DialogController + { + private: + ::std::auto_ptr< DialogController_Data > m_pImpl; + + public: + DialogController( Window& _rInstigator, const PWindowEventFilter& _pEventFilter, const PWindowOperator& _pOperator ); + virtual ~DialogController(); + + /** adds a window to the list of dependent windows + + @param _rWindow + The window to add to the list of dependent windows. + + The caller is responsible for life-time control: The given window + must live at least as long as the ->DialogController instance does. + */ + void addDependentWindow( Window& _rWindow ); + + /** resets the controller so that no actions happend anymore. + + The instances is disfunctional after this method has been called. + */ + void reset(); + + private: + void impl_Init(); + void impl_updateAll( const VclWindowEvent& _rTriggerEvent ); + void impl_update( const VclWindowEvent& _rTriggerEvent, Window& _rWindow ); + + DECL_LINK( OnWindowEvent, const VclWindowEvent* ); + + private: + DialogController( const DialogController& ); // never implemented + DialogController& operator=( const DialogController& ); // never implemented + }; + typedef ::boost::shared_ptr< DialogController > PDialogController; + + //===================================================================== + //= ControlDependencyManager + //===================================================================== + struct ControlDependencyManager_Data; + /** helper class for managing control dependencies + + Instances of this class are intended to be held as members of a dialog/tabpage/whatever + class, with easy administration of inter-control dependencies (such as "Enable + control X if and only if checkbox Y is checked). + */ + class SVT_DLLPUBLIC ControlDependencyManager + { + private: + ::std::auto_ptr< ControlDependencyManager_Data > m_pImpl; + + public: + ControlDependencyManager(); + ~ControlDependencyManager(); + + /** clears all dialog controllers previously added to the manager + */ + void clear(); + + /** ensures that a given window is enabled or disabled, according to the check state + of a given radio button + @param _rRadio + denotes the radio button whose check state is to observe + @param _rDependentWindow + denotes the window which should be enabled when ->_rRadio is checked, and + disabled when it's unchecked + */ + void enableOnRadioCheck( RadioButton& _rRadio, Window& _rDependentWindow ); + void enableOnRadioCheck( RadioButton& _rRadio, Window& _rDependentWindow1, Window& _rDependentWindow2 ); + void enableOnRadioCheck( RadioButton& _rRadio, Window& _rDependentWindow1, Window& _rDependentWindow2, Window& _rDependentWindow3 ); + void enableOnRadioCheck( RadioButton& _rRadio, Window& _rDependentWindow1, Window& _rDependentWindow2, Window& _rDependentWindow3, Window& _rDependentWindow4 ); + void enableOnRadioCheck( RadioButton& _rRadio, Window& _rDependentWindow1, Window& _rDependentWindow2, Window& _rDependentWindow3, Window& _rDependentWindow4, Window& _rDependentWindow5 ); + void enableOnRadioCheck( RadioButton& _rRadio, Window& _rDependentWindow1, Window& _rDependentWindow2, Window& _rDependentWindow3, Window& _rDependentWindow4, Window& _rDependentWindow5, Window& _rDependentWindow6 ); + + /** ensures that a given window is enabled or disabled, according to the mark state + of a given check box + @param _rBox + denotes the check box whose mark state is to observe + @param _rDependentWindow + denotes the window which should be enabled when ->_rBox is marked, and + disabled when it's unmarked + */ + void enableOnCheckMark( CheckBox& _rBox, Window& _rDependentWindow ); + void enableOnCheckMark( CheckBox& _rBox, Window& _rDependentWindow1, Window& _rDependentWindow2 ); + void enableOnCheckMark( CheckBox& _rBox, Window& _rDependentWindow1, Window& _rDependentWindow2, Window& _rDependentWindow3 ); + void enableOnCheckMark( CheckBox& _rBox, Window& _rDependentWindow1, Window& _rDependentWindow2, Window& _rDependentWindow3, Window& _rDependentWindow4 ); + void enableOnCheckMark( CheckBox& _rBox, Window& _rDependentWindow1, Window& _rDependentWindow2, Window& _rDependentWindow3, Window& _rDependentWindow4, Window& _rDependentWindow5 ); + void enableOnCheckMark( CheckBox& _rBox, Window& _rDependentWindow1, Window& _rDependentWindow2, Window& _rDependentWindow3, Window& _rDependentWindow4, Window& _rDependentWindow5, Window& _rDependentWindow6 ); + + /** adds a non-standard controller whose functionality is not covered by the other methods + + @param _pController + the controller to add to the manager. Must not be . + */ + void addController( const PDialogController& _pController ); + + private: + ControlDependencyManager( const ControlDependencyManager& ); // never implemented + ControlDependencyManager& operator=( const ControlDependencyManager& ); // never implemented + }; + + //===================================================================== + //= EnableOnCheck + //===================================================================== + /** a helper class implementing the ->IWindowOperator interface, + which enables a dependent window depending on the check state of + an instigator window. + + @see DialogController + */ + template< class CHECKABLE > + class SVT_DLLPUBLIC EnableOnCheck : public IWindowOperator + { + public: + typedef CHECKABLE SourceType; + + private: + SourceType& m_rCheckable; + + public: + /** constructs the instance + + @param _rCheckable + a ->Window instance which supports a boolean method IsChecked. Usually + a ->RadioButton or ->CheckBox + */ + EnableOnCheck( SourceType& _rCheckable ) + :m_rCheckable( _rCheckable ) + { + } + + virtual void operateOn( const VclWindowEvent& /*_rTrigger*/, Window& _rOperateOn ) const + { + _rOperateOn.Enable( m_rCheckable.IsChecked() ); + } + }; + + //===================================================================== + //= FilterForRadioOrCheckToggle + //===================================================================== + /** a helper class implementing the ->IWindowEventFilter interface, + which filters for radio buttons or check boxes being toggled. + + Technically, the class simply filters for the ->VCLEVENT_RADIOBUTTON_TOGGLE + and the ->VCLEVENT_CHECKBOX_TOGGLE event. + */ + class SVT_DLLPUBLIC FilterForRadioOrCheckToggle : public IWindowEventFilter + { + const Window& m_rWindow; + public: + FilterForRadioOrCheckToggle( const Window& _rWindow ) + :m_rWindow( _rWindow ) + { + } + + bool payAttentionTo( const VclWindowEvent& _rEvent ) const + { + if ( ( _rEvent.GetWindow() == &m_rWindow ) + && ( ( _rEvent.GetId() == VCLEVENT_RADIOBUTTON_TOGGLE ) + || ( _rEvent.GetId() == VCLEVENT_CHECKBOX_TOGGLE ) + ) + ) + return true; + return false; + } + }; + + //===================================================================== + //= RadioDependentEnabler + //===================================================================== + /** a ->DialogController derivee which enables or disables its dependent windows, + depending on the check state of a radio button. + + The usage of this class is as simple as + + pController = new RadioDependentEnabler( m_aOptionSelectSomething ); + pController->addDependentWindow( m_aLabelSelection ); + pController->addDependentWindow( m_aListSelection ); + + + With this, both m_aLabelSelection and m_aListSelection will + be disabled if and only m_aOptionSelectSomething is checked. + */ + class SVT_DLLPUBLIC RadioDependentEnabler : public DialogController + { + public: + RadioDependentEnabler( RadioButton& _rButton ) + :DialogController( _rButton, + PWindowEventFilter( new FilterForRadioOrCheckToggle( _rButton ) ), + PWindowOperator( new EnableOnCheck< RadioButton >( _rButton ) ) ) + { + } + + RadioDependentEnabler( CheckBox& _rBox ) + :DialogController( _rBox, + PWindowEventFilter( new FilterForRadioOrCheckToggle( _rBox ) ), + PWindowOperator( new EnableOnCheck< CheckBox >( _rBox ) ) ) + { + } + }; + +//........................................................................ +} // namespace svt +//........................................................................ + +#endif // SVTOOLS_DIALOGCONTROLLING_HXX + diff --git a/svtools/inc/svtools/expander.hxx b/svtools/inc/svtools/expander.hxx new file mode 100644 index 000000000000..06a527195780 --- /dev/null +++ b/svtools/inc/svtools/expander.hxx @@ -0,0 +1,95 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: expander.hxx,v $ + * $Revision: 1.3 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _SV_EXPANDER_HXX +#define _SV_EXPANDER_HXX + +#include +#include + +enum SvExpanderStateType +{ + EST_MIN=1, + EST_PLUS=2, + EST_MIN_DOWN=3, + EST_PLUS_DOWN=4, + EST_NONE=5, + EST_MIN_DIS=6, + EST_PLUS_DIS=7, + EST_MIN_DOWN_DIS=8, + EST_PLUS_DOWN_DIS=9 +}; + +class SvExpander: public Control +{ +private: + Point aImagePos; + Point aTextPos; + Image aActiveImage; + Rectangle maFocusRect; + ImageList maExpanderImages; + BOOL mbIsExpanded; + BOOL mbHasFocusRect; + BOOL mbIsInMouseDown; + Link maToggleHdl; + SvExpanderStateType eType; + +protected: + + virtual long PreNotify( NotifyEvent& rNEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void Paint( const Rectangle& rRect ); + virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void KeyUp( const KeyEvent& rKEvt ); + + virtual void Click(); + virtual void Resize(); + +public: + SvExpander( Window* pParent, WinBits nStyle = 0 ); + SvExpander( Window* pParent, const ResId& rResId ); + + BOOL IsExpanded() {return mbIsExpanded;} + + void SetToExpanded(BOOL bFlag=TRUE); + + void SetExpanderImage( SvExpanderStateType eType); + Image GetExpanderImage(SvExpanderStateType eType); + Size GetMinSize() const; + + void SetToggleHdl( const Link& rLink ) { maToggleHdl = rLink; } + const Link& GetToggleHdl() const { return maToggleHdl; } +}; + + + +#endif diff --git a/svtools/inc/svtools/extcolorcfg.hxx b/svtools/inc/svtools/extcolorcfg.hxx new file mode 100644 index 000000000000..228ef9823fd2 --- /dev/null +++ b/svtools/inc/svtools/extcolorcfg.hxx @@ -0,0 +1,131 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: extcolorcfg.hxx,v $ + * $Revision: 1.5 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef INCLUDED_SVTOOLS_EXTCOLORCFG_HXX +#define INCLUDED_SVTOOLS_EXTCOLORCFG_HXX + +#include "svtools/svtdllapi.h" +#include +#include +#include +#include +#include + +//----------------------------------------------------------------------------- +namespace svtools{ +/* -----------------------------22.03.2002 15:36------------------------------ + + ---------------------------------------------------------------------------*/ +class ExtendedColorConfig_Impl; +class ExtendedColorConfigValue +{ + ::rtl::OUString m_sName; + ::rtl::OUString m_sDisplayName; + sal_Int32 m_nColor; + sal_Int32 m_nDefaultColor; +public: + ExtendedColorConfigValue() : m_nColor(0),m_nDefaultColor(0){} + ExtendedColorConfigValue(const ::rtl::OUString& _sName + ,const ::rtl::OUString& _sDisplayName + ,sal_Int32 _nColor + ,sal_Int32 _nDefaultColor) + : m_sName(_sName) + ,m_sDisplayName(_sDisplayName) + ,m_nColor(_nColor) + ,m_nDefaultColor(_nDefaultColor) + {} + + inline ::rtl::OUString getName() const { return m_sName; } + inline ::rtl::OUString getDisplayName() const { return m_sDisplayName; } + inline sal_Int32 getColor() const { return m_nColor; } + inline sal_Int32 getDefaultColor() const { return m_nDefaultColor; } + + inline void setColor(sal_Int32 _nColor) { m_nColor = _nColor; } + + sal_Bool operator !=(const ExtendedColorConfigValue& rCmp) const + { return m_nColor != rCmp.m_nColor;} +}; +/* -----------------------------22.03.2002 15:36------------------------------ + + ---------------------------------------------------------------------------*/ +class SVT_DLLPUBLIC ExtendedColorConfig : public SfxBroadcaster, public SfxListener +{ + friend class ExtendedColorConfig_Impl; +private: + static ExtendedColorConfig_Impl* m_pImpl; +public: + ExtendedColorConfig(); + ~ExtendedColorConfig(); + + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + + // get the configured value + ExtendedColorConfigValue GetColorValue(const ::rtl::OUString& _sComponentName,const ::rtl::OUString& _sName)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& _sComponentName,sal_uInt32 _nPos) const; +}; +/* -----------------------------22.03.2002 15:31------------------------------ + + ---------------------------------------------------------------------------*/ +class SVT_DLLPUBLIC EditableExtendedColorConfig +{ + ExtendedColorConfig_Impl* m_pImpl; + sal_Bool m_bModified; +public: + EditableExtendedColorConfig(); + ~EditableExtendedColorConfig(); + + ::com::sun::star::uno::Sequence< ::rtl::OUString > GetSchemeNames() const; + void DeleteScheme(const ::rtl::OUString& rScheme ); + void AddScheme(const ::rtl::OUString& rScheme ); + sal_Bool LoadScheme(const ::rtl::OUString& rScheme ); + const ::rtl::OUString& GetCurrentSchemeName()const; + void SetCurrentSchemeName(const ::rtl::OUString& rScheme); + + ExtendedColorConfigValue GetColorValue(const ::rtl::OUString& _sComponentName,const ::rtl::OUString& _sName)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; + void SetColorValue(const ::rtl::OUString& _sComponentName, const ExtendedColorConfigValue& rValue); + void SetModified(); + void ClearModified(){m_bModified = sal_False;} + sal_Bool IsModified()const{return m_bModified;} + void Commit(); + + void DisableBroadcast(); + void EnableBroadcast(); +}; +}//namespace svtools +#endif + diff --git a/svtools/inc/svtools/filectrl.hxx b/svtools/inc/svtools/filectrl.hxx new file mode 100644 index 000000000000..a4ad0ad05dce --- /dev/null +++ b/svtools/inc/svtools/filectrl.hxx @@ -0,0 +1,114 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: filectrl.hxx,v $ + * $Revision: 1.6 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _SV_FILECTRL_HXX +#define _SV_FILECTRL_HXX + +#include "svtools/svtdllapi.h" +#include +#include +#ifndef _SV_BUTTON_HXX +#include +#endif + + +#define STR_FILECTRL_BUTTONTEXT 333 // ID-Range?! + +// Flags for FileControl +typedef USHORT FileControlMode; +#define FILECTRL_RESIZEBUTTONBYPATHLEN ((USHORT)0x0001)//if this is set, the button will become small as soon as the Text in the Edit Field is to long to be shown completely + + +// Flags for internal use of FileControl +typedef USHORT FileControlMode_Internal; +#define FILECTRL_INRESIZE ((USHORT)0x0001) +#define FILECTRL_ORIGINALBUTTONTEXT ((USHORT)0x0002) + + +class SVT_DLLPUBLIC FileControl : public Window +{ +private: + Edit maEdit; + PushButton maButton; + + String maButtonText; + BOOL mbOpenDlg; + + Link maDialogCreatedHdl; + + FileControlMode mnFlags; + FileControlMode_Internal mnInternalFlags; + +private: + SVT_DLLPRIVATE void ImplBrowseFile( ); + +protected: + SVT_DLLPRIVATE void Resize(); + SVT_DLLPRIVATE void GetFocus(); + SVT_DLLPRIVATE void StateChanged( StateChangedType nType ); + SVT_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); + DECL_DLLPRIVATE_LINK( ButtonHdl, PushButton* ); + +public: + FileControl( Window* pParent, WinBits nStyle, FileControlMode = 0 ); + ~FileControl(); + + Edit& GetEdit() { return maEdit; } + PushButton& GetButton() { return maButton; } + + void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags ); + + void SetOpenDialog( BOOL bOpen ) { mbOpenDlg = bOpen; } + BOOL IsOpenDialog() const { return mbOpenDlg; } + + void SetText( const XubString& rStr ); + XubString GetText() const; + UniString GetSelectedText() const { return maEdit.GetSelected(); } + + void SetSelection( const Selection& rSelection ) { maEdit.SetSelection( rSelection ); } + Selection GetSelection() const { return maEdit.GetSelection(); } + + void SetReadOnly( BOOL bReadOnly = TRUE ) { maEdit.SetReadOnly( bReadOnly ); } + BOOL IsReadOnly() const { return maEdit.IsReadOnly(); } + + //------ + //manipulate the Button-Text: + XubString GetButtonText() const { return maButtonText; } + void SetButtonText( const XubString& rStr ); + void ResetButtonText(); + + //------ + //use this to manipulate the dialog bevore executing it: + void SetDialogCreatedHdl( const Link& rLink ) { maDialogCreatedHdl = rLink; } + const Link& GetDialogCreatedHdl() const { return maDialogCreatedHdl; } +}; + +#endif + diff --git a/svtools/inc/svtools/filedlg.hxx b/svtools/inc/svtools/filedlg.hxx new file mode 100644 index 000000000000..04cf41130bce --- /dev/null +++ b/svtools/inc/svtools/filedlg.hxx @@ -0,0 +1,111 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: filedlg.hxx,v $ + * $Revision: 1.5 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _SVT_FILEDLG_HXX +#define _SVT_FILEDLG_HXX + +#include "svtools/svtdllapi.h" + +#ifndef _DIALOG_HXX +#include +#endif + +class Edit; +class ImpSvFileDlg; + +// -------------- +// - SvPathDialog - +// -------------- + +class SVT_DLLPUBLIC PathDialog : public ModalDialog +{ +private: + friend class FileDialog; // Imp... + + ImpSvFileDlg* pImpFileDlg; // Implementation + Link aOKHdlLink; // Link zum OK-Handler + +protected: + UniString aDfltExt; // Default - Extension + +public: + PathDialog( Window* pParent, WinBits nWinStyle = 0, BOOL bCreateDir = TRUE ); + ~PathDialog(); + + virtual long OK(); + + void SetPath( const UniString& rNewPath ); + void SetPath( const Edit& rEdit ); + UniString GetPath() const; + + void SetOKHdl( const Link& rLink ) { aOKHdlLink = rLink; } + const Link& GetOKHdl() const { return aOKHdlLink; } + + virtual short Execute(); +}; + +// -------------- +// - SvFileDialog - +// -------------- + +class SVT_DLLPUBLIC FileDialog : public PathDialog +{ +private: + Link aFileHdlLink; // Link zum FileSelect-Handler + Link aFilterHdlLink; // Link zum FilterSelect-Handler + +public: + FileDialog( Window* pParent, WinBits nWinStyle ); + ~FileDialog(); + + virtual void FileSelect(); + virtual void FilterSelect(); + + void SetDefaultExt( const UniString& rExt ) { aDfltExt = rExt; } + const UniString& GetDefaultExt() const { return aDfltExt; } + void AddFilter( const UniString& rFilter, const UniString& rType ); + void RemoveFilter( const UniString& rFilter ); + void RemoveAllFilter(); + void SetCurFilter( const UniString& rFilter ); + UniString GetCurFilter() const; + USHORT GetFilterCount() const; + UniString GetFilterName( USHORT nPos ) const; + UniString GetFilterType( USHORT nPos ) const; + + void SetFileSelectHdl( const Link& rLink ) { aFileHdlLink = rLink; } + const Link& GetFileSelectHdl() const { return aFileHdlLink; } + void SetFilterSelectHdl( const Link& rLink ) { aFilterHdlLink = rLink; } + const Link& GetFilterSelectHdl() const { return aFilterHdlLink; } + + void SetOkButtonText( const UniString& rText ); + void SetCancelButtonText( const UniString& rText ); +}; + +#endif // _FILEDLG_HXX diff --git a/svtools/inc/svtools/filedlg2.hrc b/svtools/inc/svtools/filedlg2.hrc new file mode 100644 index 000000000000..a75e9047eafb --- /dev/null +++ b/svtools/inc/svtools/filedlg2.hrc @@ -0,0 +1,44 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: filedlg2.hrc,v $ + * $Revision: 1.3 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#define STR_FILEDLG_SELECT 1000 +#define STR_FILEDLG_CANTCHDIR 1001 +#define STR_FILEDLG_OPEN 1002 +#define STR_FILEDLG_FILE 1003 +#define STR_FILEDLG_DIR 1004 +#define STR_FILEDLG_TYPE 1005 +#define STR_FILEDLG_CANTOPENFILE 1006 +#define STR_FILEDLG_CANTOPENDIR 1007 +#define STR_FILEDLG_OVERWRITE 1008 +#define STR_FILEDLG_GOUP 1009 +#define STR_FILEDLG_SAVE 1010 +#define STR_FILEDLG_DRIVES 1011 +#define STR_FILEDLG_HOME 1012 +#define STR_FILEDLG_NEWDIR 1013 +#define STR_FILEDLG_ASKNEWDIR 1014 diff --git a/svtools/inc/svtools/fileview.hxx b/svtools/inc/svtools/fileview.hxx new file mode 100644 index 000000000000..7527436e0f38 --- /dev/null +++ b/svtools/inc/svtools/fileview.hxx @@ -0,0 +1,274 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: fileview.hxx,v $ + * $Revision: 1.21 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _SVT_FILEVIEW_HXX +#define _SVT_FILEVIEW_HXX + +#include "svtools/svtdllapi.h" +#include +#include +#include +#include +#include +#ifndef _SV_BUTTON_HXX +#include +#endif +#include +#include + +// class SvtFileView ----------------------------------------------------- + +#define FILEVIEW_ONLYFOLDER 0x0001 +#define FILEVIEW_MULTISELECTION 0x0002 + +#define FILEVIEW_SHOW_TITLE 0x0010 +#define FILEVIEW_SHOW_SIZE 0x0020 +#define FILEVIEW_SHOW_DATE 0x0040 +#define FILEVIEW_SHOW_ALL 0x0070 + +class ViewTabListBox_Impl; +class SvtFileView_Impl; +class SvLBoxEntry; +class HeaderBar; +class IUrlFilter; + +/// the result of an action in the FileView +enum FileViewResult +{ + eSuccess, + eFailure, + eTimeout, + eStillRunning +}; + +/// describes parameters for doing an action on the FileView asynchronously +struct FileViewAsyncAction +{ + sal_uInt32 nMinTimeout; /// minimum time to wait for a result, in milliseconds + sal_uInt32 nMaxTimeout; /// maximum time to wait for a result, in milliseconds, until eTimeout is returned + Link aFinishHandler; /// the handler to be called when the action is finished. Called in every case, no matter of the result + + FileViewAsyncAction() + { + nMinTimeout = nMaxTimeout = 0; + } +}; + +class SVT_DLLPUBLIC SvtFileView : public Control +{ +private: + SvtFileView_Impl* mpImp; + + ::com::sun::star::uno::Sequence< ::rtl::OUString > mpBlackList; + + SVT_DLLPRIVATE void OpenFolder( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aContents ); + + DECL_DLLPRIVATE_LINK( HeaderSelect_Impl, HeaderBar * ); + DECL_DLLPRIVATE_LINK( HeaderEndDrag_Impl, HeaderBar * ); + +protected: + virtual void GetFocus(); + +public: + SvtFileView( Window* pParent, const ResId& rResId, sal_Bool bOnlyFolder, sal_Bool bMultiSelection ); + SvtFileView( Window* pParent, const ResId& rResId, sal_Int8 nFlags ); + ~SvtFileView(); + + const String& GetViewURL() const; + String GetURL( SvLBoxEntry* pEntry ) const; + String GetCurrentURL() const; + + sal_Bool GetParentURL( String& _rParentURL ) const; + sal_Bool CreateNewFolder( const String& rNewFolder ); + + void SetHelpId( sal_uInt32 nHelpId ); + sal_uInt32 GetHelpId( ) const; + void SetSizePixel( const Size& rNewSize ); + using Window::SetPosSizePixel; + virtual void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ); + + /** initialize the view with the content of a folder given by URL, and aply an immediate filter + + @param rFolderURL + the URL of the folder whose content is to be read + @param rFilter + the initial filter to be applied + @param pAsyncDescriptor + If not , this struct describes the parameters for doing the + action asynchronously. + */ + FileViewResult Initialize( + const String& rFolderURL, + const String& rFilter, + const FileViewAsyncAction* pAsyncDescriptor, + const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList + ); + + FileViewResult Initialize( + const String& rFolderURL, + const String& rFilter, + const FileViewAsyncAction* pAsyncDescriptor ); + /** initialze the view with a sequence of contents, which have already been obtained elsewhere + + This method will never return eStillRunning, since it will fill the + view synchronously + */ + sal_Bool Initialize( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aContents ); + + /** initializes the view with the content of a folder given by an UCB content + */ + sal_Bool Initialize( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent>& _xContent, + const String& rFilter ); + + /** reads the current content of the current folder again, and applies the given filter to it + + Note 1: The folder is really read a second time. This implies that any new elements (which were + not present when you called Initialize the last time) are now displayed. + + Note 2: This method must not be called when you previously initialized the view from a sequence + of strings, or a UNO content object. + + @param rFilter + the filter to be applied + @param pAsyncDescriptor + If not , this struct describes the parameters for doing the + action asynchronously. + */ + FileViewResult ExecuteFilter( + const String& rFilter, + const FileViewAsyncAction* pAsyncDescriptor + ); + + /** cancels a running async action (if any) + + @seealso Initialize + @seealso ExecuteFilter + @seealso FileViewAsyncAction + */ + void CancelRunningAsyncAction(); + + /** initializes the view with the parent folder of the current folder + + @param rNewURL + the URL of the folder which we just navigated to + @param pAsyncDescriptor + If not , this struct describes the parameters for doing the + action asynchronously. + */ + FileViewResult PreviousLevel( + const FileViewAsyncAction* pAsyncDescriptor + ); + + void SetNoSelection(); + void ResetCursor(); + + void SetSelectHdl( const Link& rHdl ); + void SetDoubleClickHdl( const Link& rHdl ); + void SetOpenDoneHdl( const Link& rHdl ); + + ULONG GetSelectionCount() const; + SvLBoxEntry* FirstSelected() const; + SvLBoxEntry* NextSelected( SvLBoxEntry* pEntry ) const; + void EnableAutoResize(); + void SetFocus(); + + void EnableContextMenu( sal_Bool bEnable ); + void EnableDelete( sal_Bool bEnable ); + void EnableNameReplacing( sal_Bool bEnable = sal_True ); + // translate folder names or display doc-title instead of file name + // EnableContextMenu( TRUE )/EnableDelete(TRUE) disable name replacing! + + // save and load column size and sort order + String GetConfigString() const; + void SetConfigString( const String& rCfgStr ); + + void SetUrlFilter( const IUrlFilter* _pFilter ); + const IUrlFilter* GetUrlFilter( ) const; + + void EndInplaceEditing( bool _bCancel ); + +protected: + virtual void StateChanged( StateChangedType nStateChange ); +}; + +// struct SvtContentEntry ------------------------------------------------ + +struct SvtContentEntry +{ + sal_Bool mbIsFolder; + UniString maURL; + + SvtContentEntry( const UniString& rURL, sal_Bool bIsFolder ) : + mbIsFolder( bIsFolder ), maURL( rURL ) {} +}; + +namespace svtools { + +// ----------------------------------------------------------------------- +// QueryDeleteDlg_Impl +// ----------------------------------------------------------------------- + +enum QueryDeleteResult_Impl +{ + QUERYDELETE_YES = 0, + QUERYDELETE_NO, + QUERYDELETE_ALL, + QUERYDELETE_CANCEL +}; + +class SVT_DLLPUBLIC QueryDeleteDlg_Impl : public ModalDialog +{ + FixedText _aEntryLabel; + FixedText _aEntry; + FixedText _aQueryMsg; + + PushButton _aYesButton; + PushButton _aAllButton; + PushButton _aNoButton; + CancelButton _aCancelButton; + + QueryDeleteResult_Impl _eResult; + +private: + + DECL_DLLPRIVATE_STATIC_LINK( QueryDeleteDlg_Impl, ClickLink, PushButton* ); + +public: + + QueryDeleteDlg_Impl( Window* pParent, + const String& rName ); + + void EnableAllButton() { _aAllButton.Enable( sal_True ); } + QueryDeleteResult_Impl GetResult() const { return _eResult; } +}; + +} + +#endif // _SVT_FILEVIEW_HXX + diff --git a/svtools/inc/svtools/fltdefs.hxx b/svtools/inc/svtools/fltdefs.hxx new file mode 100644 index 000000000000..d323dada3396 --- /dev/null +++ b/svtools/inc/svtools/fltdefs.hxx @@ -0,0 +1,155 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: fltdefs.hxx,v $ + * $Revision: 1.4 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#include +#include + +#include + +#ifndef _FLTDEFS_HXX +#define _FLTDEFS_HXX + + +#if defined ( WIN ) || defined ( WNT ) + +#define RGBQUAD RGBQUADWIN + +typedef struct RGBQUAD +{ + BYTE rgbBlue; + BYTE rgbGreen; + BYTE rgbRed; + BYTE rgbReserved; + + RGBQUAD( const BYTE cRed = 0, const BYTE cGreen = 0, const BYTE cBlue = 0 ) : + rgbBlue ( cBlue ), + rgbGreen ( cGreen ), + rgbRed ( cRed ), + rgbReserved ( 0 ) {}; +} RGBQUAD; + + +#ifdef WIN +typedef BYTE huge* PDIBBYTE; +#define MEMCPY hmemcpy +#define GLOBALALLOC(nSize) ((PDIBBYTE)GlobalLock(GlobalAlloc(GHND,(nSize)))) +#define GLOBALHANDLE(pPointer) ((HGLOBAL)GlobalHandle((*((size_t*)&(pPointer)+1)))) +#define GLOBALFREE(pPointer) (GlobalUnlock(GLOBALHANDLE((pPointer)))) +#define MEMSET( pDst, cByte, nCount ) \ +{ \ + PDIBBYTE pTmp = (PDIBBYTE) pDst; \ + for ( ULONG i = 0; i < nCount; i++ )\ + *pTmp++ = cByte; \ +} + +#else + +typedef BYTE* PDIBBYTE; +#define MEMCPY memcpy +#define MEMSET memset +#define GLOBALALLOC(nSize) ((PDIBBYTE)GlobalAlloc(GMEM_FIXED,(nSize))) +#define GLOBALFREE(pPointer) (GlobalFree((HGLOBAL)pPointer)) +#define GLOBALHANDLE(pPointer) ((HGLOBAL)(pPointer)) + +#endif +#else + +typedef BYTE* PDIBBYTE; +#define MEMCPY memcpy +#define MEMSET memset +#define GLOBALALLOC(nSize) ((PDIBBYTE)new BYTE[(nSize)]) +#define GLOBALFREE(pPointer) (delete[] (pPointer)) + +#endif + + +#if defined ( OS2 ) || defined ( UNX ) +void ReadBitmap( SvStream& rIStream, Bitmap& rBmp, USHORT nDefaultHeight = 0, ULONG nOffBits = 0 ); +void ReplaceInfoHeader( SvStream& rStm, BYTE* pBuffer ); + +#ifdef OS2 +#define RGBQUAD RGBQUADOS2 +#define BITMAPFILEHEADER BITMAPFILEHEADEROS2 +#define PBITMAPFILEHEADER PBITMAPFILEHEADEROS2 +#define BITMAPINFOHEADER BITMAPINFOHEADEROS2 +#define PBITMAPINFOHEADER PBITMAPINFOHEADEROS2 +#define BITMAPINFO BITMAPINFOOS2 +#define PBITMAPINFO PBITMAPINFOOS2 +#endif + +typedef struct RGBQUAD +{ + BYTE rgbBlue; + BYTE rgbGreen; + BYTE rgbRed; + BYTE rgbReserved; + + RGBQUAD( const BYTE cRed = 0, const BYTE cGreen = 0, const BYTE cBlue = 0 ) : + rgbBlue ( cBlue ), + rgbGreen ( cGreen ), + rgbRed ( cRed ), + rgbReserved ( 0 ) {}; +} RGBQUAD; + +typedef struct BITMAPFILEHEADER +{ + UINT16 bfType; + UINT32 bfSize; + UINT16 bfReserved1; + UINT16 bfReserved2; + UINT32 bfOffBits; +} BITMAPFILEHEADER; +typedef BITMAPFILEHEADER* PBITMAPFILEHEADER; + +typedef struct BITMAPINFOHEADER +{ + UINT32 biSize; + UINT32 biWidth; + UINT32 biHeight; + UINT16 biPlanes; + UINT16 biBitCount; + UINT32 biCompression; + UINT32 biSizeImage; + UINT32 biXPelsPerMeter; + UINT32 biYPelsPerMeter; + UINT32 biClrUsed; + UINT32 biClrImportant; +} BITMAPINFOHEADER; +typedef BITMAPINFOHEADER* PBITMAPINFOHEADER; + +typedef struct BITMAPINFO +{ + BITMAPINFOHEADER bmiHeader; + RGBQUAD bmiColors[1]; +} BITMAPINFO; +typedef BITMAPINFO* PBITMAPINFO; + +#endif +#endif diff --git a/svtools/inc/svtools/fontsubstconfig.hxx b/svtools/inc/svtools/fontsubstconfig.hxx new file mode 100644 index 000000000000..7ce7e64362b5 --- /dev/null +++ b/svtools/inc/svtools/fontsubstconfig.hxx @@ -0,0 +1,71 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: fontsubstconfig.hxx,v $ + * $Revision: 1.5 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _SVT_FONTSUBSTCONFIG_HXX +#define _SVT_FONTSUBSTCONFIG_HXX + +#include "svtools/svtdllapi.h" +#include + +struct SvtFontSubstConfig_Impl; + +//----------------------------------------------------------------------------- +struct SubstitutionStruct +{ + rtl::OUString sFont; + rtl::OUString sReplaceBy; + sal_Bool bReplaceAlways; + sal_Bool bReplaceOnScreenOnly; +}; +//----------------------------------------------------------------------------- +class SVT_DLLPUBLIC SvtFontSubstConfig : public utl::ConfigItem +{ + sal_Bool bIsEnabled; + SvtFontSubstConfig_Impl* pImpl; +public: + SvtFontSubstConfig(); + virtual ~SvtFontSubstConfig(); + + virtual void Commit(); + virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames); + + sal_Bool IsEnabled() const {return bIsEnabled;} + void Enable(sal_Bool bSet) {bIsEnabled = bSet; SetModified();} + + sal_Int32 SubstitutionCount() const; + void ClearSubstitutions(); + const SubstitutionStruct* GetSubstitution(sal_Int32 nPos); + void AddSubstitution(const SubstitutionStruct& rToAdd); + void Apply(); +}; + +#endif + + + diff --git a/svtools/inc/svtools/framestatuslistener.hxx b/svtools/inc/svtools/framestatuslistener.hxx new file mode 100644 index 000000000000..63a2f296c753 --- /dev/null +++ b/svtools/inc/svtools/framestatuslistener.hxx @@ -0,0 +1,119 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: framestatuslistener.hxx,v $ + * $Revision: 1.5 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _SVTOOLS_FRAMESTATUSLISTENER_HXX +#define _SVTOOLS_FRAMESTATUSLISTENER_HXX + +#include "svtools/svtdllapi.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifndef INCLUDED_HASH_MAP +#include +#define INCLUDED_HASH_MAP +#endif + +namespace svt +{ + +class SVT_DLLPUBLIC FrameStatusListener : public ::com::sun::star::frame::XStatusListener, + public ::com::sun::star::frame::XFrameActionListener, + public ::com::sun::star::lang::XComponent, + public ::comphelper::OBaseMutex, + public ::cppu::OWeakObject +{ + public: + FrameStatusListener( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame ); + virtual ~FrameStatusListener(); + + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > getFrameInterface() const; + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getServiceManager() const; + + void updateStatus( const rtl::OUString aCommandURL ); + + // methods to support status forwarder, known by the old sfx2 toolbox controller implementation + void addStatusListener( const rtl::OUString& aCommandURL ); + void removeStatusListener( const rtl::OUString& aCommandURL ); + void bindListener(); + void unbindListener(); + sal_Bool isBound() const; + + // XInterface + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL acquire() throw (); + virtual void SAL_CALL release() throw (); + + // XComponent + virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); + + // XEventListener + virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException ); + + // XStatusListener + virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ) = 0; + + // XFrameActionListener + virtual void SAL_CALL frameAction( const com::sun::star::frame::FrameActionEvent& Action ) throw ( ::com::sun::star::uno::RuntimeException ); + + protected: + struct Listener + { + Listener( const ::com::sun::star::util::URL& rURL, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& rDispatch ) : + aURL( rURL ), xDispatch( rDispatch ) {} + + ::com::sun::star::util::URL aURL; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch; + }; + + typedef ::std::hash_map< ::rtl::OUString, + com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >, + ::rtl::OUStringHash, + ::std::equal_to< ::rtl::OUString > > URLToDispatchMap; + + sal_Bool m_bInitialized : 1, + m_bDisposed : 1; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager; + URLToDispatchMap m_aListenerMap; +}; + +} + +#endif // _SVTOOLS_FRAMESTATUSLISTENER_HXX diff --git a/svtools/inc/svtools/helpagentwindow.hxx b/svtools/inc/svtools/helpagentwindow.hxx new file mode 100644 index 000000000000..b46f3a253f16 --- /dev/null +++ b/svtools/inc/svtools/helpagentwindow.hxx @@ -0,0 +1,91 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: helpagentwindow.hxx,v $ + * $Revision: 1.5 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _SVTOOLS_HELPAGENTWIDNOW_HXX_ +#define _SVTOOLS_HELPAGENTWIDNOW_HXX_ + +#include "svtools/svtdllapi.h" +#include +#include + +//........................................................................ +namespace svt +{ +//........................................................................ + + //==================================================================== + //= IHelpAgentCallback + //==================================================================== + class IHelpAgentCallback + { + public: + virtual void helpRequested() = 0; + virtual void closeAgent() = 0; + }; + + //==================================================================== + //= HelpAgentWindow + //==================================================================== + class SVT_DLLPUBLIC HelpAgentWindow : public FloatingWindow + { + protected: + Window* m_pCloser; + IHelpAgentCallback* m_pCallback; + Size m_aPreferredSize; + Image m_aPicture; + + public: + HelpAgentWindow( Window* _pParent ); + ~HelpAgentWindow(); + + /// returns the preferred size of the window + const Size& getPreferredSizePixel() const { return m_aPreferredSize; } + + // callback handler maintainance + void setCallback(IHelpAgentCallback* _pCB) { m_pCallback = _pCB; } + IHelpAgentCallback* getCallback() const { return m_pCallback; } + + protected: + virtual void Resize(); + virtual void Paint( const Rectangle& rRect ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ); + + DECL_LINK( OnButtonClicked, Window* ); + + private: + SVT_DLLPRIVATE Size implOptimalButtonSize( const Image& _rButtonImage ); + }; + +//........................................................................ +} // namespace svt +//........................................................................ + +#endif // _SVTOOLS_HELPAGENTWIDNOW_HXX_ + diff --git a/svtools/inc/svtools/htmlkywd.hxx b/svtools/inc/svtools/htmlkywd.hxx new file mode 100644 index 000000000000..ce7cb4dd3e0f --- /dev/null +++ b/svtools/inc/svtools/htmlkywd.hxx @@ -0,0 +1,804 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: htmlkywd.hxx,v $ + * $Revision: 1.8 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _HTMLKYWD_HXX +#define _HTMLKYWD_HXX + +#include "sal/config.h" + +#define OOO_STRING_SVTOOLS_HTML_doctype32 \ + "HTML PUBLIC \"-//W3C//DTD HTML 3.2//EN\"" +#define OOO_STRING_SVTOOLS_HTML_doctype40 \ + "HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\"" + +// diese werden nur eingeschaltet +#define OOO_STRING_SVTOOLS_HTML_area "AREA" +#define OOO_STRING_SVTOOLS_HTML_base "BASE" +#define OOO_STRING_SVTOOLS_HTML_comment "!--" +#define OOO_STRING_SVTOOLS_HTML_doctype "!DOCTYPE" +#define OOO_STRING_SVTOOLS_HTML_embed "EMBED" +#define OOO_STRING_SVTOOLS_HTML_figureoverlay "OVERLAY" +#define OOO_STRING_SVTOOLS_HTML_horzrule "HR" +#define OOO_STRING_SVTOOLS_HTML_horztab "TAB" +#define OOO_STRING_SVTOOLS_HTML_image "IMG" +#define OOO_STRING_SVTOOLS_HTML_image2 "IMAGE" +#define OOO_STRING_SVTOOLS_HTML_input "INPUT" +#define OOO_STRING_SVTOOLS_HTML_isindex "ISINDEX" +#define OOO_STRING_SVTOOLS_HTML_linebreak "BR" +#define OOO_STRING_SVTOOLS_HTML_li "LI" +#define OOO_STRING_SVTOOLS_HTML_link "LINK" +#define OOO_STRING_SVTOOLS_HTML_meta "META" +#define OOO_STRING_SVTOOLS_HTML_nextid "NEXTID" +#define OOO_STRING_SVTOOLS_HTML_nobr "NOBR" +#define OOO_STRING_SVTOOLS_HTML_of "OF" +#define OOO_STRING_SVTOOLS_HTML_option "OPTION" +#define OOO_STRING_SVTOOLS_HTML_param "PARAM" +#define OOO_STRING_SVTOOLS_HTML_range "RANGE" +#define OOO_STRING_SVTOOLS_HTML_spacer "SPACER" +#define OOO_STRING_SVTOOLS_HTML_wbr "WBR" + +// diese werden wieder abgeschaltet +#define OOO_STRING_SVTOOLS_HTML_abbreviation "ABBREV" +#define OOO_STRING_SVTOOLS_HTML_above "ABOVE" +#define OOO_STRING_SVTOOLS_HTML_acronym "ACRONYM" +#define OOO_STRING_SVTOOLS_HTML_address "ADDRESS" +#define OOO_STRING_SVTOOLS_HTML_anchor "A" +#define OOO_STRING_SVTOOLS_HTML_applet "APPLET" +#define OOO_STRING_SVTOOLS_HTML_array "ARRAY" +#define OOO_STRING_SVTOOLS_HTML_author "AU" +#define OOO_STRING_SVTOOLS_HTML_banner "BANNER" +#define OOO_STRING_SVTOOLS_HTML_bar "BAR" +#define OOO_STRING_SVTOOLS_HTML_basefont "BASEFONT" +#define OOO_STRING_SVTOOLS_HTML_below "BELOW" +#define OOO_STRING_SVTOOLS_HTML_bigprint "BIG" +#define OOO_STRING_SVTOOLS_HTML_blink "BLINK" +#define OOO_STRING_SVTOOLS_HTML_blockquote "BLOCKQUOTE" +#define OOO_STRING_SVTOOLS_HTML_blockquote30 "BQ" +#define OOO_STRING_SVTOOLS_HTML_body "BODY" +#define OOO_STRING_SVTOOLS_HTML_bold "B" +#define OOO_STRING_SVTOOLS_HTML_boldtext "BT" +#define OOO_STRING_SVTOOLS_HTML_box "BOX" +#define OOO_STRING_SVTOOLS_HTML_caption "CAPTION" +#define OOO_STRING_SVTOOLS_HTML_center "CENTER" +#define OOO_STRING_SVTOOLS_HTML_citiation "CITE" +#define OOO_STRING_SVTOOLS_HTML_code "CODE" +#define OOO_STRING_SVTOOLS_HTML_col "COL" +#define OOO_STRING_SVTOOLS_HTML_colgroup "COLGROUP" +#define OOO_STRING_SVTOOLS_HTML_credit "CREDIT" +#define OOO_STRING_SVTOOLS_HTML_dd "DD" +#define OOO_STRING_SVTOOLS_HTML_deflist "DL" +#define OOO_STRING_SVTOOLS_HTML_deletedtext "DEL" +#define OOO_STRING_SVTOOLS_HTML_dirlist "DIR" +#define OOO_STRING_SVTOOLS_HTML_division "DIV" +#define OOO_STRING_SVTOOLS_HTML_dot "DOT" +#define OOO_STRING_SVTOOLS_HTML_doubledot "DDOT" +#define OOO_STRING_SVTOOLS_HTML_dt "DT" +#define OOO_STRING_SVTOOLS_HTML_emphasis "EM" +#define OOO_STRING_SVTOOLS_HTML_figure "FIG" +#define OOO_STRING_SVTOOLS_HTML_font "FONT" +#define OOO_STRING_SVTOOLS_HTML_footnote "FN" +#define OOO_STRING_SVTOOLS_HTML_form "FORM" +#define OOO_STRING_SVTOOLS_HTML_frame "FRAME" +#define OOO_STRING_SVTOOLS_HTML_frameset "FRAMESET" +#define OOO_STRING_SVTOOLS_HTML_hat "HAT" +#define OOO_STRING_SVTOOLS_HTML_head1 "H1" +#define OOO_STRING_SVTOOLS_HTML_head2 "H2" +#define OOO_STRING_SVTOOLS_HTML_head3 "H3" +#define OOO_STRING_SVTOOLS_HTML_head4 "H4" +#define OOO_STRING_SVTOOLS_HTML_head5 "H5" +#define OOO_STRING_SVTOOLS_HTML_head6 "H6" +#define OOO_STRING_SVTOOLS_HTML_head "HEAD" +#define OOO_STRING_SVTOOLS_HTML_html "HTML" +#define OOO_STRING_SVTOOLS_HTML_iframe "IFRAME" +#define OOO_STRING_SVTOOLS_HTML_ilayer "ILAYER" +#define OOO_STRING_SVTOOLS_HTML_insertedtext "INS" +#define OOO_STRING_SVTOOLS_HTML_italic "I" +#define OOO_STRING_SVTOOLS_HTML_item "ITEM" +#define OOO_STRING_SVTOOLS_HTML_keyboard "KBD" +#define OOO_STRING_SVTOOLS_HTML_language "LANG" +#define OOO_STRING_SVTOOLS_HTML_layer "LAYER" +#define OOO_STRING_SVTOOLS_HTML_listheader "LH" +#define OOO_STRING_SVTOOLS_HTML_map "MAP" +#define OOO_STRING_SVTOOLS_HTML_math "MATH" +#define OOO_STRING_SVTOOLS_HTML_menulist "MENU" +#define OOO_STRING_SVTOOLS_HTML_multicol "MULTICOL" +#define OOO_STRING_SVTOOLS_HTML_noembed "NOEMBED" +#define OOO_STRING_SVTOOLS_HTML_noframe "NOFRAME" +#define OOO_STRING_SVTOOLS_HTML_noframes "NOFRAMES" +#define OOO_STRING_SVTOOLS_HTML_noscript "NOSCRIPT" +#define OOO_STRING_SVTOOLS_HTML_note "NOTE" +#define OOO_STRING_SVTOOLS_HTML_object "OBJECT" +#define OOO_STRING_SVTOOLS_HTML_orderlist "OL" +#define OOO_STRING_SVTOOLS_HTML_parabreak "P" +#define OOO_STRING_SVTOOLS_HTML_person "PERSON" +#define OOO_STRING_SVTOOLS_HTML_plaintext "T" +#define OOO_STRING_SVTOOLS_HTML_preformtxt "PRE" +#define OOO_STRING_SVTOOLS_HTML_root "ROOT" +#define OOO_STRING_SVTOOLS_HTML_row "ROW" +#define OOO_STRING_SVTOOLS_HTML_sample "SAMP" +#define OOO_STRING_SVTOOLS_HTML_script "SCRIPT" +#define OOO_STRING_SVTOOLS_HTML_select "SELECT" +#define OOO_STRING_SVTOOLS_HTML_shortquote "Q" +#define OOO_STRING_SVTOOLS_HTML_smallprint "SMALL" +#define OOO_STRING_SVTOOLS_HTML_span "SPAN" +#define OOO_STRING_SVTOOLS_HTML_squareroot "AQRT" +#define OOO_STRING_SVTOOLS_HTML_strikethrough "S" +#define OOO_STRING_SVTOOLS_HTML_strong "STRONG" +#define OOO_STRING_SVTOOLS_HTML_style "STYLE" +#define OOO_STRING_SVTOOLS_HTML_subscript "SUB" +#define OOO_STRING_SVTOOLS_HTML_superscript "SUP" +#define OOO_STRING_SVTOOLS_HTML_table "TABLE" +#define OOO_STRING_SVTOOLS_HTML_tablerow "TR" +#define OOO_STRING_SVTOOLS_HTML_tabledata "TD" +#define OOO_STRING_SVTOOLS_HTML_tableheader "TH" +#define OOO_STRING_SVTOOLS_HTML_tbody "TBODY" +#define OOO_STRING_SVTOOLS_HTML_teletype "TT" +#define OOO_STRING_SVTOOLS_HTML_text "TEXT" +#define OOO_STRING_SVTOOLS_HTML_textarea "TEXTAREA" +#define OOO_STRING_SVTOOLS_HTML_textflow "TEXTFLOW" +#define OOO_STRING_SVTOOLS_HTML_tfoot "TFOOT" +#define OOO_STRING_SVTOOLS_HTML_thead "THEAD" +#define OOO_STRING_SVTOOLS_HTML_tilde "TILDE" +#define OOO_STRING_SVTOOLS_HTML_title "TITLE" +#define OOO_STRING_SVTOOLS_HTML_underline "U" +#define OOO_STRING_SVTOOLS_HTML_unorderlist "UL" +#define OOO_STRING_SVTOOLS_HTML_variable "VAR" +#define OOO_STRING_SVTOOLS_HTML_vector "VEC" + +// obsolete features +#define OOO_STRING_SVTOOLS_HTML_xmp "XMP" +#define OOO_STRING_SVTOOLS_HTML_listing "LISTING" + +// proposed features +#define OOO_STRING_SVTOOLS_HTML_definstance "DFN" +#define OOO_STRING_SVTOOLS_HTML_strike "STRIKE" +#define OOO_STRING_SVTOOLS_HTML_bgsound "BGSOUND" +#define OOO_STRING_SVTOOLS_HTML_comment2 "COMMENT" +#define OOO_STRING_SVTOOLS_HTML_marquee "MARQUEE" +#define OOO_STRING_SVTOOLS_HTML_plaintext2 "PLAINTEXT" +#define OOO_STRING_SVTOOLS_HTML_sdfield "SDFIELD" + +// die Namen fuer alle Zeichen +#define OOO_STRING_SVTOOLS_HTML_C_lt "lt" +#define OOO_STRING_SVTOOLS_HTML_C_gt "gt" +#define OOO_STRING_SVTOOLS_HTML_C_amp "amp" +#define OOO_STRING_SVTOOLS_HTML_C_quot "quot" +#define OOO_STRING_SVTOOLS_HTML_C_Aacute "Aacute" +#define OOO_STRING_SVTOOLS_HTML_C_Agrave "Agrave" +#define OOO_STRING_SVTOOLS_HTML_C_Acirc "Acirc" +#define OOO_STRING_SVTOOLS_HTML_C_Atilde "Atilde" +#define OOO_STRING_SVTOOLS_HTML_C_Aring "Aring" +#define OOO_STRING_SVTOOLS_HTML_C_Auml "Auml" +#define OOO_STRING_SVTOOLS_HTML_C_AElig "AElig" +#define OOO_STRING_SVTOOLS_HTML_C_Ccedil "Ccedil" +#define OOO_STRING_SVTOOLS_HTML_C_Eacute "Eacute" +#define OOO_STRING_SVTOOLS_HTML_C_Egrave "Egrave" +#define OOO_STRING_SVTOOLS_HTML_C_Ecirc "Ecirc" +#define OOO_STRING_SVTOOLS_HTML_C_Euml "Euml" +#define OOO_STRING_SVTOOLS_HTML_C_Iacute "Iacute" +#define OOO_STRING_SVTOOLS_HTML_C_Igrave "Igrave" +#define OOO_STRING_SVTOOLS_HTML_C_Icirc "Icirc" +#define OOO_STRING_SVTOOLS_HTML_C_Iuml "Iuml" +#define OOO_STRING_SVTOOLS_HTML_C_ETH "ETH" +#define OOO_STRING_SVTOOLS_HTML_C_Ntilde "Ntilde" +#define OOO_STRING_SVTOOLS_HTML_C_Oacute "Oacute" +#define OOO_STRING_SVTOOLS_HTML_C_Ograve "Ograve" +#define OOO_STRING_SVTOOLS_HTML_C_Ocirc "Ocirc" +#define OOO_STRING_SVTOOLS_HTML_C_Otilde "Otilde" +#define OOO_STRING_SVTOOLS_HTML_C_Ouml "Ouml" +#define OOO_STRING_SVTOOLS_HTML_C_Oslash "Oslash" +#define OOO_STRING_SVTOOLS_HTML_C_Uacute "Uacute" +#define OOO_STRING_SVTOOLS_HTML_C_Ugrave "Ugrave" +#define OOO_STRING_SVTOOLS_HTML_C_Ucirc "Ucirc" +#define OOO_STRING_SVTOOLS_HTML_C_Uuml "Uuml" +#define OOO_STRING_SVTOOLS_HTML_C_Yacute "Yacute" +#define OOO_STRING_SVTOOLS_HTML_C_THORN "THORN" +#define OOO_STRING_SVTOOLS_HTML_C_szlig "szlig" +#define OOO_STRING_SVTOOLS_HTML_S_aacute "aacute" +#define OOO_STRING_SVTOOLS_HTML_S_agrave "agrave" +#define OOO_STRING_SVTOOLS_HTML_S_acirc "acirc" +#define OOO_STRING_SVTOOLS_HTML_S_atilde "atilde" +#define OOO_STRING_SVTOOLS_HTML_S_aring "aring" +#define OOO_STRING_SVTOOLS_HTML_S_auml "auml" +#define OOO_STRING_SVTOOLS_HTML_S_aelig "aelig" +#define OOO_STRING_SVTOOLS_HTML_S_ccedil "ccedil" +#define OOO_STRING_SVTOOLS_HTML_S_eacute "eacute" +#define OOO_STRING_SVTOOLS_HTML_S_egrave "egrave" +#define OOO_STRING_SVTOOLS_HTML_S_ecirc "ecirc" +#define OOO_STRING_SVTOOLS_HTML_S_euml "euml" +#define OOO_STRING_SVTOOLS_HTML_S_iacute "iacute" +#define OOO_STRING_SVTOOLS_HTML_S_igrave "igrave" +#define OOO_STRING_SVTOOLS_HTML_S_icirc "icirc" +#define OOO_STRING_SVTOOLS_HTML_S_iuml "iuml" +#define OOO_STRING_SVTOOLS_HTML_S_eth "eth" +#define OOO_STRING_SVTOOLS_HTML_S_ntilde "ntilde" +#define OOO_STRING_SVTOOLS_HTML_S_oacute "oacute" +#define OOO_STRING_SVTOOLS_HTML_S_ograve "ograve" +#define OOO_STRING_SVTOOLS_HTML_S_ocirc "ocirc" +#define OOO_STRING_SVTOOLS_HTML_S_otilde "otilde" +#define OOO_STRING_SVTOOLS_HTML_S_ouml "ouml" +#define OOO_STRING_SVTOOLS_HTML_S_oslash "oslash" +#define OOO_STRING_SVTOOLS_HTML_S_uacute "uacute" +#define OOO_STRING_SVTOOLS_HTML_S_ugrave "ugrave" +#define OOO_STRING_SVTOOLS_HTML_S_ucirc "ucirc" +#define OOO_STRING_SVTOOLS_HTML_S_uuml "uuml" +#define OOO_STRING_SVTOOLS_HTML_S_yacute "yacute" +#define OOO_STRING_SVTOOLS_HTML_S_thorn "thorn" +#define OOO_STRING_SVTOOLS_HTML_S_yuml "yuml" +#define OOO_STRING_SVTOOLS_HTML_S_acute "acute" +#define OOO_STRING_SVTOOLS_HTML_S_brvbar "brvbar" +#define OOO_STRING_SVTOOLS_HTML_S_cedil "cedil" +#define OOO_STRING_SVTOOLS_HTML_S_cent "cent" +#define OOO_STRING_SVTOOLS_HTML_S_copy "copy" +#define OOO_STRING_SVTOOLS_HTML_S_curren "curren" +#define OOO_STRING_SVTOOLS_HTML_S_deg "deg" +#define OOO_STRING_SVTOOLS_HTML_S_divide "divide" +#define OOO_STRING_SVTOOLS_HTML_S_frac12 "frac12" +#define OOO_STRING_SVTOOLS_HTML_S_frac14 "frac14" +#define OOO_STRING_SVTOOLS_HTML_S_frac34 "frac34" +#define OOO_STRING_SVTOOLS_HTML_S_iexcl "iexcl" +#define OOO_STRING_SVTOOLS_HTML_S_iquest "iquest" +#define OOO_STRING_SVTOOLS_HTML_S_laquo "laquo" +#define OOO_STRING_SVTOOLS_HTML_S_macr "macr" +#define OOO_STRING_SVTOOLS_HTML_S_micro "micro" +#define OOO_STRING_SVTOOLS_HTML_S_middot "middot" +#define OOO_STRING_SVTOOLS_HTML_S_nbsp "nbsp" +#define OOO_STRING_SVTOOLS_HTML_S_not "not" +#define OOO_STRING_SVTOOLS_HTML_S_ordf "ordf" +#define OOO_STRING_SVTOOLS_HTML_S_ordm "ordm" +#define OOO_STRING_SVTOOLS_HTML_S_para "para" +#define OOO_STRING_SVTOOLS_HTML_S_plusmn "plusmn" +#define OOO_STRING_SVTOOLS_HTML_S_pound "pound" +#define OOO_STRING_SVTOOLS_HTML_S_raquo "raquo" +#define OOO_STRING_SVTOOLS_HTML_S_reg "reg" +#define OOO_STRING_SVTOOLS_HTML_S_sect "sect" +#define OOO_STRING_SVTOOLS_HTML_S_shy "shy" +#define OOO_STRING_SVTOOLS_HTML_S_sup1 "sup1" +#define OOO_STRING_SVTOOLS_HTML_S_sup2 "sup2" +#define OOO_STRING_SVTOOLS_HTML_S_sup3 "sup3" +#define OOO_STRING_SVTOOLS_HTML_S_times "times" +#define OOO_STRING_SVTOOLS_HTML_S_uml "uml" +#define OOO_STRING_SVTOOLS_HTML_S_yen "yen" + +// Netscape kennt noch ein paar in Grossbuchstaben ... +#define OOO_STRING_SVTOOLS_HTML_C_LT "LT" +#define OOO_STRING_SVTOOLS_HTML_C_GT "GT" +#define OOO_STRING_SVTOOLS_HTML_C_AMP "AMP" +#define OOO_STRING_SVTOOLS_HTML_C_QUOT "QUOT" +#define OOO_STRING_SVTOOLS_HTML_S_COPY "COPY" +#define OOO_STRING_SVTOOLS_HTML_S_REG "REG" + +// HTML4 +#define OOO_STRING_SVTOOLS_HTML_S_alefsym "alefsym" +#define OOO_STRING_SVTOOLS_HTML_S_Alpha "Alpha" +#define OOO_STRING_SVTOOLS_HTML_S_alpha "alpha" +#define OOO_STRING_SVTOOLS_HTML_S_and "and" +#define OOO_STRING_SVTOOLS_HTML_S_ang "ang" +#define OOO_STRING_SVTOOLS_HTML_S_asymp "asymp" +#define OOO_STRING_SVTOOLS_HTML_S_bdquo "bdquo" +#define OOO_STRING_SVTOOLS_HTML_S_Beta "Beta" +#define OOO_STRING_SVTOOLS_HTML_S_beta "beta" +#define OOO_STRING_SVTOOLS_HTML_S_bull "bull" +#define OOO_STRING_SVTOOLS_HTML_S_cap "cap" +#define OOO_STRING_SVTOOLS_HTML_S_chi "chi" +#define OOO_STRING_SVTOOLS_HTML_S_Chi "Chi" +#define OOO_STRING_SVTOOLS_HTML_S_circ "circ" +#define OOO_STRING_SVTOOLS_HTML_S_clubs "clubs" +#define OOO_STRING_SVTOOLS_HTML_S_cong "cong" +#define OOO_STRING_SVTOOLS_HTML_S_crarr "crarr" +#define OOO_STRING_SVTOOLS_HTML_S_cup "cup" +#define OOO_STRING_SVTOOLS_HTML_S_dagger "dagger" +#define OOO_STRING_SVTOOLS_HTML_S_Dagger "Dagger" +#define OOO_STRING_SVTOOLS_HTML_S_darr "darr" +#define OOO_STRING_SVTOOLS_HTML_S_dArr "dArr" +#define OOO_STRING_SVTOOLS_HTML_S_Delta "Delta" +#define OOO_STRING_SVTOOLS_HTML_S_delta "delta" +#define OOO_STRING_SVTOOLS_HTML_S_diams "diams" +#define OOO_STRING_SVTOOLS_HTML_S_empty "empty" +#define OOO_STRING_SVTOOLS_HTML_S_emsp "emsp" +#define OOO_STRING_SVTOOLS_HTML_S_ensp "ensp" +#define OOO_STRING_SVTOOLS_HTML_S_Epsilon "Epsilon" +#define OOO_STRING_SVTOOLS_HTML_S_epsilon "epsilon" +#define OOO_STRING_SVTOOLS_HTML_S_equiv "equiv" +#define OOO_STRING_SVTOOLS_HTML_S_Eta "Eta" +#define OOO_STRING_SVTOOLS_HTML_S_eta "eta" +#define OOO_STRING_SVTOOLS_HTML_S_euro "euro" +#define OOO_STRING_SVTOOLS_HTML_S_exist "exist" +#define OOO_STRING_SVTOOLS_HTML_S_fnof "fnof" +#define OOO_STRING_SVTOOLS_HTML_S_forall "forall" +#define OOO_STRING_SVTOOLS_HTML_S_frasl "frasl" +#define OOO_STRING_SVTOOLS_HTML_S_Gamma "Gamma" +#define OOO_STRING_SVTOOLS_HTML_S_gamma "gamma" +#define OOO_STRING_SVTOOLS_HTML_S_ge "ge" +#define OOO_STRING_SVTOOLS_HTML_S_harr "harr" +#define OOO_STRING_SVTOOLS_HTML_S_hArr "hArr" +#define OOO_STRING_SVTOOLS_HTML_S_hearts "hearts" +#define OOO_STRING_SVTOOLS_HTML_S_hellip "hellip" +#define OOO_STRING_SVTOOLS_HTML_S_image "image" +#define OOO_STRING_SVTOOLS_HTML_S_infin "infin" +#define OOO_STRING_SVTOOLS_HTML_S_int "int" +#define OOO_STRING_SVTOOLS_HTML_S_Iota "Iota" +#define OOO_STRING_SVTOOLS_HTML_S_iota "iota" +#define OOO_STRING_SVTOOLS_HTML_S_isin "isin" +#define OOO_STRING_SVTOOLS_HTML_S_Kappa "Kappa" +#define OOO_STRING_SVTOOLS_HTML_S_kappa "kappa" +#define OOO_STRING_SVTOOLS_HTML_S_Lambda "Lambda" +#define OOO_STRING_SVTOOLS_HTML_S_lambda "lambda" +#define OOO_STRING_SVTOOLS_HTML_S_lang "lang" +#define OOO_STRING_SVTOOLS_HTML_S_larr "larr" +#define OOO_STRING_SVTOOLS_HTML_S_lArr "lArr" +#define OOO_STRING_SVTOOLS_HTML_S_lceil "lceil" +#define OOO_STRING_SVTOOLS_HTML_S_ldquo "ldquo" +#define OOO_STRING_SVTOOLS_HTML_S_le "le" +#define OOO_STRING_SVTOOLS_HTML_S_lfloor "lfloor" +#define OOO_STRING_SVTOOLS_HTML_S_lowast "lowast" +#define OOO_STRING_SVTOOLS_HTML_S_loz "loz" +#define OOO_STRING_SVTOOLS_HTML_S_lrm "lrm" +#define OOO_STRING_SVTOOLS_HTML_S_lsaquo "lsaquo" +#define OOO_STRING_SVTOOLS_HTML_S_lsquo "lsquo" +#define OOO_STRING_SVTOOLS_HTML_S_mdash "mdash" +#define OOO_STRING_SVTOOLS_HTML_S_minus "minus" +#define OOO_STRING_SVTOOLS_HTML_S_Mu "Mu" +#define OOO_STRING_SVTOOLS_HTML_S_mu "mu" +#define OOO_STRING_SVTOOLS_HTML_S_nabla "nabla" +#define OOO_STRING_SVTOOLS_HTML_S_ndash "ndash" +#define OOO_STRING_SVTOOLS_HTML_S_ne "ne" +#define OOO_STRING_SVTOOLS_HTML_S_ni "ni" +#define OOO_STRING_SVTOOLS_HTML_S_notin "notin" +#define OOO_STRING_SVTOOLS_HTML_S_nsub "nsub" +#define OOO_STRING_SVTOOLS_HTML_S_Nu "Nu" +#define OOO_STRING_SVTOOLS_HTML_S_nu "nu" +#define OOO_STRING_SVTOOLS_HTML_S_OElig "OElig" +#define OOO_STRING_SVTOOLS_HTML_S_oelig "oelig" +#define OOO_STRING_SVTOOLS_HTML_S_oline "oline" +#define OOO_STRING_SVTOOLS_HTML_S_Omega "Omega" +#define OOO_STRING_SVTOOLS_HTML_S_omega "omega" +#define OOO_STRING_SVTOOLS_HTML_S_Omicron "Omicron" +#define OOO_STRING_SVTOOLS_HTML_S_omicron "omicron" +#define OOO_STRING_SVTOOLS_HTML_S_oplus "oplus" +#define OOO_STRING_SVTOOLS_HTML_S_or "or" +#define OOO_STRING_SVTOOLS_HTML_S_otimes "otimes" +#define OOO_STRING_SVTOOLS_HTML_S_part "part" +#define OOO_STRING_SVTOOLS_HTML_S_permil "permil" +#define OOO_STRING_SVTOOLS_HTML_S_perp "perp" +#define OOO_STRING_SVTOOLS_HTML_S_Phi "Phi" +#define OOO_STRING_SVTOOLS_HTML_S_phi "phi" +#define OOO_STRING_SVTOOLS_HTML_S_Pi "Pi" +#define OOO_STRING_SVTOOLS_HTML_S_pi "pi" +#define OOO_STRING_SVTOOLS_HTML_S_piv "piv" +#define OOO_STRING_SVTOOLS_HTML_S_prime "prime" +#define OOO_STRING_SVTOOLS_HTML_S_Prime "Prime" +#define OOO_STRING_SVTOOLS_HTML_S_prod "prod" +#define OOO_STRING_SVTOOLS_HTML_S_prop "prop" +#define OOO_STRING_SVTOOLS_HTML_S_Psi "Psi" +#define OOO_STRING_SVTOOLS_HTML_S_psi "psi" +#define OOO_STRING_SVTOOLS_HTML_S_radic "radic" +#define OOO_STRING_SVTOOLS_HTML_S_rang "rang" +#define OOO_STRING_SVTOOLS_HTML_S_rarr "rarr" +#define OOO_STRING_SVTOOLS_HTML_S_rArr "rArr" +#define OOO_STRING_SVTOOLS_HTML_S_rceil "rceil" +#define OOO_STRING_SVTOOLS_HTML_S_rdquo "rdquo" +#define OOO_STRING_SVTOOLS_HTML_S_real "real" +#define OOO_STRING_SVTOOLS_HTML_S_rfloor "rfloor" +#define OOO_STRING_SVTOOLS_HTML_S_Rho "Rho" +#define OOO_STRING_SVTOOLS_HTML_S_rho "rho" +#define OOO_STRING_SVTOOLS_HTML_S_rlm "rlm" +#define OOO_STRING_SVTOOLS_HTML_S_rsaquo "rsaquo" +#define OOO_STRING_SVTOOLS_HTML_S_rsquo "rsquo" +#define OOO_STRING_SVTOOLS_HTML_S_sbquo "sbquo" +#define OOO_STRING_SVTOOLS_HTML_S_Scaron "Scaron" +#define OOO_STRING_SVTOOLS_HTML_S_scaron "scaron" +#define OOO_STRING_SVTOOLS_HTML_S_sdot "sdot" +#define OOO_STRING_SVTOOLS_HTML_S_Sigma "Sigma" +#define OOO_STRING_SVTOOLS_HTML_S_sigma "sigma" +#define OOO_STRING_SVTOOLS_HTML_S_sigmaf "sigmaf" +#define OOO_STRING_SVTOOLS_HTML_S_sim "sim" +#define OOO_STRING_SVTOOLS_HTML_S_spades "spades" +#define OOO_STRING_SVTOOLS_HTML_S_sub "sub" +#define OOO_STRING_SVTOOLS_HTML_S_sube "sube" +#define OOO_STRING_SVTOOLS_HTML_S_sum "sum" +#define OOO_STRING_SVTOOLS_HTML_S_sup "sup" +#define OOO_STRING_SVTOOLS_HTML_S_supe "supe" +#define OOO_STRING_SVTOOLS_HTML_S_Tau "Tau" +#define OOO_STRING_SVTOOLS_HTML_S_tau "tau" +#define OOO_STRING_SVTOOLS_HTML_S_there4 "there4" +#define OOO_STRING_SVTOOLS_HTML_S_Theta "Theta" +#define OOO_STRING_SVTOOLS_HTML_S_theta "theta" +#define OOO_STRING_SVTOOLS_HTML_S_thetasym "thetasym" +#define OOO_STRING_SVTOOLS_HTML_S_thinsp "thinsp" +#define OOO_STRING_SVTOOLS_HTML_S_tilde "tilde" +#define OOO_STRING_SVTOOLS_HTML_S_trade "trade" +#define OOO_STRING_SVTOOLS_HTML_S_uarr "uarr" +#define OOO_STRING_SVTOOLS_HTML_S_uArr "uArr" +#define OOO_STRING_SVTOOLS_HTML_S_upsih "upsih" +#define OOO_STRING_SVTOOLS_HTML_S_Upsilon "Upsilon" +#define OOO_STRING_SVTOOLS_HTML_S_upsilon "upsilon" +#define OOO_STRING_SVTOOLS_HTML_S_weierp "weierp" +#define OOO_STRING_SVTOOLS_HTML_S_Xi "Xi" +#define OOO_STRING_SVTOOLS_HTML_S_xi "xi" +#define OOO_STRING_SVTOOLS_HTML_S_Yuml "Yuml" +#define OOO_STRING_SVTOOLS_HTML_S_Zeta "Zeta" +#define OOO_STRING_SVTOOLS_HTML_S_zeta "zeta" +#define OOO_STRING_SVTOOLS_HTML_S_zwj "zwj" +#define OOO_STRING_SVTOOLS_HTML_S_zwnj "zwnj" + +// HTML Attribut-Token (=Optionen) + +// Attribute ohne Wert +#define OOO_STRING_SVTOOLS_HTML_O_box "BOX" +#define OOO_STRING_SVTOOLS_HTML_O_checked "CHECKED" +#define OOO_STRING_SVTOOLS_HTML_O_compact "COMPACT" +#define OOO_STRING_SVTOOLS_HTML_O_continue "CONTINUE" +#define OOO_STRING_SVTOOLS_HTML_O_controls "CONTROLS" +#define OOO_STRING_SVTOOLS_HTML_O_declare "DECLARE" +#define OOO_STRING_SVTOOLS_HTML_O_disabled "DISABLED" +#define OOO_STRING_SVTOOLS_HTML_O_folded "FOLDED" +#define OOO_STRING_SVTOOLS_HTML_O_ismap "ISMAP" +#define OOO_STRING_SVTOOLS_HTML_O_mayscript "MAYSCRIPT" +#define OOO_STRING_SVTOOLS_HTML_O_multiple "MULTIPLE" +#define OOO_STRING_SVTOOLS_HTML_O_noflow "NOFLOW" +#define OOO_STRING_SVTOOLS_HTML_O_nohref "NOHREF" +#define OOO_STRING_SVTOOLS_HTML_O_noresize "NORESIZE" +#define OOO_STRING_SVTOOLS_HTML_O_noshade "NOSHADE" +#define OOO_STRING_SVTOOLS_HTML_O_nowrap "NOWRAP" +#define OOO_STRING_SVTOOLS_HTML_O_plain "PLAIN" +#define OOO_STRING_SVTOOLS_HTML_O_sdfixed "SDFIXED" +#define OOO_STRING_SVTOOLS_HTML_O_selected "SELECTED" +#define OOO_STRING_SVTOOLS_HTML_O_shapes "SHAPES" + +// Attribute mit einem String als Wert +#define OOO_STRING_SVTOOLS_HTML_O_above "ABOVE" +#define OOO_STRING_SVTOOLS_HTML_O_accesskey "ACCESSKEY" +#define OOO_STRING_SVTOOLS_HTML_O_accept "ACCEPT" +#define OOO_STRING_SVTOOLS_HTML_O_add_date "ADD_DATE" +#define OOO_STRING_SVTOOLS_HTML_O_alt "ALT" +#define OOO_STRING_SVTOOLS_HTML_O_axes "AXES" +#define OOO_STRING_SVTOOLS_HTML_O_axis "AXIS" +#define OOO_STRING_SVTOOLS_HTML_O_below "BELOW" +#define OOO_STRING_SVTOOLS_HTML_O_char "CHAR" +#define OOO_STRING_SVTOOLS_HTML_O_class "CLASS" +#define OOO_STRING_SVTOOLS_HTML_O_clip "CLIP" +#define OOO_STRING_SVTOOLS_HTML_O_code "CODE" +#define OOO_STRING_SVTOOLS_HTML_O_codetype "CODETYPE" +#define OOO_STRING_SVTOOLS_HTML_O_colspec "COLSPEC" +#define OOO_STRING_SVTOOLS_HTML_O_content "CONTENT" +#define OOO_STRING_SVTOOLS_HTML_O_coords "COORDS" +#define OOO_STRING_SVTOOLS_HTML_O_dp "DP" +#define OOO_STRING_SVTOOLS_HTML_O_enctype "ENCTYPE" +#define OOO_STRING_SVTOOLS_HTML_O_error "ERROR" +#define OOO_STRING_SVTOOLS_HTML_O_face "FACE" +#define OOO_STRING_SVTOOLS_HTML_O_frameborder "FRAMEBORDER" +#define OOO_STRING_SVTOOLS_HTML_O_httpequiv "HTTP-EQUIV" +#define OOO_STRING_SVTOOLS_HTML_O_language "LANGUAGE" +#define OOO_STRING_SVTOOLS_HTML_O_last_modified "LAST_MODIFIED" +#define OOO_STRING_SVTOOLS_HTML_O_last_visit "LAST_VISIT" +#define OOO_STRING_SVTOOLS_HTML_O_md "MD" +#define OOO_STRING_SVTOOLS_HTML_O_n "N" +#define OOO_STRING_SVTOOLS_HTML_O_name "NAME" +#define OOO_STRING_SVTOOLS_HTML_O_notation "NOTATION" +#define OOO_STRING_SVTOOLS_HTML_O_prompt "PROMPT" +#define OOO_STRING_SVTOOLS_HTML_O_shape "SHAPE" +#define OOO_STRING_SVTOOLS_HTML_O_standby "STANDBY" +#define OOO_STRING_SVTOOLS_HTML_O_style "STYLE" +#define OOO_STRING_SVTOOLS_HTML_O_title "TITLE" +#define OOO_STRING_SVTOOLS_HTML_O_value "VALUE" +#define OOO_STRING_SVTOOLS_HTML_O_SDval "SDVAL" +#define OOO_STRING_SVTOOLS_HTML_O_SDnum "SDNUM" +#define OOO_STRING_SVTOOLS_HTML_O_sdlibrary "SDLIBRARY" +#define OOO_STRING_SVTOOLS_HTML_O_sdmodule "SDMODULE" +#define OOO_STRING_SVTOOLS_HTML_O_sdevent "SDEVENT-" +#define OOO_STRING_SVTOOLS_HTML_O_sdaddparam "SDADDPARAM-" + +// Attribute mit einem SGML-Identifier als Wert +#define OOO_STRING_SVTOOLS_HTML_O_from "FROM" +#define OOO_STRING_SVTOOLS_HTML_O_id "ID" +#define OOO_STRING_SVTOOLS_HTML_O_target "TARGET" +#define OOO_STRING_SVTOOLS_HTML_O_to "TO" +#define OOO_STRING_SVTOOLS_HTML_O_until "UNTIL" + +// Attribute mit einem URI als Wert +#define OOO_STRING_SVTOOLS_HTML_O_action "ACTION" +#define OOO_STRING_SVTOOLS_HTML_O_archive "ARCHIVE" +#define OOO_STRING_SVTOOLS_HTML_O_background "BACKGROUND" +#define OOO_STRING_SVTOOLS_HTML_O_classid "CLASSID" +#define OOO_STRING_SVTOOLS_HTML_O_codebase "CODEBASE" +#define OOO_STRING_SVTOOLS_HTML_O_data "DATA" +#define OOO_STRING_SVTOOLS_HTML_O_dynsrc "DYNSRC" +#define OOO_STRING_SVTOOLS_HTML_O_dynsync "DYNSYNC" +#define OOO_STRING_SVTOOLS_HTML_O_imagemap "IMAGEMAP" +#define OOO_STRING_SVTOOLS_HTML_O_href "HREF" +#define OOO_STRING_SVTOOLS_HTML_O_lowsrc "LOWSRC" +#define OOO_STRING_SVTOOLS_HTML_O_script "SCRIPT" +#define OOO_STRING_SVTOOLS_HTML_O_src "SRC" +#define OOO_STRING_SVTOOLS_HTML_O_usemap "USEMAP" + +// Attribute mit Entity-Namen als Wert +#define OOO_STRING_SVTOOLS_HTML_O_dingbat "DINGBAT" +#define OOO_STRING_SVTOOLS_HTML_O_sym "SYM" + +// Attribute mit einer Farbe als Wert (alle Netscape) +#define OOO_STRING_SVTOOLS_HTML_O_alink "ALINK" +#define OOO_STRING_SVTOOLS_HTML_O_bgcolor "BGCOLOR" +#define OOO_STRING_SVTOOLS_HTML_O_bordercolor "BORDERCOLOR" +#define OOO_STRING_SVTOOLS_HTML_O_bordercolorlight "BORDERCOLORLIGHT" +#define OOO_STRING_SVTOOLS_HTML_O_bordercolordark "BORDERCOLORDARK" +#define OOO_STRING_SVTOOLS_HTML_O_color "COLOR" +#define OOO_STRING_SVTOOLS_HTML_O_link "LINK" +#define OOO_STRING_SVTOOLS_HTML_O_text "TEXT" +#define OOO_STRING_SVTOOLS_HTML_O_vlink "VLINK" + +// Attribute mit einem numerischen Wert +#define OOO_STRING_SVTOOLS_HTML_O_border "BORDER" +#define OOO_STRING_SVTOOLS_HTML_O_cellspacing "CELLSPACING" +#define OOO_STRING_SVTOOLS_HTML_O_cellpadding "CELLPADDING" +#define OOO_STRING_SVTOOLS_HTML_O_charoff "CHAROFF" +#define OOO_STRING_SVTOOLS_HTML_O_colspan "COLSPAN" +#define OOO_STRING_SVTOOLS_HTML_O_framespacing "FRAMESPACING" +#define OOO_STRING_SVTOOLS_HTML_O_gutter "GUTTER" +#define OOO_STRING_SVTOOLS_HTML_O_indent "INDENT" +#define OOO_STRING_SVTOOLS_HTML_O_height "HEIGHT" +#define OOO_STRING_SVTOOLS_HTML_O_hspace "HSPACE" +#define OOO_STRING_SVTOOLS_HTML_O_left "LEFT" +#define OOO_STRING_SVTOOLS_HTML_O_leftmargin "LEFTMARGIN" +#define OOO_STRING_SVTOOLS_HTML_O_loop "LOOP" +#define OOO_STRING_SVTOOLS_HTML_O_marginheight "MARGINHEIGHT" +#define OOO_STRING_SVTOOLS_HTML_O_marginwidth "MARGINWIDTH" +#define OOO_STRING_SVTOOLS_HTML_O_max "MAX" +#define OOO_STRING_SVTOOLS_HTML_O_maxlength "MAXLENGTH" +#define OOO_STRING_SVTOOLS_HTML_O_min "MIN" +#define OOO_STRING_SVTOOLS_HTML_O_pagex "PAGEX" +#define OOO_STRING_SVTOOLS_HTML_O_pagey "PAGEY" +#define OOO_STRING_SVTOOLS_HTML_O_pointsize "POINT-SIZE" +#define OOO_STRING_SVTOOLS_HTML_O_rowspan "ROWSPAN" +#define OOO_STRING_SVTOOLS_HTML_O_scrollamount "SCROLLAMOUNT" +#define OOO_STRING_SVTOOLS_HTML_O_scrolldelay "SCROLLDELAY" +#define OOO_STRING_SVTOOLS_HTML_O_seqnum "SEQNUM" +#define OOO_STRING_SVTOOLS_HTML_O_skip "SKIP" +#define OOO_STRING_SVTOOLS_HTML_O_span "SPAN" +#define OOO_STRING_SVTOOLS_HTML_O_tabindex "TABINDEX" +#define OOO_STRING_SVTOOLS_HTML_O_top "TOP" +#define OOO_STRING_SVTOOLS_HTML_O_topmargin "TOPMARGIN" +#define OOO_STRING_SVTOOLS_HTML_O_vspace "VSPACE" +#define OOO_STRING_SVTOOLS_HTML_O_weight "WEIGHT" +#define OOO_STRING_SVTOOLS_HTML_O_width "WIDTH" +#define OOO_STRING_SVTOOLS_HTML_O_x "X" +#define OOO_STRING_SVTOOLS_HTML_O_y "Y" +#define OOO_STRING_SVTOOLS_HTML_O_zindex "Z-INDEX" + +// Attribute mit Enum-Werten +#define OOO_STRING_SVTOOLS_HTML_O_behavior "BEHAVIOR" +#define OOO_STRING_SVTOOLS_HTML_O_bgproperties "BGPROPERTIES" +#define OOO_STRING_SVTOOLS_HTML_O_clear "CLEAR" +#define OOO_STRING_SVTOOLS_HTML_O_dir "DIR" +#define OOO_STRING_SVTOOLS_HTML_O_direction "DIRECTION" +#define OOO_STRING_SVTOOLS_HTML_O_format "FORMAT" +#define OOO_STRING_SVTOOLS_HTML_O_frame "FRAME" +#define OOO_STRING_SVTOOLS_HTML_O_lang "LANG" +#define OOO_STRING_SVTOOLS_HTML_O_method "METHOD" +#define OOO_STRING_SVTOOLS_HTML_O_palette "PALETTE" +#define OOO_STRING_SVTOOLS_HTML_O_rel "REL" +#define OOO_STRING_SVTOOLS_HTML_O_rev "REV" +#define OOO_STRING_SVTOOLS_HTML_O_rules "RULES" +#define OOO_STRING_SVTOOLS_HTML_O_scrolling "SCROLLING" +#define OOO_STRING_SVTOOLS_HTML_O_sdreadonly "READONLY" +#define OOO_STRING_SVTOOLS_HTML_O_subtype "SUBTYPE" +#define OOO_STRING_SVTOOLS_HTML_O_type "TYPE" +#define OOO_STRING_SVTOOLS_HTML_O_valign "VALIGN" +#define OOO_STRING_SVTOOLS_HTML_O_valuetype "VALUETYPE" +#define OOO_STRING_SVTOOLS_HTML_O_visibility "VISIBILITY" +#define OOO_STRING_SVTOOLS_HTML_O_wrap "WRAP" + +// Attribute mit Script-Code als Wert +#define OOO_STRING_SVTOOLS_HTML_O_onblur "ONBLUR" +#define OOO_STRING_SVTOOLS_HTML_O_onchange "ONCHANGE" +#define OOO_STRING_SVTOOLS_HTML_O_onclick "ONCLICK" +#define OOO_STRING_SVTOOLS_HTML_O_onfocus "ONFOCUS" +#define OOO_STRING_SVTOOLS_HTML_O_onload "ONLOAD" +#define OOO_STRING_SVTOOLS_HTML_O_onmouseover "ONMOUSEOVER" +#define OOO_STRING_SVTOOLS_HTML_O_onreset "ONRESET" +#define OOO_STRING_SVTOOLS_HTML_O_onselect "ONSELECT" +#define OOO_STRING_SVTOOLS_HTML_O_onsubmit "ONSUBMIT" +#define OOO_STRING_SVTOOLS_HTML_O_onunload "ONUNLOAD" +#define OOO_STRING_SVTOOLS_HTML_O_onabort "ONABORT" +#define OOO_STRING_SVTOOLS_HTML_O_onerror "ONERROR" +#define OOO_STRING_SVTOOLS_HTML_O_onmouseout "ONMOUSEOUT" +#define OOO_STRING_SVTOOLS_HTML_O_SDonblur "SDONBLUR" +#define OOO_STRING_SVTOOLS_HTML_O_SDonchange "SDONCHANGE" +#define OOO_STRING_SVTOOLS_HTML_O_SDonclick "SDONCLICK" +#define OOO_STRING_SVTOOLS_HTML_O_SDonfocus "SDONFOCUS" +#define OOO_STRING_SVTOOLS_HTML_O_SDonload "SDONLOAD" +#define OOO_STRING_SVTOOLS_HTML_O_SDonmouseover "SDONMOUSEOVER" +#define OOO_STRING_SVTOOLS_HTML_O_SDonreset "SDONRESET" +#define OOO_STRING_SVTOOLS_HTML_O_SDonselect "SDONSELECT" +#define OOO_STRING_SVTOOLS_HTML_O_SDonsubmit "SDONSUBMIT" +#define OOO_STRING_SVTOOLS_HTML_O_SDonunload "SDONUNLOAD" +#define OOO_STRING_SVTOOLS_HTML_O_SDonabort "SDONABORT" +#define OOO_STRING_SVTOOLS_HTML_O_SDonerror "SDONERROR" +#define OOO_STRING_SVTOOLS_HTML_O_SDonmouseout "SDONMOUSEOUT" + +// Attribute mit Kontext-abhaengigen Werten +#define OOO_STRING_SVTOOLS_HTML_O_align "ALIGN" +#define OOO_STRING_SVTOOLS_HTML_O_cols "COLS" +#define OOO_STRING_SVTOOLS_HTML_O_rows "ROWS" +#define OOO_STRING_SVTOOLS_HTML_O_start "START" +#define OOO_STRING_SVTOOLS_HTML_O_size "SIZE" +#define OOO_STRING_SVTOOLS_HTML_O_units "UNITS" + +// Werte von +#define OOO_STRING_SVTOOLS_HTML_IT_text "TEXT" +#define OOO_STRING_SVTOOLS_HTML_IT_password "PASSWORD" +#define OOO_STRING_SVTOOLS_HTML_IT_checkbox "CHECKBOX" +#define OOO_STRING_SVTOOLS_HTML_IT_radio "RADIO" +#define OOO_STRING_SVTOOLS_HTML_IT_range "RANGE" +#define OOO_STRING_SVTOOLS_HTML_IT_scribble "SCRIBBLE" +#define OOO_STRING_SVTOOLS_HTML_IT_file "FILE" +#define OOO_STRING_SVTOOLS_HTML_IT_hidden "HIDDEN" +#define OOO_STRING_SVTOOLS_HTML_IT_submit "SUBMIT" +#define OOO_STRING_SVTOOLS_HTML_IT_image "IMAGE" +#define OOO_STRING_SVTOOLS_HTML_IT_reset "RESET" +#define OOO_STRING_SVTOOLS_HTML_IT_button "BUTTON" + +// Werte von
+#define OOO_STRING_SVTOOLS_HTML_TF_void "VOID" +#define OOO_STRING_SVTOOLS_HTML_TF_above "ABOVE" +#define OOO_STRING_SVTOOLS_HTML_TF_below "BELOW" +#define OOO_STRING_SVTOOLS_HTML_TF_hsides "HSIDES" +#define OOO_STRING_SVTOOLS_HTML_TF_lhs "LHS" +#define OOO_STRING_SVTOOLS_HTML_TF_rhs "RHS" +#define OOO_STRING_SVTOOLS_HTML_TF_vsides "VSIDES" +#define OOO_STRING_SVTOOLS_HTML_TF_box "BOX" +#define OOO_STRING_SVTOOLS_HTML_TF_border "BORDER" + +// Werte von
+#define OOO_STRING_SVTOOLS_HTML_TR_none "NONE" +#define OOO_STRING_SVTOOLS_HTML_TR_groups "GROUPS" +#define OOO_STRING_SVTOOLS_HTML_TR_rows "ROWS" +#define OOO_STRING_SVTOOLS_HTML_TR_cols "COLS" +#define OOO_STRING_SVTOOLS_HTML_TR_all "ALL" + +// Werte von +#define OOO_STRING_SVTOOLS_HTML_AL_left "LEFT" +#define OOO_STRING_SVTOOLS_HTML_AL_center "CENTER" +#define OOO_STRING_SVTOOLS_HTML_AL_middle "MIDDLE" +#define OOO_STRING_SVTOOLS_HTML_AL_right "RIGHT" +#define OOO_STRING_SVTOOLS_HTML_AL_justify "JUSTIFY" +#define OOO_STRING_SVTOOLS_HTML_AL_char "CHAR" +#define OOO_STRING_SVTOOLS_HTML_AL_all "ALL" +#define OOO_STRING_SVTOOLS_HTML_AL_none "NONE" + +// Werte von , +#define OOO_STRING_SVTOOLS_HTML_VA_top "TOP" +#define OOO_STRING_SVTOOLS_HTML_VA_middle "MIDDLE" +#define OOO_STRING_SVTOOLS_HTML_VA_bottom "BOTTOM" +#define OOO_STRING_SVTOOLS_HTML_VA_baseline "BASELINE" +#define OOO_STRING_SVTOOLS_HTML_VA_texttop "TEXTTOP" +#define OOO_STRING_SVTOOLS_HTML_VA_absmiddle "ABSMIDDLE" +#define OOO_STRING_SVTOOLS_HTML_VA_absbottom "ABSBOTTOM" + +// Werte von +#define OOO_STRING_SVTOOLS_HTML_SH_rect "RECT" +#define OOO_STRING_SVTOOLS_HTML_SH_rectangle "RECTANGLE" +#define OOO_STRING_SVTOOLS_HTML_SH_circ "CIRC" +#define OOO_STRING_SVTOOLS_HTML_SH_circle "CIRCLE" +#define OOO_STRING_SVTOOLS_HTML_SH_poly "POLY" +#define OOO_STRING_SVTOOLS_HTML_SH_polygon "POLYGON" +#define OOO_STRING_SVTOOLS_HTML_SH_default "DEFAULT" + +#define OOO_STRING_SVTOOLS_HTML_LG_starbasic "STARBASIC" +#define OOO_STRING_SVTOOLS_HTML_LG_javascript "JAVASCRIPT" +#define OOO_STRING_SVTOOLS_HTML_LG_javascript11 "JAVASCRIPT1.1" +#define OOO_STRING_SVTOOLS_HTML_LG_livescript "LIVESCRIPT" + +// ein par Werte fuer unser StarBASIC-Support +#define OOO_STRING_SVTOOLS_HTML_SB_library "$LIBRARY:" +#define OOO_STRING_SVTOOLS_HTML_SB_module "$MODULE:" + +// Werte von +#define OOO_STRING_SVTOOLS_HTML_METHOD_get "GET" +#define OOO_STRING_SVTOOLS_HTML_METHOD_post "POST" + +// Werte von +#define OOO_STRING_SVTOOLS_HTML_META_refresh "REFRESH" +#define OOO_STRING_SVTOOLS_HTML_META_generator "GENERATOR" +#define OOO_STRING_SVTOOLS_HTML_META_author "AUTHOR" +#define OOO_STRING_SVTOOLS_HTML_META_classification "CLASSIFICATION" +#define OOO_STRING_SVTOOLS_HTML_META_description "DESCRIPTION" +#define OOO_STRING_SVTOOLS_HTML_META_keywords "KEYWORDS" +#define OOO_STRING_SVTOOLS_HTML_META_changed "CHANGED" +#define OOO_STRING_SVTOOLS_HTML_META_changedby "CHANGEDBY" +#define OOO_STRING_SVTOOLS_HTML_META_created "CREATED" +#define OOO_STRING_SVTOOLS_HTML_META_content_type "CONTENT-TYPE" +#define OOO_STRING_SVTOOLS_HTML_META_content_script_type "CONTENT-SCRIPT-TYPE" +#define OOO_STRING_SVTOOLS_HTML_META_sdendnote "SDENDNOTE" +#define OOO_STRING_SVTOOLS_HTML_META_sdfootnote "SDFOOTNOTE" + +// Werte von
    +#define OOO_STRING_SVTOOLS_HTML_ULTYPE_disc "DISC" +#define OOO_STRING_SVTOOLS_HTML_ULTYPE_square "SQUARE" +#define OOO_STRING_SVTOOLS_HTML_ULTYPE_circle "CIRCLE" + +// Werte von +#define OOO_STRING_SVTOOLS_HTML_SCROLL_yes "YES" +#define OOO_STRING_SVTOOLS_HTML_SCROLL_no "NO" +#define OOO_STRING_SVTOOLS_HTML_SCROLL_auto "AUTO" + +// Werte von +#define OOO_STRING_SVTOOLS_HTML_MCTYPE_horizontal "HORIZONTAL" +#define OOO_STRING_SVTOOLS_HTML_MCTYPE_vertical "VERTICAL" +#define OOO_STRING_SVTOOLS_HTML_MCTYPE_box "BOX" + +// Werte von +#define OOO_STRING_SVTOOLS_HTML_BEHAV_scroll "SCROLL" +#define OOO_STRING_SVTOOLS_HTML_BEHAV_slide "SLIDE" +#define OOO_STRING_SVTOOLS_HTML_BEHAV_alternate "ALTERNATE" + +// Werte von +#define OOO_STRING_SVTOOLS_HTML_LOOP_infinite "INFINITE" +#define OOO_STRING_SVTOOLS_HTML_SPTYPE_block "BLOCK" +#define OOO_STRING_SVTOOLS_HTML_SPTYPE_horizontal "HORIZONTAL" +#define OOO_STRING_SVTOOLS_HTML_SPTYPE_vertical "VERTICAL" + +// interne Grafik-Namen +#define OOO_STRING_SVTOOLS_HTML_private_image "private:image/" +#define OOO_STRING_SVTOOLS_HTML_internal_gopher "internal-gopher-" +#define OOO_STRING_SVTOOLS_HTML_internal_icon "internal-icon-" +#define OOO_STRING_SVTOOLS_HTML_INT_GOPHER_binary "binary" +#define OOO_STRING_SVTOOLS_HTML_INT_GOPHER_image "image" +#define OOO_STRING_SVTOOLS_HTML_INT_GOPHER_index "index" +#define OOO_STRING_SVTOOLS_HTML_INT_GOPHER_menu "menu" +#define OOO_STRING_SVTOOLS_HTML_INT_GOPHER_movie "movie" +#define OOO_STRING_SVTOOLS_HTML_INT_GOPHER_sound "sound" +#define OOO_STRING_SVTOOLS_HTML_INT_GOPHER_telnet "telnet" +#define OOO_STRING_SVTOOLS_HTML_INT_GOPHER_text "text" +#define OOO_STRING_SVTOOLS_HTML_INT_GOPHER_unknown "unknown" +#define OOO_STRING_SVTOOLS_HTML_INT_ICON_baddata "baddata" +#define OOO_STRING_SVTOOLS_HTML_INT_ICON_delayed "delayed" +#define OOO_STRING_SVTOOLS_HTML_INT_ICON_embed "embed" +#define OOO_STRING_SVTOOLS_HTML_INT_ICON_insecure "insecure" +#define OOO_STRING_SVTOOLS_HTML_INT_ICON_notfound "notfound" +#define OOO_STRING_SVTOOLS_HTML_sdendnote "sdendnote" +#define OOO_STRING_SVTOOLS_HTML_sdendnote_anc "sdendnoteanc" +#define OOO_STRING_SVTOOLS_HTML_sdendnote_sym "sdendnotesym" +#define OOO_STRING_SVTOOLS_HTML_sdfootnote "sdfootnote" +#define OOO_STRING_SVTOOLS_HTML_sdfootnote_anc "sdfootnoteanc" +#define OOO_STRING_SVTOOLS_HTML_sdfootnote_sym "sdfootnotesym" +#define OOO_STRING_SVTOOLS_HTML_FTN_anchor "anc" +#define OOO_STRING_SVTOOLS_HTML_FTN_symbol "sym" +#define OOO_STRING_SVTOOLS_HTML_WW_off "OFF" +#define OOO_STRING_SVTOOLS_HTML_WW_hard "HARD" +#define OOO_STRING_SVTOOLS_HTML_WW_soft "SOFT" +#define OOO_STRING_SVTOOLS_HTML_WW_virtual "VIRTUAL" +#define OOO_STRING_SVTOOLS_HTML_WW_physical "PHYSICAL" +#define OOO_STRING_SVTOOLS_HTML_on "on" +#define OOO_STRING_SVTOOLS_HTML_ET_url "application/x-www-form-urlencoded" +#define OOO_STRING_SVTOOLS_HTML_ET_multipart "multipart/form-data" +#define OOO_STRING_SVTOOLS_HTML_ET_text "text/plain" + +#endif diff --git a/svtools/inc/svtools/htmltokn.h b/svtools/inc/svtools/htmltokn.h new file mode 100644 index 000000000000..0719f34cd893 --- /dev/null +++ b/svtools/inc/svtools/htmltokn.h @@ -0,0 +1,572 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: htmltokn.h,v $ + * $Revision: 1.5 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _HTMLTOKN_H +#define _HTMLTOKN_H + +#include "svtools/svtdllapi.h" +#include +#ifndef _SOLAR_h +#include +#endif + +class String; + +// suche das Char zu dem CharNamen +sal_Unicode GetHTMLCharName( const String& rName ); + +// suche die TokenID zu dem Token +SVT_DLLPUBLIC int GetHTMLToken( const String& rName ); + +// suche die TokenId zu einemm Attribut-Token +int GetHTMLOption( const String& rName ); + +// suche die 24-bit-Farbe zu einem Farbnamen (nicht gefunden = ULONG_MAX) +SVT_DLLPUBLIC ULONG GetHTMLColor( const String& rName ); + +// beginnen immer ab 256, groesser als ein char +const int HTML_TOKEN_START = 0x100; +const int HTML_TOKEN_ONOFF = 0x200; +const int HTML_TOKEN_MICROSOFT = 0x1000; + +enum HTML_TOKEN_IDS +{ + HTML_TEXTTOKEN = HTML_TOKEN_START, + HTML_SINGLECHAR, + HTML_NEWPARA, + HTML_TABCHAR, + HTML_RAWDATA, + HTML_LINEFEEDCHAR, + + // diese werden nur eingeschaltet + HTML_AREA, // Netscape 2.0 + HTML_BASE, // HTML 3.0 + HTML_COMMENT, + HTML_DOCTYPE, + HTML_EMBED, // Netscape 2.0 ignorieren + HTML_FIGUREOVERLAY, // HTML 3.0 + HTML_HORZRULE, // ignorieren + HTML_HORZTAB, // HTML 3.0 + HTML_IMAGE, // ignorieren + HTML_INPUT, // ignorieren + HTML_ISINDEX, // HTML 3.0 + HTML_LINEBREAK, //
    ->
    + HTML_LINK, // HTML 3.0 + HTML_META, // HTML 3.0 ignorieren + HTML_NEXTID, // HTML 3.0 + HTML_OF, // HTML 3.0 + HTML_OPTION, // ignorieren + HTML_PARAM, // HotJava + HTML_RANGE, // HTML 3.0 + HTML_SPACER, // Netscape 3.0b5 // ignorieren + HTML_WBR, // Netscape + + // Tokens, die ueber HTML-Charakter erkannt werden + HTML_NONBREAKSPACE, + HTML_SOFTHYPH, + + // diese werden wieder abgeschaltet, + // der off-Wert liegt immer dahinter (+1) !! + HTML_ABBREVIATION_ON = HTML_TOKEN_ONOFF, // HTML 3.0 + HTML_ABBREVIATION_OFF, // HTML 3.0 + HTML_ABOVE_ON, // HTML 3.0 + HTML_ABOVE_OFF, // HTML 3.0 + HTML_ACRONYM_ON, // HTML 3.0 + HTML_ACRONYM_OFF, // HTML 3.0 + HTML_ADDRESS_ON, + HTML_ADDRESS_OFF, + HTML_ANCHOR_ON, + HTML_ANCHOR_OFF, + HTML_APPLET_ON, // HotJava + HTML_APPLET_OFF, // HotJava + HTML_ARRAY_ON, // HTML 3.0 + HTML_ARRAY_OFF, // HTML 3.0 + HTML_AUTHOR_ON, // HTML 3.0 + HTML_AUTHOR_OFF, // HTML 3.0 + HTML_BANNER_ON, // HTML 3.0 + HTML_BANNER_OFF, // HTML 3.0 + HTML_BAR_ON, // HTML 3.0 + HTML_BAR_OFF, // HTML 3.0 + HTML_BASEFONT_ON, // Netscape + HTML_BASEFONT_OFF, // Netscape + HTML_BELOW_ON, // HTML 3.0 + HTML_BELOW_OFF, // HTML 3.0 + HTML_BIGPRINT_ON, // HTML 3.0 + HTML_BIGPRINT_OFF, // HTML 3.0 + HTML_BLINK_ON, // Netscape + HTML_BLINK_OFF, // Netscape + HTML_BLOCKQUOTE30_ON, // HTML 3.0 + HTML_BLOCKQUOTE30_OFF, // HTML 3.0 + HTML_BLOCKQUOTE_ON, + HTML_BLOCKQUOTE_OFF, + HTML_BODY_ON, + HTML_BODY_OFF, + HTML_BOLDTEXT_ON, // HTML 3.0 + HTML_BOLDTEXT_OFF, // HTML 3.0 + HTML_BOLD_ON, + HTML_BOLD_OFF, + HTML_BOX_ON, // HTML 3.0 + HTML_BOX_OFF, // HTML 3.0 + HTML_CAPTION_ON, // HTML 3.0 + HTML_CAPTION_OFF, // HTML 3.0 + HTML_CENTER_ON, // Netscape + HTML_CENTER_OFF, // Netscape + HTML_CITIATION_ON, + HTML_CITIATION_OFF, + HTML_CODE_ON, + HTML_CODE_OFF, + HTML_COL_ON, // HTML3 Table Model Draft + HTML_COL_OFF, // HTML3 Table Model Draft + HTML_COLGROUP_ON, // HTML3 Table Model Draft + HTML_COLGROUP_OFF, // HTML3 Table Model Draft + HTML_CREDIT_ON, // HTML 3.0 + HTML_CREDIT_OFF, // HTML 3.0 + HTML_DD_ON, + HTML_DD_OFF, + HTML_DEFLIST_ON, + HTML_DEFLIST_OFF, + HTML_DELETEDTEXT_ON, // HTML 3.0 + HTML_DELETEDTEXT_OFF, // HTML 3.0 + HTML_DIRLIST_ON, + HTML_DIRLIST_OFF, + HTML_DIVISION_ON, // HTML 3.0 + HTML_DIVISION_OFF, // HTML 3.0 + HTML_DOT_ON, // HTML 3.0 + HTML_DOT_OFF, // HTML 3.0 + HTML_DOUBLEDOT_ON, // HTML 3.0 + HTML_DOUBLEDOT_OFF, // HTML 3.0 + HTML_DT_ON, + HTML_DT_OFF, + HTML_EMPHASIS_ON, + HTML_EMPHASIS_OFF, + HTML_FIGURE_ON, // HTML 3.0 + HTML_FIGURE_OFF, // HTML 3.0 + HTML_FONT_ON, // Netscape + HTML_FONT_OFF, // Netscape + HTML_FOOTNOTE_ON, // HTML 3.0 + HTML_FOOTNOTE_OFF, // HTML 3.0 + HTML_FORM_ON, + HTML_FORM_OFF, + HTML_FRAME_ON, // Netscape 2.0 + HTML_FRAME_OFF, // Netscape 2.0 + HTML_FRAMESET_ON, // Netscape 2.0 + HTML_FRAMESET_OFF, // Netscape 2.0 + HTML_HAT_ON, // HTML 3.0 + HTML_HAT_OFF, // HTML 3.0 + HTML_HEAD1_ON, + HTML_HEAD1_OFF, + HTML_HEAD2_ON, + HTML_HEAD2_OFF, + HTML_HEAD3_ON, + HTML_HEAD3_OFF, + HTML_HEAD4_ON, + HTML_HEAD4_OFF, + HTML_HEAD5_ON, + HTML_HEAD5_OFF, + HTML_HEAD6_ON, + HTML_HEAD6_OFF, + HTML_HEAD_ON, + HTML_HEAD_OFF, + HTML_HTML_ON, + HTML_HTML_OFF, + HTML_IFRAME_ON, // IE 3.0b2 + HTML_IFRAME_OFF, // IE 3.0b2 + HTML_ILAYER_ON, + HTML_ILAYER_OFF, + HTML_INSERTEDTEXT_ON, // HTML 3.0 + HTML_INSERTEDTEXT_OFF, // HTML 3.0 + HTML_ITALIC_ON, + HTML_ITALIC_OFF, + HTML_ITEM_ON, // HTML 3.0 + HTML_ITEM_OFF, // HTML 3.0 + HTML_KEYBOARD_ON, + HTML_KEYBOARD_OFF, + HTML_LAYER_ON, + HTML_LAYER_OFF, + HTML_LANGUAGE_ON, // HTML 3.0 + HTML_LANGUAGE_OFF, // HTML 3.0 + HTML_LISTHEADER_ON, // HTML 3.0 + HTML_LISTHEADER_OFF, // HTML 3.0 + HTML_LI_ON, + HTML_LI_OFF, + HTML_MAP_ON, // Netscape 2.0 + HTML_MAP_OFF, // Netscape 2.0 + HTML_MATH_ON, // HTML 3.0 + HTML_MATH_OFF, // HTML 3.0 + HTML_MENULIST_ON, + HTML_MENULIST_OFF, + HTML_MULTICOL_ON, // Netscape 3.0b5 + HTML_MULTICOL_OFF, // Netscape 3.0b5 + HTML_NOBR_ON, // Netscape + HTML_NOBR_OFF, // Netscape + HTML_NOEMBED_ON, // Netscape 2.0 + HTML_NOEMBED_OFF, // Netscape 2.0 + HTML_NOFRAMES_ON, // Netscape 2.0 + HTML_NOFRAMES_OFF, // Netscape 2.0 + HTML_NOSCRIPT_ON, // Netscape 2.0 + HTML_NOSCRIPT_OFF, // Netscape 3.0 + HTML_NOTE_ON, // HTML 3.0 + HTML_NOTE_OFF, // HTML 3.0 + HTML_OBJECT_ON, // HotJava + HTML_OBJECT_OFF, // HotJava + HTML_ORDERLIST_ON, + HTML_ORDERLIST_OFF, + HTML_PARABREAK_ON, + HTML_PARABREAK_OFF, + HTML_PERSON_ON, // HTML 3.0 + HTML_PERSON_OFF, // HTML 3.0 + HTML_PLAINTEXT_ON, // HTML 3.0 + HTML_PLAINTEXT_OFF, // HTML 3.0 + HTML_PREFORMTXT_ON, + HTML_PREFORMTXT_OFF, + HTML_ROOT_ON, // HTML 3.0 + HTML_ROOT_OFF, // HTML 3.0 + HTML_ROW_ON, // HTML 3.0 + HTML_ROW_OFF, // HTML 3.0 + HTML_SAMPLE_ON, + HTML_SAMPLE_OFF, + HTML_SCRIPT_ON, // HTML 3.2 + HTML_SCRIPT_OFF, // HTML 3.2 + HTML_SELECT_ON, + HTML_SELECT_OFF, + HTML_SHORTQUOTE_ON, // HTML 3.0 + HTML_SHORTQUOTE_OFF, // HTML 3.0 + HTML_SMALLPRINT_ON, // HTML 3.0 + HTML_SMALLPRINT_OFF, // HTML 3.0 + HTML_SPAN_ON, // Style Sheets + HTML_SPAN_OFF, // Style Sheets + HTML_SQUAREROOT_ON, // HTML 3.0 + HTML_SQUAREROOT_OFF, // HTML 3.0 + HTML_STRIKETHROUGH_ON, // HTML 3.0 + HTML_STRIKETHROUGH_OFF, // HTML 3.0 + HTML_STRONG_ON, + HTML_STRONG_OFF, + HTML_STYLE_ON, // HTML 3.0 + HTML_STYLE_OFF, // HTML 3.0 + HTML_SUBSCRIPT_ON, // HTML 3.0 + HTML_SUBSCRIPT_OFF, // HTML 3.0 + HTML_SUPERSCRIPT_ON, // HTML 3.0 + HTML_SUPERSCRIPT_OFF, // HTML 3.0 + HTML_TABLE_ON, // HTML 3.0 + HTML_TABLE_OFF, // HTML 3.0 + HTML_TABLEDATA_ON, // HTML 3.0 + HTML_TABLEDATA_OFF, // HTML 3.0 + HTML_TABLEHEADER_ON, // HTML 3.0 + HTML_TABLEHEADER_OFF, // HTML 3.0 + HTML_TABLEROW_ON, // HTML 3.0 + HTML_TABLEROW_OFF, // HTML 3.0 + HTML_TBODY_ON, // HTML3 Table Model Draft + HTML_TBODY_OFF, // HTML3 Table Model Draft + HTML_TELETYPE_ON, + HTML_TELETYPE_OFF, + HTML_TEXTAREA_ON, + HTML_TEXTAREA_OFF, + HTML_TEXTFLOW_ON, // HTML 3.2 + HTML_TEXTFLOW_OFF, // HTML 3.2 + HTML_TEXT_ON, // HTML 3.0 + HTML_TEXT_OFF, // HTML 3.0 + HTML_TFOOT_ON, // HTML3 Table Model Draft + HTML_TFOOT_OFF, // HTML3 Table Model Draft + HTML_THEAD_ON, // HTML3 Table Model Draft + HTML_THEAD_OFF, // HTML3 Table Model Draft + HTML_TILDE_ON, // HTML 3.0 + HTML_TILDE_OFF, // HTML 3.0 + HTML_TITLE_ON, + HTML_TITLE_OFF, + HTML_UNDERLINE_ON, + HTML_UNDERLINE_OFF, + HTML_UNORDERLIST_ON, + HTML_UNORDERLIST_OFF, + HTML_VARIABLE_ON, + HTML_VARIABLE_OFF, + HTML_VECTOR_ON, // HTML 3.0 + HTML_VECTOR_OFF, // HTML 3.0 + + // obsolete features + HTML_XMP_ON, + HTML_XMP_OFF, + HTML_LISTING_ON, + HTML_LISTING_OFF, + + // proposed features + HTML_DEFINSTANCE_ON, + HTML_DEFINSTANCE_OFF, + HTML_STRIKE_ON, + HTML_STRIKE_OFF, + + HTML_UNKNOWNCONTROL_ON, + HTML_UNKNOWNCONTROL_OFF, + + HTML_BGSOUND = HTML_TOKEN_MICROSOFT|HTML_TOKEN_START, + + HTML_COMMENT2_ON = HTML_TOKEN_MICROSOFT|HTML_TOKEN_ONOFF, // HTML 2.0 ? + HTML_COMMENT2_OFF, // HTML 2.0 ? + HTML_MARQUEE_ON, + HTML_MARQUEE_OFF, + HTML_PLAINTEXT2_ON, // HTML 2.0 ? + HTML_PLAINTEXT2_OFF, // HTML 2.0 ? + + HTML_SDFIELD_ON, + HTML_SDFIELD_OFF +}; + +// HTML Attribut-Token (=Optionen) + +// beginnen immer ab 256, groesser als ein char +const int HTML_OPTION_START = 0x100; + +enum HTML_OPTION_IDS +{ +HTML_OPTION_BOOL_START = HTML_OPTION_START, + +// Attribute ohne Wert + HTML_O_BOX = HTML_OPTION_BOOL_START, + HTML_O_CHECKED, + HTML_O_COMPACT, + HTML_O_CONTINUE, + HTML_O_CONTROLS, // IExplorer 2.0 + HTML_O_DECLARE, // IExplorer 3.0b5 + HTML_O_DISABLED, + HTML_O_FOLDED, // Netscape internal + HTML_O_ISMAP, + HTML_O_MAYSCRIPT, // Netcape 3.0 + HTML_O_MULTIPLE, + HTML_O_NOFLOW, + HTML_O_NOHREF, // Netscape + HTML_O_NORESIZE, // Netscape 2.0 + HTML_O_NOSHADE, // Netscape + HTML_O_NOWRAP, + HTML_O_PLAIN, + HTML_O_SDFIXED, + HTML_O_SELECTED, + HTML_O_SHAPES, // IExplorer 3.0b5 +HTML_OPTION_BOOL_END, + +// Attribute mit einem String als Wert +HTML_OPTION_STRING_START = HTML_OPTION_BOOL_END, + HTML_O_ABOVE = HTML_OPTION_STRING_START, + HTML_O_ACCEPT, + HTML_O_ACCESSKEY, + HTML_O_ADD_DATE, // Netscape internal + HTML_O_ALT, + HTML_O_AXES, + HTML_O_AXIS, + HTML_O_BELOW, + HTML_O_CHAR, // HTML3 Table Model Draft + HTML_O_CLASS, + HTML_O_CLIP, + HTML_O_CODE, // HotJava + HTML_O_CODETYPE, + HTML_O_COLSPEC, + HTML_O_CONTENT, + HTML_O_COORDS, // Netscape 2.0 + HTML_O_DP, + HTML_O_ENCTYPE, + HTML_O_ERROR, + HTML_O_FACE, // IExplorer 2.0 + HTML_O_FRAMEBORDER, // IExplorer 3.0 + HTML_O_HTTPEQUIV, + HTML_O_LANGUAGE, // JavaScript + HTML_O_LAST_MODIFIED, // Netscape internal + HTML_O_LAST_VISIT, // Netscape internal + HTML_O_MD, + HTML_O_N, + HTML_O_NAME, + HTML_O_NOTATION, + HTML_O_PROMPT, + HTML_O_SHAPE, + HTML_O_STANDBY, + HTML_O_STYLE, // Style Sheets + HTML_O_TITLE, + HTML_O_VALUE, + HTML_O_SDVAL, // StarDiv NumberValue + HTML_O_SDNUM, // StarDiv NumberFormat + HTML_O_SDLIBRARY, + HTML_O_SDMODULE, +HTML_OPTION_STRING_END, + +// Attribute mit einem SGML-Identifier als Wert +HTML_OPTION_SGMLID_START = HTML_OPTION_STRING_END, + HTML_O_FROM = HTML_OPTION_SGMLID_START, + HTML_O_ID, + HTML_O_TARGET, // Netscape 2.0 + HTML_O_TO, + HTML_O_UNTIL, +HTML_OPTION_SGMLID_END, + +// Attribute mit einem URI als Wert +HTML_OPTION_URI_START = HTML_OPTION_SGMLID_END, + HTML_O_ACTION = HTML_OPTION_URI_START, + HTML_O_ARCHIVE, + HTML_O_BACKGROUND, + HTML_O_CLASSID, + HTML_O_CODEBASE, // HotJava + HTML_O_DATA, + HTML_O_DYNSRC, // IExplorer 3.0 + HTML_O_DYNSYNC, // IExplorer 2.0 + HTML_O_IMAGEMAP, + HTML_O_HREF, + HTML_O_LOWSRC, // Netscape 3.0 + HTML_O_SCRIPT, + HTML_O_SRC, + HTML_O_USEMAP, // Netscape 2.0 +HTML_OPTION_URI_END, + +// Attribute mit Entity-Namen als Wert +HTML_OPTION_ENTITY_START = HTML_OPTION_URI_END, + HTML_O_DINGBAT = HTML_OPTION_ENTITY_START, + HTML_O_SYM, +HTML_OPTION_ENTITY_END, + +// Attribute mit einer Farbe als Wert (alle Netscape) +HTML_OPTION_COLOR_START = HTML_OPTION_ENTITY_END, + HTML_O_ALINK = HTML_OPTION_COLOR_START, + HTML_O_BGCOLOR, + HTML_O_BORDERCOLOR, // IExplorer 2.0 + HTML_O_BORDERCOLORLIGHT, // IExplorer 2.0 + HTML_O_BORDERCOLORDARK, // IExplorer 2.0 + HTML_O_COLOR, + HTML_O_LINK, + HTML_O_TEXT, + HTML_O_VLINK, +HTML_OPTION_COLOR_END, + +// Attribute mit einem numerischen Wert +HTML_OPTION_NUMBER_START = HTML_OPTION_COLOR_END, + HTML_O_BORDER = HTML_OPTION_NUMBER_START, + HTML_O_CELLSPACING, // HTML3 Table Model Draft + HTML_O_CELLPADDING, // HTML3 Table Model Draft + HTML_O_CHAROFF, // HTML3 Table Model Draft + HTML_O_COLSPAN, + HTML_O_FRAMESPACING, // IExplorer 3.0 + HTML_O_GUTTER, // Netscape 3.0b5 + HTML_O_INDENT, + HTML_O_HEIGHT, + HTML_O_HSPACE, // Netscape + HTML_O_LEFT, + HTML_O_LEFTMARGIN, // IExplorer 2.0 + HTML_O_LOOP, // IExplorer 2.0 + HTML_O_MARGINWIDTH, // Netscape 2.0 + HTML_O_MARGINHEIGHT, // Netscape 2.0 + HTML_O_MAX, + HTML_O_MAXLENGTH, + HTML_O_MIN, + HTML_O_PAGEX, + HTML_O_PAGEY, + HTML_O_POINTSIZE, + HTML_O_ROWSPAN, + HTML_O_SCROLLAMOUNT, // IExplorer 2.0 + HTML_O_SCROLLDELAY, // IExplorer 2.0 + HTML_O_SEQNUM, + HTML_O_SKIP, + HTML_O_SPAN, // HTML3 Table Model Draft + HTML_O_TABINDEX, + HTML_O_TOP, + HTML_O_TOPMARGIN, // IExplorer 2.0 + HTML_O_VSPACE, // Netscape + HTML_O_WEIGHT, + HTML_O_WIDTH, + HTML_O_X, + HTML_O_Y, + HTML_O_ZINDEX, +HTML_OPTION_NUMBER_END, + +// Attribute mit Enum-Werten +HTML_OPTION_ENUM_START = HTML_OPTION_NUMBER_END, + HTML_O_BEHAVIOR = HTML_OPTION_ENUM_START, // IExplorer 2.0 + HTML_O_BGPROPERTIES, // IExplorer 2.0 + HTML_O_CLEAR, + HTML_O_DIR, + HTML_O_DIRECTION, // IExplorer 2.0 + HTML_O_FORMAT, + HTML_O_FRAME, // HTML3 Table Model Draft + HTML_O_LANG, + HTML_O_METHOD, + HTML_O_PALETTE, + HTML_O_REL, + HTML_O_REV, + HTML_O_RULES, // HTML3 Table Model Draft + HTML_O_SCROLLING, // Netscape 2.0 + HTML_O_SDREADONLY, + HTML_O_SUBTYPE, + HTML_O_TYPE, + HTML_O_VALIGN, + HTML_O_VALUETYPE, + HTML_O_VISIBILITY, + HTML_O_WRAP, +HTML_OPTION_ENUM_END, + +// Attribute mit Script-Code als Wert +HTML_OPTION_SCRIPT_START = HTML_OPTION_ENUM_END, + HTML_O_ONABORT = HTML_OPTION_SCRIPT_START, // JavaScaript + HTML_O_ONBLUR, // JavaScript + HTML_O_ONCHANGE, // JavaScript + HTML_O_ONCLICK, // JavaScript + HTML_O_ONERROR, // JavaScript + HTML_O_ONFOCUS, // JavaScript + HTML_O_ONLOAD, // JavaScript + HTML_O_ONMOUSEOUT, // JavaScript + HTML_O_ONMOUSEOVER, // JavaScript + HTML_O_ONRESET, // JavaScript + HTML_O_ONSELECT, // JavaScript + HTML_O_ONSUBMIT, // JavaScript + HTML_O_ONUNLOAD, // JavaScript + + HTML_O_SDONABORT, // StarBasic + HTML_O_SDONBLUR, // StarBasic + HTML_O_SDONCHANGE, // StarBasic + HTML_O_SDONCLICK, // StarBasic + HTML_O_SDONERROR, // StarBasic + HTML_O_SDONFOCUS, // StarBasic + HTML_O_SDONLOAD, // StarBasic + HTML_O_SDONMOUSEOUT, // StarBasic + HTML_O_SDONMOUSEOVER, // StarBasic + HTML_O_SDONRESET, // StarBasic + HTML_O_SDONSELECT, // StarBasic + HTML_O_SDONSUBMIT, // StarBasic + HTML_O_SDONUNLOAD, // StarBasic +HTML_OPTION_SCRIPT_END, + +// Attribute mit Kontext-abhaengigen Werten +HTML_OPTION_CONTEXT_START = HTML_OPTION_SCRIPT_END, + HTML_O_ALIGN = HTML_OPTION_CONTEXT_START, + HTML_O_COLS, // Netscape 2.0 vs HTML 2.0 + HTML_O_ROWS, // Netscape 2.0 vs HTML 2.0 + HTML_O_SIZE, + HTML_O_START, + HTML_O_UNITS, +HTML_OPTION_CONTEXT_END, + +// eine unbekannte Option +HTML_O_UNKNOWN = HTML_OPTION_CONTEXT_END, +HTML_OPTION_END +}; + +#endif // _HTMLTOKN_H diff --git a/svtools/inc/svtools/imagemgr.hrc b/svtools/inc/svtools/imagemgr.hrc new file mode 100644 index 000000000000..a30660bba3b2 --- /dev/null +++ b/svtools/inc/svtools/imagemgr.hrc @@ -0,0 +1,193 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: imagemgr.hrc,v $ + * $Revision: 1.15 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _SVTOOLS_IMAGEMGR_HRC +#define _SVTOOLS_IMAGEMGR_HRC + +// includes ****************************************************************** + +#define IMAGELIST_START 3076 // must match to old Id's in SFX! + +#define IMG_IMPRESS (IMAGELIST_START + 47) +#define IMG_WORKPLACE (IMAGELIST_START + 48) +#define IMG_BITMAP (IMAGELIST_START + 49) +#define IMG_CALC (IMAGELIST_START + 50) +#define IMG_CALCTEMPLATE (IMAGELIST_START + 51) +#define IMG_CHART (IMAGELIST_START + 52) +#define IMG_DATABASE (IMAGELIST_START + 53) +#define IMG_IMPRESSTEMPLATE (IMAGELIST_START + 54) +#define IMG_EXCEL (IMAGELIST_START + 55) +#define IMG_EXCELTEMPLATE (IMAGELIST_START + 56) +#define IMG_FTPSERVER (IMAGELIST_START + 58) +#define IMG_GALLERY (IMAGELIST_START + 59) +#define IMG_GALLERYTHEME (IMAGELIST_START + 60) +#define IMG_GIF (IMAGELIST_START + 61) +#define IMG_HELP (IMAGELIST_START + 62) +#define IMG_HTML (IMAGELIST_START + 63) +#define IMG_JPG (IMAGELIST_START + 64) +#define IMG_LINK (IMAGELIST_START + 65) +#define IMG_LOTUS (IMAGELIST_START + 66) +#define IMG_MATH (IMAGELIST_START + 68) +#define IMG_MATHTEMPLATE (IMAGELIST_START + 69) +#define IMG_FILE (IMAGELIST_START + 74) +#define IMG_APP (IMAGELIST_START + 75) +#define IMG_PCD (IMAGELIST_START + 76) +#define IMG_PCT (IMAGELIST_START + 77) +#define IMG_PCX (IMAGELIST_START + 78) +#define IMG_SIM (IMAGELIST_START + 79) +#define IMG_TEXTFILE (IMAGELIST_START + 80) +#define IMG_SVHELP (IMAGELIST_START + 81) +#define IMG_TIFF (IMAGELIST_START + 82) +#define IMG_URL (IMAGELIST_START + 83) +#define IMG_WMF (IMAGELIST_START + 84) +#define IMG_WORD (IMAGELIST_START + 85) +#define IMG_WRITER (IMAGELIST_START + 86) +#define IMG_WRITERTEMPLATE (IMAGELIST_START + 87) +#define IMG_FIXEDDEV (IMAGELIST_START + 88) +#define IMG_REMOVEABLEDEV (IMAGELIST_START + 89) +#define IMG_CDROMDEV (IMAGELIST_START + 90) +#define IMG_NETWORKDEV (IMAGELIST_START + 91) +#define IMG_RAMDEV (IMAGELIST_START + 92) +#define IMG_TABLEFOLDER (IMAGELIST_START + 111) +#define IMG_TABLE (IMAGELIST_START + 112) +#define IMG_FOLDER (IMAGELIST_START + 113) +#define IMG_EXPANDEDFOLDER (IMAGELIST_START + 114) +#define IMG_XXX (IMAGELIST_START + 117) +#define IMG_GALLERYIMPORT (IMAGELIST_START + 122) +#define IMG_QUERYFOLDER (IMAGELIST_START + 125) +#define IMG_QUERY (IMAGELIST_START + 126) +#define IMG_FORM (IMAGELIST_START + 127) +#define IMG_FORMFOLDER (IMAGELIST_START + 128) +#define IMG_REPORT (IMAGELIST_START + 129) +#define IMG_REPORTFOLDER (IMAGELIST_START + 130) +#define IMG_OTHERS (IMAGELIST_START + 138) +#define IMG_MACROLIB (IMAGELIST_START + 140) +#define IMG_DXF (IMAGELIST_START + 141) +#define IMG_MET (IMAGELIST_START + 142) +#define IMG_PNG (IMAGELIST_START + 143) +#define IMG_SGF (IMAGELIST_START + 144) +#define IMG_SGV (IMAGELIST_START + 145) +#define IMG_SVM (IMAGELIST_START + 146) +#define IMG_GLOBAL_DOC (IMAGELIST_START + 150) +#define IMG_DRAW (IMAGELIST_START + 151) +#define IMG_DRAWTEMPLATE (IMAGELIST_START + 152) +#define IMG_TASK (IMAGELIST_START + 160) +#define IMG_APPOINTMENT (IMAGELIST_START + 161) +#define IMG_RELATION (IMAGELIST_START + 163) +#define IMG_IMPRESSPACKED (IMAGELIST_START + 165) +#define IMG_NEWFROMTEMPLATE (IMAGELIST_START + 166) +#define IMG_POWERPOINT (IMAGELIST_START + 167) +#define IMG_POWERPOINTTEMPLATE (IMAGELIST_START + 168) +#define IMG_OO_DATABASE_DOC (IMAGELIST_START + 169) +#define IMG_OO_DRAW_DOC (IMAGELIST_START + 170) +#define IMG_OO_MATH_DOC (IMAGELIST_START + 171) +#define IMG_OO_GLOBAL_DOC (IMAGELIST_START + 172) +#define IMG_OO_IMPRESS_DOC (IMAGELIST_START + 173) +#define IMG_OO_CALC_DOC (IMAGELIST_START + 174) +#define IMG_OO_WRITER_DOC (IMAGELIST_START + 175) +#define IMG_OO_DRAW_TEMPLATE (IMAGELIST_START + 176) +#define IMG_OO_IMPRESS_TEMPLATE (IMAGELIST_START + 177) +#define IMG_OO_CALC_TEMPLATE (IMAGELIST_START + 178) +#define IMG_OO_WRITER_TEMPLATE (IMAGELIST_START + 179) +#define IMG_EXTENSION (IMAGELIST_START + 180) + +#define RID_DESCRIPTION_START 256 + +#define STR_DESCRIPTION_SOURCEFILE (RID_DESCRIPTION_START + 0) +#define STR_DESCRIPTION_BOOKMARKFILE (RID_DESCRIPTION_START + 1) +#define STR_DESCRIPTION_GRAPHIC_DOC (RID_DESCRIPTION_START + 2) +#define STR_DESCRIPTION_CFGFILE (RID_DESCRIPTION_START + 3) +#define STR_DESCRIPTION_APPLICATION (RID_DESCRIPTION_START + 4) +#define STR_DESCRIPTION_DATABASE_TABLE (RID_DESCRIPTION_START + 5) +#define STR_DESCRIPTION_SYSFILE (RID_DESCRIPTION_START + 6) +#define STR_DESCRIPTION_WORD_DOC (RID_DESCRIPTION_START + 7) +#define STR_DESCRIPTION_HELP_DOC (RID_DESCRIPTION_START + 8) +#define STR_DESCRIPTION_HTMLFILE (RID_DESCRIPTION_START + 9) +#define STR_DESCRIPTION_ARCHIVFILE (RID_DESCRIPTION_START + 10) +#define STR_DESCRIPTION_LOGFILE (RID_DESCRIPTION_START + 11) +#define STR_DESCRIPTION_SMATH_DOC (RID_DESCRIPTION_START + 12) +#define STR_DESCRIPTION_SCHART_DOC (RID_DESCRIPTION_START + 13) +#define STR_DESCRIPTION_SDRAW_DOC (RID_DESCRIPTION_START + 14) +#define STR_DESCRIPTION_SCALC_DOC (RID_DESCRIPTION_START + 15) +#define STR_DESCRIPTION_SIMPRESS_DOC (RID_DESCRIPTION_START + 16) +#define STR_DESCRIPTION_SWRITER_DOC (RID_DESCRIPTION_START + 17) +#define STR_DESCRIPTION_GLOBALDOC (RID_DESCRIPTION_START + 18) +#define STR_DESCRIPTION_SIMAGE_DOC (RID_DESCRIPTION_START + 19) +#define STR_DESCRIPTION_TEXTFILE (RID_DESCRIPTION_START + 20) +#define STR_DESCRIPTION_LINK (RID_DESCRIPTION_START + 21) +#define STR_DESCRIPTION_SOFFICE_TEMPLATE_DOC (RID_DESCRIPTION_START + 22) +#define STR_DESCRIPTION_EXCEL_DOC (RID_DESCRIPTION_START + 23) +#define STR_DESCRIPTION_EXCEL_TEMPLATE_DOC (RID_DESCRIPTION_START + 24) +#define STR_DESCRIPTION_BATCHFILE (RID_DESCRIPTION_START + 25) +#define STR_DESCRIPTION_FILE (RID_DESCRIPTION_START + 26) +#define STR_DESCRIPTION_FOLDER (RID_DESCRIPTION_START + 27) +#define STR_DESCRIPTION_FACTORY_WRITER (RID_DESCRIPTION_START + 28) +#define STR_DESCRIPTION_FACTORY_CALC (RID_DESCRIPTION_START + 29) +#define STR_DESCRIPTION_FACTORY_IMPRESS (RID_DESCRIPTION_START + 30) +#define STR_DESCRIPTION_FACTORY_DRAW (RID_DESCRIPTION_START + 31) +#define STR_DESCRIPTION_FACTORY_WRITERWEB (RID_DESCRIPTION_START + 32) +#define STR_DESCRIPTION_FACTORY_GLOBALDOC (RID_DESCRIPTION_START + 33) +#define STR_DESCRIPTION_FACTORY_MATH (RID_DESCRIPTION_START + 34) +#define STR_DESCRIPTION_CALC_TEMPLATE (RID_DESCRIPTION_START + 35) +#define STR_DESCRIPTION_DRAW_TEMPLATE (RID_DESCRIPTION_START + 36) +#define STR_DESCRIPTION_IMPRESS_TEMPLATE (RID_DESCRIPTION_START + 37) +#define STR_DESCRIPTION_WRITER_TEMPLATE (RID_DESCRIPTION_START + 38) +#define STR_DESCRIPTION_LOCALE_VOLUME (RID_DESCRIPTION_START + 39) +#define STR_DESCRIPTION_FLOPPY_VOLUME (RID_DESCRIPTION_START + 40) +#define STR_DESCRIPTION_CDROM_VOLUME (RID_DESCRIPTION_START + 41) +#define STR_DESCRIPTION_REMOTE_VOLUME (RID_DESCRIPTION_START + 42) +#define STR_DESCRIPTION_POWERPOINT (RID_DESCRIPTION_START + 43) +#define STR_DESCRIPTION_POWERPOINT_TEMPLATE (RID_DESCRIPTION_START + 44) +#define STR_DESCRIPTION_POWERPOINT_SHOW (RID_DESCRIPTION_START + 45) +#define STR_DESCRIPTION_SXMATH_DOC (RID_DESCRIPTION_START + 46) +#define STR_DESCRIPTION_SXCHART_DOC (RID_DESCRIPTION_START + 47) +#define STR_DESCRIPTION_SXDRAW_DOC (RID_DESCRIPTION_START + 48) +#define STR_DESCRIPTION_SXCALC_DOC (RID_DESCRIPTION_START + 49) +#define STR_DESCRIPTION_SXIMPRESS_DOC (RID_DESCRIPTION_START + 50) +#define STR_DESCRIPTION_SXWRITER_DOC (RID_DESCRIPTION_START + 51) +#define STR_DESCRIPTION_SXGLOBAL_DOC (RID_DESCRIPTION_START + 52) +#define STR_DESCRIPTION_MATHML_DOC (RID_DESCRIPTION_START + 53) +#define STR_DESCRIPTION_SDATABASE_DOC (RID_DESCRIPTION_START + 54) +#define STR_DESCRIPTION_OO_DATABASE_DOC (RID_DESCRIPTION_START + 55) +#define STR_DESCRIPTION_OO_DRAW_DOC (RID_DESCRIPTION_START + 56) +#define STR_DESCRIPTION_OO_MATH_DOC (RID_DESCRIPTION_START + 57) +#define STR_DESCRIPTION_OO_GLOBAL_DOC (RID_DESCRIPTION_START + 58) +#define STR_DESCRIPTION_OO_IMPRESS_DOC (RID_DESCRIPTION_START + 59) +#define STR_DESCRIPTION_OO_CALC_DOC (RID_DESCRIPTION_START + 60) +#define STR_DESCRIPTION_OO_WRITER_DOC (RID_DESCRIPTION_START + 61) +#define STR_DESCRIPTION_OO_DRAW_TEMPLATE (RID_DESCRIPTION_START + 62) +#define STR_DESCRIPTION_OO_IMPRESS_TEMPLATE (RID_DESCRIPTION_START + 63) +#define STR_DESCRIPTION_OO_CALC_TEMPLATE (RID_DESCRIPTION_START + 64) +#define STR_DESCRIPTION_OO_WRITER_TEMPLATE (RID_DESCRIPTION_START + 65) +#define STR_DESCRIPTION_FACTORY_DATABASE (RID_DESCRIPTION_START + 66) +#define STR_DESCRIPTION_EXTENSION (RID_DESCRIPTION_START + 67) + +#endif + diff --git a/svtools/inc/svtools/imagemgr.hxx b/svtools/inc/svtools/imagemgr.hxx new file mode 100644 index 000000000000..67159de7450d --- /dev/null +++ b/svtools/inc/svtools/imagemgr.hxx @@ -0,0 +1,98 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: imagemgr.hxx,v $ + * $Revision: 1.8 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _SVTOOLS_IMAGEMGR_HXX +#define _SVTOOLS_IMAGEMGR_HXX + +// includes ****************************************************************** + +#include "svtools/svtdllapi.h" +#include "sal/types.h" + +class Image; +class String; +class INetURLObject; + +namespace svtools { + +struct VolumeInfo +{ + sal_Bool m_bIsVolume; + sal_Bool m_bIsRemote; + sal_Bool m_bIsRemoveable; + sal_Bool m_bIsFloppy; + sal_Bool m_bIsCompactDisc; + + VolumeInfo() : + m_bIsVolume ( sal_False ), + m_bIsRemote ( sal_False ), + m_bIsRemoveable ( sal_False ), + m_bIsFloppy ( sal_False ), + m_bIsCompactDisc( sal_False ) {} + + VolumeInfo( sal_Bool _bIsVolume, + sal_Bool _bIsRemote, + sal_Bool _bIsRemoveable, + sal_Bool _bIsFloppy, + sal_Bool _bIsCompactDisc ) : + m_bIsVolume ( _bIsVolume ), + m_bIsRemote ( _bIsRemote ), + m_bIsRemoveable ( _bIsRemoveable ), + m_bIsFloppy ( _bIsFloppy ), + m_bIsCompactDisc( _bIsCompactDisc ) {} +}; + +} + +class SvFileInformationManager +{ +private: + SVT_DLLPRIVATE static String GetDescription_Impl( const INetURLObject& rObject, sal_Bool bDetectFolder ); + +public: + // depricated, because no high contrast mode + SVT_DLLPUBLIC static Image GetImage( const INetURLObject& rURL, sal_Bool bBig = sal_False ); + static Image GetFileImage( const INetURLObject& rURL, sal_Bool bBig = sal_False ); + static Image GetImageNoDefault( const INetURLObject& rURL, sal_Bool bBig = sal_False ); + SVT_DLLPUBLIC static Image GetFolderImage( const svtools::VolumeInfo& rInfo, sal_Bool bBig = sal_False ); + + // now with high contrast mode + SVT_DLLPUBLIC static Image GetImage( const INetURLObject& rURL, sal_Bool bBig, sal_Bool bHighContrast ); + SVT_DLLPUBLIC static Image GetFileImage( const INetURLObject& rURL, sal_Bool bBig, sal_Bool bHighContrast ); + SVT_DLLPUBLIC static Image GetImageNoDefault( const INetURLObject& rURL, sal_Bool bBig, sal_Bool bHighContrast ); + SVT_DLLPUBLIC static Image GetFolderImage( const svtools::VolumeInfo& rInfo, sal_Bool bBig, sal_Bool bHighContrast ); + + SVT_DLLPUBLIC static String GetDescription( const INetURLObject& rObject ); + SVT_DLLPUBLIC static String GetFileDescription( const INetURLObject& rObject ); + SVT_DLLPUBLIC static String GetFolderDescription( const svtools::VolumeInfo& rInfo ); +}; + +#endif + diff --git a/svtools/inc/svtools/imageresourceaccess.hxx b/svtools/inc/svtools/imageresourceaccess.hxx new file mode 100644 index 000000000000..5b6767c5f7c9 --- /dev/null +++ b/svtools/inc/svtools/imageresourceaccess.hxx @@ -0,0 +1,93 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: imageresourceaccess.hxx,v $ + * $Revision: 1.5 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef SVTOOLS_INC_IMAGERESOURCEACCESS_HXX +#define SVTOOLS_INC_IMAGERESOURCEACCESS_HXX + +#include "svtools/svtdllapi.h" + +/** === begin UNO includes === **/ +#include +#include +/** === end UNO includes === **/ + +class SvStream; +//........................................................................ +namespace svt +{ +//........................................................................ + + //==================================================================== + //= GraphicAccess + //==================================================================== + /** helper class for obtaining streams (which also can be used with the ImageProducer) + from a resource + */ + class GraphicAccess + { + private: + GraphicAccess(); // never implemented + + public: + /** determines whether the given URL denotes an image within a resource + ( or an image specified by a vnd.sun.star.GraphicObject scheme URL ) + */ + SVT_DLLPUBLIC static bool isSupportedURL( const ::rtl::OUString& _rURL ); + + /** for a given URL of an image within a resource ( or an image specified by a vnd.sun.star.GraphicObject scheme URL ), this method retrieves + an SvStream for this image. + + This method works for arbitrary URLs denoting an image, since the + GraphicsProvider service is used + to resolve the URL. However, obtaining the stream is expensive (since + the image must be copied), so you are strongly encouraged to only use it + when you know that the image is small enough. + */ + SVT_DLLPUBLIC static SvStream* getImageStream( + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB, + const ::rtl::OUString& _rImageResourceURL + ); + + /** for a given URL of an image within a resource ( or an image specified by a vnd.sun.star.GraphicObject scheme URL ), this method retrieves + an XInputStream for this image. + */ + SVT_DLLPUBLIC static ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > + getImageXStream( + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB, + const ::rtl::OUString& _rImageResourceURL + ); + }; + +//........................................................................ +} // namespace svt +//........................................................................ + +#endif // DBA14_SVTOOLS_INC_IMAGERESOURCEACCESS_HXX + diff --git a/svtools/inc/svtools/imgdef.hxx b/svtools/inc/svtools/imgdef.hxx new file mode 100644 index 000000000000..2881fe5150bc --- /dev/null +++ b/svtools/inc/svtools/imgdef.hxx @@ -0,0 +1,46 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: imgdef.hxx,v $ + * $Revision: 1.8 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _SVTOOLS_IMGDEF_HXX +#define _SVTOOLS_IMGDEF_HXX + +enum SfxSymbolsSize +{ + SFX_SYMBOLS_SIZE_SMALL, + SFX_SYMBOLS_SIZE_LARGE, + SFX_SYMBOLS_SIZE_AUTO +}; + +#define SFX_TOOLBOX_CHANGESYMBOLSET 0x0001 +#define SFX_TOOLBOX_CHANGEOUTSTYLE 0x0002 +#define SFX_TOOLBOX_CHANGEBUTTONTYPE 0x0004 + +#endif // _SVTOOLS_IMGDEF_HXX + diff --git a/svtools/inc/svtools/indexentryres.hxx b/svtools/inc/svtools/indexentryres.hxx new file mode 100644 index 000000000000..f2c73000ed67 --- /dev/null +++ b/svtools/inc/svtools/indexentryres.hxx @@ -0,0 +1,23 @@ + +#ifndef SVTOOLS_INDEXENTRYRESSOURCE_HXX +#define SVTOOLS_INDEXENTRYRESSOURCE_HXX + +#include "svtools/svtdllapi.h" +#include + +class IndexEntryRessourceData; + +class SVT_DLLPUBLIC IndexEntryRessource +{ + private: + IndexEntryRessourceData *mp_Data; + + public: + IndexEntryRessource (); + ~IndexEntryRessource (); + const String& GetTranslation (const String& r_Algorithm); +}; + +#endif /* SVTOOLS_INDEXENTRYRESSOURCE_HXX */ + + diff --git a/svtools/inc/svtools/inetimg.hxx b/svtools/inc/svtools/inetimg.hxx new file mode 100644 index 000000000000..8068f4deda3f --- /dev/null +++ b/svtools/inc/svtools/inetimg.hxx @@ -0,0 +1,89 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: inetimg.hxx,v $ + * $Revision: 1.7 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _INETIMG_HXX +#define _INETIMG_HXX + +#include +#include + +class SvData; +class SotDataObject; +class SotDataMemberObject; + +//========================================================================= + +class INetImage +{ + String aImageURL; + String aTargetURL; + String aTargetFrame; + String aAlternateText; + Size aSizePixel; + +protected: + String CopyExchange() const; + void PasteExchange( const String& rString ); + + void SetImageURL( const String& rS ) { aImageURL = rS; } + void SetTargetURL( const String& rS ) { aTargetURL = rS; } + void SetTargetFrame( const String& rS ) { aTargetFrame = rS; } + void SetAlternateText( const String& rS ){ aAlternateText = rS; } + void SetSizePixel( const Size& rSize ) { aSizePixel = rSize; } + +public: + INetImage( + const String& rImageURL, + const String& rTargetURL, + const String& rTargetFrame, + const String& rAlternateText, + const Size& rSizePixel ) + : aImageURL( rImageURL ), + aTargetURL( rTargetURL ), + aTargetFrame( rTargetFrame ), + aAlternateText( rAlternateText ), + aSizePixel( rSizePixel ) + {} + INetImage() + {} + + const String& GetImageURL() const { return aImageURL; } + const String& GetTargetURL() const { return aTargetURL; } + const String& GetTargetFrame() const { return aTargetFrame; } + const String& GetAlternateText() const { return aAlternateText; } + const Size& GetSizePixel() const { return aSizePixel; } + + // Im-/Export + sal_Bool Write( SvStream& rOStm, ULONG nFormat ) const; + sal_Bool Read( SvStream& rIStm, ULONG nFormat ); +}; + +#endif // #ifndef _INETIMG_HXX + + diff --git a/svtools/inc/svtools/itemdel.hxx b/svtools/inc/svtools/itemdel.hxx new file mode 100644 index 000000000000..1af9b6e55421 --- /dev/null +++ b/svtools/inc/svtools/itemdel.hxx @@ -0,0 +1,42 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: itemdel.hxx,v $ + * $Revision: 1.4 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _SVTOOLS_ITEMDEL_HXX +#define _SVTOOLS_ITEMDEL_HXX + +#include "svtools/svtdllapi.h" + +class SfxPoolItem; + +SVT_DLLPUBLIC SfxPoolItem* DeleteItemOnIdle( SfxPoolItem* pItem ); + +void DeleteOnIdleItems(); + +#endif + diff --git a/svtools/inc/svtools/ivctrl.hxx b/svtools/inc/svtools/ivctrl.hxx new file mode 100644 index 000000000000..08fe6d57b652 --- /dev/null +++ b/svtools/inc/svtools/ivctrl.hxx @@ -0,0 +1,393 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: ivctrl.hxx,v $ + * $Revision: 1.20 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _ICNVW_HXX +#define _ICNVW_HXX + +#include "svtools/svtdllapi.h" +#include +#include +#include +#include +#include + +class SvPtrarr; +class ResId; +class Point; +class SvxIconChoiceCtrl_Impl; +class Image; + +#define ICNVIEW_FLAG_POS_LOCKED 0x0001 +#define ICNVIEW_FLAG_SELECTED 0x0002 +#define ICNVIEW_FLAG_FOCUSED 0x0004 +#define ICNVIEW_FLAG_IN_USE 0x0008 +#define ICNVIEW_FLAG_CURSORED 0x0010 // Rahmen um Image +#define ICNVIEW_FLAG_POS_MOVED 0x0020 // per D&D verschoben aber nicht gelockt +#define ICNVIEW_FLAG_DROP_TARGET 0x0040 // im QueryDrop gesetzt +#define ICNVIEW_FLAG_BLOCK_EMPHASIS 0x0080 // Emphasis nicht painten +#define ICNVIEW_FLAG_USER1 0x0100 +#define ICNVIEW_FLAG_USER2 0x0200 +#define ICNVIEW_FLAG_PRED_SET 0x0400 // Predecessor wurde umgesetzt + +enum SvxIconChoiceCtrlTextMode +{ + IcnShowTextFull = 1, // BoundRect nach unten aufplustern + IcnShowTextShort, // Abkuerzung mit "..." + IcnShowTextSmart, // Text komplett anzeigen, wenn moeglich (n.i.) + IcnShowTextDontKnow // Einstellung der View +}; + +enum SvxIconChoiceCtrlPositionMode +{ + IcnViewPositionModeFree = 0, // freies pixelgenaues Positionieren + IcnViewPositionModeAutoArrange = 1, // automatisches Ausrichten + IcnViewPositionModeAutoAdjust = 2, // automatisches Anordnen + IcnViewPositionModeLast = IcnViewPositionModeAutoAdjust +}; + +class SvxIconChoiceCtrlEntry +{ + Image aImage; + Image aImageHC; + + String aText; + String aQuickHelpText; + void* pUserData; + + friend class SvxIconChoiceCtrl_Impl; + friend class IcnCursor_Impl; + friend class EntryList_Impl; + friend class IcnGridMap_Impl; + + Rectangle aRect; // Bounding-Rect des Entries + Rectangle aGridRect; // nur gesetzt im Grid-Modus + ULONG nPos; + + // die Eintragsposition in der Eintragsliste entspricht der beim Insert vorgegebenen + // [Sortier-]Reihenfolge (->Reihenfolge der Anker in der Ankerliste!). Im AutoArrange-Modus + // kann die sichtbare Reihenfolge aber anders sein. Die Eintraege werden deshalb dann + // verkettet + SvxIconChoiceCtrlEntry* pblink; // backward (linker Nachbar) + SvxIconChoiceCtrlEntry* pflink; // forward (rechter Nachbar) + + SvxIconChoiceCtrlTextMode eTextMode; + USHORT nX,nY; // fuer Tastatursteuerung + USHORT nFlags; + + void ClearFlags( USHORT nMask ) { nFlags &= (~nMask); } + void SetFlags( USHORT nMask ) { nFlags |= nMask; } + void AssignFlags( USHORT _nFlags ) { nFlags = _nFlags; } + + // setzt den linken Nachbarn (A <-> B ==> A <-> this <-> B) + void SetBacklink( SvxIconChoiceCtrlEntry* pA ) + { + pA->pflink->pblink = this; // X <- B + this->pflink = pA->pflink; // X -> B + this->pblink = pA; // A <- X + pA->pflink = this; // A -> X + } + // loest eine Verbindung (A <-> this <-> B ==> A <-> B) + void Unlink() + { + this->pblink->pflink = this->pflink; + this->pflink->pblink = this->pblink; + this->pflink = 0; + this->pblink = 0; + } + +public: + SvxIconChoiceCtrlEntry( USHORT nFlags = 0 ); + SvxIconChoiceCtrlEntry( const String& rText, const Image& rImage, USHORT nFlags = 0 ); + SvxIconChoiceCtrlEntry( const String& rText, const Image& rImage, const Image& rImageHC, USHORT nFlags = 0 ); + ~SvxIconChoiceCtrlEntry () {} + + void SetImage ( const Image& rImage ) { aImage = rImage; } + void SetImageHC ( const Image& rImage ) { aImageHC = rImage; } + Image GetImage () const { return aImage; } + Image GetImageHC () const { return aImageHC; } + void SetText ( const String& rText ) { aText = rText; } + String GetText () const { return aText; } + String SVT_DLLPUBLIC GetDisplayText() const; + void SetQuickHelpText( const String& rText ) { aQuickHelpText = rText; } + String GetQuickHelpText() const { return aQuickHelpText; } + void SetUserData ( void* _pUserData ) { pUserData = _pUserData; } + void* GetUserData () { return pUserData; } + + const Rectangle & GetBoundRect() const { return aRect; } + + void SetFocus ( BOOL bSet ) + { nFlags = ( bSet ? nFlags | ICNVIEW_FLAG_FOCUSED : nFlags & ~ICNVIEW_FLAG_FOCUSED ); } + + SvxIconChoiceCtrlTextMode GetTextMode() const { return eTextMode; } + USHORT GetFlags() const { return nFlags; } + BOOL IsSelected() const { return (BOOL)((nFlags & ICNVIEW_FLAG_SELECTED) !=0); } + BOOL IsFocused() const { return (BOOL)((nFlags & ICNVIEW_FLAG_FOCUSED) !=0); } + BOOL IsInUse() const { return (BOOL)((nFlags & ICNVIEW_FLAG_IN_USE) !=0); } + BOOL IsCursored() const { return (BOOL)((nFlags & ICNVIEW_FLAG_CURSORED) !=0); } + BOOL IsDropTarget() const { return (BOOL)((nFlags & ICNVIEW_FLAG_DROP_TARGET) !=0); } + BOOL IsBlockingEmphasis() const { return (BOOL)((nFlags & ICNVIEW_FLAG_BLOCK_EMPHASIS) !=0); } + BOOL WasMoved() const { return (BOOL)((nFlags & ICNVIEW_FLAG_POS_MOVED) !=0); } + void SetMoved( BOOL bMoved ); + BOOL IsPosLocked() const { return (BOOL)((nFlags & ICNVIEW_FLAG_POS_LOCKED) !=0); } + void LockPos( BOOL bLock ); + // Nur bei AutoArrange gesetzt. Den Kopf der Liste gibts per SvxIconChoiceCtrl::GetPredecessorHead + SvxIconChoiceCtrlEntry* GetSuccessor() const { return pflink; } + SvxIconChoiceCtrlEntry* GetPredecessor() const { return pblink; } + +// sal_Unicode GetMnemonicChar() const; +}; + +enum SvxIconChoiceCtrlColumnAlign +{ + IcnViewAlignLeft = 1, + IcnViewAlignRight, + IcnViewAlignCenter +}; + +class SvxIconChoiceCtrlColumnInfo +{ + String aColText; + Image aColImage; + long nWidth; + SvxIconChoiceCtrlColumnAlign eAlignment; + USHORT nSubItem; + +public: + SvxIconChoiceCtrlColumnInfo( USHORT nSub, long nWd, + SvxIconChoiceCtrlColumnAlign eAlign ) : + nWidth( nWd ), eAlignment( eAlign ), nSubItem( nSub ) {} + SvxIconChoiceCtrlColumnInfo( const SvxIconChoiceCtrlColumnInfo& ); + + void SetText( const String& rText ) { aColText = rText; } + void SetImage( const Image& rImg ) { aColImage = rImg; } + void SetWidth( long nWd ) { nWidth = nWd; } + void SetAlignment( SvxIconChoiceCtrlColumnAlign eAlign ) { eAlignment = eAlign; } + void SetSubItem( USHORT nSub) { nSubItem = nSub; } + + const String& GetText() const { return aColText; } + const Image& GetImage() const { return aColImage; } + long GetWidth() const { return nWidth; } + SvxIconChoiceCtrlColumnAlign GetAlignment() const { return eAlignment; } + USHORT GetSubItem() const { return nSubItem; } +}; + +//################################################################################################################################### +/* + Window-Bits: + WB_ICON // Text unter dem Icon + WB_SMALL_ICON // Text rechts neben Icon, beliebige Positionierung + WB_DETAILS // Text rechts neben Icon, eingeschraenkte Posit. + WB_BORDER + WB_NOHIDESELECTION // Selektion inaktiv zeichnen, wenn kein Fokus + WB_NOHSCROLL + WB_NOVSCROLL + WB_NOSELECTION + WB_SMART_ARRANGE // im Arrange die Vis-Area beibehalten + WB_ALIGN_TOP // Anordnung zeilenweise von links nach rechts + WB_ALIGN_LEFT // Anordnung spaltenweise von oben nach unten + WB_NODRAGSELECTION // Keine Selektion per Tracking-Rect + WB_NOCOLUMNHEADER // keine Headerbar in Detailsview (Headerbar not implemented) + WB_NOPOINTERFOCUS // Kein GrabFocus im MouseButtonDown + WB_HIGHLIGHTFRAME // der unter der Maus befindliche Eintrag wird hervorgehoben + WB_NOASYNCSELECTHDL // Selektionshandler synchron aufrufen, d.h. Events nicht sammeln +*/ + +#define WB_ICON WB_RECTSTYLE +#define WB_SMALLICON WB_SMALLSTYLE +#define WB_DETAILS WB_VCENTER +#define WB_NOHSCROLL WB_SPIN +#define WB_NOVSCROLL WB_DRAG +#define WB_NOSELECTION WB_REPEAT +#define WB_NODRAGSELECTION WB_PATHELLIPSIS +#define WB_SMART_ARRANGE WB_PASSWORD +#define WB_ALIGN_TOP WB_TOP +#define WB_ALIGN_LEFT WB_LEFT +#define WB_NOCOLUMNHEADER WB_CENTER +#define WB_HIGHLIGHTFRAME WB_INFO +#define WB_NOASYNCSELECTHDL WB_NOLABEL + +class MnemonicGenerator; + +class SVT_DLLPUBLIC SvtIconChoiceCtrl : public Control +{ + friend class SvxIconChoiceCtrl_Impl; + + Link _aClickIconHdl; + Link _aDocRectChangedHdl; + Link _aVisRectChangedHdl; + KeyEvent* _pCurKeyEvent; + SvxIconChoiceCtrl_Impl* _pImp; + BOOL _bAutoFontColor; + +protected: + + virtual void KeyInput( const KeyEvent& rKEvt ); + virtual BOOL EditedEntry( SvxIconChoiceCtrlEntry*, const XubString& rNewText, BOOL bCancelled ); + virtual void DocumentRectChanged(); + virtual void VisibleRectChanged(); + virtual BOOL EditingEntry( SvxIconChoiceCtrlEntry* pEntry ); + virtual void Command( const CommandEvent& rCEvt ); + virtual void Paint( const Rectangle& rRect ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void Resize(); + virtual void GetFocus(); + virtual void LoseFocus(); + virtual void ClickIcon(); + virtual void StateChanged( StateChangedType nType ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void DrawEntryImage( + SvxIconChoiceCtrlEntry* pEntry, + const Point& rPos, + OutputDevice& rDev ); + + virtual String GetEntryText( + SvxIconChoiceCtrlEntry* pEntry, + BOOL bInplaceEdit ); + + virtual void FillLayoutData() const; + + void CallImplEventListeners(ULONG nEvent, void* pData); + +public: + + SvtIconChoiceCtrl( Window* pParent, WinBits nWinStyle = WB_ICON | WB_BORDER ); + SvtIconChoiceCtrl( Window* pParent, const ResId& rResId ); + virtual ~SvtIconChoiceCtrl(); + + void SetStyle( WinBits nWinStyle ); + WinBits GetStyle() const; + + BOOL SetChoiceWithCursor ( BOOL bDo = TRUE ); + + void SetUpdateMode( BOOL bUpdateMode ); + void SetFont( const Font& rFont ); + void SetPointFont( const Font& rFont ); + + void SetClickHdl( const Link& rLink ) { _aClickIconHdl = rLink; } + const Link& GetClickHdl() const { return _aClickIconHdl; } + + using OutputDevice::SetBackground; + void SetBackground( const Wallpaper& rWallpaper ); + + void ArrangeIcons(); + + + SvxIconChoiceCtrlEntry* InsertEntry( ULONG nPos = LIST_APPEND, + const Point* pPos = 0, + USHORT nFlags = 0 ); + SvxIconChoiceCtrlEntry* InsertEntry( const String& rText, const Image& rImage, + ULONG nPos = LIST_APPEND, + const Point* pPos = 0, + USHORT nFlags = 0 ); + SvxIconChoiceCtrlEntry* InsertEntry( const String& rText, const Image& rImage, const Image& rImageHC, + ULONG nPos = LIST_APPEND, + const Point* pPos = 0, + USHORT nFlags = 0 ); + + /** creates automatic mnemonics for all icon texts in the control + */ + void CreateAutoMnemonics( void ); + + /** creates automatic mnemonics for all icon texts in the control + + @param _rUsedMnemonics + a MnemonicGenerator at which some other mnemonics are already registered. + This can be used if the control needs to share the "mnemonic space" with other elements, + such as a menu bar. + */ + void CreateAutoMnemonics( MnemonicGenerator& _rUsedMnemonics ); + + void RemoveEntry( SvxIconChoiceCtrlEntry* pEntry ); + + BOOL DoKeyInput( const KeyEvent& rKEvt ); + + BOOL IsEntryEditing() const; + void Clear(); + + ULONG GetEntryCount() const; + SvxIconChoiceCtrlEntry* GetEntry( ULONG nPos ) const; + ULONG GetEntryListPos( SvxIconChoiceCtrlEntry* pEntry ) const; + using Window::SetCursor; + void SetCursor( SvxIconChoiceCtrlEntry* pEntry ); + SvxIconChoiceCtrlEntry* GetCursor() const; + + // Neu-Berechnung gecachter View-Daten und Invalidierung im Fenster + void InvalidateEntry( SvxIconChoiceCtrlEntry* pEntry ); + + // bHit==FALSE: Eintrag gilt als getroffen, wenn Position im BoundRect liegt + // ==TRUE : Bitmap oder Text muss getroffen sein + SvxIconChoiceCtrlEntry* GetEntry( const Point& rPosPixel, BOOL bHit = FALSE ) const; + // Gibt den naechsten ueber pCurEntry liegenden Eintrag (ZOrder) + SvxIconChoiceCtrlEntry* GetNextEntry( const Point& rPosPixel, SvxIconChoiceCtrlEntry* pCurEntry, BOOL ) const; + // Gibt den naechsten unter pCurEntry liegenden Eintrag (ZOrder) + SvxIconChoiceCtrlEntry* GetPrevEntry( const Point& rPosPixel, SvxIconChoiceCtrlEntry* pCurEntry, BOOL ) const; + + // in dem ULONG wird die Position in der Liste des gefunden Eintrags zurueckgegeben + SvxIconChoiceCtrlEntry* GetSelectedEntry( ULONG& rPos ) const; + + void SetEntryTextMode( SvxIconChoiceCtrlTextMode eMode, SvxIconChoiceCtrlEntry* pEntry = 0 ); + SvxIconChoiceCtrlTextMode GetEntryTextMode( const SvxIconChoiceCtrlEntry* pEntry = 0 ) const; + + // offene asynchron abzuarbeitende Aktionen ausfuehren. Muss vor dem Speichern von + // Eintragspositionen etc. gerufen werden + void Flush(); + + + virtual BOOL HasBackground() const; + virtual BOOL HasFont() const; + virtual BOOL HasFontTextColor() const; + virtual BOOL HasFontFillColor() const; + + void SetFontColorToBackground ( BOOL bDo = TRUE ) { _bAutoFontColor = bDo; } + BOOL AutoFontColor () { return _bAutoFontColor; } + + Point GetLogicPos( const Point& rPosPixel ) const; + Point GetPixelPos( const Point& rPosLogic ) const; + void SetSelectionMode( SelectionMode eMode ); + + BOOL HandleShortCutKey( const KeyEvent& rKeyEvent ); + + Rectangle GetBoundingBox( SvxIconChoiceCtrlEntry* pEntry ) const; + Rectangle GetEntryCharacterBounds( const sal_Int32 _nEntryPos, const sal_Int32 _nCharacterIndex ) const; + + void SetNoSelection(); + + // ACCESSIBILITY ========================================================== + + /** Creates and returns the accessible object of the Box. */ + virtual ::com::sun::star::uno::Reference< + ::com::sun::star::accessibility::XAccessible > CreateAccessible(); +}; + +#endif // _ICNVW_HXX + diff --git a/svtools/inc/svtools/localresaccess.hxx b/svtools/inc/svtools/localresaccess.hxx new file mode 100644 index 000000000000..4d2043d7b992 --- /dev/null +++ b/svtools/inc/svtools/localresaccess.hxx @@ -0,0 +1,85 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: localresaccess.hxx,v $ + * $Revision: 1.7 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _SVTOOLS_LOCALRESACCESS_HXX_ +#define _SVTOOLS_LOCALRESACCESS_HXX_ + +#include +#include +#include + +//......................................................................... +namespace svt +{ +//......................................................................... + + //========================================================================= + //= OLocalResourceAccess + //========================================================================= + /** helper class for acessing local resources + */ + class OLocalResourceAccess : public Resource + { + protected: + ResMgr* m_pManager; + + public: + OLocalResourceAccess( const ResId& _rId ) + :Resource( _rId.SetAutoRelease( sal_False ) ) + ,m_pManager( _rId.GetResMgr() ) + { + } + + OLocalResourceAccess(const ResId& _rId, RESOURCE_TYPE _rType) + :Resource(_rId.SetRT(_rType).SetAutoRelease(sal_False)) + ,m_pManager(_rId.GetResMgr()) + { + OSL_ENSURE( m_pManager != NULL, "OLocalResourceAccess::OLocalResourceAccess: invalid resource manager!" ); + } + + ~OLocalResourceAccess() + { + if ( m_pManager ) + m_pManager->Increment( m_pManager->GetRemainSize() ); + FreeResource(); + } + + inline BOOL IsAvailableRes( const ResId& _rId ) const + { + return Resource::IsAvailableRes( _rId ); + } + }; + +//......................................................................... +} // namespace svt +//......................................................................... + +#endif // _SVTOOLS_LOCALRESACCESS_HXX_ + diff --git a/svtools/inc/svtools/prgsbar.hxx b/svtools/inc/svtools/prgsbar.hxx new file mode 100644 index 000000000000..ca569ac152f4 --- /dev/null +++ b/svtools/inc/svtools/prgsbar.hxx @@ -0,0 +1,103 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: prgsbar.hxx,v $ + * $Revision: 1.6 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _PRGSBAR_HXX +#define _PRGSBAR_HXX + +#include "svtools/svtdllapi.h" +#include + +/************************************************************************* + +Beschreibung +============ + +class ProgressBar + +Diese Klasse dient zur Anzeige einer Progress-Anzeige. + +-------------------------------------------------------------------------- + +WinBits + +WB_BORDER Border um das Fenster +WB_3DLOOK 3D-Darstellung + +-------------------------------------------------------------------------- + +Methoden + +Mit SetValue() setzt man einen Prozent-Wert zwischen 0 und 100. Wenn Werte +groesser 100 gesetzt werden, faengt das letzte Rechteck an zu blinken. + +*************************************************************************/ + +// ----------- +// - WinBits - +// ----------- + +#define WB_STDPROGRESSBAR WB_BORDER + +// --------------- +// - ProgressBar - +// --------------- + +class SVT_DLLPUBLIC ProgressBar : public Window +{ +private: + Point maPos; + long mnPrgsWidth; + long mnPrgsHeight; + USHORT mnPercent; + USHORT mnPercentCount; + BOOL mbCalcNew; + +#ifdef _SV_PRGSBAR_CXX + using Window::ImplInit; + SVT_DLLPRIVATE void ImplInit(); + SVT_DLLPRIVATE void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); + SVT_DLLPRIVATE void ImplDrawProgress( USHORT nOldPerc, USHORT nNewPerc ); +#endif + +public: + ProgressBar( Window* pParent, WinBits nWinBits = WB_STDPROGRESSBAR ); + ProgressBar( Window* pParent, const ResId& rResId ); + ~ProgressBar(); + + virtual void Paint( const Rectangle& rRect ); + virtual void Resize(); + virtual void StateChanged( StateChangedType nStateChange ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); + + void SetValue( USHORT nNewPercent ); + USHORT GetValue() const { return mnPercent; } +}; + +#endif // _PRGSBAR_HXX diff --git a/svtools/inc/svtools/roadmap.hxx b/svtools/inc/svtools/roadmap.hxx new file mode 100644 index 000000000000..14ed6abceed6 --- /dev/null +++ b/svtools/inc/svtools/roadmap.hxx @@ -0,0 +1,140 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: roadmap.hxx,v $ + * $Revision: 1.10 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _SVTOOLS_ROADMAP_HXX +#define _SVTOOLS_ROADMAP_HXX + +#include "svtools/svtdllapi.h" +#include +#include + +#ifndef _SVTOOLS_HYPERLABEL_HXX +#include "svtools/hyperlabel.hxx" +#endif + + + + +class Bitmap; +//......................................................................... +namespace svt +{ +//......................................................................... + + struct RoadmapTypes + { + public: + typedef sal_Int16 ItemId; + typedef sal_Int32 ItemIndex; + }; + + class RoadmapImpl; + class RoadmapItem; + + //===================================================================== + //= Roadmap + //===================================================================== + class SVT_DLLPUBLIC ORoadmap : public Control, public RoadmapTypes + { + protected: + RoadmapImpl* m_pImpl; + // Window overridables + void Paint( const Rectangle& _rRect ); + void implInit(); + + public: + ORoadmap( Window* _pParent, const ResId& _rId ); + ORoadmap( Window* _pParent, WinBits _nWinStyle = 0 ); + ~ORoadmap( ); + + void SetRoadmapBitmap( const BitmapEx& maBitmap, sal_Bool _bInvalidate = sal_True ); + const BitmapEx& GetRoadmapBitmap( ) const; + + void EnableRoadmapItem( ItemId _nItemId, sal_Bool _bEnable, ItemIndex _nStartIndex = 0 ); + sal_Bool IsRoadmapItemEnabled( ItemId _nItemId, ItemIndex _nStartIndex = 0 ) const; + + void ChangeRoadmapItemLabel( ItemId _nID, const ::rtl::OUString& sLabel, ItemIndex _nStartIndex = 0 ); + ::rtl::OUString GetRoadmapItemLabel( ItemId _nID, ItemIndex _nStartIndex = 0 ); + void ChangeRoadmapItemID( ItemId _nID, ItemId _NewID, ItemIndex _nStartIndex = 0 ); + + void SetRoadmapInteractive( sal_Bool _bInteractive ); + sal_Bool IsRoadmapInteractive(); + + void SetRoadmapComplete( sal_Bool _bComplete ); + sal_Bool IsRoadmapComplete() const; + + ItemIndex GetItemCount() const; + ItemId GetItemID( ItemIndex _nIndex ) const; + ItemIndex GetItemIndex( ItemId _nID ) const; + + void InsertRoadmapItem( ItemIndex _Index, const ::rtl::OUString& _RoadmapItem, ItemId _nUniqueId, sal_Bool _bEnabled = sal_True ); + void ReplaceRoadmapItem( ItemIndex _Index, const ::rtl::OUString& _RoadmapItem, ItemId _nUniqueId, sal_Bool _bEnabled ); + void DeleteRoadmapItem( ItemIndex _nIndex ); + + ItemId GetCurrentRoadmapItemID() const; + sal_Bool SelectRoadmapItemByID( ItemId _nItemID ); + + void SetItemSelectHdl( const Link& _rHdl ); + Link GetItemSelectHdl( ) const; + virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void GetFocus(); + + + protected: + long PreNotify( NotifyEvent& rNEvt ); + + protected: + /// called when an item has been selected by any means + virtual void Select(); + + private: + DECL_LINK(ImplClickHdl, HyperLabel*); + + RoadmapItem* GetByIndex( ItemIndex _nItemIndex ); + const RoadmapItem* GetByIndex( ItemIndex _nItemIndex ) const; + + RoadmapItem* GetByID( ItemId _nID, ItemIndex _nStartIndex = 0 ); + const RoadmapItem* GetByID( ItemId _nID, ItemIndex _nStartIndex = 0 ) const; + RoadmapItem* GetPreviousHyperLabel( ItemIndex _Index); + + void DrawHeadline(); + void DeselectOldRoadmapItems(); + ItemId GetNextAvailableItemId( ItemIndex _NewIndex ); + ItemId GetPreviousAvailableItemId( ItemIndex _NewIndex ); + RoadmapItem* GetByPointer(Window* pWindow); + RoadmapItem* InsertHyperLabel( ItemIndex _Index, const ::rtl::OUString& _aStr, ItemId _RMID, sal_Bool _bEnabled = sal_True ); + void UpdatefollowingHyperLabels( ItemIndex _Index ); + }; + +//......................................................................... +} // namespace svt +//......................................................................... + +#endif + diff --git a/svtools/inc/svtools/rtfkeywd.hxx b/svtools/inc/svtools/rtfkeywd.hxx new file mode 100644 index 000000000000..f76399ffd824 --- /dev/null +++ b/svtools/inc/svtools/rtfkeywd.hxx @@ -0,0 +1,1144 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: rtfkeywd.hxx,v $ + * $Revision: 1.13.134.1 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _RTFKEYWD_HXX +#define _RTFKEYWD_HXX + +#include "sal/config.h" + +#define OOO_STRING_SVTOOLS_RTF_HEXCHAR "\\'" +#define OOO_STRING_SVTOOLS_RTF_IGNORE "\\*" +#define OOO_STRING_SVTOOLS_RTF_OPTHYPH "\\-" +#define OOO_STRING_SVTOOLS_RTF_SUBENTRY "\\:" +#define OOO_STRING_SVTOOLS_RTF_ABSH "\\absh" +#define OOO_STRING_SVTOOLS_RTF_ABSW "\\absw" +#define OOO_STRING_SVTOOLS_RTF_ALT "\\alt" +#define OOO_STRING_SVTOOLS_RTF_ANNOTATION "\\annotation" +#define OOO_STRING_SVTOOLS_RTF_ANSI "\\ansi" +#define OOO_STRING_SVTOOLS_RTF_ATNID "\\atnid" +#define OOO_STRING_SVTOOLS_RTF_AUTHOR "\\author" +#define OOO_STRING_SVTOOLS_RTF_B "\\b" +#define OOO_STRING_SVTOOLS_RTF_BGBDIAG "\\bgbdiag" +#define OOO_STRING_SVTOOLS_RTF_BGCROSS "\\bgcross" +#define OOO_STRING_SVTOOLS_RTF_BGDCROSS "\\bgdcross" +#define OOO_STRING_SVTOOLS_RTF_BGDKBDIAG "\\bgdkbdiag" +#define OOO_STRING_SVTOOLS_RTF_BGDKCROSS "\\bgdkcross" +#define OOO_STRING_SVTOOLS_RTF_BGDKDCROSS "\\bgdkdcross" +#define OOO_STRING_SVTOOLS_RTF_BGDKFDIAG "\\bgdkfdiag" +#define OOO_STRING_SVTOOLS_RTF_BGDKHORIZ "\\bgdkhoriz" +#define OOO_STRING_SVTOOLS_RTF_BGDKVERT "\\bgdkvert" +#define OOO_STRING_SVTOOLS_RTF_BGFDIAG "\\bgfdiag" +#define OOO_STRING_SVTOOLS_RTF_BGHORIZ "\\bghoriz" +#define OOO_STRING_SVTOOLS_RTF_BGVERT "\\bgvert" +#define OOO_STRING_SVTOOLS_RTF_BIN "\\bin" +#define OOO_STRING_SVTOOLS_RTF_BINFSXN "\\binfsxn" +#define OOO_STRING_SVTOOLS_RTF_BINSXN "\\binsxn" +#define OOO_STRING_SVTOOLS_RTF_BKMKCOLF "\\bkmkcolf" +#define OOO_STRING_SVTOOLS_RTF_BKMKCOLL "\\bkmkcoll" +#define OOO_STRING_SVTOOLS_RTF_BKMKEND "\\bkmkend" +#define OOO_STRING_SVTOOLS_RTF_BKMKSTART "\\bkmkstart" +#define OOO_STRING_SVTOOLS_RTF_BLUE "\\blue" +#define OOO_STRING_SVTOOLS_RTF_BOX "\\box" +#define OOO_STRING_SVTOOLS_RTF_BRDRB "\\brdrb" +#define OOO_STRING_SVTOOLS_RTF_BRDRBAR "\\brdrbar" +#define OOO_STRING_SVTOOLS_RTF_BRDRBTW "\\brdrbtw" +#define OOO_STRING_SVTOOLS_RTF_BRDRCF "\\brdrcf" +#define OOO_STRING_SVTOOLS_RTF_BRDRDB "\\brdrdb" +#define OOO_STRING_SVTOOLS_RTF_BRDRDOT "\\brdrdot" +#define OOO_STRING_SVTOOLS_RTF_BRDRHAIR "\\brdrhair" +#define OOO_STRING_SVTOOLS_RTF_BRDRL "\\brdrl" +#define OOO_STRING_SVTOOLS_RTF_BRDRR "\\brdrr" +#define OOO_STRING_SVTOOLS_RTF_BRDRS "\\brdrs" +#define OOO_STRING_SVTOOLS_RTF_BRDRSH "\\brdrsh" +#define OOO_STRING_SVTOOLS_RTF_BRDRT "\\brdrt" +#define OOO_STRING_SVTOOLS_RTF_BRDRTH "\\brdrth" +#define OOO_STRING_SVTOOLS_RTF_BRDRW "\\brdrw" +#define OOO_STRING_SVTOOLS_RTF_BRSP "\\brsp" +#define OOO_STRING_SVTOOLS_RTF_BULLET "\\bullet" +#define OOO_STRING_SVTOOLS_RTF_BUPTIM "\\buptim" +#define OOO_STRING_SVTOOLS_RTF_BXE "\\bxe" +#define OOO_STRING_SVTOOLS_RTF_CAPS "\\caps" +#define OOO_STRING_SVTOOLS_RTF_CB "\\cb" +#define OOO_STRING_SVTOOLS_RTF_CBPAT "\\cbpat" +#define OOO_STRING_SVTOOLS_RTF_CELL "\\cell" +#define OOO_STRING_SVTOOLS_RTF_CELLX "\\cellx" +#define OOO_STRING_SVTOOLS_RTF_CF "\\cf" +#define OOO_STRING_SVTOOLS_RTF_CFPAT "\\cfpat" +#define OOO_STRING_SVTOOLS_RTF_CHATN "\\chatn" +#define OOO_STRING_SVTOOLS_RTF_CHDATE "\\chdate" +#define OOO_STRING_SVTOOLS_RTF_CHDPA "\\chdpa" +#define OOO_STRING_SVTOOLS_RTF_CHDPL "\\chdpl" +#define OOO_STRING_SVTOOLS_RTF_CHFTN "\\chftn" +#define OOO_STRING_SVTOOLS_RTF_CHFTNSEP "\\chftnsep" +#define OOO_STRING_SVTOOLS_RTF_CHFTNSEPC "\\chftnsepc" +#define OOO_STRING_SVTOOLS_RTF_CHPGN "\\chpgn" +#define OOO_STRING_SVTOOLS_RTF_CHTIME "\\chtime" +#define OOO_STRING_SVTOOLS_RTF_CLBGBDIAG "\\clbgbdiag" +#define OOO_STRING_SVTOOLS_RTF_CLBGCROSS "\\clbgcross" +#define OOO_STRING_SVTOOLS_RTF_CLBGDCROSS "\\clbgdcross" +#define OOO_STRING_SVTOOLS_RTF_CLBGDKBDIAG "\\clbgdkbdiag" +#define OOO_STRING_SVTOOLS_RTF_CLBGDKCROSS "\\clbgdkcross" +#define OOO_STRING_SVTOOLS_RTF_CLBGDKDCROSS "\\clbgdkdcross" +#define OOO_STRING_SVTOOLS_RTF_CLBGDKFDIAG "\\clbgdkfdiag" +#define OOO_STRING_SVTOOLS_RTF_CLBGDKHOR "\\clbgdkhor" +#define OOO_STRING_SVTOOLS_RTF_CLBGDKVERT "\\clbgdkvert" +#define OOO_STRING_SVTOOLS_RTF_CLBGFDIAG "\\clbgfdiag" +#define OOO_STRING_SVTOOLS_RTF_CLBGHORIZ "\\clbghoriz" +#define OOO_STRING_SVTOOLS_RTF_CLBGVERT "\\clbgvert" +#define OOO_STRING_SVTOOLS_RTF_CLBRDRB "\\clbrdrb" +#define OOO_STRING_SVTOOLS_RTF_CLBRDRL "\\clbrdrl" +#define OOO_STRING_SVTOOLS_RTF_CLBRDRR "\\clbrdrr" +#define OOO_STRING_SVTOOLS_RTF_CLBRDRT "\\clbrdrt" +#define OOO_STRING_SVTOOLS_RTF_CLCBPAT "\\clcbpat" +#define OOO_STRING_SVTOOLS_RTF_CLCFPAT "\\clcfpat" +#define OOO_STRING_SVTOOLS_RTF_CLMGF "\\clmgf" +#define OOO_STRING_SVTOOLS_RTF_CLMRG "\\clmrg" +#define OOO_STRING_SVTOOLS_RTF_CLSHDNG "\\clshdng" +#define OOO_STRING_SVTOOLS_RTF_COLNO "\\colno" +#define OOO_STRING_SVTOOLS_RTF_COLORTBL "\\colortbl" +#define OOO_STRING_SVTOOLS_RTF_COLS "\\cols" +#define OOO_STRING_SVTOOLS_RTF_COLSR "\\colsr" +#define OOO_STRING_SVTOOLS_RTF_COLSX "\\colsx" +#define OOO_STRING_SVTOOLS_RTF_COLUMN "\\column" +#define OOO_STRING_SVTOOLS_RTF_COLW "\\colw" +#define OOO_STRING_SVTOOLS_RTF_COMMENT "\\comment" +#define OOO_STRING_SVTOOLS_RTF_CREATIM "\\creatim" +#define OOO_STRING_SVTOOLS_RTF_CTRL "\\ctrl" +#define OOO_STRING_SVTOOLS_RTF_DEFF "\\deff" +#define OOO_STRING_SVTOOLS_RTF_DEFFORMAT "\\defformat" +#define OOO_STRING_SVTOOLS_RTF_DEFLANG "\\deflang" +#define OOO_STRING_SVTOOLS_RTF_DEFTAB "\\deftab" +#define OOO_STRING_SVTOOLS_RTF_DELETED "\\deleted" +#define OOO_STRING_SVTOOLS_RTF_DFRMTXTX "\\dfrmtxtx" +#define OOO_STRING_SVTOOLS_RTF_DFRMTXTY "\\dfrmtxty" +#define OOO_STRING_SVTOOLS_RTF_DIBITMAP "\\dibitmap" +#define OOO_STRING_SVTOOLS_RTF_DN "\\dn" +#define OOO_STRING_SVTOOLS_RTF_DOCCOMM "\\doccomm" +#define OOO_STRING_SVTOOLS_RTF_DOCTEMP "\\doctemp" +#define OOO_STRING_SVTOOLS_RTF_DROPCAPLI "\\dropcapli" +#define OOO_STRING_SVTOOLS_RTF_DROPCAPT "\\dropcapt" +#define OOO_STRING_SVTOOLS_RTF_ABSNOOVRLP "\\absnoovrlp" +#define OOO_STRING_SVTOOLS_RTF_DXFRTEXT "\\dxfrtext" +#define OOO_STRING_SVTOOLS_RTF_DY "\\dy" +#define OOO_STRING_SVTOOLS_RTF_EDMINS "\\edmins" +#define OOO_STRING_SVTOOLS_RTF_EMDASH "\\emdash" +#define OOO_STRING_SVTOOLS_RTF_ENDASH "\\endash" +#define OOO_STRING_SVTOOLS_RTF_ENDDOC "\\enddoc" +#define OOO_STRING_SVTOOLS_RTF_ENDNHERE "\\endnhere" +#define OOO_STRING_SVTOOLS_RTF_ENDNOTES "\\endnotes" +#define OOO_STRING_SVTOOLS_RTF_EXPND "\\expnd" +#define OOO_STRING_SVTOOLS_RTF_EXPNDTW "\\expndtw" +#define OOO_STRING_SVTOOLS_RTF_F "\\f" +#define OOO_STRING_SVTOOLS_RTF_FACINGP "\\facingp" +#define OOO_STRING_SVTOOLS_RTF_FACPGSXN "\\facpgsxn" +#define OOO_STRING_SVTOOLS_RTF_FALT "\\falt" +#define OOO_STRING_SVTOOLS_RTF_FCHARSET "\\fcharset" +#define OOO_STRING_SVTOOLS_RTF_FDECOR "\\fdecor" +#define OOO_STRING_SVTOOLS_RTF_FI "\\fi" +#define OOO_STRING_SVTOOLS_RTF_FIELD "\\field" +#define OOO_STRING_SVTOOLS_RTF_FLDDIRTY "\\flddirty" +#define OOO_STRING_SVTOOLS_RTF_FLDEDIT "\\fldedit" +#define OOO_STRING_SVTOOLS_RTF_FLDINST "\\fldinst" +#define OOO_STRING_SVTOOLS_RTF_FLDLOCK "\\fldlock" +#define OOO_STRING_SVTOOLS_RTF_FLDPRIV "\\fldpriv" +#define OOO_STRING_SVTOOLS_RTF_FLDRSLT "\\fldrslt" +#define OOO_STRING_SVTOOLS_RTF_FMODERN "\\fmodern" +#define OOO_STRING_SVTOOLS_RTF_FN "\\fn" +#define OOO_STRING_SVTOOLS_RTF_FNIL "\\fnil" +#define OOO_STRING_SVTOOLS_RTF_FONTTBL "\\fonttbl" +#define OOO_STRING_SVTOOLS_RTF_FOOTER "\\footer" +#define OOO_STRING_SVTOOLS_RTF_FOOTERF "\\footerf" +#define OOO_STRING_SVTOOLS_RTF_FOOTERL "\\footerl" +#define OOO_STRING_SVTOOLS_RTF_FOOTERR "\\footerr" +#define OOO_STRING_SVTOOLS_RTF_FOOTERY "\\footery" +#define OOO_STRING_SVTOOLS_RTF_FOOTNOTE "\\footnote" +#define OOO_STRING_SVTOOLS_RTF_FPRQ "\\fprq" +#define OOO_STRING_SVTOOLS_RTF_FRACWIDTH "\\fracwidth" +#define OOO_STRING_SVTOOLS_RTF_FROMAN "\\froman" +#define OOO_STRING_SVTOOLS_RTF_FS "\\fs" +#define OOO_STRING_SVTOOLS_RTF_FSCRIPT "\\fscript" +#define OOO_STRING_SVTOOLS_RTF_FSWISS "\\fswiss" +#define OOO_STRING_SVTOOLS_RTF_FTECH "\\ftech" +#define OOO_STRING_SVTOOLS_RTF_FTNBJ "\\ftnbj" +#define OOO_STRING_SVTOOLS_RTF_FTNCN "\\ftncn" +#define OOO_STRING_SVTOOLS_RTF_FTNRESTART "\\ftnrestart" +#define OOO_STRING_SVTOOLS_RTF_FTNSEP "\\ftnsep" +#define OOO_STRING_SVTOOLS_RTF_FTNSEPC "\\ftnsepc" +#define OOO_STRING_SVTOOLS_RTF_FTNSTART "\\ftnstart" +#define OOO_STRING_SVTOOLS_RTF_FTNTJ "\\ftntj" +#define OOO_STRING_SVTOOLS_RTF_GREEN "\\green" +#define OOO_STRING_SVTOOLS_RTF_GUTTER "\\gutter" +#define OOO_STRING_SVTOOLS_RTF_GUTTERSXN "\\guttersxn" +#define OOO_STRING_SVTOOLS_RTF_HEADER "\\header" +#define OOO_STRING_SVTOOLS_RTF_HEADERF "\\headerf" +#define OOO_STRING_SVTOOLS_RTF_HEADERL "\\headerl" +#define OOO_STRING_SVTOOLS_RTF_HEADERR "\\headerr" +#define OOO_STRING_SVTOOLS_RTF_HEADERY "\\headery" +#define OOO_STRING_SVTOOLS_RTF_HR "\\hr" +#define OOO_STRING_SVTOOLS_RTF_HYPHHOTZ "\\hyphhotz" +#define OOO_STRING_SVTOOLS_RTF_I "\\i" +#define OOO_STRING_SVTOOLS_RTF_ID "\\id" +#define OOO_STRING_SVTOOLS_RTF_INFO "\\info" +#define OOO_STRING_SVTOOLS_RTF_INTBL "\\intbl" +#define OOO_STRING_SVTOOLS_RTF_IXE "\\ixe" +#define OOO_STRING_SVTOOLS_RTF_KEEP "\\keep" +#define OOO_STRING_SVTOOLS_RTF_KEEPN "\\keepn" +#define OOO_STRING_SVTOOLS_RTF_KERNING "\\kerning" +#define OOO_STRING_SVTOOLS_RTF_KEYCODE "\\keycode" +#define OOO_STRING_SVTOOLS_RTF_KEYWORDS "\\keywords" +#define OOO_STRING_SVTOOLS_RTF_LANDSCAPE "\\landscape" +#define OOO_STRING_SVTOOLS_RTF_LANG "\\lang" +#define OOO_STRING_SVTOOLS_RTF_LDBLQUOTE "\\ldblquote" +#define OOO_STRING_SVTOOLS_RTF_LEVEL "\\level" +#define OOO_STRING_SVTOOLS_RTF_LI "\\li" +#define OOO_STRING_SVTOOLS_RTF_LIN "\\lin" +#define OOO_STRING_SVTOOLS_RTF_LINE "\\line" +#define OOO_STRING_SVTOOLS_RTF_LINEBETCOL "\\linebetcol" +#define OOO_STRING_SVTOOLS_RTF_LINECONT "\\linecont" +#define OOO_STRING_SVTOOLS_RTF_LINEMOD "\\linemod" +#define OOO_STRING_SVTOOLS_RTF_LINEPPAGE "\\lineppage" +#define OOO_STRING_SVTOOLS_RTF_LINERESTART "\\linerestart" +#define OOO_STRING_SVTOOLS_RTF_LINESTART "\\linestart" +#define OOO_STRING_SVTOOLS_RTF_LINESTARTS "\\linestarts" +#define OOO_STRING_SVTOOLS_RTF_LINEX "\\linex" +#define OOO_STRING_SVTOOLS_RTF_LNDSCPSXN "\\lndscpsxn" +#define OOO_STRING_SVTOOLS_RTF_LQUOTE "\\lquote" +#define OOO_STRING_SVTOOLS_RTF_MAC "\\mac" +#define OOO_STRING_SVTOOLS_RTF_MACPICT "\\macpict" +#define OOO_STRING_SVTOOLS_RTF_MAKEBACKUP "\\makebackup" +#define OOO_STRING_SVTOOLS_RTF_MARGB "\\margb" +#define OOO_STRING_SVTOOLS_RTF_MARGBSXN "\\margbsxn" +#define OOO_STRING_SVTOOLS_RTF_MARGL "\\margl" +#define OOO_STRING_SVTOOLS_RTF_MARGLSXN "\\marglsxn" +#define OOO_STRING_SVTOOLS_RTF_MARGMIRROR "\\margmirror" +#define OOO_STRING_SVTOOLS_RTF_MARGR "\\margr" +#define OOO_STRING_SVTOOLS_RTF_MARGRSXN "\\margrsxn" +#define OOO_STRING_SVTOOLS_RTF_MARGT "\\margt" +#define OOO_STRING_SVTOOLS_RTF_MARGTSXN "\\margtsxn" +#define OOO_STRING_SVTOOLS_RTF_MIN "\\min" +#define OOO_STRING_SVTOOLS_RTF_MO "\\mo" +#define OOO_STRING_SVTOOLS_RTF_NEXTCSET "\\nextcset" +#define OOO_STRING_SVTOOLS_RTF_NEXTFILE "\\nextfile" +#define OOO_STRING_SVTOOLS_RTF_NOFCHARS "\\nofchars" +#define OOO_STRING_SVTOOLS_RTF_NOFPAGES "\\nofpages" +#define OOO_STRING_SVTOOLS_RTF_NOFWORDS "\\nofwords" +#define OOO_STRING_SVTOOLS_RTF_NOLINE "\\noline" +#define OOO_STRING_SVTOOLS_RTF_NOSUPERSUB "\\nosupersub" +#define OOO_STRING_SVTOOLS_RTF_NOWRAP "\\nowrap" +#define OOO_STRING_SVTOOLS_RTF_OPERATOR "\\operator" +#define OOO_STRING_SVTOOLS_RTF_OUTL "\\outl" +#define OOO_STRING_SVTOOLS_RTF_PAGE "\\page" +#define OOO_STRING_SVTOOLS_RTF_PAGEBB "\\pagebb" +#define OOO_STRING_SVTOOLS_RTF_PAPERH "\\paperh" +#define OOO_STRING_SVTOOLS_RTF_PAPERW "\\paperw" +#define OOO_STRING_SVTOOLS_RTF_PAR "\\par" +#define OOO_STRING_SVTOOLS_RTF_PARD "\\pard" +#define OOO_STRING_SVTOOLS_RTF_PC "\\pc" +#define OOO_STRING_SVTOOLS_RTF_PCA "\\pca" +#define OOO_STRING_SVTOOLS_RTF_PGHSXN "\\pghsxn" +#define OOO_STRING_SVTOOLS_RTF_PGNCONT "\\pgncont" +#define OOO_STRING_SVTOOLS_RTF_PGNDEC "\\pgndec" +#define OOO_STRING_SVTOOLS_RTF_PGNLCLTR "\\pgnlcltr" +#define OOO_STRING_SVTOOLS_RTF_PGNLCRM "\\pgnlcrm" +#define OOO_STRING_SVTOOLS_RTF_PGNRESTART "\\pgnrestart" +#define OOO_STRING_SVTOOLS_RTF_PGNSTART "\\pgnstart" +#define OOO_STRING_SVTOOLS_RTF_PGNSTARTS "\\pgnstarts" +#define OOO_STRING_SVTOOLS_RTF_PGNUCLTR "\\pgnucltr" +#define OOO_STRING_SVTOOLS_RTF_PGNUCRM "\\pgnucrm" +#define OOO_STRING_SVTOOLS_RTF_PGNX "\\pgnx" +#define OOO_STRING_SVTOOLS_RTF_PGNY "\\pgny" +#define OOO_STRING_SVTOOLS_RTF_PGWSXN "\\pgwsxn" +#define OOO_STRING_SVTOOLS_RTF_PHCOL "\\phcol" +#define OOO_STRING_SVTOOLS_RTF_PHMRG "\\phmrg" +#define OOO_STRING_SVTOOLS_RTF_PHPG "\\phpg" +#define OOO_STRING_SVTOOLS_RTF_PICCROPB "\\piccropb" +#define OOO_STRING_SVTOOLS_RTF_PICCROPL "\\piccropl" +#define OOO_STRING_SVTOOLS_RTF_PICCROPR "\\piccropr" +#define OOO_STRING_SVTOOLS_RTF_PICCROPT "\\piccropt" +#define OOO_STRING_SVTOOLS_RTF_PICH "\\pich" +#define OOO_STRING_SVTOOLS_RTF_PICHGOAL "\\pichgoal" +#define OOO_STRING_SVTOOLS_RTF_PICSCALED "\\picscaled" +#define OOO_STRING_SVTOOLS_RTF_PICSCALEX "\\picscalex" +#define OOO_STRING_SVTOOLS_RTF_PICSCALEY "\\picscaley" +#define OOO_STRING_SVTOOLS_RTF_PICT "\\pict" +#define OOO_STRING_SVTOOLS_RTF_PICW "\\picw" +#define OOO_STRING_SVTOOLS_RTF_PICWGOAL "\\picwgoal" +#define OOO_STRING_SVTOOLS_RTF_PLAIN "\\plain" +#define OOO_STRING_SVTOOLS_RTF_PMMETAFILE "\\pmmetafile" +#define OOO_STRING_SVTOOLS_RTF_POSNEGX "\\posnegx" +#define OOO_STRING_SVTOOLS_RTF_POSNEGY "\\posnegy" +#define OOO_STRING_SVTOOLS_RTF_POSX "\\posx" +#define OOO_STRING_SVTOOLS_RTF_POSXC "\\posxc" +#define OOO_STRING_SVTOOLS_RTF_POSXI "\\posxi" +#define OOO_STRING_SVTOOLS_RTF_POSXL "\\posxl" +#define OOO_STRING_SVTOOLS_RTF_POSXO "\\posxo" +#define OOO_STRING_SVTOOLS_RTF_POSXR "\\posxr" +#define OOO_STRING_SVTOOLS_RTF_POSY "\\posy" +#define OOO_STRING_SVTOOLS_RTF_POSYB "\\posyb" +#define OOO_STRING_SVTOOLS_RTF_POSYC "\\posyc" +#define OOO_STRING_SVTOOLS_RTF_POSYIL "\\posyil" +#define OOO_STRING_SVTOOLS_RTF_POSYT "\\posyt" +#define OOO_STRING_SVTOOLS_RTF_PRINTIM "\\printim" +#define OOO_STRING_SVTOOLS_RTF_PSOVER "\\psover" +#define OOO_STRING_SVTOOLS_RTF_PVMRG "\\pvmrg" +#define OOO_STRING_SVTOOLS_RTF_PVPARA "\\pvpara" +#define OOO_STRING_SVTOOLS_RTF_PVPG "\\pvpg" +#define OOO_STRING_SVTOOLS_RTF_QC "\\qc" +#define OOO_STRING_SVTOOLS_RTF_QJ "\\qj" +#define OOO_STRING_SVTOOLS_RTF_QL "\\ql" +#define OOO_STRING_SVTOOLS_RTF_QR "\\qr" +#define OOO_STRING_SVTOOLS_RTF_RDBLQUOTE "\\rdblquote" +#define OOO_STRING_SVTOOLS_RTF_RED "\\red" +#define OOO_STRING_SVTOOLS_RTF_REVBAR "\\revbar" +#define OOO_STRING_SVTOOLS_RTF_REVISED "\\revised" +#define OOO_STRING_SVTOOLS_RTF_REVISIONS "\\revisions" +#define OOO_STRING_SVTOOLS_RTF_REVPROP "\\revprop" +#define OOO_STRING_SVTOOLS_RTF_REVTIM "\\revtim" +#define OOO_STRING_SVTOOLS_RTF_RI "\\ri" +#define OOO_STRING_SVTOOLS_RTF_RIN "\\rin" +#define OOO_STRING_SVTOOLS_RTF_ROW "\\row" +#define OOO_STRING_SVTOOLS_RTF_RQUOTE "\\rquote" +#define OOO_STRING_SVTOOLS_RTF_RTF "\\rtf" +#define OOO_STRING_SVTOOLS_RTF_RXE "\\rxe" +#define OOO_STRING_SVTOOLS_RTF_S "\\s" +#define OOO_STRING_SVTOOLS_RTF_SA "\\sa" +#define OOO_STRING_SVTOOLS_RTF_SB "\\sb" +#define OOO_STRING_SVTOOLS_RTF_SBASEDON "\\sbasedon" +#define OOO_STRING_SVTOOLS_RTF_SBKCOL "\\sbkcol" +#define OOO_STRING_SVTOOLS_RTF_SBKEVEN "\\sbkeven" +#define OOO_STRING_SVTOOLS_RTF_SBKNONE "\\sbknone" +#define OOO_STRING_SVTOOLS_RTF_SBKODD "\\sbkodd" +#define OOO_STRING_SVTOOLS_RTF_SBKPAGE "\\sbkpage" +#define OOO_STRING_SVTOOLS_RTF_SBYS "\\sbys" +#define OOO_STRING_SVTOOLS_RTF_SCAPS "\\scaps" +#define OOO_STRING_SVTOOLS_RTF_SECT "\\sect" +#define OOO_STRING_SVTOOLS_RTF_SECTD "\\sectd" +#define OOO_STRING_SVTOOLS_RTF_SHAD "\\shad" +#define OOO_STRING_SVTOOLS_RTF_SHADING "\\shading" +#define OOO_STRING_SVTOOLS_RTF_SHIFT "\\shift" +#define OOO_STRING_SVTOOLS_RTF_SL "\\sl" +#define OOO_STRING_SVTOOLS_RTF_SNEXT "\\snext" +#define OOO_STRING_SVTOOLS_RTF_STRIKE "\\strike" +#define OOO_STRING_SVTOOLS_RTF_STYLESHEET "\\stylesheet" +#define OOO_STRING_SVTOOLS_RTF_SUB "\\sub" +#define OOO_STRING_SVTOOLS_RTF_SUBJECT "\\subject" +#define OOO_STRING_SVTOOLS_RTF_SUPER "\\super" +#define OOO_STRING_SVTOOLS_RTF_TAB "\\tab" +#define OOO_STRING_SVTOOLS_RTF_TB "\\tb" +#define OOO_STRING_SVTOOLS_RTF_TC "\\tc" +#define OOO_STRING_SVTOOLS_RTF_TCF "\\tcf" +#define OOO_STRING_SVTOOLS_RTF_TCL "\\tcl" +#define OOO_STRING_SVTOOLS_RTF_TEMPLATE "\\template" +#define OOO_STRING_SVTOOLS_RTF_TITLE "\\title" +#define OOO_STRING_SVTOOLS_RTF_TITLEPG "\\titlepg" +#define OOO_STRING_SVTOOLS_RTF_TLDOT "\\tldot" +#define OOO_STRING_SVTOOLS_RTF_TLEQ "\\tleq" +#define OOO_STRING_SVTOOLS_RTF_TLHYPH "\\tlhyph" +#define OOO_STRING_SVTOOLS_RTF_TLTH "\\tlth" +#define OOO_STRING_SVTOOLS_RTF_TLUL "\\tlul" +#define OOO_STRING_SVTOOLS_RTF_TQC "\\tqc" +#define OOO_STRING_SVTOOLS_RTF_TQDEC "\\tqdec" +#define OOO_STRING_SVTOOLS_RTF_TQR "\\tqr" +#define OOO_STRING_SVTOOLS_RTF_TQL "\\tql" +#define OOO_STRING_SVTOOLS_RTF_TRGAPH "\\trgaph" +#define OOO_STRING_SVTOOLS_RTF_TRLEFT "\\trleft" +#define OOO_STRING_SVTOOLS_RTF_TROWD "\\trowd" +#define OOO_STRING_SVTOOLS_RTF_TRQC "\\trqc" +#define OOO_STRING_SVTOOLS_RTF_TRQL "\\trql" +#define OOO_STRING_SVTOOLS_RTF_TRQR "\\trqr" +#define OOO_STRING_SVTOOLS_RTF_TRRH "\\trrh" +#define OOO_STRING_SVTOOLS_RTF_TX "\\tx" +#define OOO_STRING_SVTOOLS_RTF_TXE "\\txe" +#define OOO_STRING_SVTOOLS_RTF_UL "\\ul" +#define OOO_STRING_SVTOOLS_RTF_ULD "\\uld" +#define OOO_STRING_SVTOOLS_RTF_ULDB "\\uldb" +#define OOO_STRING_SVTOOLS_RTF_ULNONE "\\ulnone" +#define OOO_STRING_SVTOOLS_RTF_ULW "\\ulw" +#define OOO_STRING_SVTOOLS_RTF_UP "\\up" +#define OOO_STRING_SVTOOLS_RTF_V "\\v" +#define OOO_STRING_SVTOOLS_RTF_VERN "\\vern" +#define OOO_STRING_SVTOOLS_RTF_VERSION "\\version" +#define OOO_STRING_SVTOOLS_RTF_VERTALB "\\vertalb" +#define OOO_STRING_SVTOOLS_RTF_VERTALC "\\vertalc" +#define OOO_STRING_SVTOOLS_RTF_VERTALJ "\\vertalj" +#define OOO_STRING_SVTOOLS_RTF_VERTALT "\\vertalt" +#define OOO_STRING_SVTOOLS_RTF_WBITMAP "\\wbitmap" +#define OOO_STRING_SVTOOLS_RTF_WBMBITSPIXEL "\\wbmbitspixel" +#define OOO_STRING_SVTOOLS_RTF_WBMPLANES "\\wbmplanes" +#define OOO_STRING_SVTOOLS_RTF_WBMWIDTHBYTES "\\wbmwidthbytes" +#define OOO_STRING_SVTOOLS_RTF_WIDOWCTRL "\\widowctrl" +#define OOO_STRING_SVTOOLS_RTF_WMETAFILE "\\wmetafile" +#define OOO_STRING_SVTOOLS_RTF_XE "\\xe" +#define OOO_STRING_SVTOOLS_RTF_YR "\\yr" +#define OOO_STRING_SVTOOLS_RTF_NOBRKHYPH "\\_" +#define OOO_STRING_SVTOOLS_RTF_FORMULA "\\|" +#define OOO_STRING_SVTOOLS_RTF_NOBREAK "\\~" +#define OOO_STRING_SVTOOLS_RTF_AB "\\ab" +#define OOO_STRING_SVTOOLS_RTF_ACAPS "\\acaps" +#define OOO_STRING_SVTOOLS_RTF_ACF "\\acf" +#define OOO_STRING_SVTOOLS_RTF_ADDITIVE "\\additive" +#define OOO_STRING_SVTOOLS_RTF_ADN "\\adn" +#define OOO_STRING_SVTOOLS_RTF_AENDDOC "\\aenddoc" +#define OOO_STRING_SVTOOLS_RTF_AENDNOTES "\\aendnotes" +#define OOO_STRING_SVTOOLS_RTF_AEXPND "\\aexpnd" +#define OOO_STRING_SVTOOLS_RTF_AF "\\af" +#define OOO_STRING_SVTOOLS_RTF_AFS "\\afs" +#define OOO_STRING_SVTOOLS_RTF_AFTNBJ "\\aftnbj" +#define OOO_STRING_SVTOOLS_RTF_AFTNCN "\\aftncn" +#define OOO_STRING_SVTOOLS_RTF_AFTNNALC "\\aftnnalc" +#define OOO_STRING_SVTOOLS_RTF_AFTNNAR "\\aftnnar" +#define OOO_STRING_SVTOOLS_RTF_AFTNNAUC "\\aftnnauc" +#define OOO_STRING_SVTOOLS_RTF_AFTNNCHI "\\aftnnchi" +#define OOO_STRING_SVTOOLS_RTF_AFTNNRLC "\\aftnnrlc" +#define OOO_STRING_SVTOOLS_RTF_AFTNNRUC "\\aftnnruc" +#define OOO_STRING_SVTOOLS_RTF_AFTNRESTART "\\aftnrestart" +#define OOO_STRING_SVTOOLS_RTF_AFTNRSTCONT "\\aftnrstcont" +#define OOO_STRING_SVTOOLS_RTF_AFTNSEP "\\aftnsep" +#define OOO_STRING_SVTOOLS_RTF_AFTNSEPC "\\aftnsepc" +#define OOO_STRING_SVTOOLS_RTF_AFTNSTART "\\aftnstart" +#define OOO_STRING_SVTOOLS_RTF_AFTNTJ "\\aftntj" +#define OOO_STRING_SVTOOLS_RTF_AI "\\ai" +#define OOO_STRING_SVTOOLS_RTF_ALANG "\\alang" +#define OOO_STRING_SVTOOLS_RTF_ALLPROT "\\allprot" +#define OOO_STRING_SVTOOLS_RTF_ANNOTPROT "\\annotprot" +#define OOO_STRING_SVTOOLS_RTF_AOUTL "\\aoutl" +#define OOO_STRING_SVTOOLS_RTF_ASCAPS "\\ascaps" +#define OOO_STRING_SVTOOLS_RTF_ASHAD "\\ashad" +#define OOO_STRING_SVTOOLS_RTF_ASTRIKE "\\astrike" +#define OOO_STRING_SVTOOLS_RTF_ATNAUTHOR "\\atnauthor" +#define OOO_STRING_SVTOOLS_RTF_ATNICN "\\atnicn" +#define OOO_STRING_SVTOOLS_RTF_ATNREF "\\atnref" +#define OOO_STRING_SVTOOLS_RTF_ATNTIME "\\atntime" +#define OOO_STRING_SVTOOLS_RTF_ATRFEND "\\atrfend" +#define OOO_STRING_SVTOOLS_RTF_ATRFSTART "\\atrfstart" +#define OOO_STRING_SVTOOLS_RTF_AUL "\\aul" +#define OOO_STRING_SVTOOLS_RTF_AULD "\\auld" +#define OOO_STRING_SVTOOLS_RTF_AULDB "\\auldb" +#define OOO_STRING_SVTOOLS_RTF_AULNONE "\\aulnone" +#define OOO_STRING_SVTOOLS_RTF_AULW "\\aulw" +#define OOO_STRING_SVTOOLS_RTF_AUP "\\aup" +#define OOO_STRING_SVTOOLS_RTF_BKMKPUB "\\bkmkpub" +#define OOO_STRING_SVTOOLS_RTF_BRDRDASH "\\brdrdash" +#define OOO_STRING_SVTOOLS_RTF_BRKFRM "\\brkfrm" +#define OOO_STRING_SVTOOLS_RTF_CCHS "\\cchs" +#define OOO_STRING_SVTOOLS_RTF_CPG "\\cpg" +#define OOO_STRING_SVTOOLS_RTF_CS "\\cs" +#define OOO_STRING_SVTOOLS_RTF_CVMME "\\cvmme" +#define OOO_STRING_SVTOOLS_RTF_DATAFIELD "\\datafield" +#define OOO_STRING_SVTOOLS_RTF_DO "\\do" +#define OOO_STRING_SVTOOLS_RTF_DOBXCOLUMN "\\dobxcolumn" +#define OOO_STRING_SVTOOLS_RTF_DOBXMARGIN "\\dobxmargin" +#define OOO_STRING_SVTOOLS_RTF_DOBXPAGE "\\dobxpage" +#define OOO_STRING_SVTOOLS_RTF_DOBYMARGIN "\\dobymargin" +#define OOO_STRING_SVTOOLS_RTF_DOBYPAGE "\\dobypage" +#define OOO_STRING_SVTOOLS_RTF_DOBYPARA "\\dobypara" +#define OOO_STRING_SVTOOLS_RTF_DODHGT "\\dodhgt" +#define OOO_STRING_SVTOOLS_RTF_DOLOCK "\\dolock" +#define OOO_STRING_SVTOOLS_RTF_DPAENDHOL "\\dpaendhol" +#define OOO_STRING_SVTOOLS_RTF_DPAENDL "\\dpaendl" +#define OOO_STRING_SVTOOLS_RTF_DPAENDSOL "\\dpaendsol" +#define OOO_STRING_SVTOOLS_RTF_DPAENDW "\\dpaendw" +#define OOO_STRING_SVTOOLS_RTF_DPARC "\\dparc" +#define OOO_STRING_SVTOOLS_RTF_DPARCFLIPX "\\dparcflipx" +#define OOO_STRING_SVTOOLS_RTF_DPARCFLIPY "\\dparcflipy" +#define OOO_STRING_SVTOOLS_RTF_DPASTARTHOL "\\dpastarthol" +#define OOO_STRING_SVTOOLS_RTF_DPASTARTL "\\dpastartl" +#define OOO_STRING_SVTOOLS_RTF_DPASTARTSOL "\\dpastartsol" +#define OOO_STRING_SVTOOLS_RTF_DPASTARTW "\\dpastartw" +#define OOO_STRING_SVTOOLS_RTF_DPCALLOUT "\\dpcallout" +#define OOO_STRING_SVTOOLS_RTF_DPCOA "\\dpcoa" +#define OOO_STRING_SVTOOLS_RTF_DPCOACCENT "\\dpcoaccent" +#define OOO_STRING_SVTOOLS_RTF_DPCOBESTFIT "\\dpcobestfit" +#define OOO_STRING_SVTOOLS_RTF_DPCOBORDER "\\dpcoborder" +#define OOO_STRING_SVTOOLS_RTF_DPCODABS "\\dpcodabs" +#define OOO_STRING_SVTOOLS_RTF_DPCODBOTTOM "\\dpcodbottom" +#define OOO_STRING_SVTOOLS_RTF_DPCODCENTER "\\dpcodcenter" +#define OOO_STRING_SVTOOLS_RTF_DPCODTOP "\\dpcodtop" +#define OOO_STRING_SVTOOLS_RTF_DPCOLENGTH "\\dpcolength" +#define OOO_STRING_SVTOOLS_RTF_DPCOMINUSX "\\dpcominusx" +#define OOO_STRING_SVTOOLS_RTF_DPCOMINUSY "\\dpcominusy" +#define OOO_STRING_SVTOOLS_RTF_DPCOOFFSET "\\dpcooffset" +#define OOO_STRING_SVTOOLS_RTF_DPCOSMARTA "\\dpcosmarta" +#define OOO_STRING_SVTOOLS_RTF_DPCOTDOUBLE "\\dpcotdouble" +#define OOO_STRING_SVTOOLS_RTF_DPCOTRIGHT "\\dpcotright" +#define OOO_STRING_SVTOOLS_RTF_DPCOTSINGLE "\\dpcotsingle" +#define OOO_STRING_SVTOOLS_RTF_DPCOTTRIPLE "\\dpcottriple" +#define OOO_STRING_SVTOOLS_RTF_DPCOUNT "\\dpcount" +#define OOO_STRING_SVTOOLS_RTF_DPELLIPSE "\\dpellipse" +#define OOO_STRING_SVTOOLS_RTF_DPENDGROUP "\\dpendgroup" +#define OOO_STRING_SVTOOLS_RTF_DPFILLBGCB "\\dpfillbgcb" +#define OOO_STRING_SVTOOLS_RTF_DPFILLBGCG "\\dpfillbgcg" +#define OOO_STRING_SVTOOLS_RTF_DPFILLBGCR "\\dpfillbgcr" +#define OOO_STRING_SVTOOLS_RTF_DPFILLBGGRAY "\\dpfillbggray" +#define OOO_STRING_SVTOOLS_RTF_DPFILLBGPAL "\\dpfillbgpal" +#define OOO_STRING_SVTOOLS_RTF_DPFILLFGCB "\\dpfillfgcb" +#define OOO_STRING_SVTOOLS_RTF_DPFILLFGCG "\\dpfillfgcg" +#define OOO_STRING_SVTOOLS_RTF_DPFILLFGCR "\\dpfillfgcr" +#define OOO_STRING_SVTOOLS_RTF_DPFILLFGGRAY "\\dpfillfggray" +#define OOO_STRING_SVTOOLS_RTF_DPFILLFGPAL "\\dpfillfgpal" +#define OOO_STRING_SVTOOLS_RTF_DPFILLPAT "\\dpfillpat" +#define OOO_STRING_SVTOOLS_RTF_DPGROUP "\\dpgroup" +#define OOO_STRING_SVTOOLS_RTF_DPLINE "\\dpline" +#define OOO_STRING_SVTOOLS_RTF_DPLINECOB "\\dplinecob" +#define OOO_STRING_SVTOOLS_RTF_DPLINECOG "\\dplinecog" +#define OOO_STRING_SVTOOLS_RTF_DPLINECOR "\\dplinecor" +#define OOO_STRING_SVTOOLS_RTF_DPLINEDADO "\\dplinedado" +#define OOO_STRING_SVTOOLS_RTF_DPLINEDADODO "\\dplinedadodo" +#define OOO_STRING_SVTOOLS_RTF_DPLINEDASH "\\dplinedash" +#define OOO_STRING_SVTOOLS_RTF_DPLINEDOT "\\dplinedot" +#define OOO_STRING_SVTOOLS_RTF_DPLINEGRAY "\\dplinegray" +#define OOO_STRING_SVTOOLS_RTF_DPLINEHOLLOW "\\dplinehollow" +#define OOO_STRING_SVTOOLS_RTF_DPLINEPAL "\\dplinepal" +#define OOO_STRING_SVTOOLS_RTF_DPLINESOLID "\\dplinesolid" +#define OOO_STRING_SVTOOLS_RTF_DPLINEW "\\dplinew" +#define OOO_STRING_SVTOOLS_RTF_DPPOLYCOUNT "\\dppolycount" +#define OOO_STRING_SVTOOLS_RTF_DPPOLYGON "\\dppolygon" +#define OOO_STRING_SVTOOLS_RTF_DPPOLYLINE "\\dppolyline" +#define OOO_STRING_SVTOOLS_RTF_DPPTX "\\dpptx" +#define OOO_STRING_SVTOOLS_RTF_DPPTY "\\dppty" +#define OOO_STRING_SVTOOLS_RTF_DPRECT "\\dprect" +#define OOO_STRING_SVTOOLS_RTF_DPROUNDR "\\dproundr" +#define OOO_STRING_SVTOOLS_RTF_DPSHADOW "\\dpshadow" +#define OOO_STRING_SVTOOLS_RTF_DPSHADX "\\dpshadx" +#define OOO_STRING_SVTOOLS_RTF_DPSHADY "\\dpshady" +#define OOO_STRING_SVTOOLS_RTF_DPTXBX "\\dptxbx" +#define OOO_STRING_SVTOOLS_RTF_DPTXBXMAR "\\dptxbxmar" +#define OOO_STRING_SVTOOLS_RTF_DPTXBXTEXT "\\dptxbxtext" +#define OOO_STRING_SVTOOLS_RTF_DPX "\\dpx" +#define OOO_STRING_SVTOOLS_RTF_DPXSIZE "\\dpxsize" +#define OOO_STRING_SVTOOLS_RTF_DPY "\\dpy" +#define OOO_STRING_SVTOOLS_RTF_DPYSIZE "\\dpysize" +#define OOO_STRING_SVTOOLS_RTF_DS "\\ds" +#define OOO_STRING_SVTOOLS_RTF_EMSPACE "\\emspace" +#define OOO_STRING_SVTOOLS_RTF_ENSPACE "\\enspace" +#define OOO_STRING_SVTOOLS_RTF_FBIDI "\\fbidi" +#define OOO_STRING_SVTOOLS_RTF_FET "\\fet" +#define OOO_STRING_SVTOOLS_RTF_FID "\\fid" +#define OOO_STRING_SVTOOLS_RTF_FILE "\\file" +#define OOO_STRING_SVTOOLS_RTF_FILETBL "\\filetbl" +#define OOO_STRING_SVTOOLS_RTF_FLDALT "\\fldalt" +#define OOO_STRING_SVTOOLS_RTF_FNETWORK "\\fnetwork" +#define OOO_STRING_SVTOOLS_RTF_FONTEMB "\\fontemb" +#define OOO_STRING_SVTOOLS_RTF_FONTFILE "\\fontfile" +#define OOO_STRING_SVTOOLS_RTF_FORMDISP "\\formdisp" +#define OOO_STRING_SVTOOLS_RTF_FORMPROT "\\formprot" +#define OOO_STRING_SVTOOLS_RTF_FORMSHADE "\\formshade" +#define OOO_STRING_SVTOOLS_RTF_FOSNUM "\\fosnum" +#define OOO_STRING_SVTOOLS_RTF_FRELATIVE "\\frelative" +#define OOO_STRING_SVTOOLS_RTF_FTNALT "\\ftnalt" +#define OOO_STRING_SVTOOLS_RTF_FTNIL "\\ftnil" +#define OOO_STRING_SVTOOLS_RTF_FTNNALC "\\ftnnalc" +#define OOO_STRING_SVTOOLS_RTF_FTNNAR "\\ftnnar" +#define OOO_STRING_SVTOOLS_RTF_FTNNAUC "\\ftnnauc" +#define OOO_STRING_SVTOOLS_RTF_FTNNCHI "\\ftnnchi" +#define OOO_STRING_SVTOOLS_RTF_FTNNRLC "\\ftnnrlc" +#define OOO_STRING_SVTOOLS_RTF_FTNNRUC "\\ftnnruc" +#define OOO_STRING_SVTOOLS_RTF_FTNRSTCONT "\\ftnrstcont" +#define OOO_STRING_SVTOOLS_RTF_FTNRSTPG "\\ftnrstpg" +#define OOO_STRING_SVTOOLS_RTF_FTTRUETYPE "\\fttruetype" +#define OOO_STRING_SVTOOLS_RTF_FVALIDDOS "\\fvaliddos" +#define OOO_STRING_SVTOOLS_RTF_FVALIDHPFS "\\fvalidhpfs" +#define OOO_STRING_SVTOOLS_RTF_FVALIDMAC "\\fvalidmac" +#define OOO_STRING_SVTOOLS_RTF_FVALIDNTFS "\\fvalidntfs" +#define OOO_STRING_SVTOOLS_RTF_HYPHAUTO "\\hyphauto" +#define OOO_STRING_SVTOOLS_RTF_HYPHCAPS "\\hyphcaps" +#define OOO_STRING_SVTOOLS_RTF_HYPHCONSEC "\\hyphconsec" +#define OOO_STRING_SVTOOLS_RTF_HYPHPAR "\\hyphpar" +#define OOO_STRING_SVTOOLS_RTF_LINKSELF "\\linkself" +#define OOO_STRING_SVTOOLS_RTF_LINKSTYLES "\\linkstyles" +#define OOO_STRING_SVTOOLS_RTF_LTRCH "\\ltrch" +#define OOO_STRING_SVTOOLS_RTF_LTRDOC "\\ltrdoc" +#define OOO_STRING_SVTOOLS_RTF_LTRMARK "\\ltrmark" +#define OOO_STRING_SVTOOLS_RTF_LTRPAR "\\ltrpar" +#define OOO_STRING_SVTOOLS_RTF_LTRROW "\\ltrrow" +#define OOO_STRING_SVTOOLS_RTF_LTRSECT "\\ltrsect" +#define OOO_STRING_SVTOOLS_RTF_NOCOLBAL "\\nocolbal" +#define OOO_STRING_SVTOOLS_RTF_NOEXTRASPRL "\\noextrasprl" +#define OOO_STRING_SVTOOLS_RTF_NOTABIND "\\notabind" +#define OOO_STRING_SVTOOLS_RTF_NOWIDCTLPAR "\\nowidctlpar" +#define OOO_STRING_SVTOOLS_RTF_OBJALIAS "\\objalias" +#define OOO_STRING_SVTOOLS_RTF_OBJALIGN "\\objalign" +#define OOO_STRING_SVTOOLS_RTF_OBJAUTLINK "\\objautlink" +#define OOO_STRING_SVTOOLS_RTF_OBJCLASS "\\objclass" +#define OOO_STRING_SVTOOLS_RTF_OBJCROPB "\\objcropb" +#define OOO_STRING_SVTOOLS_RTF_OBJCROPL "\\objcropl" +#define OOO_STRING_SVTOOLS_RTF_OBJCROPR "\\objcropr" +#define OOO_STRING_SVTOOLS_RTF_OBJCROPT "\\objcropt" +#define OOO_STRING_SVTOOLS_RTF_OBJDATA "\\objdata" +#define OOO_STRING_SVTOOLS_RTF_OBJECT "\\object" +#define OOO_STRING_SVTOOLS_RTF_OBJEMB "\\objemb" +#define OOO_STRING_SVTOOLS_RTF_OBJH "\\objh" +#define OOO_STRING_SVTOOLS_RTF_OBJICEMB "\\objicemb" +#define OOO_STRING_SVTOOLS_RTF_OBJLINK "\\objlink" +#define OOO_STRING_SVTOOLS_RTF_OBJLOCK "\\objlock" +#define OOO_STRING_SVTOOLS_RTF_OBJNAME "\\objname" +#define OOO_STRING_SVTOOLS_RTF_OBJPUB "\\objpub" +#define OOO_STRING_SVTOOLS_RTF_OBJSCALEX "\\objscalex" +#define OOO_STRING_SVTOOLS_RTF_OBJSCALEY "\\objscaley" +#define OOO_STRING_SVTOOLS_RTF_OBJSECT "\\objsect" +#define OOO_STRING_SVTOOLS_RTF_OBJSETSIZE "\\objsetsize" +#define OOO_STRING_SVTOOLS_RTF_OBJSUB "\\objsub" +#define OOO_STRING_SVTOOLS_RTF_OBJTIME "\\objtime" +#define OOO_STRING_SVTOOLS_RTF_OBJTRANSY "\\objtransy" +#define OOO_STRING_SVTOOLS_RTF_OBJUPDATE "\\objupdate" +#define OOO_STRING_SVTOOLS_RTF_OBJW "\\objw" +#define OOO_STRING_SVTOOLS_RTF_OTBLRUL "\\otblrul" +#define OOO_STRING_SVTOOLS_RTF_PGNHN "\\pgnhn" +#define OOO_STRING_SVTOOLS_RTF_PGNHNSC "\\pgnhnsc" +#define OOO_STRING_SVTOOLS_RTF_PGNHNSH "\\pgnhnsh" +#define OOO_STRING_SVTOOLS_RTF_PGNHNSM "\\pgnhnsm" +#define OOO_STRING_SVTOOLS_RTF_PGNHNSN "\\pgnhnsn" +#define OOO_STRING_SVTOOLS_RTF_PGNHNSP "\\pgnhnsp" +#define OOO_STRING_SVTOOLS_RTF_PICBMP "\\picbmp" +#define OOO_STRING_SVTOOLS_RTF_PICBPP "\\picbpp" +#define OOO_STRING_SVTOOLS_RTF_PN "\\pn" +#define OOO_STRING_SVTOOLS_RTF_PNACROSS "\\pnacross" +#define OOO_STRING_SVTOOLS_RTF_PNB "\\pnb" +#define OOO_STRING_SVTOOLS_RTF_PNCAPS "\\pncaps" +#define OOO_STRING_SVTOOLS_RTF_PNCARD "\\pncard" +#define OOO_STRING_SVTOOLS_RTF_PNCF "\\pncf" +#define OOO_STRING_SVTOOLS_RTF_PNDEC "\\pndec" +#define OOO_STRING_SVTOOLS_RTF_PNF "\\pnf" +#define OOO_STRING_SVTOOLS_RTF_PNFS "\\pnfs" +#define OOO_STRING_SVTOOLS_RTF_PNHANG "\\pnhang" +#define OOO_STRING_SVTOOLS_RTF_PNI "\\pni" +#define OOO_STRING_SVTOOLS_RTF_PNINDENT "\\pnindent" +#define OOO_STRING_SVTOOLS_RTF_PNLCLTR "\\pnlcltr" +#define OOO_STRING_SVTOOLS_RTF_PNLCRM "\\pnlcrm" +#define OOO_STRING_SVTOOLS_RTF_PNLVL "\\pnlvl" +#define OOO_STRING_SVTOOLS_RTF_PNLVLBLT "\\pnlvlblt" +#define OOO_STRING_SVTOOLS_RTF_PNLVLBODY "\\pnlvlbody" +#define OOO_STRING_SVTOOLS_RTF_PNLVLCONT "\\pnlvlcont" +#define OOO_STRING_SVTOOLS_RTF_PNNUMONCE "\\pnnumonce" +#define OOO_STRING_SVTOOLS_RTF_PNORD "\\pnord" +#define OOO_STRING_SVTOOLS_RTF_PNORDT "\\pnordt" +#define OOO_STRING_SVTOOLS_RTF_PNPREV "\\pnprev" +#define OOO_STRING_SVTOOLS_RTF_PNQC "\\pnqc" +#define OOO_STRING_SVTOOLS_RTF_PNQL "\\pnql" +#define OOO_STRING_SVTOOLS_RTF_PNQR "\\pnqr" +#define OOO_STRING_SVTOOLS_RTF_PNRESTART "\\pnrestart" +#define OOO_STRING_SVTOOLS_RTF_PNSCAPS "\\pnscaps" +#define OOO_STRING_SVTOOLS_RTF_PNSECLVL "\\pnseclvl" +#define OOO_STRING_SVTOOLS_RTF_PNSP "\\pnsp" +#define OOO_STRING_SVTOOLS_RTF_PNSTART "\\pnstart" +#define OOO_STRING_SVTOOLS_RTF_PNSTRIKE "\\pnstrike" +#define OOO_STRING_SVTOOLS_RTF_PNTEXT "\\pntext" +#define OOO_STRING_SVTOOLS_RTF_PNTXTA "\\pntxta" +#define OOO_STRING_SVTOOLS_RTF_PNTXTB "\\pntxtb" +#define OOO_STRING_SVTOOLS_RTF_PNUCLTR "\\pnucltr" +#define OOO_STRING_SVTOOLS_RTF_PNUCRM "\\pnucrm" +#define OOO_STRING_SVTOOLS_RTF_PNUL "\\pnul" +#define OOO_STRING_SVTOOLS_RTF_PNULD "\\pnuld" +#define OOO_STRING_SVTOOLS_RTF_PNULDB "\\pnuldb" +#define OOO_STRING_SVTOOLS_RTF_PNULNONE "\\pnulnone" +#define OOO_STRING_SVTOOLS_RTF_PNULW "\\pnulw" +#define OOO_STRING_SVTOOLS_RTF_PRCOLBL "\\prcolbl" +#define OOO_STRING_SVTOOLS_RTF_PRINTDATA "\\printdata" +#define OOO_STRING_SVTOOLS_RTF_PSZ "\\psz" +#define OOO_STRING_SVTOOLS_RTF_PUBAUTO "\\pubauto" +#define OOO_STRING_SVTOOLS_RTF_RESULT "\\result" +#define OOO_STRING_SVTOOLS_RTF_REVAUTH "\\revauth" +#define OOO_STRING_SVTOOLS_RTF_REVDTTM "\\revdttm" +#define OOO_STRING_SVTOOLS_RTF_REVPROT "\\revprot" +#define OOO_STRING_SVTOOLS_RTF_REVTBL "\\revtbl" +#define OOO_STRING_SVTOOLS_RTF_RSLTBMP "\\rsltbmp" +#define OOO_STRING_SVTOOLS_RTF_RSLTMERGE "\\rsltmerge" +#define OOO_STRING_SVTOOLS_RTF_RSLTPICT "\\rsltpict" +#define OOO_STRING_SVTOOLS_RTF_RSLTRTF "\\rsltrtf" +#define OOO_STRING_SVTOOLS_RTF_RSLTTXT "\\rslttxt" +#define OOO_STRING_SVTOOLS_RTF_RTLCH "\\rtlch" +#define OOO_STRING_SVTOOLS_RTF_RTLDOC "\\rtldoc" +#define OOO_STRING_SVTOOLS_RTF_RTLMARK "\\rtlmark" +#define OOO_STRING_SVTOOLS_RTF_RTLPAR "\\rtlpar" +#define OOO_STRING_SVTOOLS_RTF_RTLROW "\\rtlrow" +#define OOO_STRING_SVTOOLS_RTF_RTLSECT "\\rtlsect" +#define OOO_STRING_SVTOOLS_RTF_SEC "\\sec" +#define OOO_STRING_SVTOOLS_RTF_SECTNUM "\\sectnum" +#define OOO_STRING_SVTOOLS_RTF_SECTUNLOCKED "\\sectunlocked" +#define OOO_STRING_SVTOOLS_RTF_SLMULT "\\slmult" +#define OOO_STRING_SVTOOLS_RTF_SOFTCOL "\\softcol" +#define OOO_STRING_SVTOOLS_RTF_SOFTLHEIGHT "\\softlheight" +#define OOO_STRING_SVTOOLS_RTF_SOFTLINE "\\softline" +#define OOO_STRING_SVTOOLS_RTF_SOFTPAGE "\\softpage" +#define OOO_STRING_SVTOOLS_RTF_SPRSSPBF "\\sprsspbf" +#define OOO_STRING_SVTOOLS_RTF_SPRSTSP "\\sprstsp" +#define OOO_STRING_SVTOOLS_RTF_SUBDOCUMENT "\\subdocument" +#define OOO_STRING_SVTOOLS_RTF_SWPBDR "\\swpbdr" +#define OOO_STRING_SVTOOLS_RTF_TCN "\\tcn" +#define OOO_STRING_SVTOOLS_RTF_TRANSMF "\\transmf" +#define OOO_STRING_SVTOOLS_RTF_TRBRDRB "\\trbrdrb" +#define OOO_STRING_SVTOOLS_RTF_TRBRDRH "\\trbrdrh" +#define OOO_STRING_SVTOOLS_RTF_TRBRDRL "\\trbrdrl" +#define OOO_STRING_SVTOOLS_RTF_TRBRDRR "\\trbrdrr" +#define OOO_STRING_SVTOOLS_RTF_TRBRDRT "\\trbrdrt" +#define OOO_STRING_SVTOOLS_RTF_TRBRDRV "\\trbrdrv" +#define OOO_STRING_SVTOOLS_RTF_TRHDR "\\trhdr" +#define OOO_STRING_SVTOOLS_RTF_TRKEEP "\\trkeep" +#define OOO_STRING_SVTOOLS_RTF_TRPADDB "\\trpaddb" +#define OOO_STRING_SVTOOLS_RTF_TRPADDL "\\trpaddl" +#define OOO_STRING_SVTOOLS_RTF_TRPADDR "\\trpaddr" +#define OOO_STRING_SVTOOLS_RTF_TRPADDT "\\trpaddt" +#define OOO_STRING_SVTOOLS_RTF_TRPADDFB "\\trpaddfb" +#define OOO_STRING_SVTOOLS_RTF_TRPADDFL "\\trpaddfl" +#define OOO_STRING_SVTOOLS_RTF_TRPADDFR "\\trpaddfr" +#define OOO_STRING_SVTOOLS_RTF_TRPADDFT "\\trpaddft" +#define OOO_STRING_SVTOOLS_RTF_WRAPTRSP "\\wraptrsp" +#define OOO_STRING_SVTOOLS_RTF_XEF "\\xef" +#define OOO_STRING_SVTOOLS_RTF_ZWJ "\\zwj" +#define OOO_STRING_SVTOOLS_RTF_ZWNJ "\\zwnj" + +// neue Tokens zur 1.5 +#define OOO_STRING_SVTOOLS_RTF_ABSLOCK "\\abslock" +#define OOO_STRING_SVTOOLS_RTF_ADJUSTRIGHT "\\adjustright" +#define OOO_STRING_SVTOOLS_RTF_AFTNNCHOSUNG "\\aftnnchosung" +#define OOO_STRING_SVTOOLS_RTF_AFTNNCNUM "\\aftnncnum" +#define OOO_STRING_SVTOOLS_RTF_AFTNNDBAR "\\aftnndbar" +#define OOO_STRING_SVTOOLS_RTF_AFTNNDBNUM "\\aftnndbnum" +#define OOO_STRING_SVTOOLS_RTF_AFTNNDBNUMD "\\aftnndbnumd" +#define OOO_STRING_SVTOOLS_RTF_AFTNNDBNUMK "\\aftnndbnumk" +#define OOO_STRING_SVTOOLS_RTF_AFTNNDBNUMT "\\aftnndbnumt" +#define OOO_STRING_SVTOOLS_RTF_AFTNNGANADA "\\aftnnganada" +#define OOO_STRING_SVTOOLS_RTF_AFTNNGBNUM "\\aftnngbnum" +#define OOO_STRING_SVTOOLS_RTF_AFTNNGBNUMD "\\aftnngbnumd" +#define OOO_STRING_SVTOOLS_RTF_AFTNNGBNUMK "\\aftnngbnumk" +#define OOO_STRING_SVTOOLS_RTF_AFTNNGBNUML "\\aftnngbnuml" +#define OOO_STRING_SVTOOLS_RTF_AFTNNZODIAC "\\aftnnzodiac" +#define OOO_STRING_SVTOOLS_RTF_AFTNNZODIACD "\\aftnnzodiacd" +#define OOO_STRING_SVTOOLS_RTF_AFTNNZODIACL "\\aftnnzodiacl" +#define OOO_STRING_SVTOOLS_RTF_ANIMTEXT "\\animtext" +#define OOO_STRING_SVTOOLS_RTF_ANSICPG "\\ansicpg" +#define OOO_STRING_SVTOOLS_RTF_BACKGROUND "\\background" +#define OOO_STRING_SVTOOLS_RTF_BDBFHDR "\\bdbfhdr" +#define OOO_STRING_SVTOOLS_RTF_BLIPTAG "\\bliptag" +#define OOO_STRING_SVTOOLS_RTF_BLIPUID "\\blipuid" +#define OOO_STRING_SVTOOLS_RTF_BLIPUPI "\\blipupi" +#define OOO_STRING_SVTOOLS_RTF_BRDRART "\\brdrart" +#define OOO_STRING_SVTOOLS_RTF_BRDRDASHD "\\brdrdashd" +#define OOO_STRING_SVTOOLS_RTF_BRDRDASHDD "\\brdrdashdd" +#define OOO_STRING_SVTOOLS_RTF_BRDRDASHDOTSTR "\\brdrdashdotstr" +#define OOO_STRING_SVTOOLS_RTF_BRDRDASHSM "\\brdrdashsm" +#define OOO_STRING_SVTOOLS_RTF_BRDREMBOSS "\\brdremboss" +#define OOO_STRING_SVTOOLS_RTF_BRDRENGRAVE "\\brdrengrave" +#define OOO_STRING_SVTOOLS_RTF_BRDRFRAME "\\brdrframe" +#define OOO_STRING_SVTOOLS_RTF_BRDRTHTNLG "\\brdrthtnlg" +#define OOO_STRING_SVTOOLS_RTF_BRDRTHTNMG "\\brdrthtnmg" +#define OOO_STRING_SVTOOLS_RTF_BRDRTHTNSG "\\brdrthtnsg" +#define OOO_STRING_SVTOOLS_RTF_BRDRTNTHLG "\\brdrtnthlg" +#define OOO_STRING_SVTOOLS_RTF_BRDRTNTHMG "\\brdrtnthmg" +#define OOO_STRING_SVTOOLS_RTF_BRDRTNTHSG "\\brdrtnthsg" +#define OOO_STRING_SVTOOLS_RTF_BRDRTNTHTNLG "\\brdrtnthtnlg" +#define OOO_STRING_SVTOOLS_RTF_BRDRTNTHTNMG "\\brdrtnthtnmg" +#define OOO_STRING_SVTOOLS_RTF_BRDRTNTHTNSG "\\brdrtnthtnsg" +#define OOO_STRING_SVTOOLS_RTF_BRDRTRIPLE "\\brdrtriple" +#define OOO_STRING_SVTOOLS_RTF_BRDRWAVY "\\brdrwavy" +#define OOO_STRING_SVTOOLS_RTF_BRDRWAVYDB "\\brdrwavydb" +#define OOO_STRING_SVTOOLS_RTF_CATEGORY "\\category" +#define OOO_STRING_SVTOOLS_RTF_CGRID "\\cgrid" +#define OOO_STRING_SVTOOLS_RTF_CHARSCALEX "\\charscalex" +#define OOO_STRING_SVTOOLS_RTF_CHBGBDIAG "\\chbgbdiag" +#define OOO_STRING_SVTOOLS_RTF_CHBGCROSS "\\chbgcross" +#define OOO_STRING_SVTOOLS_RTF_CHBGDCROSS "\\chbgdcross" +#define OOO_STRING_SVTOOLS_RTF_CHBGDKBDIAG "\\chbgdkbdiag" +#define OOO_STRING_SVTOOLS_RTF_CHBGDKCROSS "\\chbgdkcross" +#define OOO_STRING_SVTOOLS_RTF_CHBGDKDCROSS "\\chbgdkdcross" +#define OOO_STRING_SVTOOLS_RTF_CHBGDKFDIAG "\\chbgdkfdiag" +#define OOO_STRING_SVTOOLS_RTF_CHBGDKHORIZ "\\chbgdkhoriz" +#define OOO_STRING_SVTOOLS_RTF_CHBGDKVERT "\\chbgdkvert" +#define OOO_STRING_SVTOOLS_RTF_CHBGFDIAG "\\chbgfdiag" +#define OOO_STRING_SVTOOLS_RTF_CHBGHORIZ "\\chbghoriz" +#define OOO_STRING_SVTOOLS_RTF_CHBGVERT "\\chbgvert" +#define OOO_STRING_SVTOOLS_RTF_CHBRDR "\\chbrdr" +#define OOO_STRING_SVTOOLS_RTF_CHCBPAT "\\chcbpat" +#define OOO_STRING_SVTOOLS_RTF_CHCFPAT "\\chcfpat" +#define OOO_STRING_SVTOOLS_RTF_CHSHDNG "\\chshdng" +#define OOO_STRING_SVTOOLS_RTF_CLPADL "\\clpadl" +#define OOO_STRING_SVTOOLS_RTF_CLPADT "\\clpadt" +#define OOO_STRING_SVTOOLS_RTF_CLPADB "\\clpadb" +#define OOO_STRING_SVTOOLS_RTF_CLPADR "\\clpadr" +#define OOO_STRING_SVTOOLS_RTF_CLPADFL "\\clpadfl" +#define OOO_STRING_SVTOOLS_RTF_CLPADFT "\\clpadft" +#define OOO_STRING_SVTOOLS_RTF_CLPADFB "\\clpadfb" +#define OOO_STRING_SVTOOLS_RTF_CLPADFR "\\clpadfr" +#define OOO_STRING_SVTOOLS_RTF_CLTXLRTB "\\cltxlrtb" +#define OOO_STRING_SVTOOLS_RTF_CLTXTBRL "\\cltxtbrl" +#define OOO_STRING_SVTOOLS_RTF_CLVERTALB "\\clvertalb" +#define OOO_STRING_SVTOOLS_RTF_CLVERTALC "\\clvertalc" +#define OOO_STRING_SVTOOLS_RTF_CLVERTALT "\\clvertalt" +#define OOO_STRING_SVTOOLS_RTF_CLVMGF "\\clvmgf" +#define OOO_STRING_SVTOOLS_RTF_CLVMRG "\\clvmrg" +#define OOO_STRING_SVTOOLS_RTF_CLTXTBRLV "\\cltxtbrlv" +#define OOO_STRING_SVTOOLS_RTF_CLTXBTLR "\\cltxbtlr" +#define OOO_STRING_SVTOOLS_RTF_CLTXLRTBV "\\cltxlrtbv" +#define OOO_STRING_SVTOOLS_RTF_COMPANY "\\company" +#define OOO_STRING_SVTOOLS_RTF_CRAUTH "\\crauth" +#define OOO_STRING_SVTOOLS_RTF_CRDATE "\\crdate" +#define OOO_STRING_SVTOOLS_RTF_DATE "\\date" +#define OOO_STRING_SVTOOLS_RTF_DEFLANGFE "\\deflangfe" +#define OOO_STRING_SVTOOLS_RTF_DFRAUTH "\\dfrauth" +#define OOO_STRING_SVTOOLS_RTF_DFRDATE "\\dfrdate" +#define OOO_STRING_SVTOOLS_RTF_DFRSTART "\\dfrstart" +#define OOO_STRING_SVTOOLS_RTF_DFRSTOP "\\dfrstop" +#define OOO_STRING_SVTOOLS_RTF_DFRXST "\\dfrxst" +#define OOO_STRING_SVTOOLS_RTF_DGMARGIN "\\dgmargin" +#define OOO_STRING_SVTOOLS_RTF_DNTBLNSBDB "\\dntblnsbdb" +#define OOO_STRING_SVTOOLS_RTF_DOCTYPE "\\doctype" +#define OOO_STRING_SVTOOLS_RTF_DOCVAR "\\docvar" +#define OOO_STRING_SVTOOLS_RTF_DPCODESCENT "\\dpcodescent" +#define OOO_STRING_SVTOOLS_RTF_EMBO "\\embo" +#define OOO_STRING_SVTOOLS_RTF_EMFBLIP "\\emfblip" +#define OOO_STRING_SVTOOLS_RTF_EXPSHRTN "\\expshrtn" +#define OOO_STRING_SVTOOLS_RTF_FAAUTO "\\faauto" +#define OOO_STRING_SVTOOLS_RTF_FBIAS "\\fbias" +#define OOO_STRING_SVTOOLS_RTF_FFDEFRES "\\ffdefres" +#define OOO_STRING_SVTOOLS_RTF_FFDEFTEXT "\\ffdeftext" +#define OOO_STRING_SVTOOLS_RTF_FFENTRYMCR "\\ffentrymcr" +#define OOO_STRING_SVTOOLS_RTF_FFEXITMCR "\\ffexitmcr" +#define OOO_STRING_SVTOOLS_RTF_FFFORMAT "\\ffformat" +#define OOO_STRING_SVTOOLS_RTF_FFHASLISTBOX "\\ffhaslistbox" +#define OOO_STRING_SVTOOLS_RTF_FFHELPTEXT "\\ffhelptext" +#define OOO_STRING_SVTOOLS_RTF_FFHPS "\\ffhps" +#define OOO_STRING_SVTOOLS_RTF_FFL "\\ffl" +#define OOO_STRING_SVTOOLS_RTF_FFMAXLEN "\\ffmaxlen" +#define OOO_STRING_SVTOOLS_RTF_FFNAME "\\ffname" +#define OOO_STRING_SVTOOLS_RTF_FFOWNHELP "\\ffownhelp" +#define OOO_STRING_SVTOOLS_RTF_FFOWNSTAT "\\ffownstat" +#define OOO_STRING_SVTOOLS_RTF_FFPROT "\\ffprot" +#define OOO_STRING_SVTOOLS_RTF_FFRECALC "\\ffrecalc" +#define OOO_STRING_SVTOOLS_RTF_FFRES "\\ffres" +#define OOO_STRING_SVTOOLS_RTF_FFSIZE "\\ffsize" +#define OOO_STRING_SVTOOLS_RTF_FFSTATTEXT "\\ffstattext" +#define OOO_STRING_SVTOOLS_RTF_FFTYPE "\\fftype" +#define OOO_STRING_SVTOOLS_RTF_FFTYPETXT "\\fftypetxt" +#define OOO_STRING_SVTOOLS_RTF_FLDTYPE "\\fldtype" +#define OOO_STRING_SVTOOLS_RTF_FNAME "\\fname" +#define OOO_STRING_SVTOOLS_RTF_FORMFIELD "\\formfield" +#define OOO_STRING_SVTOOLS_RTF_FROMTEXT "\\fromtext" +#define OOO_STRING_SVTOOLS_RTF_FTNNCHOSUNG "\\ftnnchosung" +#define OOO_STRING_SVTOOLS_RTF_FTNNCNUM "\\ftnncnum" +#define OOO_STRING_SVTOOLS_RTF_FTNNDBAR "\\ftnndbar" +#define OOO_STRING_SVTOOLS_RTF_FTNNDBNUM "\\ftnndbnum" +#define OOO_STRING_SVTOOLS_RTF_FTNNDBNUMD "\\ftnndbnumd" +#define OOO_STRING_SVTOOLS_RTF_FTNNDBNUMK "\\ftnndbnumk" +#define OOO_STRING_SVTOOLS_RTF_FTNNDBNUMT "\\ftnndbnumt" +#define OOO_STRING_SVTOOLS_RTF_FTNNGANADA "\\ftnnganada" +#define OOO_STRING_SVTOOLS_RTF_FTNNGBNUM "\\ftnngbnum" +#define OOO_STRING_SVTOOLS_RTF_FTNNGBNUMD "\\ftnngbnumd" +#define OOO_STRING_SVTOOLS_RTF_FTNNGBNUMK "\\ftnngbnumk" +#define OOO_STRING_SVTOOLS_RTF_FTNNGBNUML "\\ftnngbnuml" +#define OOO_STRING_SVTOOLS_RTF_FTNNZODIAC "\\ftnnzodiac" +#define OOO_STRING_SVTOOLS_RTF_FTNNZODIACD "\\ftnnzodiacd" +#define OOO_STRING_SVTOOLS_RTF_FTNNZODIACL "\\ftnnzodiacl" +#define OOO_STRING_SVTOOLS_RTF_G "\\g" +#define OOO_STRING_SVTOOLS_RTF_GCW "\\gcw" +#define OOO_STRING_SVTOOLS_RTF_GRIDTBL "\\gridtbl" +#define OOO_STRING_SVTOOLS_RTF_HIGHLIGHT "\\highlight" +#define OOO_STRING_SVTOOLS_RTF_HLFR "\\hlfr" +#define OOO_STRING_SVTOOLS_RTF_HLINKBASE "\\hlinkbase" +#define OOO_STRING_SVTOOLS_RTF_HLLOC "\\hlloc" +#define OOO_STRING_SVTOOLS_RTF_HLSRC "\\hlsrc" +#define OOO_STRING_SVTOOLS_RTF_ILVL "\\ilvl" +#define OOO_STRING_SVTOOLS_RTF_IMPR "\\impr" +#define OOO_STRING_SVTOOLS_RTF_JPEGBLIP "\\jpegblip" +#define OOO_STRING_SVTOOLS_RTF_LEVELFOLLOW "\\levelfollow" +#define OOO_STRING_SVTOOLS_RTF_LEVELINDENT "\\levelindent" +#define OOO_STRING_SVTOOLS_RTF_LEVELJC "\\leveljc" +#define OOO_STRING_SVTOOLS_RTF_LEVELLEGAL "\\levellegal" +#define OOO_STRING_SVTOOLS_RTF_LEVELNFC "\\levelnfc" +#define OOO_STRING_SVTOOLS_RTF_LEVELNORESTART "\\levelnorestart" +#define OOO_STRING_SVTOOLS_RTF_LEVELNUMBERS "\\levelnumbers" +#define OOO_STRING_SVTOOLS_RTF_LEVELOLD "\\levelold" +#define OOO_STRING_SVTOOLS_RTF_LEVELPREV "\\levelprev" +#define OOO_STRING_SVTOOLS_RTF_LEVELPREVSPACE "\\levelprevspace" +#define OOO_STRING_SVTOOLS_RTF_LEVELSPACE "\\levelspace" +#define OOO_STRING_SVTOOLS_RTF_LEVELSTARTAT "\\levelstartat" +#define OOO_STRING_SVTOOLS_RTF_LEVELTEXT "\\leveltext" +#define OOO_STRING_SVTOOLS_RTF_LINKVAL "\\linkval" +#define OOO_STRING_SVTOOLS_RTF_LIST "\\list" +#define OOO_STRING_SVTOOLS_RTF_LISTID "\\listid" +#define OOO_STRING_SVTOOLS_RTF_LISTLEVEL "\\listlevel" +#define OOO_STRING_SVTOOLS_RTF_LISTNAME "\\listname" +#define OOO_STRING_SVTOOLS_RTF_LISTOVERRIDE "\\listoverride" +#define OOO_STRING_SVTOOLS_RTF_LISTOVERRIDECOUNT "\\listoverridecount" +#define OOO_STRING_SVTOOLS_RTF_LISTOVERRIDEFORMAT "\\listoverrideformat" +#define OOO_STRING_SVTOOLS_RTF_LISTOVERRIDESTART "\\listoverridestart" +#define OOO_STRING_SVTOOLS_RTF_LISTOVERRIDETABLE "\\listoverridetable" +#define OOO_STRING_SVTOOLS_RTF_LISTRESTARTHDN "\\listrestarthdn" +#define OOO_STRING_SVTOOLS_RTF_LISTSIMPLE "\\listsimple" +#define OOO_STRING_SVTOOLS_RTF_LISTTABLE "\\listtable" +#define OOO_STRING_SVTOOLS_RTF_LISTTEMPLATEID "\\listtemplateid" +#define OOO_STRING_SVTOOLS_RTF_LISTTEXT "\\listtext" +#define OOO_STRING_SVTOOLS_RTF_LS "\\ls" +#define OOO_STRING_SVTOOLS_RTF_LYTEXCTTP "\\lytexcttp" +#define OOO_STRING_SVTOOLS_RTF_LYTPRTMET "\\lytprtmet" +#define OOO_STRING_SVTOOLS_RTF_MANAGER "\\manager" +#define OOO_STRING_SVTOOLS_RTF_MSMCAP "\\msmcap" +#define OOO_STRING_SVTOOLS_RTF_NOFCHARSWS "\\nofcharsws" +#define OOO_STRING_SVTOOLS_RTF_NOLEAD "\\nolead" +#define OOO_STRING_SVTOOLS_RTF_NONSHPPICT "\\nonshppict" +#define OOO_STRING_SVTOOLS_RTF_NOSECTEXPAND "\\nosectexpand" +#define OOO_STRING_SVTOOLS_RTF_NOSNAPLINEGRID "\\nosnaplinegrid" +#define OOO_STRING_SVTOOLS_RTF_NOSPACEFORUL "\\nospaceforul" +#define OOO_STRING_SVTOOLS_RTF_NOULTRLSPC "\\noultrlspc" +#define OOO_STRING_SVTOOLS_RTF_NOXLATTOYEN "\\noxlattoyen" +#define OOO_STRING_SVTOOLS_RTF_OBJATTPH "\\objattph" +#define OOO_STRING_SVTOOLS_RTF_OBJHTML "\\objhtml" +#define OOO_STRING_SVTOOLS_RTF_OBJOCX "\\objocx" +#define OOO_STRING_SVTOOLS_RTF_OLDLINEWRAP "\\oldlinewrap" +#define OOO_STRING_SVTOOLS_RTF_OUTLINELEVEL "\\outlinelevel" +#define OOO_STRING_SVTOOLS_RTF_OVERLAY "\\overlay" +#define OOO_STRING_SVTOOLS_RTF_PANOSE "\\panose" +#define OOO_STRING_SVTOOLS_RTF_PGBRDRB "\\pgbrdrb" +#define OOO_STRING_SVTOOLS_RTF_PGBRDRFOOT "\\pgbrdrfoot" +#define OOO_STRING_SVTOOLS_RTF_PGBRDRHEAD "\\pgbrdrhead" +#define OOO_STRING_SVTOOLS_RTF_PGBRDRL "\\pgbrdrl" +#define OOO_STRING_SVTOOLS_RTF_PGBRDROPT "\\pgbrdropt" +#define OOO_STRING_SVTOOLS_RTF_PGBRDRR "\\pgbrdrr" +#define OOO_STRING_SVTOOLS_RTF_PGBRDRSNAP "\\pgbrdrsnap" +#define OOO_STRING_SVTOOLS_RTF_PGBRDRT "\\pgbrdrt" +#define OOO_STRING_SVTOOLS_RTF_PGNCHOSUNG "\\pgnchosung" +#define OOO_STRING_SVTOOLS_RTF_PGNCNUM "\\pgncnum" +#define OOO_STRING_SVTOOLS_RTF_PGNDBNUMK "\\pgndbnumk" +#define OOO_STRING_SVTOOLS_RTF_PGNDBNUMT "\\pgndbnumt" +#define OOO_STRING_SVTOOLS_RTF_PGNGANADA "\\pgnganada" +#define OOO_STRING_SVTOOLS_RTF_PGNGBNUM "\\pgngbnum" +#define OOO_STRING_SVTOOLS_RTF_PGNGBNUMD "\\pgngbnumd" +#define OOO_STRING_SVTOOLS_RTF_PGNGBNUMK "\\pgngbnumk" +#define OOO_STRING_SVTOOLS_RTF_PGNGBNUML "\\pgngbnuml" +#define OOO_STRING_SVTOOLS_RTF_PGNZODIAC "\\pgnzodiac" +#define OOO_STRING_SVTOOLS_RTF_PGNZODIACD "\\pgnzodiacd" +#define OOO_STRING_SVTOOLS_RTF_PGNZODIACL "\\pgnzodiacl" +#define OOO_STRING_SVTOOLS_RTF_PICPROP "\\picprop" +#define OOO_STRING_SVTOOLS_RTF_PNAIUEO "\\pnaiueo" +#define OOO_STRING_SVTOOLS_RTF_PNAIUEOD "\\pnaiueod" +#define OOO_STRING_SVTOOLS_RTF_PNCHOSUNG "\\pnchosung" +#define OOO_STRING_SVTOOLS_RTF_PNDBNUMD "\\pndbnumd" +#define OOO_STRING_SVTOOLS_RTF_PNDBNUMK "\\pndbnumk" +#define OOO_STRING_SVTOOLS_RTF_PNDBNUML "\\pndbnuml" +#define OOO_STRING_SVTOOLS_RTF_PNDBNUMT "\\pndbnumt" +#define OOO_STRING_SVTOOLS_RTF_PNGANADA "\\pnganada" +#define OOO_STRING_SVTOOLS_RTF_PNGBLIP "\\pngblip" +#define OOO_STRING_SVTOOLS_RTF_PNGBNUM "\\pngbnum" +#define OOO_STRING_SVTOOLS_RTF_PNGBNUMD "\\pngbnumd" +#define OOO_STRING_SVTOOLS_RTF_PNGBNUMK "\\pngbnumk" +#define OOO_STRING_SVTOOLS_RTF_PNGBNUML "\\pngbnuml" +#define OOO_STRING_SVTOOLS_RTF_PNRAUTH "\\pnrauth" +#define OOO_STRING_SVTOOLS_RTF_PNRDATE "\\pnrdate" +#define OOO_STRING_SVTOOLS_RTF_PNRNFC "\\pnrnfc" +#define OOO_STRING_SVTOOLS_RTF_PNRNOT "\\pnrnot" +#define OOO_STRING_SVTOOLS_RTF_PNRPNBR "\\pnrpnbr" +#define OOO_STRING_SVTOOLS_RTF_PNRRGB "\\pnrrgb" +#define OOO_STRING_SVTOOLS_RTF_PNRSTART "\\pnrstart" +#define OOO_STRING_SVTOOLS_RTF_PNRSTOP "\\pnrstop" +#define OOO_STRING_SVTOOLS_RTF_PNRXST "\\pnrxst" +#define OOO_STRING_SVTOOLS_RTF_PNZODIAC "\\pnzodiac" +#define OOO_STRING_SVTOOLS_RTF_PNZODIACD "\\pnzodiacd" +#define OOO_STRING_SVTOOLS_RTF_PNZODIACL "\\pnzodiacl" +#define OOO_STRING_SVTOOLS_RTF_LFOLEVEL "\\lfolevel" +#define OOO_STRING_SVTOOLS_RTF_POSYIN "\\posyin" +#define OOO_STRING_SVTOOLS_RTF_POSYOUT "\\posyout" +#define OOO_STRING_SVTOOLS_RTF_PRIVATE "\\private" +#define OOO_STRING_SVTOOLS_RTF_PROPNAME "\\propname" +#define OOO_STRING_SVTOOLS_RTF_PROPTYPE "\\proptype" +#define OOO_STRING_SVTOOLS_RTF_REVAUTHDEL "\\revauthdel" +#define OOO_STRING_SVTOOLS_RTF_REVDTTMDEL "\\revdttmdel" +#define OOO_STRING_SVTOOLS_RTF_SAUTOUPD "\\sautoupd" +#define OOO_STRING_SVTOOLS_RTF_SECTDEFAULTCL "\\sectdefaultcl" +#define OOO_STRING_SVTOOLS_RTF_SECTEXPAND "\\sectexpand" +#define OOO_STRING_SVTOOLS_RTF_SECTLINEGRID "\\sectlinegrid" +#define OOO_STRING_SVTOOLS_RTF_SECTSPECIFYCL "\\sectspecifycl" +#define OOO_STRING_SVTOOLS_RTF_SECTSPECIFYL "\\sectspecifyl" +#define OOO_STRING_SVTOOLS_RTF_SHIDDEN "\\shidden" +#define OOO_STRING_SVTOOLS_RTF_SHPBOTTOM "\\shpbottom" +#define OOO_STRING_SVTOOLS_RTF_SHPBXCOLUMN "\\shpbxcolumn" +#define OOO_STRING_SVTOOLS_RTF_SHPBXMARGIN "\\shpbxmargin" +#define OOO_STRING_SVTOOLS_RTF_SHPBXPAGE "\\shpbxpage" +#define OOO_STRING_SVTOOLS_RTF_SHPBYMARGIN "\\shpbymargin" +#define OOO_STRING_SVTOOLS_RTF_SHPBYPAGE "\\shpbypage" +#define OOO_STRING_SVTOOLS_RTF_SHPBYPARA "\\shpbypara" +#define OOO_STRING_SVTOOLS_RTF_SHPFBLWTXT "\\shpfblwtxt" +#define OOO_STRING_SVTOOLS_RTF_SHPFHDR "\\shpfhdr" +#define OOO_STRING_SVTOOLS_RTF_SHPGRP "\\shpgrp" +#define OOO_STRING_SVTOOLS_RTF_SHPLEFT "\\shpleft" +#define OOO_STRING_SVTOOLS_RTF_SHPLID "\\shplid" +#define OOO_STRING_SVTOOLS_RTF_SHPLOCKANCHOR "\\shplockanchor" +#define OOO_STRING_SVTOOLS_RTF_SHPPICT "\\shppict" +#define OOO_STRING_SVTOOLS_RTF_SHPRIGHT "\\shpright" +#define OOO_STRING_SVTOOLS_RTF_SHPRSLT "\\shprslt" +#define OOO_STRING_SVTOOLS_RTF_SHPTOP "\\shptop" +#define OOO_STRING_SVTOOLS_RTF_SHPTXT "\\shptxt" +#define OOO_STRING_SVTOOLS_RTF_SHPWRK "\\shpwrk" +#define OOO_STRING_SVTOOLS_RTF_SHPWR "\\shpwr" +#define OOO_STRING_SVTOOLS_RTF_SHPZ "\\shpz" +#define OOO_STRING_SVTOOLS_RTF_SPRSBSP "\\sprsbsp" +#define OOO_STRING_SVTOOLS_RTF_SPRSLNSP "\\sprslnsp" +#define OOO_STRING_SVTOOLS_RTF_SPRSTSM "\\sprstsm" +#define OOO_STRING_SVTOOLS_RTF_STATICVAL "\\staticval" +#define OOO_STRING_SVTOOLS_RTF_STEXTFLOW "\\stextflow" +#define OOO_STRING_SVTOOLS_RTF_STRIKED "\\striked" +#define OOO_STRING_SVTOOLS_RTF_SUBFONTBYSIZE "\\subfontbysize" +#define OOO_STRING_SVTOOLS_RTF_TCELLD "\\tcelld" +#define OOO_STRING_SVTOOLS_RTF_TIME "\\time" +#define OOO_STRING_SVTOOLS_RTF_TRUNCATEFONTHEIGHT "\\truncatefontheight" +#define OOO_STRING_SVTOOLS_RTF_UC "\\uc" +#define OOO_STRING_SVTOOLS_RTF_UD "\\ud" +#define OOO_STRING_SVTOOLS_RTF_ULDASH "\\uldash" +#define OOO_STRING_SVTOOLS_RTF_ULDASHD "\\uldashd" +#define OOO_STRING_SVTOOLS_RTF_ULDASHDD "\\uldashdd" +#define OOO_STRING_SVTOOLS_RTF_ULTH "\\ulth" +#define OOO_STRING_SVTOOLS_RTF_ULWAVE "\\ulwave" +#define OOO_STRING_SVTOOLS_RTF_ULC "\\ulc" +#define OOO_STRING_SVTOOLS_RTF_U "\\u" +#define OOO_STRING_SVTOOLS_RTF_UPR "\\upr" +#define OOO_STRING_SVTOOLS_RTF_USERPROPS "\\userprops" +#define OOO_STRING_SVTOOLS_RTF_VIEWKIND "\\viewkind" +#define OOO_STRING_SVTOOLS_RTF_VIEWSCALE "\\viewscale" +#define OOO_STRING_SVTOOLS_RTF_VIEWZK "\\viewzk" +#define OOO_STRING_SVTOOLS_RTF_WIDCTLPAR "\\widctlpar" +#define OOO_STRING_SVTOOLS_RTF_WINDOWCAPTION "\\windowcaption" +#define OOO_STRING_SVTOOLS_RTF_WPEQN "\\wpeqn" +#define OOO_STRING_SVTOOLS_RTF_WPJST "\\wpjst" +#define OOO_STRING_SVTOOLS_RTF_WPSP "\\wpsp" +#define OOO_STRING_SVTOOLS_RTF_YXE "\\yxe" +#define OOO_STRING_SVTOOLS_RTF_FRMTXLRTB "\\frmtxlrtb" +#define OOO_STRING_SVTOOLS_RTF_FRMTXTBRL "\\frmtxtbrl" +#define OOO_STRING_SVTOOLS_RTF_FRMTXBTLR "\\frmtxbtlr" +#define OOO_STRING_SVTOOLS_RTF_FRMTXLRTBV "\\frmtxlrtbv" +#define OOO_STRING_SVTOOLS_RTF_FRMTXTBRLV "\\frmtxtbrlv" + +// MS-2000 Tokens +#define OOO_STRING_SVTOOLS_RTF_ULTHD "\\ulthd" +#define OOO_STRING_SVTOOLS_RTF_ULTHDASH "\\ulthdash" +#define OOO_STRING_SVTOOLS_RTF_ULLDASH "\\ulldash" +#define OOO_STRING_SVTOOLS_RTF_ULTHLDASH "\\ulthldash" +#define OOO_STRING_SVTOOLS_RTF_ULTHDASHD "\\ulthdashd" +#define OOO_STRING_SVTOOLS_RTF_ULTHDASHDD "\\ulthdashdd" +#define OOO_STRING_SVTOOLS_RTF_ULHWAVE "\\ulhwave" +#define OOO_STRING_SVTOOLS_RTF_ULULDBWAVE "\\ululdbwave" +#define OOO_STRING_SVTOOLS_RTF_LOCH "\\loch" +#define OOO_STRING_SVTOOLS_RTF_HICH "\\hich" +#define OOO_STRING_SVTOOLS_RTF_DBCH "\\dbch" +#define OOO_STRING_SVTOOLS_RTF_LANGFE "\\langfe" +#define OOO_STRING_SVTOOLS_RTF_ADEFLANG "\\adeflang" +#define OOO_STRING_SVTOOLS_RTF_ADEFF "\\adeff" +#define OOO_STRING_SVTOOLS_RTF_ACCNONE "\\accnone" +#define OOO_STRING_SVTOOLS_RTF_ACCDOT "\\accdot" +#define OOO_STRING_SVTOOLS_RTF_ACCCOMMA "\\acccomma" +#define OOO_STRING_SVTOOLS_RTF_TWOINONE "\\twoinone" +#define OOO_STRING_SVTOOLS_RTF_HORZVERT "\\horzvert" +#define OOO_STRING_SVTOOLS_RTF_FAHANG "\\fahang" +#define OOO_STRING_SVTOOLS_RTF_FAVAR "\\favar" +#define OOO_STRING_SVTOOLS_RTF_FACENTER "\\facenter" +#define OOO_STRING_SVTOOLS_RTF_FAROMAN "\\faroman" +#define OOO_STRING_SVTOOLS_RTF_FAFIXED "\\fafixed" +#define OOO_STRING_SVTOOLS_RTF_NOCWRAP "\\nocwrap" +#define OOO_STRING_SVTOOLS_RTF_NOOVERFLOW "\\nooverflow" +#define OOO_STRING_SVTOOLS_RTF_ASPALPHA "\\aspalpha" + +// SWG spezifische Attribute +#define OOO_STRING_SVTOOLS_RTF_GRFALIGNV "\\grfalignv" +#define OOO_STRING_SVTOOLS_RTF_GRFALIGNH "\\grfalignh" +#define OOO_STRING_SVTOOLS_RTF_GRFMIRROR "\\grfmirror" +#define OOO_STRING_SVTOOLS_RTF_HEADERYB "\\headeryb" +#define OOO_STRING_SVTOOLS_RTF_HEADERXL "\\headerxl" +#define OOO_STRING_SVTOOLS_RTF_HEADERXR "\\headerxr" +#define OOO_STRING_SVTOOLS_RTF_FOOTERYT "\\footeryt" +#define OOO_STRING_SVTOOLS_RTF_FOOTERXL "\\footerxl" +#define OOO_STRING_SVTOOLS_RTF_FOOTERXR "\\footerxr" +#define OOO_STRING_SVTOOLS_RTF_HEADERYH "\\headeryh" +#define OOO_STRING_SVTOOLS_RTF_FOOTERYH "\\footeryh" +#define OOO_STRING_SVTOOLS_RTF_BALANCEDCOLUMN "\\swcolmnblnc" +#define OOO_STRING_SVTOOLS_RTF_UPDNPROP "\\updnprop" +#define OOO_STRING_SVTOOLS_RTF_PRTDATA "\\prtdata" +#define OOO_STRING_SVTOOLS_RTF_BKMKKEY "\\bkmkkey" + +// Attribute fuer die freifliegenden Rahmen +#define OOO_STRING_SVTOOLS_RTF_FLYPRINT "\\flyprint" +#define OOO_STRING_SVTOOLS_RTF_FLYOPAQUE "\\flyopaque" +#define OOO_STRING_SVTOOLS_RTF_FLYPRTCTD "\\flyprtctd" +#define OOO_STRING_SVTOOLS_RTF_FLYMAINCNT "\\flymaincnt" +#define OOO_STRING_SVTOOLS_RTF_FLYVERT "\\flyvert" +#define OOO_STRING_SVTOOLS_RTF_FLYHORZ "\\flyhorz" +#define OOO_STRING_SVTOOLS_RTF_DFRMTXTL "\\dfrmtxtl" +#define OOO_STRING_SVTOOLS_RTF_DFRMTXTR "\\dfrmtxtr" +#define OOO_STRING_SVTOOLS_RTF_DFRMTXTU "\\dfrmtxtu" +#define OOO_STRING_SVTOOLS_RTF_DFRMTXTW "\\dfrmtxtw" +#define OOO_STRING_SVTOOLS_RTF_FLYANCHOR "\\flyanchor" +#define OOO_STRING_SVTOOLS_RTF_FLYCNTNT "\\flycntnt" +#define OOO_STRING_SVTOOLS_RTF_FLYCOLUMN "\\flycolumn" +#define OOO_STRING_SVTOOLS_RTF_FLYPAGE "\\flypage" +#define OOO_STRING_SVTOOLS_RTF_FLYINPARA "\\flyinpara" +#define OOO_STRING_SVTOOLS_RTF_BRDBOX "\\brdbox" +#define OOO_STRING_SVTOOLS_RTF_BRDLNCOL "\\brdlncol" +#define OOO_STRING_SVTOOLS_RTF_BRDLNIN "\\brdlnin" +#define OOO_STRING_SVTOOLS_RTF_BRDLNOUT "\\brdlnout" +#define OOO_STRING_SVTOOLS_RTF_BRDLNDIST "\\brdlndist" +#define OOO_STRING_SVTOOLS_RTF_SHADOW "\\shadow" +#define OOO_STRING_SVTOOLS_RTF_SHDWDIST "\\shdwdist" +#define OOO_STRING_SVTOOLS_RTF_SHDWSTYLE "\\shdwstyle" +#define OOO_STRING_SVTOOLS_RTF_SHDWCOL "\\shdwcol" +#define OOO_STRING_SVTOOLS_RTF_SHDWFCOL "\\shdwfcol" +#define OOO_STRING_SVTOOLS_RTF_PGDSCTBL "\\pgdsctbl" +#define OOO_STRING_SVTOOLS_RTF_PGDSC "\\pgdsc" +#define OOO_STRING_SVTOOLS_RTF_PGDSCUSE "\\pgdscuse" +#define OOO_STRING_SVTOOLS_RTF_PGDSCNXT "\\pgdscnxt" +#define OOO_STRING_SVTOOLS_RTF_HYPHEN "\\hyphen" +#define OOO_STRING_SVTOOLS_RTF_HYPHLEAD "\\hyphlead" +#define OOO_STRING_SVTOOLS_RTF_HYPHTRAIL "\\hyphtrail" +#define OOO_STRING_SVTOOLS_RTF_HYPHMAX "\\hyphmax" +#define OOO_STRING_SVTOOLS_RTF_TLSWG "\\tlswg" +#define OOO_STRING_SVTOOLS_RTF_PGBRK "\\pgbrk" +#define OOO_STRING_SVTOOLS_RTF_PGDSCNO "\\pgdscno" +#define OOO_STRING_SVTOOLS_RTF_SOUTLVL "\\soutlvl" +#define OOO_STRING_SVTOOLS_RTF_SHP "\\shp" +#define OOO_STRING_SVTOOLS_RTF_SN "\\sn" +#define OOO_STRING_SVTOOLS_RTF_SV "\\sv" + +// Support for overline attributes +#define OOO_STRING_SVTOOLS_RTF_OL "\\ol" +#define OOO_STRING_SVTOOLS_RTF_OLD "\\old" +#define OOO_STRING_SVTOOLS_RTF_OLDB "\\oldb" +#define OOO_STRING_SVTOOLS_RTF_OLNONE "\\olnone" +#define OOO_STRING_SVTOOLS_RTF_OLW "\\olw" +#define OOO_STRING_SVTOOLS_RTF_OLDASH "\\oldash" +#define OOO_STRING_SVTOOLS_RTF_OLDASHD "\\oldashd" +#define OOO_STRING_SVTOOLS_RTF_OLDASHDD "\\oldashdd" +#define OOO_STRING_SVTOOLS_RTF_OLTH "\\olth" +#define OOO_STRING_SVTOOLS_RTF_OLWAVE "\\olwave" +#define OOO_STRING_SVTOOLS_RTF_OLC "\\olc" +#define OOO_STRING_SVTOOLS_RTF_OLTHD "\\olthd" +#define OOO_STRING_SVTOOLS_RTF_OLTHDASH "\\olthdash" +#define OOO_STRING_SVTOOLS_RTF_OLLDASH "\\olldash" +#define OOO_STRING_SVTOOLS_RTF_OLTHLDASH "\\olthldash" +#define OOO_STRING_SVTOOLS_RTF_OLTHDASHD "\\olthdashd" +#define OOO_STRING_SVTOOLS_RTF_OLTHDASHDD "\\olthdashdd" +#define OOO_STRING_SVTOOLS_RTF_OLHWAVE "\\olhwave" +#define OOO_STRING_SVTOOLS_RTF_OLOLDBWAVE "\\ololdbwave" + +#endif // _RTFKEYWD_HXX diff --git a/svtools/inc/svtools/rtfout.hxx b/svtools/inc/svtools/rtfout.hxx new file mode 100644 index 000000000000..ba20add1d968 --- /dev/null +++ b/svtools/inc/svtools/rtfout.hxx @@ -0,0 +1,70 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: rtfout.hxx,v $ + * $Revision: 1.6 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _RTFOUT_HXX +#define _RTFOUT_HXX + +#include "svtools/svtdllapi.h" +#include + +#ifndef _RTL_TEXTENC_H_ +#include +#endif + +class String; +class SvStream; + +class SVT_DLLPUBLIC RTFOutFuncs +{ +public: +#if defined(MAC) || defined(UNX) + static const sal_Char sNewLine; // nur \012 oder \015 +#else + static const sal_Char __FAR_DATA sNewLine[]; // \015\012 +#endif + + static SvStream& Out_Char( SvStream&, sal_Unicode cChar, + int *pUCMode, + rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252, + BOOL bWriteHelpFile = FALSE ); + static SvStream& Out_String( SvStream&, const String&, + rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252, + BOOL bWriteHelpFile = FALSE ); + static SvStream& Out_Fontname( SvStream&, const String&, + rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252, + BOOL bWriteHelpFile = FALSE ); + + static SvStream& Out_Hex( SvStream&, ULONG nHex, BYTE nLen ); +}; + + +#endif + + diff --git a/svtools/inc/svtools/rtftoken.h b/svtools/inc/svtools/rtftoken.h new file mode 100644 index 000000000000..c7981361ffc9 --- /dev/null +++ b/svtools/inc/svtools/rtftoken.h @@ -0,0 +1,1276 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: rtftoken.h,v $ + * $Revision: 1.13.134.1 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ + +#ifndef _RTFTOKEN_H +#define _RTFTOKEN_H + +class String; + +// suche die TokenID zu dem Token +int GetRTFToken( const String& rSearch ); + +enum RTF_TOKEN_RANGES { + RTF_NOGROUP = 0x0100, + RTF_DOCFMT = 0x0200, + RTF_SECTFMT = 0x0300, + RTF_PARFMT = 0x0400, + RTF_TABSTOPDEF = 0x0500, + RTF_BRDRDEF = 0x0600, + RTF_CHRFMT = 0x0700, + RTF_SPECCHAR = 0x0800, + RTF_APOCTL = 0x0900, + RTF_SHADINGDEF = 0x0A00, + // free = 0x0B00, + RTF_DRAWOBJECTS = 0x0C00, + RTF_OBJECTS = 0x0D00, + RTF_NUMBULLETS = 0x0E00, + + // !!! kann hinein verodert werden (Border/Background) !!!! + RTF_TABLEDEF = 0x1000, + + // !!! kann hinein verodert werden (Border/Tab) !!!! + RTF_SWGDEFS = 0x4000 +}; + +enum RTF_TOKEN_IDS { + + RTF_TEXTTOKEN = RTF_NOGROUP, + RTF_SINGLECHAR, + RTF_UNKNOWNCONTROL, + RTF_UNKNOWNDATA, + + RTF_RTF, + RTF_ANSITYPE, + RTF_MACTYPE, + RTF_PCTYPE, + RTF_PCATYPE, + RTF_NEXTTYPE, + + RTF_STYLESHEET, + RTF_SBASEDON, + RTF_SNEXT, + RTF_SHIDDEN, + RTF_SAUTOUPD, + + RTF_KEYCODE, + RTF_FNKEY, + RTF_ALTKEY, + RTF_SHIFTKEY, + RTF_CTRLKEY, + + RTF_FONTTBL, + RTF_DEFF, + RTF_FNIL, + RTF_FROMAN, + RTF_FSWISS, + RTF_FMODERN, + RTF_FSCRIPT, + RTF_FDECOR, + RTF_FTECH, + + RTF_COLORTBL, + RTF_RED, + RTF_GREEN, + RTF_BLUE, + + RTF_INFO, + RTF_TITLE, + RTF_SUBJECT, + RTF_AUTHOR, + RTF_OPERATOR, + RTF_KEYWORDS, + RTF_COMMENT, + RTF_VERSION, + RTF_DOCCOMM, + RTF_VERN, + RTF_CREATIM, + RTF_REVTIM, + RTF_PRINTIM, + RTF_BUPTIM, + RTF_EDMINS, + RTF_NOFPAGES, + RTF_NOFWORDS, + RTF_NOFCHARS, + RTF_ID, + RTF_YR, + RTF_MO, + RTF_DY, + RTF_HR, + RTF_MIN, + RTF_USERPROPS, + RTF_CATEGORY, + RTF_COMPANY, + RTF_MANAGER, + RTF_PROPNAME, + RTF_LINKVAL, + RTF_NOFCHARSWS, + RTF_HLINKBASE, + RTF_STATICVAL, + RTF_PROPTYPE, + + RTF_ANNOTATION, + RTF_ATNID, + + RTF_FOOTNOTE, + + RTF_XE, + RTF_BXE, + RTF_IXE, + RTF_RXE, + RTF_TXE, + RTF_YXE, + + RTF_TC, + RTF_TCF, + RTF_TCL, + + RTF_BKMKSTART, + RTF_BKMKEND, + + RTF_PICT, // Bitmaps + RTF_PICW, + RTF_PICH, + RTF_WBMBITSPIXEL, + RTF_WBMPLANES, + RTF_WBMWIDTHBYTES, + RTF_PICWGOAL, + RTF_PICHGOAL, + RTF_BIN, + RTF_PICSCALEX, + RTF_PICSCALEY, + RTF_PICSCALED, + RTF_WBITMAP, + RTF_WMETAFILE, + RTF_MACPICT, + RTF_OSMETAFILE, + RTF_DIBITMAP, + RTF_PICCROPT, + RTF_PICCROPB, + RTF_PICCROPL, + RTF_PICCROPR, + RTF_PICDATA, + RTF_PICBMP, + RTF_PICBPP, + RTF_PICPROP, + RTF_SHPPICT, + RTF_EMFBLIP, + RTF_PNGBLIP, + RTF_JPEGBLIP, + RTF_NONSHPPICT, + RTF_BLIPTAG, + RTF_BLIPUID, + RTF_BLIPUPI, + + RTF_FIELD, // Felder + RTF_FLDDIRTY, + RTF_FLDEDIT, + RTF_FLDLOCK, + RTF_FLDPRIV, + RTF_FLDINST, + RTF_FLDRSLT, + RTF_FLDTYPE, + RTF_TIME, + RTF_DATE, + RTF_WPEQN, + + RTF_NOLINE, + RTF_REVISED, + + RTF_BKMKCOLF, + RTF_BKMKCOLL, + RTF_PSOVER, + RTF_DOCTEMP, + RTF_DELETED, + + RTF_FCHARSET, + RTF_FALT, + RTF_FPRQ, + RTF_PANOSE, + RTF_FNAME, + RTF_FBIAS, + + RTF_ADDITIVE, + RTF_BKMKPUB, + RTF_CPG, + RTF_DATAFIELD, + + RTF_FBIDI, + RTF_FID, + RTF_FILE, + RTF_FILETBL, + RTF_FNETWORK, + RTF_FONTEMB, + RTF_FONTFILE, + RTF_FOSNUM, + RTF_FRELATIVE, + RTF_FTNIL, + RTF_FTTRUETYPE, + RTF_FVALIDDOS, + RTF_FVALIDHPFS, + RTF_FVALIDMAC, + RTF_FVALIDNTFS, + RTF_LINKSELF, + RTF_PUBAUTO, + RTF_REVTBL, + RTF_RTLMARK, + RTF_SEC, + RTF_TCN, + RTF_XEF, + + RTF_UD, // Unicode + RTF_UPR, + RTF_U, + RTF_UC, + RTF_ANSICPG, + + RTF_FFEXITMCR, // Form Fields + RTF_FFENTRYMCR, + RTF_FFDEFTEXT, + RTF_FFFORMAT, + RTF_FFSTATTEXT, + RTF_FORMFIELD, + RTF_FFNAME, + RTF_FFHELPTEXT, + RTF_FFL, + RTF_FFOWNHELP, + RTF_FFOWNSTAT, + RTF_FFMAXLEN, + RTF_FFHASLISTBOX, + RTF_FFHPS, + RTF_FFPROT, + RTF_FFTYPE, + RTF_FFTYPETXT, + RTF_FFSIZE, + RTF_FFRECALC, + RTF_FFRES, + RTF_FFDEFRES, + + RTF_HIGHLIGHT, + +/* */ + + RTF_DEFTAB = RTF_DOCFMT, + RTF_HYPHHOTZ, + RTF_LINESTART, + RTF_FRACWIDTH, + RTF_NEXTFILE, + RTF_TEMPLATE, + RTF_MAKEBACKUP, + RTF_DEFFORMAT, + RTF_DEFLANG, + RTF_FTNSEP, + RTF_FTNSEPC, + RTF_FTNCN, + RTF_ENDNOTES, + RTF_ENDDOC, + RTF_FTNTJ, + RTF_FTNBJ, + RTF_FTNSTART, + RTF_FTNRESTART, + RTF_PAPERW, + RTF_PAPERH, + RTF_MARGL, + RTF_MARGR, + RTF_MARGT, + RTF_MARGB, + RTF_FACINGP, + RTF_GUTTER, + RTF_MARGMIRROR, + RTF_LANDSCAPE, + RTF_PGNSTART, + RTF_WIDOWCTRL, + RTF_REVISIONS, + RTF_REVPROP, + RTF_REVBAR, + + RTF_AENDDOC, + RTF_AENDNOTES, + RTF_AFTNBJ, + RTF_AFTNCN, + RTF_AFTNNALC, + RTF_AFTNNAR, + RTF_AFTNNAUC, + RTF_AFTNNCHI, + RTF_AFTNNRLC, + RTF_AFTNNRUC, + RTF_AFTNRESTART, + RTF_AFTNRSTCONT, + RTF_AFTNSEP, + RTF_AFTNSEPC, + RTF_AFTNSTART, + RTF_AFTNTJ, + RTF_ALLPROT, + RTF_ANNOTPROT, + RTF_ATNAUTHOR, + RTF_ATNICN, + RTF_ATNREF, + RTF_ATNTIME, + RTF_ATRFEND, + RTF_ATRFSTART, + RTF_BRKFRM, + RTF_CVMME, + RTF_FET, + RTF_FLDALT, + RTF_FORMDISP, + RTF_FORMPROT, + RTF_FORMSHADE, + RTF_FTNALT, + RTF_FTNNALC, + RTF_FTNNAR, + RTF_FTNNAUC, + RTF_FTNNCHI, + RTF_FTNNRLC, + RTF_FTNNRUC, + RTF_FTNRSTCONT, + RTF_FTNRSTPG, + RTF_HYPHAUTO, + RTF_HYPHCAPS, + RTF_HYPHCONSEC, + RTF_LINKSTYLES, + RTF_LTRDOC, + RTF_NOCOLBAL, + RTF_NOEXTRASPRL, + RTF_NOTABIND, + RTF_OTBLRUL, + RTF_PRCOLBL, + RTF_PRINTDATA, + RTF_PSZ, + RTF_REVPROT, + RTF_RTLDOC, + RTF_SPRSSPBF, + RTF_SPRSTSP, + RTF_SWPBDR, + RTF_TRANSMF, + RTF_WRAPTRSP, + + RTF_PRIVATE, + RTF_NOULTRLSPC, + RTF_MSMCAP, + RTF_NOLEAD, + RTF_NOSPACEFORUL, + RTF_LYTEXCTTP, + RTF_LYTPRTMET, + RTF_DNTBLNSBDB, + RTF_FROMTEXT, + RTF_EXPSHRTN, + RTF_PGBRDRT, + RTF_SPRSBSP, + RTF_PGBRDRR, + RTF_PGBRDRSNAP, + RTF_BDBFHDR, + RTF_SUBFONTBYSIZE, + RTF_TRUNCATEFONTHEIGHT, + RTF_SPRSLNSP, + RTF_SPRSTSM, + RTF_PGBRDRL, + RTF_WPJST, + RTF_PGBRDRB, + RTF_WPSP, + RTF_NOXLATTOYEN, + RTF_OLDLINEWRAP, + RTF_PGBRDRFOOT, + RTF_PGBRDRHEAD, + RTF_DEFLANGFE, + RTF_DOCTYPE, + RTF_PGBRDROPT, + RTF_VIEWKIND, + RTF_VIEWSCALE, + RTF_WINDOWCAPTION, + RTF_BRDRART, + RTF_VIEWZK, + RTF_DOCVAR, + + RTF_DGMARGIN, + RTF_AFTNNCHOSUNG, + RTF_AFTNNCNUM, + RTF_AFTNNDBAR, + RTF_AFTNNDBNUM, + RTF_AFTNNDBNUMD, + RTF_AFTNNDBNUMK, + RTF_AFTNNDBNUMT, + RTF_AFTNNGANADA, + RTF_AFTNNGBNUM, + RTF_AFTNNGBNUMD, + RTF_AFTNNGBNUMK, + RTF_AFTNNGBNUML, + RTF_AFTNNZODIAC, + RTF_AFTNNZODIACD, + RTF_AFTNNZODIACL, + RTF_FTNNCHOSUNG, + RTF_FTNNCNUM, + RTF_FTNNDBAR, + RTF_FTNNDBNUM, + RTF_FTNNDBNUMD, + RTF_FTNNDBNUMK, + RTF_FTNNDBNUMT, + RTF_FTNNGANADA, + RTF_FTNNGBNUM, + RTF_FTNNGBNUMD, + RTF_FTNNGBNUMK, + RTF_FTNNGBNUML, + RTF_FTNNZODIAC, + RTF_FTNNZODIACD, + RTF_FTNNZODIACL, + + RTF_ADEFLANG, + RTF_ADEFF, + +/* */ + + RTF_SECTD = RTF_SECTFMT, + RTF_ENDNHERE, + RTF_BINFSXN, + RTF_BINSXN, + RTF_SBKNONE, + RTF_SBKCOL, + RTF_SBKPAGE, + RTF_SBKEVEN, + RTF_SBKODD, + RTF_COLS, + RTF_COLSX, + RTF_COLNO, + RTF_COLSR, + RTF_COLW, + RTF_LINEBETCOL, + RTF_LINEMOD, + RTF_LINEX, + RTF_LINESTARTS, + RTF_LINERESTART, + RTF_LINEPAGE, + RTF_LINECONT, + RTF_PGWSXN, + RTF_PGHSXN, + RTF_MARGLSXN, + RTF_MARGRSXN, + RTF_MARGTSXN, + RTF_MARGBSXN, + RTF_GUTTERSXN, + RTF_LNDSCPSXN, + RTF_FACPGSXN, + RTF_TITLEPG, + RTF_HEADERY, + RTF_FOOTERY, + RTF_PGNSTARTS, + RTF_PGNCONT, + RTF_PGNRESTART, + RTF_PGNX, + RTF_PGNY, + RTF_PGNDEC, + RTF_PGNUCRM, + RTF_PGNLCRM, + RTF_PGNUCLTR, + RTF_PGNLCLTR, + RTF_VERTALT, + RTF_VERTALB, + RTF_VERTALC, + RTF_VERTALJ, + + RTF_FOOTER, + RTF_FOOTERL, + RTF_FOOTERR, + RTF_FOOTERF, + RTF_HEADER, + RTF_HEADERL, + RTF_HEADERR, + RTF_HEADERF, + RTF_DS, + RTF_LTRSECT, + RTF_PGNHN, + RTF_PGNHNSC, + RTF_PGNHNSH, + RTF_PGNHNSM, + RTF_PGNHNSN, + RTF_PGNHNSP, + RTF_RTLSECT, + RTF_SECTUNLOCKED, + RTF_STEXTFLOW, + RTF_PGNCHOSUNG, + RTF_PGNCNUM, + RTF_PGNDBNUMK, + RTF_PGNDBNUMT, + RTF_PGNGANADA, + RTF_PGNGBNUM, + RTF_PGNGBNUMD, + RTF_PGNGBNUMK, + RTF_PGNGBNUML, + RTF_PGNZODIAC, + RTF_PGNZODIACD, + RTF_PGNZODIACL, + RTF_SECTDEFAULTCL, + RTF_SECTEXPAND, + RTF_SECTLINEGRID, + RTF_SECTSPECIFYCL, + RTF_SECTSPECIFYL, + + // Swg-Header/Footer-Tokens + RTF_HEADER_YB = (RTF_SECTFMT|RTF_SWGDEFS), + RTF_HEADER_XL, + RTF_HEADER_XR, + RTF_FOOTER_YT, + RTF_FOOTER_XL, + RTF_FOOTER_XR, + RTF_HEADER_YH, + RTF_FOOTER_YH, + RTF_BALANCED_COLUMN, + + +/* */ + + RTF_PARD = RTF_PARFMT, + RTF_S, + RTF_INTBL, + RTF_KEEP, + RTF_KEEPN, + RTF_LEVEL, + RTF_PAGEBB, + RTF_SBYS, + RTF_QL, + RTF_QR, + RTF_QJ, + RTF_QC, + RTF_FI, + RTF_LI, + RTF_LIN, + RTF_RI, + RTF_RIN, + RTF_SB, + RTF_SA, + RTF_SL, + RTF_HYPHPAR, + RTF_LTRPAR, + RTF_NOWIDCTLPAR, + RTF_RTLPAR, + RTF_SLMULT, + RTF_SUBDOCUMENT, + + RTF_WIDCTLPAR, + + RTF_LISTTEXT, + RTF_POSYIN, + RTF_PNRNOT, + RTF_BRDRDASHDOTSTR, + RTF_POSYOUT, + RTF_BRDRDASHD, + RTF_BRDRDASHDD, + RTF_BRDRENGRAVE, + RTF_BRDRTHTNLG, + RTF_BRDREMBOSS, + RTF_BRDRTNTHTNLG, + RTF_BRDRDASHSM, + RTF_BRDRTHTNMG, + RTF_OVERLAY, + RTF_BRDRTNTHSG, + RTF_BRDRTNTHMG, + RTF_BRDRTHTNSG, + RTF_BRDRTNTHLG, + RTF_BRDRTRIPLE, + RTF_BRDRTNTHTNSG, + RTF_BRDRTNTHTNMG, + RTF_BRDRWAVYDB, + RTF_BRDRWAVY, + RTF_ILVL, + RTF_DFRSTOP, + RTF_DFRXST, + RTF_PNRAUTH, + RTF_DFRSTART, + RTF_OUTLINELEVEL, + RTF_DFRAUTH, + RTF_DFRDATE, + RTF_PNRRGB, + RTF_PNRPNBR, + RTF_PNRSTART, + RTF_PNRXST, + RTF_PNRSTOP, + RTF_PNRDATE, + RTF_PNRNFC, + RTF_NOSNAPLINEGRID, + RTF_FAAUTO, + RTF_FAHANG, + RTF_FAVAR, + RTF_FACENTER, + RTF_FAROMAN, + RTF_FAFIXED, + RTF_ADJUSTRIGHT, + RTF_LS, + RTF_NOCWRAP, + RTF_NOOVERFLOW, + RTF_ASPALPHA, + + +/* */ + + RTF_TX = RTF_TABSTOPDEF, + RTF_TB, + RTF_TQL, + RTF_TQR, + RTF_TQC, + RTF_TQDEC, + RTF_TLDOT, + RTF_TLHYPH, + RTF_TLUL, + RTF_TLTH, + RTF_TLEQ, + + // Swg-TabStop-Tokens + RTF_TLSWG = (RTF_TABSTOPDEF|RTF_SWGDEFS), + +/* */ + + RTF_BRDRT = RTF_BRDRDEF, + RTF_BRDRB, + RTF_BRDRL, + RTF_BRDRR, + RTF_BRDRBTW, + RTF_BRDRBAR, + RTF_BOX, + RTF_BRSP, + RTF_BRDRW, + RTF_BRDRCF, + RTF_BRDRS, + RTF_BRDRTH, + RTF_BRDRSH, + RTF_BRDRDB, + RTF_BRDRDOT, + RTF_BRDRHAIR, + RTF_BRDRDASH, + RTF_BRDRFRAME, + + // Swg-Border-Tokens + RTF_BRDBOX = (RTF_BRDRDEF|RTF_SWGDEFS), + RTF_BRDLINE_COL, + RTF_BRDLINE_IN, + RTF_BRDLINE_OUT, + RTF_BRDLINE_DIST, + +/* */ + + RTF_PLAIN = RTF_CHRFMT, + RTF_B, + RTF_CAPS, + RTF_DN, + RTF_SUB, + RTF_NOSUPERSUB, + RTF_EXPND, + RTF_EXPNDTW, + RTF_KERNING, + RTF_F, + RTF_FS, + RTF_I, + RTF_OUTL, + RTF_SCAPS, + RTF_SHAD, + RTF_STRIKE, + RTF_UL, + RTF_ULD, + RTF_ULDB, + RTF_ULNONE, + RTF_ULW, + RTF_OL, + RTF_OLD, + RTF_OLDB, + RTF_OLNONE, + RTF_OLW, + RTF_UP, + RTF_SUPER, + RTF_V, + RTF_CF, + RTF_CB, + RTF_LANG, + RTF_CCHS, + RTF_CS, + RTF_LTRCH, + RTF_REVAUTH, + RTF_REVDTTM, + RTF_RTLCH, + + RTF_CHBGFDIAG, + RTF_CHBGDKVERT, + RTF_CHBGDKHORIZ, + RTF_CHBRDR, + RTF_CHBGVERT, + RTF_CHBGHORIZ, + RTF_CHBGDKFDIAG, + RTF_CHBGDCROSS, + RTF_CHBGCROSS, + RTF_CHBGBDIAG, + RTF_CHBGDKDCROSS, + RTF_CHBGDKCROSS, + RTF_CHBGDKBDIAG, + RTF_ULDASHD, + RTF_ULDASH, + RTF_ULDASHDD, + RTF_ULWAVE, + RTF_ULC, + RTF_ULTH, + RTF_OLDASHD, + RTF_OLDASH, + RTF_OLDASHDD, + RTF_OLWAVE, + RTF_OLC, + RTF_OLTH, + RTF_EMBO, + RTF_IMPR, + RTF_STRIKED, + RTF_CRDATE, + RTF_CRAUTH, + RTF_CHARSCALEX, + RTF_CHCBPAT, + RTF_CHCFPAT, + RTF_CHSHDNG, + RTF_REVAUTHDEL, + RTF_REVDTTMDEL, + RTF_CGRID, + RTF_GCW, + RTF_NOSECTEXPAND, + RTF_GRIDTBL, + RTF_G, + RTF_ANIMTEXT, + RTF_ULTHD, + RTF_ULTHDASH, + RTF_ULLDASH, + RTF_ULTHLDASH, + RTF_ULTHDASHD, + RTF_ULTHDASHDD, + RTF_ULHWAVE, + RTF_ULULDBWAVE, + RTF_OLTHD, + RTF_OLTHDASH, + RTF_OLLDASH, + RTF_OLTHLDASH, + RTF_OLTHDASHD, + RTF_OLTHDASHDD, + RTF_OLHWAVE, + RTF_OLOLDBWAVE, + + // association control words + RTF_AB, + RTF_ACAPS, + RTF_ACF, + RTF_ADN, + RTF_AEXPND, + RTF_AF, + RTF_AFS, + RTF_AI, + RTF_ALANG, + RTF_AOUTL, + RTF_ASCAPS, + RTF_ASHAD, + RTF_ASTRIKE, + RTF_AUL, + RTF_AULD, + RTF_AULDB, + RTF_AULNONE, + RTF_AULW, + RTF_AUP, + + RTF_LOCH, + RTF_HICH, + RTF_DBCH, + RTF_LANGFE, + RTF_ACCNONE, + RTF_ACCDOT, + RTF_ACCCOMMA, + RTF_TWOINONE, + RTF_HORZVERT, + + // Swg-Border-Tokens + RTF_SWG_ESCPROP = (RTF_CHRFMT|RTF_SWGDEFS), + RTF_HYPHEN, + RTF_HYPHLEAD, + RTF_HYPHTRAIL, + RTF_HYPHMAX, + + +/* */ + + RTF_CHDATE = RTF_SPECCHAR, + RTF_CHDATEL, + RTF_CHDATEA, + RTF_CHTIME, + RTF_CHPGN, + RTF_CHFTN, + RTF_CHATN, + RTF_CHFTNSEP, + RTF_CHFTNSEPC, + RTF_CELL, + RTF_ROW, + RTF_PAR, + RTF_SECT, + RTF_PAGE, + RTF_COLUM, + RTF_LINE, + RTF_TAB, + RTF_EMDASH, + RTF_ENDASH, + RTF_BULLET, + RTF_LQUOTE, + RTF_RQUOTE, + RTF_LDBLQUOTE, + RTF_RDBLQUOTE, + RTF_FORMULA, + RTF_NONBREAKINGSPACE, + RTF_OPTIONALHYPHEN, + RTF_NONBREAKINGHYPHEN, + RTF_SUBENTRYINDEX, + RTF_IGNOREFLAG, + RTF_HEX, + RTF_EMSPACE, + RTF_ENSPACE, + RTF_LTRMARK, + RTF_SECTNUM, + RTF_SOFTCOL, + RTF_SOFTLHEIGHT, + RTF_SOFTLINE, + RTF_SOFTPAGE, + RTF_ZWJ, + RTF_ZWNJ, + +/* */ + + RTF_ABSW = RTF_APOCTL, + RTF_ABSH, + RTF_NOWRAP, + RTF_DXFRTEXT, + RTF_DFRMTXTX, + RTF_DFRMTXTY, + RTF_DROPCAPLI, + RTF_DROPCAPT, + RTF_ABSNOOVRLP, + RTF_PHMRG, + RTF_PHPG, + RTF_PHCOL, + RTF_POSX, + RTF_POSNEGX, + RTF_POSXC, + RTF_POSXI, + RTF_POSXO, + RTF_POSXL, + RTF_POSXR, + RTF_PVMRG, + RTF_PVPG, + RTF_PVPARA, + RTF_POSY, + RTF_POSNEGY, + RTF_POSYT, + RTF_POSYIL, + RTF_POSYB, + RTF_POSYC, + RTF_ABSLOCK, + RTF_FRMTXLRTB, + RTF_FRMTXTBRL, + RTF_FRMTXBTLR, + RTF_FRMTXLRTBV, + RTF_FRMTXTBRLV, + + // Swg-Frame-Tokens + RTF_FLYPRINT = (RTF_APOCTL|RTF_SWGDEFS), + RTF_FLYOPAQUE, + RTF_FLYPRTCTD, + RTF_FLYMAINCNT, + RTF_FLYVERT, + RTF_FLYHORZ, + RTF_FLYOUTLEFT, + RTF_FLYOUTRIGHT, + RTF_FLYOUTUPPER, + RTF_FLYOUTLOWER, + RTF_FLYANCHOR, + RTF_FLY_CNTNT, + RTF_FLY_COLUMN, + RTF_FLY_PAGE, + RTF_FLY_INPARA, + + +/* */ + + RTF_SHADING = RTF_SHADINGDEF, + RTF_CFPAT, + RTF_CBPAT, + RTF_BGHORIZ, + RTF_BGVERT, + RTF_BGFDIAG, + RTF_BGBDIAG, + RTF_BGCROSS, + RTF_BGDCROSS, + RTF_BGDKHORIZ, + RTF_BGDKVERT, + RTF_BGDKFDIAG, + RTF_BGDKBDIAG, + RTF_BGDKCROSS, + RTF_BGDKDCROSS, + +/* */ + + RTF_TROWD = RTF_TABLEDEF, + RTF_TRGAPH, + RTF_TRLEFT, + RTF_TRRH, + + RTF_TRQL, + RTF_TRQR, + RTF_TRQC, + + RTF_CLMGF, + RTF_CLMRG, + RTF_CELLX, + RTF_LTRROW, + RTF_RTLROW, + RTF_TRBRDRB, + RTF_TRBRDRH, + RTF_TRBRDRL, + RTF_TRBRDRR, + RTF_TRBRDRT, + RTF_TRBRDRV, + RTF_TRHDR, + RTF_TRKEEP, + RTF_TRPADDB, + RTF_TRPADDL, + RTF_TRPADDR, + RTF_TRPADDT, + RTF_TRPADDFB, + RTF_TRPADDFL, + RTF_TRPADDFR, + RTF_TRPADDFT, + RTF_TCELLD, + RTF_CLTXTBRL, + RTF_CLTXLRTB, + RTF_CLVERTALB, + RTF_CLVERTALT, + RTF_CLVERTALC, + RTF_CLVMGF, + RTF_CLVMRG, + RTF_CLTXTBRLV, + RTF_CLTXBTLR, + RTF_CLTXLRTBV, + RTF_CLPADL, + RTF_CLPADT, + RTF_CLPADB, + RTF_CLPADR, + RTF_CLPADFL, + RTF_CLPADFT, + RTF_CLPADFB, + RTF_CLPADFR, + + + RTF_CLBRDRT = (RTF_BRDRDEF|RTF_TABLEDEF), + RTF_CLBRDRL, + RTF_CLBRDRB, + RTF_CLBRDRR, + + RTF_CLCFPAT = (RTF_SHADINGDEF|RTF_TABLEDEF), + RTF_CLCBPAT, + RTF_CLSHDNG, + RTF_CLBGHORIZ, + RTF_CLBGVERT, + RTF_CLBGFDIAG, + RTF_CLBGBDIAG, + RTF_CLBGCROSS, + RTF_CLBGDCROSS, + RTF_CLBGDKHOR, + RTF_CLBGDKVERT, + RTF_CLBGDKFDIAG, + RTF_CLBGDKBDIAG, + RTF_CLBGDKCROSS, + RTF_CLBGDKDCROSS, + +/* */ + + +/* */ + + RTF_DO = RTF_DRAWOBJECTS, + RTF_DOBXCOLUMN, + RTF_DOBXMARGIN, + RTF_DOBXPAGE, + RTF_DOBYMARGIN, + RTF_DOBYPAGE, + RTF_DOBYPARA, + RTF_DODHGT, + RTF_DOLOCK, + RTF_DPAENDHOL, + RTF_DPAENDL, + RTF_DPAENDSOL, + RTF_DPAENDW, + RTF_DPARC, + RTF_DPARCFLIPX, + RTF_DPARCFLIPY, + RTF_DPASTARTHOL, + RTF_DPASTARTL, + RTF_DPASTARTSOL, + RTF_DPASTARTW, + RTF_DPCALLOUT, + RTF_DPCOA, + RTF_DPCOACCENT, + RTF_DPCOBESTFIT, + RTF_DPCOBORDER, + RTF_DPCODABS, + RTF_DPCODBOTTOM, + RTF_DPCODCENTER, + RTF_DPCODTOP, + RTF_DPCOLENGTH, + RTF_DPCOMINUSX, + RTF_DPCOMINUSY, + RTF_DPCOOFFSET, + RTF_DPCOSMARTA, + RTF_DPCOTDOUBLE, + RTF_DPCOTRIGHT, + RTF_DPCOTSINGLE, + RTF_DPCOTTRIPLE, + RTF_DPCOUNT, + RTF_DPELLIPSE, + RTF_DPENDGROUP, + RTF_DPFILLBGCB, + RTF_DPFILLBGCG, + RTF_DPFILLBGCR, + RTF_DPFILLBGGRAY, + RTF_DPFILLBGPAL, + RTF_DPFILLFGCB, + RTF_DPFILLFGCG, + RTF_DPFILLFGCR, + RTF_DPFILLFGGRAY, + RTF_DPFILLFGPAL, + RTF_DPFILLPAT, + RTF_DPGROUP, + RTF_DPLINE, + RTF_DPLINECOB, + RTF_DPLINECOG, + RTF_DPLINECOR, + RTF_DPLINEDADO, + RTF_DPLINEDADODO, + RTF_DPLINEDASH, + RTF_DPLINEDOT, + RTF_DPLINEGRAY, + RTF_DPLINEHOLLOW, + RTF_DPLINEPAL, + RTF_DPLINESOLID, + RTF_DPLINEW, + RTF_DPPOLYCOUNT, + RTF_DPPOLYGON, + RTF_DPPOLYLINE, + RTF_DPPTX, + RTF_DPPTY, + RTF_DPRECT, + RTF_DPROUNDR, + RTF_DPSHADOW, + RTF_DPSHADX, + RTF_DPSHADY, + RTF_DPTXBX, + RTF_DPTXBXMAR, + RTF_DPTXBXTEXT, + RTF_DPX, + RTF_DPXSIZE, + RTF_DPY, + RTF_DPYSIZE, + + RTF_DPCODESCENT, + RTF_BACKGROUND, + RTF_SHPBYPAGE, + RTF_SHPBYPARA, + RTF_SHPBYMARGIN, + RTF_SHPBXCOLUMN, + RTF_SHPBXMARGIN, + RTF_SHPBXPAGE, + RTF_SHPLOCKANCHOR, + RTF_SHPWR, + RTF_HLLOC, + RTF_HLSRC, + RTF_SHPWRK, + RTF_SHPTOP, + RTF_SHPRSLT, + RTF_HLFR, + RTF_SHPTXT, + RTF_SHPFHDR, + RTF_SHPGRP, + RTF_SHPRIGHT, + RTF_SHPFBLWTXT, + RTF_SHPZ, + RTF_SHPBOTTOM, + RTF_SHPLEFT, + RTF_SHPLID, + +/* */ + + RTF_OBJALIAS = RTF_OBJECTS, + RTF_OBJALIGN, + RTF_OBJAUTLINK, + RTF_OBJCLASS, + RTF_OBJCROPB, + RTF_OBJCROPL, + RTF_OBJCROPR, + RTF_OBJCROPT, + RTF_OBJDATA, + RTF_OBJECT, + RTF_OBJEMB, + RTF_OBJH, + RTF_OBJICEMB, + RTF_OBJLINK, + RTF_OBJLOCK, + RTF_OBJNAME, + RTF_OBJPUB, + RTF_OBJSCALEX, + RTF_OBJSCALEY, + RTF_OBJSECT, + RTF_OBJSETSIZE, + RTF_OBJSUB, + RTF_OBJTIME, + RTF_OBJTRANSY, + RTF_OBJUPDATE, + RTF_OBJW, + RTF_RESULT, + RTF_RSLTBMP, + RTF_RSLTMERGE, + RTF_RSLTPICT, + RTF_RSLTRTF, + RTF_RSLTTXT, + RTF_OBJOCX, + RTF_OBJHTML, + RTF_OBJATTPH, + +/* */ + + RTF_PN = RTF_NUMBULLETS, + RTF_PNACROSS, + RTF_PNB, + RTF_PNCAPS, + RTF_PNCARD, + RTF_PNCF, + RTF_PNDEC, + RTF_PNF, + RTF_PNFS, + RTF_PNHANG, + RTF_PNI, + RTF_PNINDENT, + RTF_PNLCLTR, + RTF_PNLCRM, + RTF_PNLVL, + RTF_PNLVLBLT, + RTF_PNLVLBODY, + RTF_PNLVLCONT, + RTF_PNNUMONCE, + RTF_PNORD, + RTF_PNORDT, + RTF_PNPREV, + RTF_PNQC, + RTF_PNQL, + RTF_PNQR, + RTF_PNRESTART, + RTF_PNSCAPS, + RTF_PNSECLVL, + RTF_PNSP, + RTF_PNSTART, + RTF_PNSTRIKE, + RTF_PNTEXT, + RTF_PNTXTA, + RTF_PNTXTB, + RTF_PNUCLTR, + RTF_PNUCRM, + RTF_PNUL, + RTF_PNULD, + RTF_PNULDB, + RTF_PNULNONE, + RTF_PNULW, + RTF_LIST, + RTF_LISTLEVEL, + RTF_LISTOVERRIDE, + RTF_LISTOVERRIDETABLE, + RTF_LISTTABLE, + RTF_LISTNAME, + RTF_LEVELNUMBERS, + RTF_LEVELNORESTART, + RTF_LEVELNFC, + RTF_LEVELOLD, + RTF_LISTOVERRIDECOUNT, + RTF_LISTTEMPLATEID, + RTF_LEVELINDENT, + RTF_LEVELFOLLOW, + RTF_LEVELLEGAL, + RTF_LEVELJC, + RTF_LISTOVERRIDESTART, + RTF_LISTID, + RTF_LISTRESTARTHDN, + RTF_LEVELTEXT, + RTF_LISTOVERRIDEFORMAT, + RTF_LEVELPREVSPACE, + RTF_LEVELPREV, + RTF_LEVELSPACE, + RTF_LISTSIMPLE, + RTF_LEVELSTARTAT, + RTF_PNAIUEO, + RTF_PNAIUEOD, + RTF_PNCHOSUNG, + RTF_PNDBNUMD, + RTF_PNDBNUMK, + RTF_PNDBNUML, + RTF_PNDBNUMT, + RTF_PNGANADA, + RTF_PNGBNUM, + RTF_PNGBNUMD, + RTF_PNGBNUMK, + RTF_PNGBNUML, + RTF_PNZODIAC, + RTF_PNZODIACD, + RTF_PNZODIACL, + RTF_LFOLEVEL, + +/* */ + + RTF_GRF_ALIGNV= RTF_SWGDEFS, + RTF_GRF_ALIGNH, + RTF_GRF_MIRROR, + RTF_SWG_PRTDATA, + RTF_BKMK_KEY, + RTF_SHADOW, + RTF_SHDW_DIST, + RTF_SHDW_STYLE, + RTF_SHDW_COL, + RTF_SHDW_FCOL, + RTF_PGDSCTBL, + RTF_PGDSC, + RTF_PGDSCUSE, + RTF_PGDSCNXT, + RTF_PGDSCNO, + RTF_PGBRK, + RTF_SOUTLVL, + +// shapes + RTF_SHP, RTF_SN, RTF_SV +/* + RTF_SHPLEFT, + RTF_SHPTOP, + RTF_SHPBOTTOM, + RTF_SHPRIGHT +*/ + +}; + +#endif // _RTFTOKEN_H + +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/svtools/inc/svtools/ruler.hxx b/svtools/inc/svtools/ruler.hxx new file mode 100644 index 000000000000..805394999abe --- /dev/null +++ b/svtools/inc/svtools/ruler.hxx @@ -0,0 +1,877 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: ruler.hxx,v $ + * $Revision: 1.13 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _RULER_HXX +#define _RULER_HXX + +#include "svtools/svtdllapi.h" +#include +#include +#ifndef _VIRDEV_HXX +#include +#endif +#include + +class MouseEvent; +class TrackingEvent; +class DataChangedEvent; + +/************************************************************************* + +Beschreibung +============ + +class Ruler + +Diese Klasse dient zur Anzeige eines Lineals. Dabei kann diese Klasse nicht +nur als Anzeige-Control verwendet werden, sondern auch als aktives Control +zum Setzen/Verschieben von Tabulatoren und Raendern. + +-------------------------------------------------------------------------- + +WinBits + +WB_HORZ Lineal wird horizontal dargestellt +WB_VERT Lineal wird vertikal dargestellt +WB_3DLOOK 3D-Darstellung +WB_BORDER Border am unteren/rechten Rand +WB_EXTRAFIELD Feld in der linken/oberen Ecke zur Anzeige und + Auswahl von Tabs, Null-Punkt, ... +WB_RIGHT_ALIGNED Marks the vertical ruler as right aligned + +-------------------------------------------------------------------------- + +Beim Lineal werden alle Werte als Pixel-Werte eingestellt. Dadurch werden +doppelte Umrechnungen und Rundungsfehler vermieden und die Raender werden +im Lineal auch an der Position angezeigt, den Sie auch im Dokument haben. +Dadurch kann die Applikation zum Beispiel bei Tabellendarstellung auch +eigene Rundungen vornehmen und die Positionen im Lineal passen trotzdem noch +zu denen im Dokument. Damit aber das Lineal weiss, wie das Dokument auf dem +Bildschirm dargestellt wird, muessen noch ein paar zusaetzliche Werte +eingestellt werden. + +Mit SetWinPos() wird der Offset des Edit-Fenster zum Lineal eingestellt. +Dabei kann auch die Breite des Fensters eingestellt werden. Wenn bei den +Werten 0 uebergeben wird, wird die Position/Breite vom Fenster automatisch +so breit gesetzt, wie das Lineal breit ist. + +Mit SetPagePos() wird der Offset der Seite zum Edit-Fenster eingestellt und +die Breite der Seite eingestellt. Wenn bei den Werten 0 uebergeben wird, +wird die Position/Breite automatisch so gesetzt, als ob die Seite das ganze +Editfenster ausfuellen wuerde. + +Mit SetBorderPos() kann der Offset eingestellt werden, ab dem der +Border ausgegeben wird. Die Position bezieht sich auf die linke bzw. obere +Fensterkante. Dies wird gebraucht, wenn ein horizontales und vertikales +Lineal gleichzeitig sichtbar sind. Beispiel: + aHRuler.SetBorderPos( aVRuler.GetSizePixel().Width()-1 ); + +Mit SetNullOffset() wird der Null-Punkt bezogen auf die Seite gesetzt. + +Alle anderen Werte (Raender, Einzug, Tabs, ...) beziehen sich auf den 0 Punkt, +der mit SetNullOffset() eingestellt wird. + +Die Werte werden zum Beispiel folgendermassen berechnet: + +- WinPos (wenn beide Fenster den gleichen Parent haben) + + Point aHRulerPos = aHRuler.GetPosPixel(); + Point aEditWinPos = aEditWin.GetPosPixel(); + aHRuler.SetWinPos( aEditWinPos().X() - aHRulerPos.X() ); + +- PagePos + + Point aPagePos = aEditWin.LogicToPixel( aEditWin.GetPagePos() ); + aHRuler.SetPagePos( aPagePos().X() ); + +- Alle anderen Werte + + Die logischen Werte zusammenaddieren, als Position umrechnen und + die vorher gemerkten Pixel-Positionen (von PagePos und NullOffset) + entsprechend abziehen. + +-------------------------------------------------------------------------- + +Mit SetUnit() und SetZoom() wird eingestellt, in welcher Einheit das Lineal +die Werte anzeigt. Folgende Einheiten werden akzeptiert: + + FUNIT_MM + FUNIT_CM (Default) + FUNIT_M + FUNIT_KM + FUNIT_INCH + FUNIT_FOOT + FUNIT_MILE + FUNIT_POINT + FUNIT_PICA + +-------------------------------------------------------------------------- + +Mit SetMargin1() kann der linke/obere Rand und mit SetMargin2() kann +der rechte/untere Rand gesetzt werden. Falls diese Methoden ohne Parameter +aufgerufen werden, werden keine Raender angezeigt. Wenn SetMargin1() bzw. +SetMargin2() mit Parametern aufgerufen werden, kann bei diesen +folgendes angegeben werden: + + long nPos - Offset zum NullPunkt in Pixel + USHORT nStyle - Bit-Style: + RULER_MARGIN_SIZEABLE + Rand kann in der Groesse veraendert werden. + + Zu diesen Style's koennen folgende Style- + Bits dazugeodert werden: + RULER_STYLE_INVISIBLE (fuer nicht sichtbar) + + +Mit SetBorders() kann ein Array von Raendern gesetzt werden. Dabei muss +ein Array vom Typ RulerBorder uebergeben werden, wobei folgende Werte +initialisiert werden muessen: + + long nPos - Offset zum NullPunkt in Pixel + long nWidth - Breite des Spaltenabstands in Pixel (kann zum + Beispiel fuer Tabellenspalten auch 0 sein) + USHORT nStyle - Bit-Style: + RULER_BORDER_SIZEABLE + Spaltenabstand kann in der Groesse veraendert + werden. Dieses Flag sollte nur gesetzt werden, + wenn ein Abstand in der Groesse geaendert wird + und nicht die Groesse einer Zelle. + RULER_BORDER_MOVEABLE + Spaltenabstand/Begrenzung kann verschoben + werden. Wenn Tabellenbegrenzungen verschoben + werden, sollte dieses Flag gesetzt werden und + nicht Sizeable. Denn Sizeable gibt an, das + ein Abstand vergroessert werden kann und nicht + eine einzelne Zelle in der Groesse geaendert + werden kann. + RULER_BORDER_VARIABLE + Nicht alle Spaltenabstande sind gleich + RULER_BORDER_TABLE + Tabellenrahmen. Wenn dieser Style gesetzt + wird, muss die Spaltenbreite 0 sein. + RULER_BORDER_SNAP + Hilfslinie / Fanglinie. Wenn dieser Style + gesetzt wird, muss die Spaltenbreite 0 sein. + RULER_BORDER_MARGIN + Margin. Wenn dieser Style gesetzt wird, + muss die Spaltenbreite 0 sein. + + Zu diesen Style's koennen folgende Style- + Bits dazugeodert werden: + RULER_STYLE_INVISIBLE (fuer nicht sichtbar) + +Mit SetIndents() kann ein Array von Indents gesetzt werden. Diese Methode darf +nur angewendet werden, wenn es sich um ein horizontales Lineal handelt. Als +Parameter muss ein Array vom Typ RulerIndent uebergeben werden, wobei folgende +Werte initialisiert werden muessen: + + long nPos - Offset zum NullPunkt in Pixel + USHORT nStyle - Bit-Style: + RULER_INDENT_TOP (Erstzeileneinzug) + RULER_INDENT_BOTTOM (Linker/Rechter Einzug) + RULER_INDENT_BORDER (Verical line that shows the border distance) + Zu diesen Style's koennen folgende Style- + Bits dazugeodert werden: + RULER_STYLE_DONTKNOW (fuer alte Position oder + fuer Uneindeutigkeit) + RULER_STYLE_INVISIBLE (fuer nicht sichtbar) + +Mit SetTabs() kann ein Array von Tabs gesetzt werden. Diese Methode darf nur +angewendet werden, wenn es sich um ein horizontales Lineal handelt. Als +Parameter muss ein Array vom Typ RulerTab uebergeben werden, wobei folgende +Werte initialisiert werden muessen: + + long nPos - Offset zum NullPunkt in Pixel + USHORT nStyle - Bit-Style: + RULER_TAB_DEFAULT (kann nicht selektiert werden) + RULER_TAB_LEFT + RULER_TAB_CENTER + RULER_TAB_RIGHT + RULER_TAB_DECIMAL + Zu diesen Style's koennen folgende Style- + Bits dazugeodert werden: + RULER_STYLE_DONTKNOW (fuer alte Position oder + fuer Uneindeutigkeit) + RULER_STYLE_INVISIBLE (fuer nicht sichtbar) + +Mit SetLines() koennen Positionslinien im Lineal angezeigt werden. Dabei +muss ein Array vom Typ RulerLine uebergeben werden, wobei folgende Werte +initialisiert werden muessen: + + long nPos - Offset zum NullPunkt in Pixel + USHORT nStyle - Bit-Style (muss zur Zeit immer 0 sein) + +Mit SetArrows() koennen Bemassungspfeile im Lineal angezeigt werden. Wenn +Bemassungspfeile gesetzt werden, werden im Lineal auch keine Unterteilungen +mehr angezeigt. Deshalb sollten die Bemassungspfeile immer ueber die ganze +Linealbreite gesetzt werden. Dabei muss ein Array vom Typ RulerArrow +uebergeben werden, wobei folgende Werte initialisiert werden muessen: + + long nPos - Offset zum NullPunkt in Pixel + long nWidth - Breite des Pfeils + long nLogWidth - Breite des Pfeils in logischer Einheit + USHORT nStyle - Bit-Style (muss zur Zeit immer 0 sein) + +Mit SetSourceUnit() wird die Einheit eingestellt, in welcher die logischen +Werte vorliegen, die bei SetArrows() uebergeben werden. Dabei werden nur die +Einheiten MAP_TWIP und MAP_100TH_MM (default) akzeptiert. + +-------------------------------------------------------------------------- + +Wenn auch vom Benutzer die Raender, Tabs, Border, ... ueber das Lineal +geaendert werden koennen, muss etwas mehr Aufwand getrieben werden. Dazu +muessen die Methoden StartDrag(), Drag() und EndDrag() ueberlagert werden. +Bei der Methode StartDrag() besteht die Moeglichkeit durch das zurueckgeben +von FALSE das Draggen zu verhindern. Im Drag-Handler muss die Drag-Position +abgefragt werden und die Werte muessen an die neue Position verschoben werden. +Dazu ruft man einfach die einzelnen Set-Methoden auf. Solange man sich +im Drag-Handler befindet, werden sich die Werte nur gemerkt und erst +danach das Lineal neu ausgegeben. Alle Handler koennen auch als Links ueber +entsprechende Set..Hdl()-Methoden gesetzt werden. + + - StartDrag() + Wird gerufen, wenn das Draggen gestartet wird. Wenn FALSE + zurueckgegeben wird, wird das Draggen nicht ausgefuehrt. Bei TRUE + wird das Draggen zugelassen. Wenn der Handler nicht ueberlagert + wird, wird FALSE zurueckgegeben. + + - EndDrag() + Wird gerufen, wenn das Draggen beendet wird. + + - Drag() + Wird gerufen, wenn gedragt wird. + + - Click() + Dieser Handler wird gerufen, wenn kein Element angeklickt wurde. + Die Position kann mit GetClickPos() abgefragt werden. Dadurch + kann man zum Beispiel Tabs in das Lineal setzen. Nach Aufruf des + Click-Handlers wird gegebenenfalls das Drag sofort ausgeloest. Dadurch + ist es moeglich, einen neuen Tab im Click-Handler zu setzen und + danach gleich zu verschieben. + + - DoubleClick() + Dieser Handler wird gerufen, wenn ein DoubleClick ausserhalb des + Extrafeldes gemacht wurde. Was angeklickt wurde, kann mit + GetClickType(), GetClickAryPos() und GetClickPos() abgefragt werden. + Somit kann man zum Beispiel den Tab-Dialog anzeigen, wenn ein + Tab mit einem DoubleClick betaetigt wurde. + +Im Drag-Handler kann man abfragen, was und wohin gedragt wurde. Dazu gibt +es folgende Abfrage-Methoden. + + - GetDragType() + Liefert zurueck, was gedragt wird: + RULER_TYPE_MARGIN1 + RULER_TYPE_MARGIN2 + RULER_TYPE_BORDER + RULER_TYPE_INDENT + RULER_TYPE_TAB + + - GetDragPos() + Liefert die Pixel-Position bezogen auf den eingestellten Null-Offset + zurueck, wohin der Anwender die Maus bewegt hat. + + - GetDragAryPos() + Liefert den Index im Array zurueck, wenn ein Border, Indent oder ein + Tab gedragt wird. Achtung: Es wird die Array-Position waehrend des + gesammten Drag-Vorgangs von dem Item im Array was vor dem Drag gesetzt + war zurueckgeben. Dadurch ist es zum Beispiel auch moeglich, einen + Tab nicht mehr anzuzeigen, wenn die Maus nach unten/rechts aus dem + Lineal gezogen wird. + + - GetDragSize() + Wenn Borders gedragt werden, kann hierueber abgefragt werden, ob + die Groesse bzw. welche Seite oder die Position geaendert werden soll. + RULER_DRAGSIZE_MOVE oder 0 - Move + RULER_DRAGSIZE_1 - Linke/obere Kante + RULER_DRAGSIZE_2 - Rechte/untere Kante + + - IsDragDelete() + Mit dieser Methode kann abgefragt werden, ob beim Draggen die + Maus unten/rechts aus dem Fenster gezogen wurde. Damit kann + zum Beispiel festgestellt werden, ob der Benutzer einen Tab + loeschen will. + + - IsDragCanceled() + Mit dieser Methode kann im EndDrag-Handler abgefragt werden, + ob die Aktion abgebrochen wurde, indem der Anwender die + Maus oben/links vom Fenster losgelassen hat oder ESC gedrueckt + hat. In diesem Fall werden die Werte nicht uebernommen. Wird + waehrend des Draggings die Maus oben/links aus dem Fenster + gezogen, werden automatisch die alten Werte dargestellt, ohne das + der Drag-Handler gerufen wird. + Falls der Benutzer jedoch den Wert auf die alte Position + zurueckgeschoben hat, liefert die Methode trotzdem FALSE. Falls + dies vermieden werden soll, muss sich die Applikation im StartDrag- + Handler den alten Wert merken und im EndDrag-Handler den Wert + vergleichen. + + - GetDragScroll() + Mit dieser Methode kann abgefragt werden, ob gescrollt werden + soll. Es wird einer der folgenden Werte zurueckgegeben: + RULER_SCROLL_NO - Drag-Position befindet sich + an keinem Rand und somit + muss nicht gescrollt werden. + RULER_SCROLL_1 - Drag-Position befindet sich + am linken/oberen Rand und + somit sollte das Programm evt. + ein Srcoll ausloesen. + RULER_SCROLL_2 - Drag-Position befindet sich + am rechten/unteren Rand und + somit sollte das Programm evt. + ein Srcoll ausloesen. + + - GetDragModifier() + Liefert die Modifier-Tasten zurueck, die beim Starten des Drag- + Vorgangs gedrueckt waren. Siehe MouseEvent. + + - GetClickPos() + Liefert die Pixel-Position bezogen auf den eingestellten Null-Offset + zurueck, wo der Anwender die Maus gedrueckt hat. + + - GetClickType() + Liefert zurueck, was per DoubleClick betaetigt wird: + RULER_TYPE_DONTKNOW (kein Element im Linealbereich) + RULER_TYPE_OUTSIDE (ausserhalb des Linealbereichs) + RULER_TYPE_MARGIN1 (nur Margin1-Kante) + RULER_TYPE_MARGIN2 (nur Margin2-Kante) + RULER_TYPE_BORDER (Border: GetClickAryPos()) + RULER_TYPE_INDENT (Einzug: GetClickAryPos()) + RULER_TYPE_TAB (Tab: GetClickAryPos()) + + - GetClickAryPos() + Liefert den Index im Array zurueck, wenn ein Border, Indent oder ein + Tab per DoubleClick betaetigt wird. + + - GetType() + Mit dieser Methode kann man einen HitTest durchfuehren, um + gegebenenfalls ueber das Abfangen des MouseButtonDown-Handlers + auch ueber die rechte Maustaste etwas auf ein Item anzuwenden. Als + Paramter ueber gibt man die Fensterposition und gegebenenfalls + einen Pointer auf einen USHORT, um die Array-Position eines + Tabs, Indent oder Borders mitzubekommen. Als Type werden folgende + Werte zurueckgegeben: + RULER_TYPE_DONTKNOW (kein Element im Linealbereich) + RULER_TYPE_OUTSIDE (ausserhalb des Linealbereichs) + RULER_TYPE_MARGIN1 (nur Margin1-Kante) + RULER_TYPE_MARGIN2 (nur Margin2-Kante) + RULER_TYPE_BORDER (Border: GetClickAryPos()) + RULER_TYPE_INDENT (Einzug: GetClickAryPos()) + RULER_TYPE_TAB (Tab: GetClickAryPos()) + +Wenn der Drag-Vorgang abgebrochen werden soll, kann der Drag-Vorgang +mit CancelDrag() abgebrochen werden. Folgende Methoden gibt es fuer die +Drag-Steuerung: + + - IsDrag() + Liefert TRUE zurueck, wenn sich das Lineal im Drag-Vorgang befindet. + + - CancelDrag() + Bricht den Drag-Vorgang ab, falls einer durchgefuehrt wird. Dabei + werden die alten Werte wieder hergestellt und der Drag und der + EndDrag-Handler gerufen. + +Um vom Dokument ein Drag auszuloesen, gibt es folgende Methoden: + + - StartDocDrag() + Dieser Methode werden der MouseEvent vom Dokumentfenster und + was gedragt werden soll uebergeben. Wenn als DragType + RULER_TYPE_DONTKNOW uebergeben wird, bestimmt das Lineal, was + verschoben werden soll. Bei den anderen, wird der Drag nur dann + gestartet, wenn auch an der uebergebenen Position ein entsprechendes + Element gefunden wurde. Dies ist zun Beispiel dann notwendig, wenn + zum Beispiel Einzuege und Spalten an der gleichen X-Position liegen. + Der Rueckgabewert gibt an, ob der Drag ausgeloest wurde. Wenn ein + Drag ausgeloest wird, uebernimmt das Lineal die normale Drag-Steuerung + und verhaelt sich dann so, wie als wenn direkt in das Lineal geklickt + wurde. So captured das Lineal die Mouse und uebernimmt auch die + Steuerung des Cancel (ueber Tastatur, oder wenn die Mouse ueber + oder links vom Lineal ruasgeschoben wird). Auch alle Handler werden + gerufen (inkl. des StartDrag-Handlers). Wenn ein MouseEvent mit + Click-Count 2 uebergeben wird auch der DoubleClick-Handler + entsprechend gerufen. + + - GetDocType() + Dieser Methode wird die Position vom Dokumentfenster uebergeben und + testet, was sich unter der Position befindet. Dabei kann wie bei + StartDocDrag() der entsprechende Test auf ein bestimmtes Element + eingeschraenkt werden. Im Gegensatz zu GetType() liefert diese + Methode immer DontKnow zurueck, falls kein Element getroffen wurde. + Falls man den HitTest selber durchfuehren moechte, kann man + folgende Defines fuer die Toleranz benutzen (Werte gelten fuer + eine Richtung): + RULER_MOUSE_TABLEWIDTH - fuer Tabellenspalten + RULER_MOUSE_MARGINWIDTH - fuer Margins + +-------------------------------------------------------------------------- + +Fuer das Extra-Feld kann der Inhalt bestimmt werden und es gibt Handler, +womit man bestimmte Aktionen abfangen kann. + + - ExtraDown() + Dieser Handler wird gerufen, wenn im Extra-Feld die Maus + gedrueckt wird. + + - SetExtraType() + Mit dieser Methode kann festgelegt werden, was im ExtraFeld + dargestellt werden soll. + - ExtraType Was im Extrafeld dargestellt werden soll + RULER_EXTRA_DONTKNOW (Nichts) + RULER_EXTRA_NULLOFFSET (Koordinaaten-Kreuz) + RULER_EXTRA_TAB (Tab) + - USHORT nStyle Bitfeld als Style: + RULER_STYLE_HIGHLIGHT (selektiert) + RULER_TAB_... (ein Tab-Style) + + - GetExtraClick() + Liefert die Anzahl der Mausclicks zurueck. Dadurch ist es zum + Beispiel auch moeglich, auch durch einen DoubleClick im Extrafeld + eine Aktion auszuloesen. + + - GetExtraModifier() + Liefert die Modifier-Tasten zurueck, die beim Klicken in das Extra- + Feld gedrueckt waren. Siehe MouseEvent. + +-------------------------------------------------------------------------- + +Weitere Hilfsfunktionen: + +- static Ruler::DrawTab() + Mit dieser Methode kann ein Tab auf einem OutputDevice ausgegeben + werden. Dadurch ist es moeglich, auch in Dialogen die Tabs so + anzuzeigen, wie Sie im Lineal gemalt werden. + + Diese Methode gibt den Tab zentriert an der uebergebenen Position + aus. Die Groesse der Tabs kann ueber die Defines RULER_TAB_WIDTH und + RULER_TAB_HEIGHT bestimmt werden. + +-------------------------------------------------------------------------- + +Tips zur Benutzung des Lineals: + +- Bei dem Lineal muss weder im Drag-Modus noch sonst das Setzen der Werte + in SetUpdateMode() geklammert werden. Denn das Lineal sorgt von sich + aus dafuer, das wenn mehrere Werte gesetzt werden, diese automatisch + zusammengefast werden und flackerfrei ausgegeben werden. + +- Initial sollten beim Lineal zuerst die Groessen, Positionen und Werte + gesetzt werden, bevor es angezeigt wird. Dies ist deshalb wichtig, da + ansonsten viele Werte unnoetig berechnet werden. + +- Wenn das Dokumentfenster, in dem sich das Lineal befindet aktiv bzw. + deaktiv wird, sollten die Methoden Activate() und Deactivate() vom + Lineal gerufen werden. Denn je nach Einstellungen und System wird die + Anzeige entsprechend umgeschaltet. + +- Zum Beispiel sollte beim Drag von Tabs und Einzuegen nach Moeglichkeit die + alten Positionen noch mit angezeigt werden. Dazu sollte zusaetzlich beim + Setzen der Tabs und Einzuege als erstes im Array die alten Positionen + eingetragen werden und mit dem Style RULER_STYLE_DONTKNOW verknuepft + werden. Danach sollte im Array die restlichen Werte eingetragen werden. + +- Bei mehreren markierten Absaetzen und Tabellen-Zellen, sollten die Tabs + und Einzuege in grau von der ersten Zelle, bzw. vom ersten Absatz + angezeigt werden. Dies kann man auch ueber den Style RULER_STYLE_DONTKNOW + erreichen. + +- Die Bemassungspfeile sollten immer dann angezeigt, wenn beim Drag die + Alt-Taste (WW-Like) gedrueckt wird. Vielleicht sollte diese Einstellung + auch immer vornehmbar sein und vielleicht beim Drag immer die + Bemassungspfeile dargestellt werden. Bei allen Einstellung sollten die + Werte immer auf ein vielfaches eines Wertes gerundet werden, da die + Bildschirmausloesung sehr ungenau ist. + +- DoppelKlicks sollten folgendermassen behandelt werden (GetClickType()): + - RULER_TYPE_DONTKNOW + RULER_TYPE_MARGIN1 + RULER_TYPE_MARGIN2 + Wenn die Bedingunden GetClickPos() <= GetMargin1() oder + GetClickPos() >= GetMargin2() oder der Type gleich + RULER_TYPE_MARGIN1 oder RULER_TYPE_MARGIN2 ist, sollte + ein SeitenDialog angezeigt werden, wo der Focus auf dem + entsprechenden Rand steht + - RULER_TYPE_BORDER + Es sollte ein Spalten- oder Tabellen-Dialog angezeigt werden, + wo der Focus auf der entsprechenden Spalte steht, die mit + GetClickAryPos() abgefragt werden kann. + - RULER_TYPE_INDENT + Es sollte der Dialog angezeigt werden, wo die Einzuege eingestellt + werden koennen. Dabei sollte der Focus auf dem Einzug stehen, der + mit GetClickAryPos() ermittelt werden kann. + - RULER_TYPE_TAB + Es sollte ein TabDialog angezeigt werden, wo der Tab selektiert + sein sollte, der ueber GetClickAryPos() abgefragt werden kann. + +*************************************************************************/ + +// ----------- +// - WinBits - +// ----------- + +#define WB_EXTRAFIELD ((WinBits)0x00004000) +#define WB_RIGHT_ALIGNED ((WinBits)0x00008000) +#define WB_STDRULER WB_HORZ + +// --------------- +// - Ruler-Types - +// --------------- + +struct ImplRulerHitTest; + +// -------------- +// - Ruler-Type - +// -------------- + +enum RulerType { RULER_TYPE_DONTKNOW, RULER_TYPE_OUTSIDE, + RULER_TYPE_MARGIN1, RULER_TYPE_MARGIN2, + RULER_TYPE_BORDER, RULER_TYPE_INDENT, RULER_TYPE_TAB }; + +enum RulerExtra { RULER_EXTRA_DONTKNOW, + RULER_EXTRA_NULLOFFSET, RULER_EXTRA_TAB }; + +#define RULER_STYLE_HIGHLIGHT ((USHORT)0x8000) +#define RULER_STYLE_DONTKNOW ((USHORT)0x4000) +#define RULER_STYLE_INVISIBLE ((USHORT)0x2000) + +#define RULER_DRAGSIZE_MOVE 0 +#define RULER_DRAGSIZE_1 1 +#define RULER_DRAGSIZE_2 2 + +#define RULER_MOUSE_BORDERMOVE 5 +#define RULER_MOUSE_BORDERWIDTH 5 +#define RULER_MOUSE_TABLEWIDTH 1 +#define RULER_MOUSE_MARGINWIDTH 3 + +#define RULER_SCROLL_NO 0 +#define RULER_SCROLL_1 1 +#define RULER_SCROLL_2 2 + +// --------------- +// - RulerMargin - +// --------------- + +#define RULER_MARGIN_SIZEABLE ((USHORT)0x0001) + +// --------------- +// - RulerBorder - +// --------------- + +#define RULER_BORDER_SIZEABLE ((USHORT)0x0001) +#define RULER_BORDER_MOVEABLE ((USHORT)0x0002) +#define RULER_BORDER_VARIABLE ((USHORT)0x0004) +#define RULER_BORDER_TABLE ((USHORT)0x0008) +#define RULER_BORDER_SNAP ((USHORT)0x0010) +#define RULER_BORDER_MARGIN ((USHORT)0x0020) + +struct RulerBorder +{ + long nPos; + long nWidth; + USHORT nStyle; + //minimum/maximum position, supported for table borders/rows + long nMinPos; + long nMaxPos; +}; + +// --------------- +// - RulerIndent - +// --------------- + +#define RULER_INDENT_TOP ((USHORT)0x0000) +#define RULER_INDENT_BOTTOM ((USHORT)0x0001) +#define RULER_INDENT_BORDER ((USHORT)0x0002) +#define RULER_INDENT_STYLE ((USHORT)0x000F) + +struct RulerIndent +{ + long nPos; + USHORT nStyle; +}; + +// ------------ +// - RulerTab - +// ------------ + +#define RULER_TAB_LEFT ((USHORT)0x0000) +#define RULER_TAB_RIGHT ((USHORT)0x0001) +#define RULER_TAB_DECIMAL ((USHORT)0x0002) +#define RULER_TAB_CENTER ((USHORT)0x0003) +#define RULER_TAB_DEFAULT ((USHORT)0x0004) +#define RULER_TAB_STYLE ((USHORT)0x000F) +#define RULER_TAB_RTL ((USHORT)0x0010) + +struct RulerTab +{ + long nPos; + USHORT nStyle; +}; + +#define RULER_TAB_WIDTH 7 +#define RULER_TAB_HEIGHT 6 + +// ------------- +// - RulerLine - +// ------------- + +struct RulerLine +{ + long nPos; + USHORT nStyle; +}; + +// -------------- +// - RulerArrow - +// -------------- + +struct RulerArrow +{ + long nPos; + long nWidth; + long nLogWidth; + USHORT nStyle; +}; + +class ImplRulerData; +// --------- +// - Ruler - +// --------- + +class SVT_DLLPUBLIC Ruler : public Window +{ +private: + VirtualDevice maVirDev; + MapMode maMapMode; + long mnBorderOff; + long mnWinOff; + long mnWinWidth; + long mnWidth; + long mnHeight; + long mnVirOff; + long mnVirWidth; + long mnVirHeight; + long mnBorderWidth; + long mnStartDragPos; + long mnDragPos; + ULONG mnUpdateEvtId; + ImplRulerData* mpSaveData; + ImplRulerData* mpData; + ImplRulerData* mpDragData; + Rectangle maExtraRect; + WinBits mnWinStyle; + USHORT mnUnitIndex; + USHORT mnDragAryPos; + USHORT mnDragSize; + USHORT mnDragScroll; + USHORT mnDragModifier; + USHORT mnExtraStyle; + USHORT mnExtraClicks; + USHORT mnExtraModifier; + RulerExtra meExtraType; + RulerType meDragType; + MapUnit meSourceUnit; + FieldUnit meUnit; + Fraction maZoom; + BOOL mbCalc; + BOOL mbFormat; + BOOL mbDrag; + BOOL mbDragDelete; + BOOL mbDragCanceled; + BOOL mbAutoWinWidth; + BOOL mbActive; + BYTE mnUpdateFlags; + Link maStartDragHdl; + Link maDragHdl; + Link maEndDragHdl; + Link maClickHdl; + Link maDoubleClickHdl; + Link maExtraDownHdl; + +#ifdef _SV_RULER_CXX + SVT_DLLPRIVATE void ImplVDrawLine( long nX1, long nY1, long nX2, long nY2 ); + SVT_DLLPRIVATE void ImplVDrawRect( long nX1, long nY1, long nX2, long nY2 ); + SVT_DLLPRIVATE void ImplVDrawText( long nX, long nY, const String& rText ); + + SVT_DLLPRIVATE void ImplDrawTicks( long nMin, long nMax, long nStart, long nCenter ); + SVT_DLLPRIVATE void ImplDrawArrows( long nCenter ); + SVT_DLLPRIVATE void ImplDrawBorders( long nMin, long nMax, long nVirTop, long nVirBottom ); + SVT_DLLPRIVATE void ImplDrawIndent( const Polygon& rPoly, USHORT nStyle ); + SVT_DLLPRIVATE void ImplDrawIndents( long nMin, long nMax, long nVirTop, long nVirBottom ); + SVT_DLLPRIVATE void ImplDrawTab( OutputDevice* pDevice, const Point& rPos, USHORT nStyle ); + SVT_DLLPRIVATE void ImplDrawTabs( long nMin, long nMax, long nVirTop, long nVirBottom ); + using Window::ImplInit; + SVT_DLLPRIVATE void ImplInit( WinBits nWinBits ); + SVT_DLLPRIVATE void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); + SVT_DLLPRIVATE void ImplCalc(); + SVT_DLLPRIVATE void ImplFormat(); + SVT_DLLPRIVATE void ImplInitExtraField( BOOL bUpdate ); + SVT_DLLPRIVATE void ImplInvertLines( BOOL bErase = FALSE ); + SVT_DLLPRIVATE void ImplDraw(); + SVT_DLLPRIVATE void ImplDrawExtra( BOOL bPaint = FALSE ); + SVT_DLLPRIVATE void ImplUpdate( BOOL bMustCalc = FALSE ); + using Window::ImplHitTest; + SVT_DLLPRIVATE BOOL ImplHitTest( const Point& rPos, + ImplRulerHitTest* pHitTest, + BOOL bRequiredStyle = FALSE, + USHORT nRequiredStyle = 0 ) const; + SVT_DLLPRIVATE BOOL ImplDocHitTest( const Point& rPos, RulerType eDragType, ImplRulerHitTest* pHitTest ) const; + SVT_DLLPRIVATE BOOL ImplStartDrag( ImplRulerHitTest* pHitTest, USHORT nModifier ); + SVT_DLLPRIVATE void ImplDrag( const Point& rPos ); + SVT_DLLPRIVATE void ImplEndDrag(); + DECL_DLLPRIVATE_LINK( ImplUpdateHdl, void* ); +#endif + + // Forbidden and not implemented. + Ruler (const Ruler &); + Ruler & operator= (const Ruler &); + +public: + Ruler( Window* pParent, WinBits nWinStyle = WB_STDRULER ); + virtual ~Ruler(); + + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void Tracking( const TrackingEvent& rTEvt ); + virtual void Paint( const Rectangle& rRect ); + virtual void Resize(); + virtual void StateChanged( StateChangedType nStateChange ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); + + virtual long StartDrag(); + virtual void Drag(); + virtual void EndDrag(); + virtual void Click(); + virtual void DoubleClick(); + virtual void ExtraDown(); + + void Activate(); + void Deactivate(); + BOOL IsActive() const { return mbActive; } + + void SetWinPos( long nOff = 0, long nWidth = 0 ); + long GetWinOffset() const { return mnWinOff; } + long GetWinWidth() const { return mnWinWidth; } + void SetPagePos( long nOff = 0, long nWidth = 0 ); + long GetPageOffset() const; + long GetPageWidth() const; + void SetBorderPos( long nOff = 0 ); + long GetBorderOffset() const { return mnBorderOff; } + Rectangle GetExtraRect() const { return maExtraRect; } + + void SetUnit( FieldUnit eNewUnit ); + FieldUnit GetUnit() const { return meUnit; } + void SetZoom( const Fraction& rNewZoom ); + Fraction GetZoom() const { return maZoom; } + + void SetSourceUnit( MapUnit eNewUnit ) { meSourceUnit = eNewUnit; } + MapUnit GetSourceUnit() const { return meSourceUnit; } + + void SetExtraType( RulerExtra eNewExtraType, USHORT nStyle = 0 ); + RulerExtra GetExtraType() const { return meExtraType; } + USHORT GetExtraStyle() const { return mnExtraStyle; } + USHORT GetExtraClicks() const { return mnExtraClicks; } + USHORT GetExtraModifier() const { return mnExtraModifier; } + + BOOL StartDocDrag( const MouseEvent& rMEvt, + RulerType eDragType = RULER_TYPE_DONTKNOW ); + RulerType GetDocType( const Point& rPos, + RulerType eDragType = RULER_TYPE_DONTKNOW, + USHORT* pAryPos = NULL ) const; + RulerType GetDragType() const { return meDragType; } + long GetDragPos() const { return mnDragPos; } + USHORT GetDragAryPos() const { return mnDragAryPos; } + USHORT GetDragSize() const { return mnDragSize; } + BOOL IsDragDelete() const { return mbDragDelete; } + BOOL IsDragCanceled() const { return mbDragCanceled; } + USHORT GetDragScroll() const { return mnDragScroll; } + USHORT GetDragModifier() const { return mnDragModifier; } + BOOL IsDrag() const { return mbDrag; } + void CancelDrag(); + long GetClickPos() const { return mnDragPos; } + RulerType GetClickType() const { return meDragType; } + USHORT GetClickAryPos() const { return mnDragAryPos; } + using Window::GetType; + RulerType GetType( const Point& rPos, + USHORT* pAryPos = NULL ) const; + + void SetNullOffset( long nPos ); + long GetNullOffset() const; + void SetMargin1() { SetMargin1( 0, RULER_STYLE_INVISIBLE ); } + void SetMargin1( long nPos, USHORT nMarginStyle = RULER_MARGIN_SIZEABLE ); + long GetMargin1() const; + USHORT GetMargin1Style() const; + void SetMargin2() { SetMargin2( 0, RULER_STYLE_INVISIBLE ); } + void SetMargin2( long nPos, USHORT nMarginStyle = RULER_MARGIN_SIZEABLE ); + long GetMargin2() const; + USHORT GetMargin2Style() const; + + void SetLines( USHORT n = 0, const RulerLine* pLineAry = NULL ); + USHORT GetLineCount() const; + const RulerLine* GetLines() const; + + void SetArrows( USHORT n = 0, const RulerArrow* pArrowAry = NULL ); + USHORT GetArrowCount() const; + const RulerArrow* GetArrows() const; + + void SetBorders( USHORT n = 0, const RulerBorder* pBrdAry = NULL ); + USHORT GetBorderCount() const; + const RulerBorder* GetBorders() const; + + void SetIndents( USHORT n = 0, const RulerIndent* pIndentAry = NULL ); + USHORT GetIndentCount() const; + const RulerIndent* GetIndents() const; + + void SetTabs( USHORT n = 0, const RulerTab* pTabAry = NULL ); + USHORT GetTabCount() const; + const RulerTab* GetTabs() const; + + static void DrawTab( OutputDevice* pDevice, + const Point& rPos, USHORT nStyle ); + + void SetStyle( WinBits nStyle ); + WinBits GetStyle() const { return mnWinStyle; } + + void SetStartDragHdl( const Link& rLink ) { maStartDragHdl = rLink; } + const Link& GetStartDragHdl() const { return maStartDragHdl; } + void SetDragHdl( const Link& rLink ) { maDragHdl = rLink; } + const Link& GetDragHdl() const { return maDragHdl; } + void SetEndDragHdl( const Link& rLink ) { maEndDragHdl = rLink; } + const Link& GetEndDragHdl() const { return maEndDragHdl; } + void SetClickHdl( const Link& rLink ) { maClickHdl = rLink; } + const Link& GetClickHdl() const { return maClickHdl; } + void SetDoubleClickHdl( const Link& rLink ) { maDoubleClickHdl = rLink; } + const Link& GetDoubleClickHdl() const { return maDoubleClickHdl; } + void SetExtraDownHdl( const Link& rLink ) { maExtraDownHdl = rLink; } + const Link& GetExtraDownHdl() const { return maExtraDownHdl; } + + //set text direction right-to-left + void SetTextRTL(BOOL bRTL); +}; + +#endif // _RULER_HXX diff --git a/svtools/inc/svtools/scriptedtext.hxx b/svtools/inc/svtools/scriptedtext.hxx new file mode 100644 index 000000000000..0bf026b11ced --- /dev/null +++ b/svtools/inc/svtools/scriptedtext.hxx @@ -0,0 +1,132 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: scriptedtext.hxx,v $ + * $Revision: 1.5 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _SVTOOLS_SCRIPTEDTEXT_HXX +#define _SVTOOLS_SCRIPTEDTEXT_HXX + +#include "svtools/svtdllapi.h" +#include +#include + + +namespace rtl { class OUString; } +class OutputDevice; +class Font; +class SvtScriptedTextHelper_Impl; + + +//_____________________________________________________________________________ + +/** +This class provides drawing text with different script types on any output devices. +*/ +class SVT_DLLPUBLIC SvtScriptedTextHelper +{ +private: + SvtScriptedTextHelper_Impl* mpImpl; /// Implementation of class functionality. + + /** Assignment operator not implemented to prevent usage. */ + SvtScriptedTextHelper& operator=( const SvtScriptedTextHelper& ); + +public: + /** Constructor sets an output device and no fonts. + @param _rOutDevice + A reference to an output device. */ + SvtScriptedTextHelper( OutputDevice& _rOutDevice ); + + /** Constructor sets an output device and fonts for all script types. + @param _rOutDevice + A reference to an output device. + @param _pLatinFont + The font for latin characters. + @param _pAsianFont + The font for asian characters. + @param _pCmplxFont + The font for complex text layout. */ + SvtScriptedTextHelper( + OutputDevice& _rOutDevice, + Font* _pLatinFont, + Font* _pAsianFont, + Font* _pCmplxFont ); + + /** Copy constructor. */ + SvtScriptedTextHelper( + const SvtScriptedTextHelper& _rCopy ); + + /** Destructor. */ + virtual ~SvtScriptedTextHelper(); + + /** Sets new fonts and recalculates the text width. + @param _pLatinFont + The font for latin characters. + @param _pAsianFont + The font for asian characters. + @param _pCmplxFont + The font for complex text layout. */ + void SetFonts( Font* _pLatinFont, Font* _pAsianFont, Font* _pCmplxFont ); + + /** Sets the default font of the current output device to all script types. */ + void SetDefaultFont(); + + /** Sets a new text and calculates all script breaks and the text width. + @param _rText + The new text. + @param _xBreakIter + The break iterator for iterating through the script portions. */ + void SetText( + const ::rtl::OUString& _rText, + const ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator >& _xBreakIter ); + + /** Returns the previously set text. + @return The current text. */ + const ::rtl::OUString& GetText() const; + + /** Returns the calculated width the text will take in the current output device. + @return The calculated text width. */ + sal_Int32 GetTextWidth() const; + + /** Returns the maximum height the text will take in the current output device. + @return The maximum text height. */ + sal_Int32 GetTextHeight() const; + + /** Returns a size struct containing the width and height of the text in the current output device. + @return A size struct with the text dimensions. */ + const Size& GetTextSize() const; + + /** Draws the text in the current output device. + @param _rPos + The position of the top left edge of the text. */ + void DrawText( const Point& _rPos ); +}; + +//_____________________________________________________________________________ + +#endif + diff --git a/svtools/inc/svtools/scrwin.hxx b/svtools/inc/svtools/scrwin.hxx new file mode 100644 index 000000000000..c4c06aeb96ab --- /dev/null +++ b/svtools/inc/svtools/scrwin.hxx @@ -0,0 +1,115 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: scrwin.hxx,v $ + * $Revision: 1.5 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _SCRWIN_HXX +#define _SCRWIN_HXX + +#include "svtools/svtdllapi.h" + +#ifndef _SCRBAR_HXX //autogen +#include +#endif + +class DataChangedEvent; + +// ------------------------- +// - ScrollableWindow-Type - +// ------------------------- + +typedef USHORT ScrollableWindowFlags; + +#define SCRWIN_THUMBDRAGGING 1 +#define SCRWIN_VCENTER 2 +#define SCRWIN_HCENTER 4 +#define SCRWIN_DEFAULT (SCRWIN_THUMBDRAGGING | SCRWIN_VCENTER | SCRWIN_HCENTER) + +// -------------------- +// - ScrollableWindow - +// -------------------- + +class SVT_DLLPUBLIC ScrollableWindow: public Window +{ +private: + Point aPixOffset; // offset to virtual window (pixel) + Size aTotPixSz; // total size of virtual window (pixel) + long nLinePixH; // size of a line/column (pixel) + long nColumnPixW; + + ScrollBar aVScroll; // the scrollbars + ScrollBar aHScroll; + ScrollBarBox aCornerWin; // window in the bottom right corner + BOOL bScrolling:1, // user controlled scrolling + bHandleDragging:1, // scroll window while dragging + bHCenter:1, + bVCenter:1; + +#ifdef _SVT_SCRWIN_CXX + SVT_DLLPRIVATE void ImpInitialize( ScrollableWindowFlags nFlags ); + DECL_DLLPRIVATE_LINK( ScrollHdl, ScrollBar * ); + DECL_DLLPRIVATE_LINK( EndScrollHdl, ScrollBar * ); +#endif + +public: + ScrollableWindow( Window* pParent, WinBits nBits = 0, + ScrollableWindowFlags = SCRWIN_DEFAULT ); + ScrollableWindow( Window* pParent, const ResId& rId, + ScrollableWindowFlags = SCRWIN_DEFAULT ); + + virtual void Resize(); + virtual void Command( const CommandEvent& rCEvt ); + virtual void DataChanged( const DataChangedEvent& rDEvt ); + + virtual void StartScroll(); + virtual void EndScroll( long nDeltaX, long nDeltaY ); + + using OutputDevice::SetMapMode; + virtual void SetMapMode( const MapMode& rNewMapMode ); + virtual MapMode GetMapMode() const; + + void SetTotalSize( const Size& rNewSize ); + Size GetTotalSize() { return PixelToLogic( aTotPixSz ); } + + void SetVisibleSize( const Size& rNewSize ); + BOOL MakeVisible( const Rectangle& rTarget, BOOL bSloppy = FALSE ); + Rectangle GetVisibleArea() const; + + void SetLineSize( ULONG nHorz, ULONG nVert ); + using Window::Scroll; + virtual void Scroll( long nDeltaX, long nDeltaY, USHORT nFlags = 0 ); + void ScrollLines( long nLinesX, long nLinesY ); + void ScrollPages( long nPagesX, ULONG nOverlapX, + long nPagesY, ULONG nOverlapY ); + +private: + SVT_DLLPRIVATE Size GetOutputSizePixel() const; + SVT_DLLPRIVATE Size GetOutputSize() const; +}; + +#endif diff --git a/svtools/inc/svtools/sfxecode.hxx b/svtools/inc/svtools/sfxecode.hxx new file mode 100644 index 000000000000..d87fff819748 --- /dev/null +++ b/svtools/inc/svtools/sfxecode.hxx @@ -0,0 +1,121 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: sfxecode.hxx,v $ + * $Revision: 1.8 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _SFXECODE_HXX +#define _SFXECODE_HXX + +#include + +#define ERRCODE_SFX_NOSTDTEMPLATE (ERRCODE_AREA_SFX|ERRCODE_CLASS_PATH|1) +#define ERRCODE_SFX_NOTATEMPLATE (ERRCODE_AREA_SFX|ERRCODE_CLASS_FORMAT|2) +#define ERRCODE_SFX_GENERAL (ERRCODE_AREA_SFX|ERRCODE_CLASS_GENERAL|3) +#define ERRCODE_SFX_DOLOADFAILED (ERRCODE_AREA_SFX|ERRCODE_CLASS_READ|4) +#define ERRCODE_SFX_DOSAVECOMPLETEDFAILED (ERRCODE_AREA_SFX|ERRCODE_CLASS_WRITE|5) +#define ERRCODE_SFX_COMMITFAILED (ERRCODE_AREA_SFX|ERRCODE_CLASS_WRITE|6) +#define ERRCODE_SFX_HANDSOFFFAILED (ERRCODE_AREA_SFX|ERRCODE_CLASS_GENERAL|7) +#define ERRCODE_SFX_DOINITNEWFAILED (ERRCODE_AREA_SFX|ERRCODE_CLASS_CREATE|8) +#define ERRCODE_SFX_CANTREADDOCINFO (ERRCODE_AREA_SFX|ERRCODE_CLASS_FORMAT|9) +#define ERRCODE_SFX_ALREADYOPEN (ERRCODE_AREA_SFX|ERRCODE_CLASS_ALREADYEXISTS|10) +#define ERRCODE_SFX_WRONGPASSWORD (ERRCODE_AREA_SFX|ERRCODE_CLASS_READ|11) +#define ERRCODE_SFX_DOCUMENTREADONLY (ERRCODE_AREA_SFX|ERRCODE_CLASS_WRITE|12) +#define ERRCODE_SFX_OLEGENERAL (ERRCODE_AREA_SFX|ERRCODE_CLASS_NONE|14) +#define ERRCODE_SFXMSG_STYLEREPLACE (ERRCODE_WARNING_MASK|ERRCODE_AREA_SFX|ERRCODE_CLASS_NONE|13) +#define ERRCODE_SFX_TEMPLATENOTFOUND (ERRCODE_AREA_SFX|ERRCODE_CLASS_NOTEXISTS|15) +#define ERRCODE_SFX_ISRELATIVE (ERRCODE_WARNING_MASK|ERRCODE_AREA_SFX|ERRCODE_CLASS_NOTEXISTS|16) +#define ERRCODE_SFX_FORCEDOCLOAD (ERRCODE_WARNING_MASK|ERRCODE_AREA_SFX|ERRCODE_CLASS_NONE|17) + +#define ERRCODE_SFX_CANTFINDORIGINAL (ERRCODE_AREA_SFX|ERRCODE_CLASS_GENERAL|19) +#define ERRCODE_SFX_RESTART (ERRCODE_AREA_SFX|ERRCODE_CLASS_GENERAL|20) +#define ERRCODE_SFX_CANTCREATECONTENT (ERRCODE_AREA_SFX|ERRCODE_CLASS_CREATE|21) +#define ERRCODE_SFX_CANTCREATELINK (ERRCODE_AREA_SFX|ERRCODE_CLASS_CREATE|22) +#define ERRCODE_SFX_WRONGBMKFORMAT (ERRCODE_AREA_SFX|ERRCODE_CLASS_FORMAT|23) +#define ERRCODE_SFX_WRONGICONFILE (ERRCODE_AREA_SFX|ERRCODE_CLASS_FORMAT|24) +#define ERRCODE_SFX_CANTDELICONFILE (ERRCODE_AREA_SFX|ERRCODE_CLASS_ACCESS|25) +#define ERRCODE_SFX_CANTWRITEICONFILE (ERRCODE_AREA_SFX|ERRCODE_CLASS_ACCESS|26) +#define ERRCODE_SFX_CANTRENAMECONTENT (ERRCODE_AREA_SFX|ERRCODE_CLASS_ACCESS|27) +#define ERRCODE_SFX_INVALIDBMKPATH (ERRCODE_AREA_SFX|ERRCODE_CLASS_PATH|28) +#define ERRCODE_SFX_CANTWRITEURLCFGFILE (ERRCODE_AREA_SFX|ERRCODE_CLASS_ACCESS|29) +#define ERRCODE_SFX_WRONGURLCFGFORMAT (ERRCODE_AREA_SFX|ERRCODE_CLASS_FORMAT|30) +#define ERRCODE_SFX_NODOCUMENT (ERRCODE_AREA_SFX|ERRCODE_CLASS_NOTEXISTS|31) +#define ERRCODE_SFX_INVALIDLINK (ERRCODE_AREA_SFX|ERRCODE_CLASS_NOTEXISTS|32) +#define ERRCODE_SFX_INVALIDTRASHPATH (ERRCODE_AREA_SFX|ERRCODE_CLASS_PATH|33) +#define ERRCODE_SFX_NOTRESTORABLE (ERRCODE_AREA_SFX|ERRCODE_CLASS_CREATE|34) +#define ERRCODE_SFX_NOTRASH (ERRCODE_AREA_SFX|ERRCODE_CLASS_NOTEXISTS|35) +#define ERRCODE_SFX_INVALIDSYNTAX (ERRCODE_AREA_SFX|ERRCODE_CLASS_PATH|36) +#define ERRCODE_SFX_CANTCREATEFOLDER (ERRCODE_AREA_SFX|ERRCODE_CLASS_CREATE|37) +#define ERRCODE_SFX_CANTRENAMEFOLDER (ERRCODE_AREA_SFX|ERRCODE_CLASS_PATH|38) +#define ERRCODE_SFX_WRONG_CDF_FORMAT (ERRCODE_AREA_SFX| ERRCODE_CLASS_READ | 39) +#define ERRCODE_SFX_EMPTY_SERVER (ERRCODE_AREA_SFX|ERRCODE_CLASS_NONE|40) +#define ERRCODE_SFX_NO_ABOBOX (ERRCODE_AREA_SFX| ERRCODE_CLASS_READ | 41) +#define ERRCODE_SFX_CANTGETPASSWD (ERRCODE_AREA_SFX| ERRCODE_CLASS_READ | 42) +#define ERRCODE_SFX_TARGETFILECORRUPTED (ERRCODE_AREA_SFX| ERRCODE_CLASS_READ | 43) +#define ERRCODE_SFX_NOMOREDOCUMENTSALLOWED (ERRCODE_WARNING_MASK | ERRCODE_AREA_SFX | ERRCODE_CLASS_NONE | 44) +#define ERRCODE_SFX_NOFILTER (ERRCODE_AREA_SFX|ERRCODE_CLASS_NOTEXISTS|45) +#define ERRCODE_SFX_FORCEQUIET (ERRCODE_WARNING_MASK|ERRCODE_AREA_SFX|ERRCODE_CLASS_NONE|47) +#define ERRCODE_SFX_CONSULTUSER (ERRCODE_WARNING_MASK|ERRCODE_AREA_SFX|ERRCODE_CLASS_NONE|48) +#define ERRCODE_SFX_NEVERCHECKCONTENT (ERRCODE_AREA_SFX|ERRCODE_CLASS_NONE|49) +#define ERRCODE_SFX_CANTCREATEBACKUP (ERRCODE_AREA_SFX | ERRCODE_CLASS_CREATE | 50) +#define ERRCODE_SFX_MACROS_SUPPORT_DISABLED (ERRCODE_WARNING_MASK | ERRCODE_AREA_SFX | ERRCODE_CLASS_NONE | 51) +#define ERRCODE_SFX_DOCUMENT_MACRO_DISABLED (ERRCODE_WARNING_MASK | ERRCODE_AREA_SFX | ERRCODE_CLASS_NONE | 52) +#define ERRCODE_SFX_BROKENSIGNATURE (ERRCODE_WARNING_MASK | ERRCODE_AREA_SFX | ERRCODE_CLASS_NONE | 53) +#define ERRCODE_SFX_SHARED_NOPASSWORDCHANGE (ERRCODE_WARNING_MASK | ERRCODE_AREA_SFX | ERRCODE_CLASS_NONE | 54) +#define ERRCODE_SFX_INCOMPLETE_ENCRYPTION (ERRCODE_WARNING_MASK | ERRCODE_AREA_SFX | ERRCODE_CLASS_NONE | 55) + + + +//Dies und das +#define ERRCTX_ERROR 21 +#define ERRCTX_WARNING 22 + +//Documentkontexte +#define ERRCTX_SFX_LOADTEMPLATE 1 +#define ERRCTX_SFX_SAVEDOC 2 +#define ERRCTX_SFX_SAVEASDOC 3 +#define ERRCTX_SFX_DOCINFO 4 +#define ERRCTX_SFX_DOCTEMPLATE 5 +#define ERRCTX_SFX_MOVEORCOPYCONTENTS 6 + +//Appkontexte +#define ERRCTX_SFX_DOCMANAGER 50 +#define ERRCTX_SFX_OPENDOC 51 +#define ERRCTX_SFX_NEWDOCDIRECT 52 +#define ERRCTX_SFX_NEWDOC 53 + +//Organizerkontexte +#define ERRCTX_SFX_CREATEOBJSH 70 + +//BASIC-Kontexte +#define ERRCTX_SFX_LOADBASIC 80 + +//Addressbook contexts +#define ERRCTX_SFX_SEARCHADDRESS 90 + +#endif // #ifndef _SFXECODE_HXX + + diff --git a/svtools/inc/svtools/soerr.hxx b/svtools/inc/svtools/soerr.hxx new file mode 100644 index 000000000000..9d8c9797a79f --- /dev/null +++ b/svtools/inc/svtools/soerr.hxx @@ -0,0 +1,84 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: soerr.hxx,v $ + * $Revision: 1.4 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _SOERR_HXX +#define _SOERR_HXX + +#include + +// Fehler Codes +#define RID_SO_ERROR_HANDLER 32000 + +#define SO_ERR() (ERRCODE_AREA_SO | ERRCODE_CLASS_SO) +#define SO_WRN() (ERRCODE_AREA_SO | ERRCODE_CLASS_SO | ERRCODE_WARNING_MASK) + +#define ERRCODE_SO_GENERALERROR (SO_ERR() | 1) +#define ERRCODE_SO_CANT_BINDTOSOURCE (SO_ERR() | 2) +#define ERRCODE_SO_NOCACHE_UPDATED (SO_ERR() | 3) +#define ERRCODE_SO_SOMECACHES_NOTUPDATED (SO_WRN() | 4) +#define ERRCODE_SO_MK_UNAVAILABLE (SO_ERR() | 5) +#define ERRCODE_SO_E_CLASSDIFF (SO_ERR() | 6) +#define ERRCODE_SO_MK_NO_OBJECT (SO_ERR() | 7) +#define ERRCODE_SO_MK_EXCEEDED_DEADLINE (SO_ERR() | 8) +#define ERRCODE_SO_MK_CONNECT_MANUALLY (SO_ERR() | 9) +#define ERRCODE_SO_MK_INTERMEDIATE_INTERFACE_NOT_SUPPORTED (SO_ERR() | 10) +#define ERRCODE_SO_NO_INTERFACE (SO_ERR() | 11) +#define ERRCODE_SO_OUT_OF_MEMORY (SO_ERR() | 12) +#define ERRCODE_SO_MK_SYNTAX (SO_ERR() | 13) +#define ERRCODE_SO_MK_REDUCED_TO_SELF (SO_WRN() | 14) +#define ERRCODE_SO_MK_NO_INVERSE (SO_ERR() | 15) +#define ERRCODE_SO_MK_NO_PREFIX (SO_ERR() | 16) +#define ERRCODE_SO_MK_HIM (SO_WRN() | 17) +#define ERRCODE_SO_MK_US (SO_WRN() | 18) +#define ERRCODE_SO_MK_ME (SO_WRN() | 19) +#define ERRCODE_SO_MK_NOT_BINDABLE (SO_ERR() | 20) +#define ERRCODE_SO_NOT_IMPLEMENTED (SO_ERR() | 21) +#define ERRCODE_SO_MK_NO_STORAGE (SO_ERR() | 22) +#define ERRCODE_SO_FALSE (SO_WRN() | 23) +#define ERRCODE_SO_MK_NEED_GENERIC (SO_ERR() | 24) +#define ERRCODE_SO_PENDING (SO_ERR() | 25) +#define ERRCODE_SO_NOT_INPLACEACTIVE (SO_ERR() | 26) +#define ERRCODE_SO_LINDEX (SO_ERR() | 27) +#define ERRCODE_SO_CANNOT_DOVERB_NOW (SO_WRN() | 28) +#define ERRCODE_SO_OLEOBJ_INVALIDHWND (SO_WRN() | 29) +#define ERRCODE_SO_NOVERBS (SO_ERR() | 30) +#define ERRCODE_SO_INVALIDVERB (SO_WRN() | 31) +#define ERRCODE_SO_MK_CONNECT (SO_ERR() | 32) +#define ERRCODE_SO_NOTIMPL (SO_ERR() | 33) +#define ERRCODE_SO_MK_CANTOPENFILE (SO_ERR() | 34) + +// Fehler Contexte +#define RID_SO_ERRCTX 32001 + +#define ERRCTX_SO_DOVERB 1 + + + +#endif + diff --git a/svtools/inc/svtools/sores.hxx b/svtools/inc/svtools/sores.hxx new file mode 100644 index 000000000000..158810c5b171 --- /dev/null +++ b/svtools/inc/svtools/sores.hxx @@ -0,0 +1,182 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: sores.hxx,v $ + * $Revision: 1.4 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +// Strings +#define STR_INS_OBJECT 32000 +#define STR_INS_OBJECT_ICON 32001 +#define STR_INS_FILE 32002 +#define STR_INS_FILE_ICON 32003 +#define STR_INS_FILE_LINK 32004 +#define STR_INS_FILE_ICON_LINK 32005 +#define STR_PASTE 32012 +#define STR_ERROR_DDE 32013 +#define STR_ERROR_OBJNOCREATE 32014 +#define STR_ERROR_OBJNOCREATE_FROM_FILE 32015 +#define STR_VERB_OPEN 32016 +#define STR_PLUGIN_CANT_SHOW 32017 +#define STR_ERROR_OBJNOCREATE_PLUGIN 32018 +#define STR_INS_PLUGIN 32019 +#define STR_CONVERT_TO 32010 +#define STR_ACTIVATE_AS 32021 +#define STR_QUERYUPDATELINKS 32022 +#define STR_INS_APPLET 32023 +#define STR_VERB_PROPS 32025 +#define STR_FURTHER_OBJECT 32026 +#define STR_EDIT_APPLET 32029 +#define STR_UNKNOWN_SOURCE 32027 + +#define BMP_PLUGIN 32000 +#define BMP_OLEOBJ 32001 +#define MB_PLUGIN 32000 +#define MI_PLUGIN 32000 +#define MI_PLUGIN_DEACTIVATE 1 + +// Sot Format Strings +#define STR_FORMAT_START 32100 +#define STR_FORMAT_STRING (STR_FORMAT_START + 1) +#define STR_FORMAT_BITMAP (STR_FORMAT_START + 2) +#define STR_FORMAT_GDIMETAFILE (STR_FORMAT_START + 3) + // #define STR_FORMAT_PRIVATE (STR_FORMAT_START + 4) + // #define STR_FORMAT_FILE (STR_FORMAT_START + 5) + // #define STR_FORMAT_FILE_LIST (STR_FORMAT_START + 6) +#define STR_FORMAT_RTF (STR_FORMAT_START + 7) +#define STR_FORMAT_ID_DRAWING (STR_FORMAT_START + 8) +#define STR_FORMAT_ID_SVXB (STR_FORMAT_START + 9) + // #define STR_FORMAT_ID_SVIM (STR_FORMAT_START + 10) + // #define STR_FORMAT_ID_XFA (STR_FORMAT_START + 11) + // #define STR_FORMAT_ID_EDITENGINE (STR_FORMAT_START + 12) +#define STR_FORMAT_ID_INTERNALLINK_STATE (STR_FORMAT_START + 13) +#define STR_FORMAT_ID_SOLK (STR_FORMAT_START + 14) +#define STR_FORMAT_ID_NETSCAPE_BOOKMARK (STR_FORMAT_START + 15) + // #define STR_FORMAT_ID_TREELISTBOX (STR_FORMAT_START + 16) + // #define STR_FORMAT_ID_NATIVE (STR_FORMAT_START + 17) + // #define STR_FORMAT_ID_OWNERLINK (STR_FORMAT_START + 18) +#define STR_FORMAT_ID_STARSERVER (STR_FORMAT_START + 19) +#define STR_FORMAT_ID_STAROBJECT (STR_FORMAT_START + 20) +#define STR_FORMAT_ID_APPLETOBJECT (STR_FORMAT_START + 21) +#define STR_FORMAT_ID_PLUGIN_OBJECT (STR_FORMAT_START + 22) +#define STR_FORMAT_ID_STARWRITER_30 (STR_FORMAT_START + 23) +#define STR_FORMAT_ID_STARWRITER_40 (STR_FORMAT_START + 24) +#define STR_FORMAT_ID_STARWRITER_50 (STR_FORMAT_START + 25) +#define STR_FORMAT_ID_STARWRITERWEB_40 (STR_FORMAT_START + 26) +#define STR_FORMAT_ID_STARWRITERWEB_50 (STR_FORMAT_START + 27) +#define STR_FORMAT_ID_STARWRITERGLOB_40 (STR_FORMAT_START + 28) +#define STR_FORMAT_ID_STARWRITERGLOB_50 (STR_FORMAT_START + 29) +#define STR_FORMAT_ID_STARDRAW (STR_FORMAT_START + 30) +#define STR_FORMAT_ID_STARDRAW_40 (STR_FORMAT_START + 31) +#define STR_FORMAT_ID_STARIMPRESS_50 (STR_FORMAT_START + 32) +#define STR_FORMAT_ID_STARDRAW_50 (STR_FORMAT_START + 33) +#define STR_FORMAT_ID_STARCALC (STR_FORMAT_START + 34) +#define STR_FORMAT_ID_STARCALC_40 (STR_FORMAT_START + 35) +#define STR_FORMAT_ID_STARCALC_50 (STR_FORMAT_START + 36) +#define STR_FORMAT_ID_STARCHART (STR_FORMAT_START + 37) +#define STR_FORMAT_ID_STARCHART_40 (STR_FORMAT_START + 38) +#define STR_FORMAT_ID_STARCHART_50 (STR_FORMAT_START + 39) +#define STR_FORMAT_ID_STARIMAGE (STR_FORMAT_START + 40) +#define STR_FORMAT_ID_STARIMAGE_40 (STR_FORMAT_START + 41) +#define STR_FORMAT_ID_STARIMAGE_50 (STR_FORMAT_START + 42) +#define STR_FORMAT_ID_STARMATH (STR_FORMAT_START + 43) +#define STR_FORMAT_ID_STARMATH_40 (STR_FORMAT_START + 44) +#define STR_FORMAT_ID_STARMATH_50 (STR_FORMAT_START + 45) +#define STR_FORMAT_ID_STAROBJECT_PAINTDOC (STR_FORMAT_START + 46) + // #define STR_FORMAT_ID_FILLED_AREA (STR_FORMAT_START + 47) +#define STR_FORMAT_ID_HTML (STR_FORMAT_START + 48) +#define STR_FORMAT_ID_HTML_SIMPLE (STR_FORMAT_START + 49) + // #define STR_FORMAT_ID_CHAOS (STR_FORMAT_START + 50) + // #define STR_FORMAT_ID_CNT_MSGATTACHFILE (STR_FORMAT_START + 51) +#define STR_FORMAT_ID_BIFF_5 (STR_FORMAT_START + 52) +#define STR_FORMAT_ID_BIFF_8 (STR_FORMAT_START + 53) +#define STR_FORMAT_ID_SYLK (STR_FORMAT_START + 54) + // #define STR_FORMAT_ID_SYLK_BIGCAPS (STR_FORMAT_START + 55) +#define STR_FORMAT_ID_LINK (STR_FORMAT_START + 56) +#define STR_FORMAT_ID_DIF (STR_FORMAT_START + 57) + // #define STR_FORMAT_ID_STARDRAW_TABBAR (STR_FORMAT_START + 58) + // #define STR_FORMAT_ID_SONLK (STR_FORMAT_START + 59) +#define STR_FORMAT_ID_MSWORD_DOC (STR_FORMAT_START + 60) +#define STR_FORMAT_ID_STAR_FRAMESET_DOC (STR_FORMAT_START + 61) +#define STR_FORMAT_ID_OFFICE_DOC (STR_FORMAT_START + 62) +#define STR_FORMAT_ID_NOTES_DOCINFO (STR_FORMAT_START + 63) + // #define STR_FORMAT_ID_NOTES_HNOTE (STR_FORMAT_START + 64) + // #define STR_FORMAT_ID_NOTES_NATIVE (STR_FORMAT_START + 65) +#define STR_FORMAT_ID_SFX_DOC (STR_FORMAT_START + 66) + // #define STR_FORMAT_ID_EVDF (STR_FORMAT_START + 67) + // #define STR_FORMAT_ID_ESDF (STR_FORMAT_START + 68) + // #define STR_FORMAT_ID_IDF (STR_FORMAT_START + 69) + // #define STR_FORMAT_ID_EFTP (STR_FORMAT_START + 70) + // #define STR_FORMAT_ID_EFD (STR_FORMAT_START + 71) + // #define STR_FORMAT_ID_SVX_FORMFIELDEXCH (STR_FORMAT_START + 72) + // #define STR_FORMAT_ID_EXTENDED_TABBAR (STR_FORMAT_START + 73) + // #define STR_FORMAT_ID_SBA_DATAEXCHANGE (STR_FORMAT_START + 74) + // #define STR_FORMAT_ID_SBA_FIELDDATAEXCHANGE (STR_FORMAT_START + 75) + // #define STR_FORMAT_ID_SBA_PRIVATE_URL (STR_FORMAT_START + 76) + // #define STR_FORMAT_ID_SBA_TABED (STR_FORMAT_START + 77) + // #define STR_FORMAT_ID_SBA_TABID (STR_FORMAT_START + 78) + // #define STR_FORMAT_ID_SBA_JOIN (STR_FORMAT_START + 79) + // #define STR_FORMAT_ID_OBJECTDESCRIPTOR (STR_FORMAT_START + 80) + // #define STR_FORMAT_ID_LINKSRCDESCRIPTOR (STR_FORMAT_START + 81) + // #define STR_FORMAT_ID_EMBED_SOURCE (STR_FORMAT_START + 82) + // #define STR_FORMAT_ID_LINK_SOURCE (STR_FORMAT_START + 83) + // #define STR_FORMAT_ID_EMBEDDED_OBJ (STR_FORMAT_START + 84) + // #define STR_FORMAT_ID_FILECONTENT (STR_FORMAT_START + 85) +#define STR_FORMAT_ID_FILEGRPDESCRIPTOR (STR_FORMAT_START + 86) + // #define STR_FORMAT_ID_FILENAME (STR_FORMAT_START + 87) + // #define STR_FORMAT_ID_SD_OLE (STR_FORMAT_START + 88) + // #define STR_FORMAT_ID_EMBEDDED_OBJ_OLE (STR_FORMAT_START + 89) + // #define STR_FORMAT_ID_EMBED_SOURCE_OLE (STR_FORMAT_START + 90) + // #define STR_FORMAT_ID_OBJECTDESCRIPTOR_OLE (STR_FORMAT_START + 91) + // #define STR_FORMAT_ID_LINKSRCDESCRIPTOR_OLE (STR_FORMAT_START + 92) + // #define STR_FORMAT_ID_LINK_SOURCE_OLE (STR_FORMAT_START + 93) + // #define STR_FORMAT_ID_SBA_CTRLDATAEXCHANGE (STR_FORMAT_START + 94) + // #define STR_FORMAT_ID_OUTPLACE_OBJ (STR_FORMAT_START + 95) + // #define STR_FORMAT_ID_CNT_OWN_CLIP (STR_FORMAT_START + 96) + // #define STR_FORMAT_ID_INET_IMAGE (STR_FORMAT_START + 97) + // #define STR_FORMAT_ID_NETSCAPE_IMAGE (STR_FORMAT_START + 98) + // #define STR_FORMAT_ID_SBA_FORMEXCHANGE (STR_FORMAT_START + 99) + // #define STR_FORMAT_ID_SBA_REPORTEXCHANGE (STR_FORMAT_START + 100) + // #define STR_FORMAT_ID_UNIFORMRESOURCELOCATOR (STR_FORMAT_START + 101) +#define STR_FORMAT_ID_STARCHARTDOCUMENT_50 (STR_FORMAT_START + 102) +#define STR_FORMAT_ID_GRAPHOBJ (STR_FORMAT_START + 103) +#define STR_FORMAT_ID_STARWRITER_60 (STR_FORMAT_START + 104) +#define STR_FORMAT_ID_STARWRITERWEB_60 (STR_FORMAT_START + 105) +#define STR_FORMAT_ID_STARWRITERGLOB_60 (STR_FORMAT_START + 106) +#define STR_FORMAT_ID_STARDRAW_60 (STR_FORMAT_START + 107) +#define STR_FORMAT_ID_STARIMPRESS_60 (STR_FORMAT_START + 108) +#define STR_FORMAT_ID_STARCALC_60 (STR_FORMAT_START + 109) +#define STR_FORMAT_ID_STARCHART_60 (STR_FORMAT_START + 110) +#define STR_FORMAT_ID_STARMATH_60 (STR_FORMAT_START + 111) +#define STR_FORMAT_ID_WMF (STR_FORMAT_START + 112) +#define STR_FORMAT_ID_DBACCESS_QUERY (STR_FORMAT_START + 113) +#define STR_FORMAT_ID_DBACCESS_TABLE (STR_FORMAT_START + 114) +#define STR_FORMAT_ID_DBACCESS_COMMAND (STR_FORMAT_START + 115) +#define STR_FORMAT_ID_DIALOG_60 (STR_FORMAT_START + 116) + // #define STR_FORMAT_ID_EMF (STR_FORMAT_START + 117) + // #define STR_FORMAT_ID_BIFF_8 (STR_FORMAT_START + 118) +#define STR_FORMAT_ID_HTML_NO_COMMENT (STR_FORMAT_START + 119) +#define STR_FORMAT_END (STR_FORMAT_ID_HTML_NO_COMMENT) diff --git a/svtools/inc/svtools/statusbarcontroller.hxx b/svtools/inc/svtools/statusbarcontroller.hxx new file mode 100644 index 000000000000..a5f4fc1c974c --- /dev/null +++ b/svtools/inc/svtools/statusbarcontroller.hxx @@ -0,0 +1,161 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: statusbarcontroller.hxx,v $ + * $Revision: 1.7 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _SVTOOLS_STATUSBARCONTROLLER_HXX +#define _SVTOOLS_STATUSBARCONTROLLER_HXX + +#include "svtools/svtdllapi.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifndef INCLUDED_HASH_MAP +#include +#define INCLUDED_HASH_MAP +#endif + +#include + +namespace svt +{ + +class SVT_DLLPUBLIC StatusbarController : public ::com::sun::star::frame::XStatusListener, + public ::com::sun::star::frame::XStatusbarController, + public ::com::sun::star::lang::XInitialization, + public ::com::sun::star::util::XUpdatable, + public ::com::sun::star::lang::XComponent, + public ::comphelper::OBaseMutex, + public ::cppu::OWeakObject +{ + public: + StatusbarController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, + const rtl::OUString& aCommandURL, + unsigned short nID ); + StatusbarController(); + virtual ~StatusbarController(); + + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > getFrameInterface() const; + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getServiceManager() const; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager > getLayoutManager() const; + ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > getURLTransformer() const; + + void updateStatus( const rtl::OUString aCommandURL ); + void updateStatus(); + + ::Rectangle getControlRect() const; + + // XInterface + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL acquire() throw (); + virtual void SAL_CALL release() throw (); + + // XInitialization + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + + // XUpdatable + virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException); + + // XComponent + virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); + + // XEventListener + virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException ); + + // XStatusListener + virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ); + + // XStatusbarController + virtual ::sal_Bool SAL_CALL mouseButtonDown( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL mouseMove( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL mouseButtonUp( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL command( const ::com::sun::star::awt::Point& aPos, + ::sal_Int32 nCommand, + ::sal_Bool bMouseEvent, + const ::com::sun::star::uno::Any& aData ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL paint( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xGraphics, + const ::com::sun::star::awt::Rectangle& rOutputRectangle, + ::sal_Int32 nItemId, ::sal_Int32 nStyle ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL click() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL doubleClick() throw (::com::sun::star::uno::RuntimeException); + + protected: + struct Listener + { + Listener( const ::com::sun::star::util::URL& rURL, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& rDispatch ) : + aURL( rURL ), xDispatch( rDispatch ) {} + + ::com::sun::star::util::URL aURL; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch; + }; + + typedef ::std::hash_map< ::rtl::OUString, + com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >, + ::rtl::OUStringHash, + ::std::equal_to< ::rtl::OUString > > URLToDispatchMap; + + // methods to support status forwarder, known by the old sfx2 toolbox controller implementation + void addStatusListener( const rtl::OUString& aCommandURL ); + void removeStatusListener( const rtl::OUString& aCommandURL ); + void bindListener(); + void unbindListener(); + sal_Bool isBound() const; + + // execute methods + // execute bound status bar controller command/execute various commands + void execute( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ); + void execute( const rtl::OUString& aCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ); + + sal_Bool m_bInitialized : 1, + m_bDisposed : 1; + unsigned short m_nID; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xParentWindow; + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager; + rtl::OUString m_aCommandURL; + URLToDispatchMap m_aListenerMap; + ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener + mutable ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xURLTransformer; +}; + +} + +#endif // _SVTOOLS_TOOLBOXCONTROLLER_HXX diff --git a/svtools/inc/svtools/stdmenu.hxx b/svtools/inc/svtools/stdmenu.hxx new file mode 100644 index 000000000000..fb7d69476d92 --- /dev/null +++ b/svtools/inc/svtools/stdmenu.hxx @@ -0,0 +1,244 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: stdmenu.hxx,v $ + * $Revision: 1.8 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _STDMENU_HXX +#define _STDMENU_HXX + +#include "svtools/svtdllapi.h" +#include +#ifndef _MENU_HXX +#include +#endif + +class FontList; +class FontInfo; + +/************************************************************************* + +Beschreibung +============ + +class FontNameMenu + +Beschreibung + +Erlaubt die Auswahl von Fonts. Das Menu wird ueber Fill mit den FontNamen +gefuellt. Fill sortiert automatisch die FontNamen (inkl. aller Umlaute und +sprachabhaengig). Mit SetCurName()/GetCurName() kann der aktuelle Fontname +gesetzt/abgefragt werden. Wenn SetCurName() mit einem leeren String +aufgerufen wird, wird kein Eintrag als aktueller angezeigt (fuer DontKnow). +Vor dem Selectaufruf wird der ausgewaehlte Name automatisch als aktueller +gesetzt und wuerde beim naechsten Aufruf auch als aktueller Name angezeigt +werden. Deshalb sollte vor PopupMenu::Execute() gegebenenfalls mit +SetCurName() der aktuelle Fontname gesetzt werden. + +Da die Id's und der interne Aufbau des Menus nicht bekannt ist, muss ein +Select-Handler gesetzt werden, um die Auswahl eines Namens mitzubekommen. + +In dieses Menu koennen keine weiteren Items eingefuegt werden. + +Spaeter soll auch das Menu die gleichen Bitmaps anzeigen, wie die +FontNameBox. Auf den Systemen, wo Menues nicht automatisch scrollen, +wird spaeter wohl ein A-Z Menu ziwschengeschaltet. Da ein Menu bei vielen +installierten Fonts bisher schon immer lange gebraucht hat, sollte dieses +Menu schon jetzt nur einmal erzeugt werden (da sonst das Kontextmenu bis +zu 10-Sekunden fuer die Erzeugung brauchen koennte). + +Querverweise + +FontList; FontStyleMenu; FontSizeMenu; FontNameBox + +-------------------------------------------------------------------------- + +class FontStyleMenu + +Beschreibung + +Erlaubt die Auswahl eines FontStyles. Mit Fill wird das FontStyleMenu mit +den Styles zum uebergebenen Font gefuellt. Nachgebildete Styles werden +immer mit eingefuegt (kann sich aber noch aendern, da vielleicht +nicht alle Applikationen [StarDraw,Formel,FontWork] mit Syntetic-Fonts +umgehen koennen). Mit SetCurStyle()/GetCurStyle() kann der aktuelle Fontstyle +gesetzt/abgefragt werden. Der Stylename muss mit FontList::GetStyleName() +ermittelt werden. Wenn SetCurStyle() mit einem leeren String aufgerufen wird, +wird kein Eintrag als aktueller angezeigt (fuer DontKnow). Vor dem Selectaufruf +wird der ausgewaehlte Style automatisch als aktueller gesetzt und wuerde beim +naechsten Aufruf auch als aktueller Style angezeigt werden. Deshalb sollte vor +PopupMenu::Execute() gegebenenfalls mit SetCurStyle() der aktuelle Style +gesetzt werden. Da die Styles vom ausgewaehlten Font abhaengen, sollte +nach einer Aenderung des Fontnamen das Menu mit Fill mit den Styles des +Fonts neu gefuellt werden. + +Mit GetCurStyle() kann der ausgewaehlte Style abgefragt +werden. Mit Check wird der Style gecheckt/uncheckt, welcher aktiv +ist. Der Stylename muss mit FontList::GetStyleName() ermittelt werden. Vor +dem Selectaufruf wird der ausgewaehlte Style automatisch gecheckt. Mit +UncheckAllStyles() koennen alle Fontstyles geuncheckt werden (zum Beispiel +fuer DontKnow). + +Da die Id's und der interne Aufbau des Menus nicht bekannt ist, muss ein +Select-Handler gesetzt werden, um die Auswahl eines Styles mitzubekommen. + +An dieses Menu kann ueber MENU_APPEND weitere Items eingefuegt werden. +Bei Fill werden nur Items entfernt, die die Id zwischen FONTSTYLEMENU_FIRSTID +und FONTSTYLEMENU_LASTID haben. + +Querverweise + +FontList; FontNameMenu; FontSizeMenu; FontStyleBox + +-------------------------------------------------------------------------- + +class FontSizeMenu + +Beschreibung + +Erlaubt die Auswahl von Fontgroessen. Ueber Fill wird das FontSizeMenu +gefuellt und ueber GetCurHeight() kann die ausgewaehlte Fontgroesse +abgefragt werden. Mit SetCurHeight()/GetCurHeight() kann die aktuelle +Fontgroesse gesetzt/abgefragt werden. Wenn SetCurHeight() mit 0 aufgerufen +wird, wird kein Eintrag als aktueller angezeigt (fuer DontKnow). Vor dem +Selectaufruf wird die ausgewaehlte Groesse automatisch als aktuelle gesetzt +und wuerde beim naechsten Aufruf auch als aktuelle Groesse angezeigt werden. +Deshalb sollte vor PopupMenu::Execute() gegebenenfalls mit SetCurHeight() +die aktuelle Groesse gesetzt werden. Da die Groessen vom ausgewaehlten Font +abhaengen, sollte nach einer Aenderung des Fontnamen das Menu mit Fill mit +den Groessen des Fonts neu gefuellt werden. + +Da die Id's und der interne Aufbau des Menus nicht bekannt ist, muss ein +Select-Handler gesetzt werden, um die Auswahl einer Groesse mitzubekommen. + +Alle Groessen werden in 10tel Point angegeben. + +In dieses Menu koennen keine weiteren Items eingefuegt werden. + +Spaeter soll das Menu je nach System die Groessen anders darstelllen. Zum +Beispiel koennte der Mac spaeter vielleicht einmal die Groessen als Outline +darstellen, die als Bitmap-Fonts vorhanden sind. + +Querverweise + +FontList; FontNameMenu; FontStyleMenu; FontSizeBox + +*************************************************************************/ + +// ---------------- +// - FontNameMenu - +// ---------------- + +class SVT_DLLPUBLIC FontNameMenu : public PopupMenu +{ +private: + XubString maCurName; + Link maSelectHdl; + Link maHighlightHdl; + +public: + FontNameMenu(); + virtual ~FontNameMenu(); + + virtual void Select(); + virtual void Highlight(); + + void Fill( const FontList* pList ); + + void SetCurName( const XubString& rName ); + const XubString& GetCurName() const { return maCurName; } + + void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } + const Link& GetSelectHdl() const { return maSelectHdl; } + void SetHighlightHdl( const Link& rLink ) { maHighlightHdl = rLink; } + const Link& GetHighlightHdl() const { return maHighlightHdl; } +}; + +// ----------------- +// - FontStyleMenu - +// ----------------- + +#define FONTSTYLEMENU_FIRSTID 62000 +#define FONTSTYLEMENU_LASTID 62999 + +class SVT_DLLPUBLIC FontStyleMenu : public PopupMenu +{ +private: + XubString maCurStyle; + Link maSelectHdl; + Link maHighlightHdl; + + SVT_DLLPRIVATE BOOL ImplIsAlreadyInserted( const XubString& rStyleName, USHORT nCount ); + +public: + FontStyleMenu(); + virtual ~FontStyleMenu(); + + virtual void Select(); + virtual void Highlight(); + + void Fill( const XubString& rName, const FontList* pList ); + void SetCurStyle( const XubString& rStyle ); + const XubString& GetCurStyle() const { return maCurStyle; } + + void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } + const Link& GetSelectHdl() const { return maSelectHdl; } + void SetHighlightHdl( const Link& rLink ) { maHighlightHdl = rLink; } + const Link& GetHighlightHdl() const { return maHighlightHdl; } +}; + +// ---------------- +// - FontSizeMenu - +// ---------------- + +class SVT_DLLPUBLIC FontSizeMenu : public PopupMenu +{ +private: + long* mpHeightAry; + long mnCurHeight; + Link maSelectHdl; + Link maHighlightHdl; + +public: + FontSizeMenu(); + ~FontSizeMenu(); + + virtual void Select(); + virtual void Highlight(); + + void Fill( const FontInfo& rInfo, const FontList* pList ); + + void SetCurHeight( long nHeight ); + long GetCurHeight() const { return mnCurHeight; } + + void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } + const Link& GetSelectHdl() const { return maSelectHdl; } + void SetHighlightHdl( const Link& rLink ) { maHighlightHdl = rLink; } + const Link& GetHighlightHdl() const { return maHighlightHdl; } +}; + +#endif // _STDMENU_HXX diff --git a/svtools/inc/svtools/sychconv.hxx b/svtools/inc/svtools/sychconv.hxx new file mode 100644 index 000000000000..2e570dfe2550 --- /dev/null +++ b/svtools/inc/svtools/sychconv.hxx @@ -0,0 +1,50 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: sychconv.hxx,v $ + * $Revision: 1.3.136.1 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _SYCHCONV_HXX +#define _SYCHCONV_HXX + +#include +#include + +// ---------------------- +// - CharacterConverter - +// ---------------------- + +class OutputDevice; + +class SymCharConverter +{ +public: + + static BOOL Convert( Font& rFont, UniString& rString, OutputDevice* pDev = NULL ); +}; + +#endif // _CHARCONV_HXX diff --git a/svtools/inc/svtools/tabbar.hxx b/svtools/inc/svtools/tabbar.hxx new file mode 100644 index 000000000000..5261697dd8b0 --- /dev/null +++ b/svtools/inc/svtools/tabbar.hxx @@ -0,0 +1,558 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: tabbar.hxx,v $ + * $Revision: 1.11 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _TABBAR_HXX +#define _TABBAR_HXX + +#include "svtools/svtdllapi.h" +#include +#include + +class MouseEvent; +class TrackingEvent; +class DataChangedEvent; +class ImplTabBarList; +class ImplTabButton; +class ImplTabSizer; +class TabBarEdit; + +// ----------------- +// - Dokumentation - +// ----------------- + +/* + +Erlaubte StyleBits +------------------ + +WB_SCROLL - Die Tabs koennen ueber ein Extra-Feld gescrollt werden +WB_MINSCROLL - Die Tabs koennen ueber 2 zusaetzliche Buttons gescrollt werden +WB_RANGESELECT - Zusammenhaengende Bereiche koennen selektiert werden +WB_MULTISELECT - Einzelne Tabs koennen selektiert werden +WB_BORDER - Oben und unten wird ein Strich gezeichnet +WB_TOPBORDER - Oben wird ein Border gezeichnet +WB_3DTAB - Die Tabs und der Border werden in 3D gezeichnet +WB_DRAG - Vom TabBar wird ein StartDrag-Handler gerufen, wenn + Drag and Drop gestartet werden soll. Es wird ausserdem + im TabBar mit EnableDrop() Drag and Drop eingeschaltet. +WB_SIZEABLE - Vom TabBar wird ein Split-Handler gerufen, wenn der Anwender + den TabBar in der Breite aendern will +WB_STDTABBAR - WB_BORDER + +Wenn man den TabBar zum Beispiel als Property-Bar benutzen moechte, sollten +die WinBits WB_TOPBORDER und WB_3DTAB anstatt WB_BORDER gesetzt werden. + + +Erlaubte PageBits +----------------- + +TPB_SPECIAL - Andere Darstellung des TabTextes, zum Beispiel fuer + Szenario-Seiten. + + +Handler +------- + +Select - Wird gerufen, wenn eine Tab selektiert oder + deselektiert wird +DoubleClick - Wird gerufen, wenn ein DoubleClick im TabBar ausgeloest + wurde. Innerhalb des Handlers liefert GetCurPageId() die + angeklickte Tab zurueck oder 0, wenn keine Tab angeklickt + wurde +ActivatePage - Wird gerufen, wenn eine andere Seite aktiviert wird. + GetCurPageId() gibt die aktivierte Seite zurueck. +DeactivatePage - Wird gerufen, wenn eine Seite deaktiviert wird. Wenn + eine andere Seite aktiviert werden darf, muss TRUE + zurueckgegeben werden, wenn eine andere Seite von + der Aktivierung ausgeschlossen werden soll, muss + FALSE zurueckgegeben werden. GetCurPageId() gibt die + zu deaktivierende Seite zurueck. + + + +Drag and Drop +------------- + +Fuer Drag and Drop muss das WinBit WB_DRAG gesetzt werden. Ausserdem +muss der Command-, QueryDrop-Handler und der Drop-Handler ueberlagert +werden. Dabei muss in den Handlern folgendes implementiert werden: + +Command - Wenn in diesem Handler das Dragging gestartet werden + soll, muss StartDrag() gerufen werden. Diese Methode + selektiert dann den entsprechenden Eintrag oder gibt + FALSE zurueck, wenn das Dragging nicht durchgefuhert + werden kann. + +QueryDrop - Dieser Handler wird von StarView immer dann gerufen, wenn + bei einem Drag-Vorgang die Maus ueber das Fenster gezogen + wird (siehe dazu auch SV-Doku). In diesem Handler muss + festgestellt werden, ob ein Drop moeglich ist. Die + Drop-Position kann im TabBar mit ShowDropPos() angezeigt + werden. Beim Aufruf muss die Position vom Event uebergeben + werden. Wenn sich die Position am linken oder rechten + Rand befindet, wird automatisch im TabBar gescrollt. + Diese Methode gibt auch die entsprechende Drop-Position + zurueck, die auch fuer ein Drop gebraucht wird. Wenn das + Fenster beim Drag verlassen wird, kann mit HideDropPos() + die DropPosition wieder weggenommen werden. Es ist dadurch + auch moeglich, ein von ausserhalb des TabBars ausgeloestes + Drag zu verarbeiten. + +Drop - Im Drop-Handler muessen dann die Pages verschoben werden, + oder die neuen Pages eingefuegt werden. Die entsprechende + Drop-Postion kann mit ShowDropPos() ermittelt werden. + +Folgende Methoden werden fuer Drag and Drop gebraucht und muessen von +den Handlern gerufen werden: + +StartDrag - Muss aus dem Commnad-Handler gerufen werden. Als Parameter + muss der CommandEvent uebergeben werden und eine Referenz + auf eine Region. Diese Region muss dann bei ExecuteDrag() + uebergeben werden, wenn der Rueckgabewert sagt, das + ExecuteDrag durchgefuehrt werden soll. Falls der Eintrag + nicht selektiert ist, wird er vorher als aktueller + Eintrag gesetzt. Es ist daher darauf zu achten, das aus + dieser Methode heraus der Select-Handler gerufen werden + kann. + +ShowDropPos - Diese Methode muss vom QueryDrop-Handler gerufen werden, + damit der TabBar anzeigt, wo die Tabs eingefuegt werden. + Diese Methode kann auch im Drop-Handler benutzt werden, + um die Position zu ermitteln wo die Tabs eingefuegt werden + sollen. In der Methode muss die Position vom Event + uebergeben werden. Diese Methode gibt die Position zurueck, + wo die Tabs eingefuegt werden sollen. + +HideDropPos - Diese Methode nimmt die vorher mit ShowDropPos() angezeigte + DropPosition wieder zurueck. Diese Methode sollte dann + gerufen werden, wenn bei QueryDrop() das Fenster verlassen + wird oder der Dragvorgang beendet wurde. + +Folgende Methoden koennen eingesetzt werden, wenn bei D&D die Seiten +umgeschaltet werden sollen: + +SwitchPage - Diese Methode muss vom QueryDrop-Handler gerufen werden, + wenn die Seite ueber der sich der Mousepointer befindet, + umgeschaltet werden soll. Diese Methode sollte jedesmal + gerufen werden, wenn der QueryDrop-Handler gerufen wird. + Das umschalten der Seite passiert zeitverzoegert (500 ms) + und wird automatisch von dieser Methode verwaltet. + In der Methode muss die Position vom Event uebergeben + werden. Diese Methode gibt TRUE zurueck, wenn die Page + umgeschaltet wurde. + +EndSwitchPage - Diese Methode setzt die Daten fuer das umschalten der + Seiten zurueck. Diese Methode sollte dann gerufen werden, + wenn bei QueryDrop() das Fenster verlassen wird oder + der Dragvorgang beendet wurde. + +IsInSwitching - Mit dieser Methode kann im ActivatePage()/DeactivatePage() + abgefragt werden, ob dies durch SwitchPage() veranlasst + wurde. So kann dann beispielsweise in DeactivatePage() + das Umschalten ohne eine Fehlerbox verhindert werden. + + +Fenster-Resize +-------------- + +Wenn das Fenster vom Anwender in der Breite geaendert werden kann, dann +muss das WinBit WB_SIZEABLE gesetzt werden. In diesem Fall muss noch +folgender Handler ueberlagert werden: + +Split - Wenn dieser Handler gerufen wird, sollte das Fenster + auf die Breite angepasst werden, die von GetSplitSize() + zurueckgegeben wird. Dabei wird keine minimale und + maximale Breite beruecksichtig. Eine minimale Breite + kann mit GetMinSize() abgefragt werden und die maximale + Breite muss von der Anwendung selber berechnet werden. + Da nur Online-Resize unterstuetzt wird, muss das Fenster + innerhalb dieses Handlers in der Breite geaendert + werden und eventuell abhaengige Fenster ebenfalls. Fuer + diesen Handler kann auch mit SetSplitHdl() ein + Link gesetzt werden. + +Folgende Methoden liefern beim Splitten weitere Informationen: + +GetSplitSize() - Liefert die Breite des TabBars zurueck, auf die der + Anwender das Fenster resizen will. Dabei wird keine + minimale oder maximale Breite beruecksichtigt. Es wird + jedoch nie eine Breite < 5 zurueckgeliefert. Diese Methode + liefert nur solange richtige Werte, wie Splitten aktiv + ist. + +GetMinSize() - Mit dieser Methode kann eine minimale Fensterbreite + abgefragt werden, so das min. etwas eines Tabs sichtbar + ist. Jedoch kann der TabBar immer noch schmaler gesetzt + werden, als die Breite, die diese Methode zurueckliefert. + Diese Methode kann auch aufgerufen werden, wenn kein + Splitten aktiv ist. + + +Edit-Modus +---------- + +Der Tabbar bietet auch Moeglichkeiten, das der Anwender in den Tabreitern +die Namen aendern kann. + +EnableEditMode - Damit kann eingestellt werden, das bei Alt+LeftClick + StartEditMode() automatisch vom TabBar gerufen wird. + Im StartRenaming()-Handler kann dann das Umbenennen + noch abgelehnt werden. +StartEditMode - Mit dieser Methode wird der EditModus auf einem + Tab gestartet. FALSE wird zurueckgegeben, wenn + der Editmodus schon aktiv ist, mit StartRenaming() + der Modus abgelehnt wurde oder kein Platz zum + Editieren vorhanden ist. +EndEditMode - Mit dieser Methode wird der EditModus beendet. +SetEditText - Mit dieser Methode kann der Text im AllowRenaming()- + Handler noch durch einen anderen Text ersetzt werden. +GetEditText - Mit dieser Methode kann im AllowRenaming()-Handler + der Text abgefragt werden, den der Anwender eingegeben + hat. +IsInEditMode - Mit dieser Methode kann abgefragt werden, ob der + Editmodus aktiv ist. +IsEditModeCanceled - Mit dieser Methode kann im EndRenaming()- + Handler abgefragt werden, ob die Umbenenung + abgebrochen wurde. +GetEditPageId - Mit dieser Methode wird in den Renaming-Handlern + abgefragt, welcher Tab umbenannt wird/wurde. + +StartRenaming() - Dieser Handler wird gerufen, wenn ueber StartEditMode() + der Editmodus gestartet wurde. Mit GetEditPageId() + kann abgefragt werden, welcher Tab umbenannt werden + soll. FALSE sollte zurueckgegeben werden, wenn + der Editmodus nicht gestartet werden soll. +AllowRenaming() - Dieser Handler wird gerufen, wenn der Editmodus + beendet wird (nicht bei Cancel). In diesem Handler + kann dann getestet werden, ob der Text OK ist. + Mit GetEditPageId() kann abgefragt werden, welcher Tab + umbenannt wurde. + Es sollte einer der folgenden Werte zurueckgegeben + werden: + TAB_RENAMING_YES + Der Tab wird umbenannt. + TAB_RENAMING_NO + Der Tab wird nicht umbenannt, der Editmodus bleibt + jedoch aktiv, so das der Anwender den Namen + entsprechent anpassen kann. + TAB_RENAMING_CANCEL + Der Editmodus wird abgebrochen und der alte + Text wieder hergestellt. +EndRenaming() - Dieser Handler wird gerufen, wenn der Editmodus + beendet wurde. Mit GetEditPageId() kann abgefragt + werden, welcher Tab umbenannt wurde. Mit + IsEditModeCanceled() kann abgefragt werden, ob der + Modus abgebrochen wurde und der Name dadurch nicht + geaendert wurde. + + +Maximale Pagebreite +------------------- + +Die Pagebreite der Tabs kann begrenzt werden, damit ein einfacheres +Navigieren ueber diese moeglich ist. Wenn der Text dann nicht komplett +angezeigt werden kann, wird er mit ... abgekuerzt und in der Tip- +oder der aktiven Hilfe (wenn kein Hilfetext gesetzt ist) wird dann der +ganze Text angezeigt. Mit EnableAutoMaxPageWidth() kann eingestellt +werden, ob die maximale Pagebreite sich nach der gerade sichtbaren +Breite richten soll (ist der default). Ansonsten kann auch die +maximale Pagebreite mit SetMaxPageWidth() (in Pixeln) gesetzt werden +(die AutoMaxPageWidth wird dann ignoriert). + + +KontextMenu +----------- + +Wenn ein kontextsensitives PopupMenu anzeigt werden soll, muss der +Command-Handler ueberlagert werden. Mit GetPageId() und bei +Uebergabe der Mausposition kann ermittelt werden, ob der Mausclick +ueber einem bzw. ueber welchem Item durchgefuehrt wurde. +*/ + +// ----------- +// - WinBits - +// ----------- + +#define WB_RANGESELECT ((WinBits)0x00200000) +#define WB_MULTISELECT ((WinBits)0x00400000) +#define WB_TOPBORDER ((WinBits)0x04000000) +#define WB_3DTAB ((WinBits)0x08000000) +#define WB_MINSCROLL ((WinBits)0x20000000) +#define WB_STDTABBAR WB_BORDER + +// ------------------ +// - TabBarPageBits - +// ------------------ + +typedef USHORT TabBarPageBits; + +// ------------------------- +// - Bits fuer TabBarPages - +// ------------------------- + +#define TPB_SPECIAL ((TabBarPageBits)0x0001) + +// ---------------- +// - TabBar-Types - +// ---------------- + +#define TABBAR_APPEND ((USHORT)0xFFFF) +#define TABBAR_PAGE_NOTFOUND ((USHORT)0xFFFF) + +#define TABBAR_RENAMING_YES ((long)TRUE) +#define TABBAR_RENAMING_NO ((long)FALSE) +#define TABBAR_RENAMING_CANCEL ((long)2) + +// ---------- +// - TabBar - +// ---------- +struct TabBar_Impl; + +class SVT_DLLPUBLIC TabBar : public Window +{ + friend class ImplTabButton; + friend class ImplTabSizer; + +private: + ImplTabBarList* mpItemList; + ImplTabButton* mpFirstBtn; + ImplTabButton* mpPrevBtn; + ImplTabButton* mpNextBtn; + ImplTabButton* mpLastBtn; + TabBar_Impl* mpImpl; + TabBarEdit* mpEdit; + XubString maEditText; + Color maSelColor; + Color maSelTextColor; + Size maWinSize; + long mnMaxPageWidth; + long mnCurMaxWidth; + long mnOffX; + long mnOffY; + long mnLastOffX; + long mnSplitSize; + ULONG mnSwitchTime; + WinBits mnWinStyle; + USHORT mnCurPageId; + USHORT mnFirstPos; + USHORT mnDropPos; + USHORT mnSwitchId; + USHORT mnEditId; + BOOL mbFormat; + BOOL mbFirstFormat; + BOOL mbSizeFormat; + BOOL mbAutoMaxWidth; + BOOL mbInSwitching; + BOOL mbAutoEditMode; + BOOL mbEditCanceled; + BOOL mbDropPos; + BOOL mbInSelect; + BOOL mbSelColor; + BOOL mbSelTextColor; + BOOL mbMirrored; + Link maSelectHdl; + Link maDoubleClickHdl; + Link maSplitHdl; + Link maActivatePageHdl; + Link maDeactivatePageHdl; + Link maStartRenamingHdl; + Link maAllowRenamingHdl; + Link maEndRenamingHdl; + + using Window::ImplInit; + SVT_DLLPRIVATE void ImplInit( WinBits nWinStyle ); + SVT_DLLPRIVATE void ImplInitSettings( BOOL bFont, BOOL bBackground ); + SVT_DLLPRIVATE void ImplGetColors( Color& rFaceColor, Color& rFaceTextColor, + Color& rSelectColor, Color& rSelectTextColor ); + SVT_DLLPRIVATE void ImplShowPage( USHORT nPos ); + SVT_DLLPRIVATE BOOL ImplCalcWidth(); + SVT_DLLPRIVATE void ImplFormat(); + SVT_DLLPRIVATE USHORT ImplGetLastFirstPos(); + SVT_DLLPRIVATE void ImplInitControls(); + SVT_DLLPRIVATE void ImplEnableControls(); + SVT_DLLPRIVATE void ImplSelect(); + SVT_DLLPRIVATE void ImplActivatePage(); + SVT_DLLPRIVATE long ImplDeactivatePage(); + DECL_DLLPRIVATE_LINK( ImplClickHdl, ImplTabButton* ); + +public: + TabBar( Window* pParent, WinBits nWinStyle = WB_STDTABBAR ); + virtual ~TabBar(); + + virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void Paint( const Rectangle& rRect ); + virtual void Resize(); + virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void StateChanged( StateChangedType nStateChange ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); + + virtual void Select(); + virtual void DoubleClick(); + virtual void Split(); + virtual void ActivatePage(); + virtual long DeactivatePage(); + virtual long StartRenaming(); + virtual long AllowRenaming(); + virtual void EndRenaming(); + virtual void Mirror(); + + void InsertPage( USHORT nPageId, const XubString& rText, + TabBarPageBits nBits = 0, + USHORT nPos = TABBAR_APPEND ); + void RemovePage( USHORT nPageId ); + void MovePage( USHORT nPageId, USHORT nNewPos ); + void Clear(); + + void EnablePage( USHORT nPageId, BOOL bEnable = TRUE ); + BOOL IsPageEnabled( USHORT nPageId ) const; + + void SetPageBits( USHORT nPageId, TabBarPageBits nBits = 0 ); + TabBarPageBits GetPageBits( USHORT nPageId ) const; + + USHORT GetPageCount() const; + USHORT GetPageId( USHORT nPos ) const; + USHORT GetPagePos( USHORT nPageId ) const; + USHORT GetPageId( const Point& rPos ) const; + Rectangle GetPageRect( USHORT nPageId ) const; + // returns the rectangle in which page tabs are drawn + Rectangle GetPageArea() const; + + void SetCurPageId( USHORT nPageId ); + USHORT GetCurPageId() const { return mnCurPageId; } + + void SetFirstPageId( USHORT nPageId ); + USHORT GetFirstPageId() const { return GetPageId( mnFirstPos ); } + void MakeVisible( USHORT nPageId ); + + void SelectPage( USHORT nPageId, BOOL bSelect = TRUE ); + void SelectPageRange( BOOL bSelect = FALSE, + USHORT nStartPos = 0, + USHORT nEndPos = TABBAR_APPEND ); + USHORT GetSelectPage( USHORT nSelIndex = 0 ) const; + USHORT GetSelectPageCount() const; + BOOL IsPageSelected( USHORT nPageId ) const; + + void EnableAutoMaxPageWidth( BOOL bEnable = TRUE ) { mbAutoMaxWidth = bEnable; } + BOOL IsAutoMaxPageWidthEnabled() const { return mbAutoMaxWidth; } + void SetMaxPageWidth( long nMaxWidth ); + long GetMaxPageWidth() const { return mnMaxPageWidth; } + void ResetMaxPageWidth() { SetMaxPageWidth( 0 ); } + BOOL IsMaxPageWidth() const { return mnMaxPageWidth != 0; } + + void EnableEditMode( BOOL bEnable = TRUE ) { mbAutoEditMode = bEnable; } + BOOL IsEditModeEnabled() const { return mbAutoEditMode; } + BOOL StartEditMode( USHORT nPageId ); + void EndEditMode( BOOL bCancel = FALSE ); + void SetEditText( const XubString& rText ) { maEditText = rText; } + const XubString& GetEditText() const { return maEditText; } + BOOL IsInEditMode() const { return (mpEdit != NULL); } + BOOL IsEditModeCanceled() const { return mbEditCanceled; } + USHORT GetEditPageId() const { return mnEditId; } + + /** Mirrors the entire control including position of buttons and splitter. + Mirroring is done relative to the current direction of the GUI. + @param bMirrored TRUE = the control will draw itself RTL in LTR GUI, + and vice versa; FALSE = the control behaves according to the + current direction of the GUI. */ + void SetMirrored( BOOL bMirrored = TRUE ); + /** Returns TRUE, if the control is set to mirrored mode (see SetMirrored()). */ + BOOL IsMirrored() const { return mbMirrored; } + + /** Sets the control to LTR or RTL mode regardless of the GUI direction. + @param bRTL FALSE = the control will draw from left to right; + TRUE = the control will draw from right to left. */ + void SetEffectiveRTL( BOOL bRTL ); + /** Returns TRUE, if the control draws from right to left (see SetEffectiveRTL()). */ + BOOL IsEffectiveRTL() const; + + BOOL StartDrag( const CommandEvent& rCEvt, Region& rRegion ); + USHORT ShowDropPos( const Point& rPos ); + void HideDropPos(); + BOOL SwitchPage( const Point& rPos ); + void EndSwitchPage(); + BOOL IsInSwitching() { return mbInSwitching; } + + void SetSelectColor(); + void SetSelectColor( const Color& rColor ); + const Color& GetSelectColor() const { return maSelColor; } + BOOL IsSelectColor() const { return mbSelColor; } + void SetSelectTextColor(); + void SetSelectTextColor( const Color& rColor ); + const Color& GetSelectTextColor() const { return maSelTextColor; } + BOOL IsSelectTextColor() const { return mbSelTextColor; } + + void SetPageText( USHORT nPageId, const XubString& rText ); + XubString GetPageText( USHORT nPageId ) const; + void SetHelpText( USHORT nPageId, const XubString& rText ); + XubString GetHelpText( USHORT nPageId ) const; + void SetHelpId( USHORT nPageId, ULONG nHelpId ); + ULONG GetHelpId( USHORT nPageId ) const; + + long GetSplitSize() const { return mnSplitSize; } + long GetMinSize() const; + + void SetHelpText( const XubString& rText ) + { Window::SetHelpText( rText ); } + XubString GetHelpText() const + { return Window::GetHelpText(); }; + void SetHelpId( ULONG nId ) + { Window::SetHelpId( nId ); } + ULONG GetHelpId() const + { return Window::GetHelpId(); } + + void SetStyle( WinBits nStyle ); + WinBits GetStyle() const { return mnWinStyle; } + + Size CalcWindowSizePixel() const; + + void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } + const Link& GetSelectHdl() const { return maSelectHdl; } + void SetDoubleClickHdl( const Link& rLink ) { maDoubleClickHdl = rLink; } + const Link& GetDoubleClickHdl() const { return maDoubleClickHdl; } + void SetSplitHdl( const Link& rLink ) { maSplitHdl = rLink; } + const Link& GetSplitHdl() const { return maSplitHdl; } + void SetActivatePageHdl( const Link& rLink ) { maActivatePageHdl = rLink; } + const Link& GetActivatePageHdl() const { return maActivatePageHdl; } + void SetDeactivatePageHdl( const Link& rLink ) { maDeactivatePageHdl = rLink; } + const Link& GetDeactivatePageHdl() const { return maDeactivatePageHdl; } + void SetStartRenamingHdl( const Link& rLink ) { maStartRenamingHdl = rLink; } + const Link& GetStartRenamingHdl() const { return maStartRenamingHdl; } + void SetAllowRenamingHdl( const Link& rLink ) { maAllowRenamingHdl = rLink; } + const Link& GetAllowRenamingHdl() const { return maAllowRenamingHdl; } + void SetEndRenamingHdl( const Link& rLink ) { maEndRenamingHdl = rLink; } + const Link& GetEndRenamingHdl() const { return maEndRenamingHdl; } + + // accessibility + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); +}; + +#endif // _TABBAR_HXX diff --git a/svtools/inc/svtools/taskbar.hxx b/svtools/inc/svtools/taskbar.hxx new file mode 100644 index 000000000000..af373749248c --- /dev/null +++ b/svtools/inc/svtools/taskbar.hxx @@ -0,0 +1,493 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: taskbar.hxx,v $ + * $Revision: 1.7 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _TASKBAR_HXX +#define _TASKBAR_HXX + +#include "svtools/svtdllapi.h" +#include +#ifndef _TOOLS_LIST_HXX +#include +#endif +#include +#include +#include + +class TaskBar; +class TaskStatusFieldItem; +class ImplTaskItemList; +class ImplTaskSBItemList; +class ImplTaskBarFloat; +struct ImplTaskSBFldItem; + +// ----------------- +// - Dokumentation - +// ----------------- + +/* + +TaskToolBox +=========== + +StartUpdateTask()/UpdateTask()/EndUpdateTask() +Diese muessen gerufen werden, wenn die Task upgedatet werden muessen. +Dann muss StartUpdateTask() gerufen werden, dann UpdateTask() fuer alle +Task's und danach EndUpdateTask() wo dann die TaskButtons entsprechend +neu angeordnet werden. + +ActivateTask() +Handler der gerufen wird, wenn ein Task aktiviert werden muss. Mit +GetTaskItem() kann abgefragt werden, welcher Task aktiviert werden muss. + +ContextMenu() +Dieser Handler wird gerufen, wenn ein ContextMenu angezeigt werden soll. +Mit GetTaskMode() kann abgefragt werden, ob fuer einen Task oder ein +Item. + +GetTaskItem() +Diese Methode liefert das Item zurueck, welches bei UpdateTask an der +entsprechenden Position eingefuegt wurde. + +GetContextMenuPos() +Liefert die Position zurueck, wo das Contextmenu angezeigt werden soll. + + +TaskStatusBar +============= + +InsertStatusField()/RemoveStatusField() +Fuegt ein Statusfeld ein, wo die aktuelle Uhrzeit angezeigt wird. In +dieses Feld koennen dann mit AddStatusFielItem(), ModifyStatusFielItem() +und RemoveStatusFielItem() Status-Items eingefuegt werden. Bei diesen +muss man ein Image angeben, welches dann angezeigt wird. Ausserdem kann +man bei diesen noch Hilfe-Texte angeben oder sagen, ob sie blinken +sollen und ein Notify-Object, worueber man informiert wird, wenn ein +Kontextmenu angezeigt wird oder das Item angeklickt wird. Am +TaskStatusBar kann auch ein Notify-Object gesetzt werden, wenn man +benachrichtigt werden will, wenn die Uhrzeit oder die TaskStatusBar +angeklickt wird. Wenn der Notify fuer die Uhrzeit kommt, ist die +Id TASKSTATUSBAR_CLOCKID, wenn er fuer die TaskStatusBar kommt, ist +die Id 0. Mit SetFieldFlags() kann am TaskStatusBar auch die Flags +hinterher umgesetzt werden, um zum Beispiel die Uhrzeit ein- und +auszuschalten. + + +TaskBar +======= + +Erlaubte StyleBits +------------------ + +WB_BORDER - Border an der oberen Kante +WB_SIZEABLE - Zwischen TaskToolBox und TaskStatusBar kann der Anwender + die Groesse aendern. + +Wenn WB_SIZEABLE gesetzt ist, kann die Breite des StatusBars gesetzt und +abgefragt werden. Dazu kann man SetStatusSize()/GetStatusSize() aufrufen. +0 steht dabei fuer optimale Groesse, was auch der Default ist. Bei einem +Doppelklick auf den Trenner kann der Anwender auch wieder die optimale +Groesse einstellen. + +Wichtige Methoden +------------------ + +virtual TaskToolBox* TaskBar::CreateButtonBar(); +virtual TaskToolBox* TaskBar::CreateTaskToolBox(); +virtual TaskStatusBar* TaskBar::CreateTaskStatusBar(); + +Diese Methoden muesste man ueberladen, wenn man eine eigene Klasse anlegen +will. + +void TaskBar::ShowStatusText( const String& rText ); +void TaskBar::HideStatusText(); + +Blendet den ButtonBar und die TaskBar ein bzw. aus um den Hilfetexte in der +gesammten Zeile anzuzeigen. +*/ + +// ----------------- +// - TaskButtonBar - +// ----------------- + +class TaskButtonBar : public ToolBox +{ + friend class TaskBar; + +private: + TaskBar* mpNotifyTaskBar; + void* mpDummy1; + void* mpDummy2; + void* mpDummy3; + void* mpDummy4; + +public: + TaskButtonBar( Window* pParent, WinBits nWinStyle = 0 ); + ~TaskButtonBar(); + + virtual void RequestHelp( const HelpEvent& rHEvt ); + + void InsertButton( USHORT nItemId, + const Image& rImage, const String& rText, + USHORT nPos = TOOLBOX_APPEND ) + { InsertItem( nItemId, rImage, rText, TIB_LEFT | TIB_AUTOSIZE, nPos ); } + void RemoveButton( USHORT nItemId ) + { RemoveItem( nItemId ); } +}; + +// --------------------- +// - TaskToolBox-Types - +// --------------------- + +#define TASKTOOLBOX_TASK_NOTFOUND ((USHORT)0xFFFF) + +// --------------- +// - TaskToolBox - +// --------------- + +class SVT_DLLPUBLIC TaskToolBox : public ToolBox +{ + friend class TaskBar; + +private: + ImplTaskItemList* mpItemList; + TaskBar* mpNotifyTaskBar; + Point maContextMenuPos; + ULONG mnOldItemCount; + long mnMaxTextWidth; + long mnDummy1; + USHORT mnUpdatePos; + USHORT mnUpdateNewPos; + USHORT mnActiveItemId; + USHORT mnNewActivePos; + USHORT mnTaskItem; + USHORT mnSmallItem; + USHORT mnDummy2; + BOOL mbMinActivate; + BOOL mbDummy1; + Link maActivateTaskHdl; + Link maContextMenuHdl; + +#ifdef _TASKBAR_CXX + SVT_DLLPRIVATE void ImplFormatTaskToolBox(); +#endif + + // Forbidden and not implemented. + TaskToolBox (const TaskToolBox &); + TaskToolBox & operator= (const TaskToolBox &); + +public: + TaskToolBox( Window* pParent, WinBits nWinStyle = 0 ); + ~TaskToolBox(); + + void ActivateTaskItem( USHORT nItemId, + BOOL bMinActivate = FALSE ); + USHORT GetTaskItem( const Point& rPos ) const; + + virtual void ActivateTask(); + virtual void ContextMenu(); + + virtual void Select(); + + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void Resize(); + virtual void Command( const CommandEvent& rCEvt ); + virtual void RequestHelp( const HelpEvent& rHEvt ); + + void StartUpdateTask(); + void UpdateTask( const Image& rImage, const String& rText, + BOOL bActive = FALSE ); + void EndUpdateTask(); + + const Point& GetContextMenuPos() const { return maContextMenuPos; } + USHORT GetTaskItem() const { return mnTaskItem; } + BOOL IsMinActivate() const { return mbMinActivate; } + + void SetActivateTaskHdl( const Link& rLink ) { maActivateTaskHdl = rLink; } + const Link& GetActivateTaskHdl() const { return maActivateTaskHdl; } + void SetContextMenuHdl( const Link& rLink ) { maContextMenuHdl = rLink; } + const Link& GetContextMenuHdl() const { return maContextMenuHdl; } +}; + +inline USHORT TaskToolBox::GetTaskItem( const Point& rPos ) const +{ + USHORT nId = GetItemId( rPos ); + if ( nId ) + return nId-1; + else + return TASKTOOLBOX_TASK_NOTFOUND; +} + +// --------------------- +// - ITaskStatusNotify - +// --------------------- + +class ITaskStatusNotify +{ +public: + virtual BOOL MouseButtonDown( USHORT nItemd, const MouseEvent& rMEvt ); + virtual BOOL MouseButtonUp( USHORT nItemd, const MouseEvent& rMEvt ); + virtual BOOL MouseMove( USHORT nItemd, const MouseEvent& rMEvt ); + virtual BOOL Command( USHORT nItemd, const CommandEvent& rCEvt ); + virtual BOOL UpdateHelp( USHORT nItemd ); +}; + +// ----------------------- +// - TaskStatusFieldItem - +// ----------------------- + +#define TASKSTATUSFIELDITEM_FLASH ((USHORT)0x0001) + +class TaskStatusFieldItem +{ +private: + ITaskStatusNotify* mpNotify; + Image maImage; + XubString maQuickHelpText; + XubString maHelpText; + ULONG mnHelpId; + USHORT mnFlags; + +public: + TaskStatusFieldItem(); + TaskStatusFieldItem( const TaskStatusFieldItem& rItem ); + TaskStatusFieldItem( ITaskStatusNotify* pNotify, + const Image& rImage, + const XubString& rQuickHelpText, + const XubString& rHelpText, + USHORT nFlags ); + ~TaskStatusFieldItem(); + + void SetNotifyObject( ITaskStatusNotify* pNotify ) { mpNotify = pNotify; } + ITaskStatusNotify* GetNotifyObject() const { return mpNotify; } + void SetImage( const Image& rImage ) { maImage = rImage; } + const Image& GetImage() const { return maImage; } + void SetQuickHelpText( const XubString& rStr ) { maQuickHelpText = rStr; } + const XubString& GetQuickHelpText() const { return maQuickHelpText; } + void SetHelpText( const XubString& rStr ) { maHelpText = rStr; } + const XubString& GetHelpText() const { return maHelpText; } + void SetHelpId( ULONG nHelpId ) { mnHelpId = nHelpId; } + ULONG GetHelpId() const { return mnHelpId; } + void SetFlags( USHORT nFlags ) { mnFlags = nFlags; } + USHORT GetFlags() const { return mnFlags; } + + const TaskStatusFieldItem& operator=( const TaskStatusFieldItem& rItem ); +}; + +// ----------------- +// - TaskStatusBar - +// ----------------- + +#define TASKSTATUSBAR_STATUSFIELDID ((USHORT)61000) + +#define TASKSTATUSBAR_CLOCKID ((USHORT)61000) +#define TASKSTATUSFIELD_CLOCK ((USHORT)0x0001) + +class SVT_DLLPUBLIC TaskStatusBar : public StatusBar +{ + friend class TaskBar; + +private: + ImplTaskSBItemList* mpFieldItemList; + TaskBar* mpNotifyTaskBar; + ITaskStatusNotify* mpNotify; + Time maTime; + XubString maTimeText; + AutoTimer maTimer; + long mnClockWidth; + long mnItemWidth; + long mnFieldWidth; + USHORT mnFieldFlags; + USHORT mnDummy1; + BOOL mbFlashItems; + BOOL mbOutInterval; + BOOL mbDummy1; + BOOL mbDummy2; + +#ifdef _TASKBAR_CXX + SVT_DLLPRIVATE ImplTaskSBFldItem* ImplGetFieldItem( USHORT nItemId ) const; + SVT_DLLPRIVATE ImplTaskSBFldItem* ImplGetFieldItem( const Point& rPos, BOOL& rFieldRect ) const; + SVT_DLLPRIVATE BOOL ImplUpdateClock(); + SVT_DLLPRIVATE BOOL ImplUpdateFlashItems(); + SVT_DLLPRIVATE void ImplUpdateField( BOOL bItems ); + DECL_DLLPRIVATE_LINK( ImplTimerHdl, Timer* ); +#endif + +public: + TaskStatusBar( Window* pParent, WinBits nWinStyle = WB_LEFT ); + ~TaskStatusBar(); + + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void Command( const CommandEvent& rCEvt ); + virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void UserDraw( const UserDrawEvent& rUDEvt ); + + void InsertStatusField( long nOffset = STATUSBAR_OFFSET, + USHORT nPos = STATUSBAR_APPEND, + USHORT nFlags = TASKSTATUSFIELD_CLOCK ); + void RemoveStatusField() + { maTimer.Stop(); RemoveItem( TASKSTATUSBAR_STATUSFIELDID ); } + void SetFieldFlags( USHORT nFlags ); + USHORT GetFieldFlags() const { return mnFieldFlags; } + void SetNotifyObject( ITaskStatusNotify* pNotify ) { mpNotify = pNotify; } + ITaskStatusNotify* GetNotifyObject() const { return mpNotify; } + + void AddStatusFieldItem( USHORT nItemId, const TaskStatusFieldItem& rItem, + USHORT nPos = 0xFFFF ); + void ModifyStatusFieldItem( USHORT nItemId, const TaskStatusFieldItem& rItem ); + void RemoveStatusFieldItem( USHORT nItemId ); + BOOL GetStatusFieldItem( USHORT nItemId, TaskStatusFieldItem& rItem ) const; +}; + +// ----------- +// - TaskBar - +// ----------- + +class SVT_DLLPUBLIC TaskBar : public Window +{ +private: + ImplTaskBarFloat* mpAutoHideBar; + TaskButtonBar* mpButtonBar; + TaskToolBox* mpTaskToolBox; + TaskStatusBar* mpStatusBar; + void* mpDummy1; + void* mpDummy2; + void* mpDummy3; + void* mpDummy4; + String maOldText; + long mnStatusWidth; + long mnMouseOff; + long mnOldStatusWidth; + long mnDummy1; + long mnDummy2; + long mnDummy3; + long mnDummy4; + WinBits mnWinBits; + USHORT mnLines; + BOOL mbStatusText; + BOOL mbShowItems; + BOOL mbAutoHide; + BOOL mbAlignDummy1; + BOOL mbDummy1; + BOOL mbDummy2; + BOOL mbDummy3; + BOOL mbDummy4; + Link maTaskResizeHdl; + +#ifdef _TASKBAR_CXX + SVT_DLLPRIVATE void ImplInitSettings(); + SVT_DLLPRIVATE void ImplNewHeight( long nNewHeight ); +#endif + +public: + TaskBar( Window* pParent, WinBits nWinStyle = WB_BORDER | WB_SIZEABLE ); + ~TaskBar(); + + virtual void TaskResize(); + + virtual TaskButtonBar* CreateButtonBar(); + virtual TaskToolBox* CreateTaskToolBox(); + virtual TaskStatusBar* CreateTaskStatusBar(); + + virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void Tracking( const TrackingEvent& rMEvt ); + virtual void Paint( const Rectangle& rRect ); + virtual void Resize(); + virtual void StateChanged( StateChangedType nType ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); + + void Format(); + + void SetLines( USHORT nLines ); + USHORT GetLines() const { return mnLines; } + void EnableAutoHide( BOOL bAutoHide = TRUE ); + BOOL IsAutoHideEnabled() const { return mbAutoHide; } + + void ShowStatusText( const String& rText ); + void HideStatusText(); + + void SetStatusSize( long nNewSize ) + { mnStatusWidth=nNewSize; Resize(); } + long GetStatusSize() const { return mnStatusWidth; } + + Size CalcWindowSizePixel() const; + + TaskButtonBar* GetButtonBar() const; + TaskToolBox* GetTaskToolBox() const; + TaskStatusBar* GetStatusBar() const; + + void SetTaskResizeHdl( const Link& rLink ) { maTaskResizeHdl = rLink; } + const Link& GetTaskResizeHdl() const { return maTaskResizeHdl; } +}; + +// ----------------------- +// - WindowArrange-Types - +// ----------------------- + +#define WINDOWARRANGE_TILE 1 +#define WINDOWARRANGE_HORZ 2 +#define WINDOWARRANGE_VERT 3 +#define WINDOWARRANGE_CASCADE 4 + +class ImplWindowArrangeList; + +// ----------------------- +// - class WindowArrange - +// ----------------------- + +class SVT_DLLPUBLIC WindowArrange +{ +private: + List* mpWinList; + void* mpDummy; + ULONG mnDummy; + +#ifdef _TASKBAR_CXX + SVT_DLLPRIVATE void ImplTile( const Rectangle& rRect ); + SVT_DLLPRIVATE void ImplHorz( const Rectangle& rRect ); + SVT_DLLPRIVATE void ImplVert( const Rectangle& rRect ); + SVT_DLLPRIVATE void ImplCascade( const Rectangle& rRect ); +#endif + +public: + WindowArrange(); + ~WindowArrange(); + + void AddWindow( Window* pWindow, ULONG nPos = LIST_APPEND ) + { mpWinList->Insert( (void*)pWindow, nPos ); } + void RemoveAllWindows() + { mpWinList->Clear(); } + + void Arrange( USHORT nType, const Rectangle& rRect ); +}; + +#endif // _TASKBAR_HXX diff --git a/svtools/inc/svtools/templatefoldercache.hxx b/svtools/inc/svtools/templatefoldercache.hxx new file mode 100644 index 000000000000..8a6b6d9c1a3a --- /dev/null +++ b/svtools/inc/svtools/templatefoldercache.hxx @@ -0,0 +1,111 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: templatefoldercache.hxx,v $ + * $Revision: 1.5 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef SFX2_TEMPLATEFOLDERCACHE_HXX +#define SFX2_TEMPLATEFOLDERCACHE_HXX + +#include "svtools/svtdllapi.h" +#include + +//......................................................................... +namespace svt +{ +//......................................................................... + + //===================================================================== + //= TemplateFolderCache + //===================================================================== + class TemplateFolderCacheImpl; + /** allows to cache the state of the template directories of OOo +

    Usually, this class is used together with an instance of a the + DocumentTemplates service. It allows to scan the template folders + of the Office, and updates the configuration so that it reflects the most recent state of the folders.
    + As this is an expensive, the TemplateFolderCache has been introduced. It caches the state of the template + folders, and allows to determine if the DocumentTemplates service needs to be invoked to do the (much more expensive) + update.

    + @example C++ + + TemplateFolderCache aTemplateFolders; + if ( aTemplateFolders.needsUpdate() ) + { + // store the current state + aCache.storeState(); + + // create the DocumentTemplates instance + Reference< XDocumentTemplates > xTemplates = ...; + + // update the templates configuration + xTemplates->update(); + } + + // do anything which relies on a up-to-date template configuration + + */ + class SVT_DLLPUBLIC TemplateFolderCache + { + private: + TemplateFolderCacheImpl* m_pImpl; + + public: + /** ctor. + @param _bAutoStoreState + Set this to if you want the instance to automatically store the state of the template folders upon + destruction.
    + If set to , you would epplicitly need to call storeState to do this.
    + If the current state is not known (e.g. because you did not call needsUpdate, which retrieves it), + it is not retrieved in the dtor, regardless of the _bAutoStoreState flag. + */ + TemplateFolderCache( sal_Bool _bAutoStoreState = sal_False ); + ~TemplateFolderCache( ); + + /** determines whether or not the template configuration needs to be updated + @param _bForceCheck + set this to if you want the object to rescan the template folders in every case. The default () + means that once the information has been retrieved in a first call, every second call returns the same result + as the first one, even if in the meantime the template folders changed. + @return + if the template configuration needs to be updated + */ + sal_Bool needsUpdate( sal_Bool _bForceCheck = sal_False ); + + /** stores the current state of the template folders in the cache + @param _bForceRetrieval + if set to , the current state of the template folders is retrieved again, even if it is already known. + Usually, you set this to : After calling needsUpdate, the state is know and does not + need to be read again. + */ + void storeState( sal_Bool _bForceRetrieval = sal_False ); + }; + +//......................................................................... +} // namespace svt +//......................................................................... + +#endif // SFX2_TEMPLATEFOLDERCACHE_HXX diff --git a/svtools/inc/svtools/templdlg.hxx b/svtools/inc/svtools/templdlg.hxx new file mode 100644 index 000000000000..4b2d644d6f6b --- /dev/null +++ b/svtools/inc/svtools/templdlg.hxx @@ -0,0 +1,95 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: templdlg.hxx,v $ + * $Revision: 1.16 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _SVTOOLS_TEMPLDLG_HXX +#define _SVTOOLS_TEMPLDLG_HXX + +#include "svtools/svtdllapi.h" + +#include +#include +#include +#include + +struct SvtTmplDlg_Impl; + +// class SvtDocumentTemplateDialog --------------------------------------- + +class SvtTemplateWindow; + +class SVT_DLLPUBLIC SvtDocumentTemplateDialog : public ModalDialog +{ +private: + svt::FixedHyperlink aMoreTemplatesLink; + FixedLine aLine; + PushButton aManageBtn; + PushButton aEditBtn; + OKButton aOKBtn; + CancelButton aCancelBtn; + HelpButton aHelpBtn; + + SvtTmplDlg_Impl* pImpl; + + DECL_DLLPRIVATE_LINK( SelectHdl_Impl, SvtTemplateWindow* ); + DECL_DLLPRIVATE_LINK( DoubleClickHdl_Impl, SvtTemplateWindow* ); + DECL_DLLPRIVATE_LINK( NewFolderHdl_Impl, SvtTemplateWindow* ); + DECL_DLLPRIVATE_LINK( SendFocusHdl_Impl, SvtTemplateWindow* ); + DECL_DLLPRIVATE_LINK( OKHdl_Impl, PushButton* ); + DECL_DLLPRIVATE_LINK( OrganizerHdl_Impl, PushButton* ); + DECL_DLLPRIVATE_LINK( UpdateHdl_Impl, Timer* ); + DECL_DLLPRIVATE_LINK( OpenLinkHdl_Impl, svt::FixedHyperlink* ); + +public: + SvtDocumentTemplateDialog( Window* pParent ); + + /** ctor for calling the dialog for selection only, not for opening a document +

    If you use this ctor, the dialog will behave differently in the following areas: +

    • The Edit button will be hidden.
      • +
    • Upon pressing em>Open, the selected file will not be opened. Instead, it's + URL is available (see GetSelectedFileURL).
      • +
    + + */ + struct SelectOnly { }; + SvtDocumentTemplateDialog( Window* _pParent, SelectOnly ); + + ~SvtDocumentTemplateDialog(); + + sal_Bool IsFileSelected( ) const; + String GetSelectedFileURL( ) const; + + void SelectTemplateFolder(); + +private: + SVT_DLLPRIVATE void InitImpl( ); + SVT_DLLPRIVATE sal_Bool CanEnableEditBtn() const; +}; + +#endif // _SVTOOLS_TEMPLDLG_HXX + diff --git a/svtools/inc/svtools/testtool.hxx b/svtools/inc/svtools/testtool.hxx new file mode 100644 index 000000000000..5d4ec5c6208e --- /dev/null +++ b/svtools/inc/svtools/testtool.hxx @@ -0,0 +1,78 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: testtool.hxx,v $ + * $Revision: 1.5 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef SVTOOLS_TESTTOOL_HXX +#define SVTOOLS_TESTTOOL_HXX + +#include +#include +#include + +class Application; +class SvStream; + +class StatementFlow; +class CommunicationManager; +class CommunicationLink; +#if OSL_DEBUG_LEVEL > 1 +class EditWindow; +#endif +class ImplRC; + +class RemoteControl +{ + friend class StatementFlow; + + BOOL m_bIdleInserted; +#if OSL_DEBUG_LEVEL > 1 + EditWindow *m_pDbgWin; +#endif + ImplRC* pImplRC; + +public: + RemoteControl(); + ~RemoteControl(); + BOOL QueCommands( ULONG nServiceId, SvStream *pIn ); + SvStream* GetReturnStream(); + + DECL_LINK( IdleHdl, Application* ); + DECL_LINK( CommandHdl, Application* ); + + DECL_LINK( QueCommandsEvent, CommunicationLink* ); + ULONG nStoredServiceId; + SvStream *pStoredStream; + + void ExecuteURL( String &aURL ); + +protected: + CommunicationManager *pServiceMgr; + SvStream *pRetStream; +}; + +#endif // SVTOOLS_TESTTOOL_HXX diff --git a/svtools/inc/svtools/tooltiplbox.hxx b/svtools/inc/svtools/tooltiplbox.hxx new file mode 100644 index 000000000000..a72a2042a9cc --- /dev/null +++ b/svtools/inc/svtools/tooltiplbox.hxx @@ -0,0 +1,70 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: tooltiplbox.hxx,v $ + * $Revision: 1.4 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef SVTOOLS_TOOLTIPLBOX_HXX +#define SVTOOLS_TOOLTIPLBOX_HXX + +#include "svtools/svtdllapi.h" +#include + +namespace svtools { + +// ============================================================================ + +/** ListBox with tool tips for long entries. */ +class ToolTipListBox : public ListBox +{ +public: + ToolTipListBox( Window* pParent, WinBits nStyle = WB_BORDER ); + ToolTipListBox( Window* pParent, const ResId& rResId ); + +protected: + virtual void RequestHelp( const HelpEvent& rHEvt ); +}; + +// ---------------------------------------------------------------------------- + +/** MultiListBox with tool tips for long entries. */ +class SVT_DLLPUBLIC ToolTipMultiListBox : public MultiListBox +{ +public: + ToolTipMultiListBox( Window* pParent, WinBits nStyle = WB_BORDER ); + ToolTipMultiListBox( Window* pParent, const ResId& rResId ); + +protected: + virtual void RequestHelp( const HelpEvent& rHEvt ); +}; + +// ============================================================================ + +} // namespace svtools + +#endif + diff --git a/svtools/inc/svtools/txtattr.hxx b/svtools/inc/svtools/txtattr.hxx new file mode 100644 index 000000000000..4d4432f782bb --- /dev/null +++ b/svtools/inc/svtools/txtattr.hxx @@ -0,0 +1,238 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: txtattr.hxx,v $ + * $Revision: 1.11 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _TXTATTR_HXX +#define _TXTATTR_HXX + +#include "svtools/svtdllapi.h" +#include +#include +#include +#include + +class Font; + +#define TEXTATTR_INVALID 0 +#define TEXTATTR_FONTCOLOR 1 +#define TEXTATTR_HYPERLINK 2 +#define TEXTATTR_FONTWEIGHT 3 + +#define TEXTATTR_USER_START 1000 //start id for user defined text attributes +#define TEXTATTR_PROTECTED 4 + + +class SVT_DLLPUBLIC TextAttrib +{ +private: + USHORT mnWhich; + +protected: + TextAttrib( USHORT nWhich ) { mnWhich = nWhich; } + TextAttrib( const TextAttrib& rAttr ) { mnWhich = rAttr.mnWhich; } + +public: + + virtual ~TextAttrib(); + + USHORT Which() const { return mnWhich; } + + virtual void SetFont( Font& rFont ) const = 0; + virtual TextAttrib* Clone() const = 0; + virtual int operator==( const TextAttrib& rAttr ) const = 0; + int operator!=( const TextAttrib& rAttr ) const + { return !(*this == rAttr ); } +}; + + + +class SVT_DLLPUBLIC TextAttribFontColor : public TextAttrib +{ +private: + Color maColor; + +public: + TextAttribFontColor( const Color& rColor ); + TextAttribFontColor( const TextAttribFontColor& rAttr ); + ~TextAttribFontColor(); + + const Color& GetColor() const { return maColor; } + + virtual void SetFont( Font& rFont ) const; + virtual TextAttrib* Clone() const; + virtual int operator==( const TextAttrib& rAttr ) const; + +}; + +class SVT_DLLPUBLIC TextAttribFontWeight : public TextAttrib +{ +private: + FontWeight meWeight; + +public: + TextAttribFontWeight( FontWeight eWeight ); + TextAttribFontWeight( const TextAttribFontWeight& rAttr ); + ~TextAttribFontWeight(); + + virtual void SetFont( Font& rFont ) const; + virtual TextAttrib* Clone() const; + virtual int operator==( const TextAttrib& rAttr ) const; + + inline FontWeight getFontWeight() const { return meWeight; } +}; + + +class TextAttribHyperLink : public TextAttrib +{ +private: + XubString maURL; + XubString maDescription; + Color maColor; + +public: + TextAttribHyperLink( const XubString& rURL ); + TextAttribHyperLink( const XubString& rURL, const XubString& rDescription ); + TextAttribHyperLink( const TextAttribHyperLink& rAttr ); + ~TextAttribHyperLink(); + + void SetURL( const XubString& rURL ) { maURL = rURL; } + const XubString& GetURL() const { return maURL; } + + void SetDescription( const XubString& rDescr ) { maDescription = rDescr; } + const XubString& GetDescription() const { return maDescription; } + + void SetColor( const Color& rColor ) { maColor = rColor; } + const Color& GetColor() const { return maColor; } + + virtual void SetFont( Font& rFont ) const; + virtual TextAttrib* Clone() const; + virtual int operator==( const TextAttrib& rAttr ) const; +}; + +class SVT_DLLPUBLIC TextAttribProtect : public TextAttrib +{ +public: + TextAttribProtect(); + TextAttribProtect( const TextAttribProtect& rAttr ); + ~TextAttribProtect(); + + virtual void SetFont( Font& rFont ) const; + virtual TextAttrib* Clone() const; + virtual int operator==( const TextAttrib& rAttr ) const; + +}; + + +class TextCharAttrib +{ +private: + TextAttrib* mpAttr; + USHORT mnStart; + USHORT mnEnd; + +protected: + +public: + + TextCharAttrib( const TextAttrib& rAttr, USHORT nStart, USHORT nEnd ); + TextCharAttrib( const TextCharAttrib& rTextCharAttrib ); + ~TextCharAttrib(); + + const TextAttrib& GetAttr() const { return *mpAttr; } + + USHORT Which() const { return mpAttr->Which(); } + + USHORT GetStart() const { return mnStart; } + USHORT& GetStart() { return mnStart; } + + USHORT GetEnd() const { return mnEnd; } + USHORT& GetEnd() { return mnEnd; } + + inline USHORT GetLen() const; + + inline void MoveForward( USHORT nDiff ); + inline void MoveBackward( USHORT nDiff ); + + inline void Expand( USHORT nDiff ); + inline void Collaps( USHORT nDiff ); + + inline BOOL IsIn( USHORT nIndex ); + inline BOOL IsInside( USHORT nIndex ); + inline BOOL IsEmpty(); + +}; + +inline USHORT TextCharAttrib::GetLen() const +{ + DBG_ASSERT( mnEnd >= mnStart, "TextCharAttrib: nEnd < nStart!" ); + return mnEnd-mnStart; +} + +inline void TextCharAttrib::MoveForward( USHORT nDiff ) +{ + DBG_ASSERT( ((long)mnEnd + nDiff) <= 0xFFFF, "TextCharAttrib: MoveForward?!" ); + mnStart = mnStart + nDiff; + mnEnd = mnEnd + nDiff; +} + +inline void TextCharAttrib::MoveBackward( USHORT nDiff ) +{ + DBG_ASSERT( ((long)mnStart - nDiff) >= 0, "TextCharAttrib: MoveBackward?!" ); + mnStart = mnStart - nDiff; + mnEnd = mnEnd - nDiff; +} + +inline void TextCharAttrib::Expand( USHORT nDiff ) +{ + DBG_ASSERT( ( ((long)mnEnd + nDiff) <= (long)0xFFFF ), "TextCharAttrib: Expand?!" ); + mnEnd = mnEnd + nDiff; +} + +inline void TextCharAttrib::Collaps( USHORT nDiff ) +{ + DBG_ASSERT( (long)mnEnd - nDiff >= (long)mnStart, "TextCharAttrib: Collaps?!" ); + mnEnd = mnEnd - nDiff; +} + +inline BOOL TextCharAttrib::IsIn( USHORT nIndex ) +{ + return ( ( mnStart <= nIndex ) && ( mnEnd >= nIndex ) ); +} + +inline BOOL TextCharAttrib::IsInside( USHORT nIndex ) +{ + return ( ( mnStart < nIndex ) && ( mnEnd > nIndex ) ); +} + +inline BOOL TextCharAttrib::IsEmpty() +{ + return mnStart == mnEnd; +} + +#endif // _TXTATTR_HXX diff --git a/svtools/inc/svtools/txtcmp.hxx b/svtools/inc/svtools/txtcmp.hxx new file mode 100644 index 000000000000..e40e578401cb --- /dev/null +++ b/svtools/inc/svtools/txtcmp.hxx @@ -0,0 +1,36 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: txtcmp.hxx,v $ + * $Revision: 1.4 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _TXTCMP_HXX +#define _TXTCMP_HXX + +#include + +#endif + diff --git a/svtools/inc/svtools/unoevent.hxx b/svtools/inc/svtools/unoevent.hxx new file mode 100644 index 000000000000..e8507722e31b --- /dev/null +++ b/svtools/inc/svtools/unoevent.hxx @@ -0,0 +1,332 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: unoevent.hxx,v $ + * $Revision: 1.5.136.1 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _SVTOOLS_UNOEVENT_HXX_ +#define _SVTOOLS_UNOEVENT_HXX_ + +#include "svtools/svtdllapi.h" +#include +#include +#include +#include + +class SvxMacroTableDtor; +class SvxMacroItem; +class SvxMacro; + +/** SvEventDescription: Description of a single event. + mnEvent is the id used by SvxMacroItem + mpEventName is the api name for this event + + the last event in an array is indicated by mnEvent && mpEventName == 0 +*/ +struct SvEventDescription +{ + sal_uInt16 mnEvent; + const sal_Char* mpEventName; +}; + +/** + * SvBaseEventDescriptor: Abstract class that implements the basics + * of an XNameReplace that is delivered by the + * XEventsSupplier::getEvents() method. + * + * The functionality this class provides is: + * 1) Which elements are in the XNameReplace? + * 2) Mapping from Api names to item IDs. + * 3) conversion from SvxMacroItem to Any and vice versa. + * + * All details of how to actually get and set SvxMacroItem(s) have to + * be supplied by the base class. + */ +class SVT_DLLPUBLIC SvBaseEventDescriptor : public cppu::WeakImplHelper2 +< + ::com::sun::star::container::XNameReplace, + ::com::sun::star::lang::XServiceInfo +> +{ + const ::rtl::OUString sEventType; + const ::rtl::OUString sMacroName; + const ::rtl::OUString sLibrary; + const ::rtl::OUString sStarBasic; + const ::rtl::OUString sJavaScript; + const ::rtl::OUString sScript; + const ::rtl::OUString sNone; + + + /// name of own service + const ::rtl::OUString sServiceName; + +protected: + const ::rtl::OUString sEmpty; + + /// last element is 0, 0 + const SvEventDescription* mpSupportedMacroItems; + sal_Int16 mnMacroItems; + +public: + + SvBaseEventDescriptor(const SvEventDescription* pSupportedMacroItems); + + virtual ~SvBaseEventDescriptor(); + + + // XNameReplace + /// calls replaceByName(const sal_uInt16, const SvxMacro&) + virtual void SAL_CALL replaceByName( + const ::rtl::OUString& rName, /// API name of event + const ::com::sun::star::uno::Any& rElement ) /// event (PropertyValues) + throw( + ::com::sun::star::lang::IllegalArgumentException, + ::com::sun::star::container::NoSuchElementException, + ::com::sun::star::lang::WrappedTargetException, + ::com::sun::star::uno::RuntimeException); + + // XNameAccess (via XNameReplace) + /// calls getByName(sal_uInt16) + virtual ::com::sun::star::uno::Any SAL_CALL getByName( + const ::rtl::OUString& rName ) /// API name of event + throw( + ::com::sun::star::container::NoSuchElementException, + ::com::sun::star::lang::WrappedTargetException, + ::com::sun::star::uno::RuntimeException); + + // XNameAxcess (via XNameReplace) + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + getElementNames() + throw(::com::sun::star::uno::RuntimeException); + + // XNameAccess (via XNameReplace) + virtual sal_Bool SAL_CALL hasByName( + const ::rtl::OUString& rName ) + throw(::com::sun::star::uno::RuntimeException); + + // XElementAccess (via XNameReplace) + virtual ::com::sun::star::uno::Type SAL_CALL getElementType() + throw(::com::sun::star::uno::RuntimeException); + + // XElementAccess (via XNameReplace) + virtual sal_Bool SAL_CALL hasElements() + throw(::com::sun::star::uno::RuntimeException); + + // XServiceInfo + /// must be implemented in subclass + virtual rtl::OUString SAL_CALL getImplementationName(void) + throw( ::com::sun::star::uno::RuntimeException ) = 0; + + // XServiceInfo + virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) + throw( ::com::sun::star::uno::RuntimeException ); + + // XServiceInfo + virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL + getSupportedServiceNames(void) + throw( ::com::sun::star::uno::RuntimeException ); + +protected: + + /// Must be implemented in subclass. + virtual void replaceByName( + const sal_uInt16 nEvent, /// item ID of event + const SvxMacro& rMacro) /// event (will be copied) + throw( + ::com::sun::star::lang::IllegalArgumentException, + ::com::sun::star::container::NoSuchElementException, + ::com::sun::star::lang::WrappedTargetException, + ::com::sun::star::uno::RuntimeException) = 0; + + /// Must be implemented in subclass. + virtual void getByName( + SvxMacro& rMacro, + const sal_uInt16 nEvent ) + throw( + ::com::sun::star::container::NoSuchElementException, + ::com::sun::star::lang::WrappedTargetException, + ::com::sun::star::uno::RuntimeException) = 0; + + /// convert an API event name to the event ID as used by SvxMacroItem + sal_uInt16 mapNameToEventID(const ::rtl::OUString& rName) const; + + /// convert an event ID to an API event name + ::rtl::OUString mapEventIDToName(sal_uInt16 nPoolID) const; + + /// get the event ID for the name; return 0 if not supported + sal_uInt16 getMacroID(const ::rtl::OUString& rName) const; + + /// create PropertyValues and Any from macro + void getAnyFromMacro( + ::com::sun::star::uno::Any& aAny, // Any to be filled by Macro values + const SvxMacro& rMacro); + + /// create macro from PropertyValues (in an Any) + void getMacroFromAny( + SvxMacro& aMacro, // reference to be filled by Any + const ::com::sun::star::uno::Any& rAny) + throw ( + ::com::sun::star::lang::IllegalArgumentException); + +}; + + + + +/** + * SvEventDescriptor: Implement the XNameReplace that is delivered by + * the XEventsSupplier::getEvents() method. The SvEventDescriptor has + * to be subclassed to implement the events for a specific + * objects. The subclass has to + * 1) supply the super class constructor with a list of known events (item IDs) + * 2) supply the super class constructor with a reference of it's parent object + * (to prevent destruction) + * 3) implement getItem() and setItem(...) methods. + * + * If no object is available to which the SvEventDescriptor can attach itself, + * the class SvDetachedEventDescriptor should be used. + */ +class SVT_DLLPUBLIC SvEventDescriptor : public SvBaseEventDescriptor +{ + /// keep reference to parent to prevent it from being destroyed + ::com::sun::star::uno::Reference< + ::com::sun::star::uno::XInterface > xParentRef; + +public: + + SvEventDescriptor(::com::sun::star::uno::XInterface& rParent, + const SvEventDescription* pSupportedMacroItems); + + virtual ~SvEventDescriptor(); + + +protected: + + + using SvBaseEventDescriptor::replaceByName; + virtual void replaceByName( + const sal_uInt16 nEvent, /// item ID of event + const SvxMacro& rMacro) /// event (will be copied) + throw( + ::com::sun::star::lang::IllegalArgumentException, + ::com::sun::star::container::NoSuchElementException, + ::com::sun::star::lang::WrappedTargetException, + ::com::sun::star::uno::RuntimeException); + + using SvBaseEventDescriptor::getByName; + virtual void getByName( + SvxMacro& rMacros, /// macro to be filled with values + const sal_uInt16 nEvent ) /// item ID of event + throw( + ::com::sun::star::container::NoSuchElementException, + ::com::sun::star::lang::WrappedTargetException, + ::com::sun::star::uno::RuntimeException); + + + /// Get the SvxMacroItem from the parent. + /// must be implemented by subclass + virtual const SvxMacroItem& getMacroItem() = 0; + + /// Set the SvxMacroItem at the parent. + /// must be implemented by subclass + virtual void setMacroItem(const SvxMacroItem& rItem) = 0; + + /// Get the SvxMacroItem Which Id needed for the current application + /// must be implemented by subclass + virtual sal_uInt16 getMacroItemWhich() const = 0; +}; + + +/** + * SvDetachedEventDescriptor: + */ +class SVT_DLLPUBLIC SvDetachedEventDescriptor : public SvBaseEventDescriptor +{ + // the macros; aMacros[i] is the value for aSupportedMacroItemIDs[i] + SvxMacro** aMacros; + + const ::rtl::OUString sImplName; + +public: + + SvDetachedEventDescriptor(const SvEventDescription* pSupportedMacroItems); + + virtual ~SvDetachedEventDescriptor(); + + //XServiceInfo + virtual rtl::OUString SAL_CALL getImplementationName(void) + throw( ::com::sun::star::uno::RuntimeException ); + +protected: + + sal_Int16 getIndex(const sal_uInt16 nID) const; + + using SvBaseEventDescriptor::replaceByName; + virtual void replaceByName( + const sal_uInt16 nEvent, /// item ID of event + const SvxMacro& rMacro) /// event (will be copied) + throw( + ::com::sun::star::lang::IllegalArgumentException, + ::com::sun::star::container::NoSuchElementException, + ::com::sun::star::lang::WrappedTargetException, + ::com::sun::star::uno::RuntimeException); + + using SvBaseEventDescriptor::getByName; + virtual void getByName( + SvxMacro& rMacro, /// macro to be filled + const sal_uInt16 nEvent ) /// item ID of event + throw( + ::com::sun::star::container::NoSuchElementException, + ::com::sun::star::lang::WrappedTargetException, + ::com::sun::star::uno::RuntimeException); + + /// do we have an event? + /// return sal_True: we have a macro for the event + /// return sal_False: no macro; getByName() will return an empty macro + /// IllegalArgumentException: the event is not supported + using SvBaseEventDescriptor::hasByName; + virtual sal_Bool hasByName( + const sal_uInt16 nEvent ) const /// item ID of event + throw( + ::com::sun::star::lang::IllegalArgumentException); + +}; + +class SVT_DLLPUBLIC SvMacroTableEventDescriptor : public SvDetachedEventDescriptor +{ +public: + + SvMacroTableEventDescriptor(const SvEventDescription* pSupportedMacroItems); + SvMacroTableEventDescriptor(const SvxMacroTableDtor& aFmt, + const SvEventDescription* pSupportedMacroItems); + + virtual ~SvMacroTableEventDescriptor(); + + void copyMacrosFromTable(const SvxMacroTableDtor& aFmt); + void copyMacrosIntoTable(SvxMacroTableDtor& aFmt); +}; + +#endif diff --git a/svtools/inc/svtools/unoimap.hxx b/svtools/inc/svtools/unoimap.hxx new file mode 100644 index 000000000000..f3a5aae50844 --- /dev/null +++ b/svtools/inc/svtools/unoimap.hxx @@ -0,0 +1,48 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: unoimap.hxx,v $ + * $Revision: 1.4 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _SVTOOLS_UNOIMAP_HXX +#define _SVTOOLS_UNOIMAP_HXX + +#include "svtools/svtdllapi.h" +#include + +class ImageMap; +struct SvEventDescription; + +SVT_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SvUnoImageMapRectangleObject_createInstance( const SvEventDescription* pSupportedMacroItems ); +SVT_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SvUnoImageMapCircleObject_createInstance( const SvEventDescription* pSupportedMacroItems ); +SVT_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SvUnoImageMapPolygonObject_createInstance( const SvEventDescription* pSupportedMacroItems ); + +SVT_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SvUnoImageMap_createInstance( const SvEventDescription* pSupportedMacroItems ); +SVT_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SvUnoImageMap_createInstance( const ImageMap& rMap, const SvEventDescription* pSupportedMacroItems ); +SVT_DLLPUBLIC sal_Bool SvUnoImageMap_fillImageMap( com::sun::star::uno::Reference< com::sun::star::uno::XInterface > xImageMap, ImageMap& rMap ); + +#endif diff --git a/svtools/inc/svtools/wallitem.hxx b/svtools/inc/svtools/wallitem.hxx new file mode 100644 index 000000000000..7f3e04ce2a8c --- /dev/null +++ b/svtools/inc/svtools/wallitem.hxx @@ -0,0 +1,68 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: wallitem.hxx,v $ + * $Revision: 1.5 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _WALLITEM_HXX +#define _WALLITEM_HXX + +#ifndef SHL_HXX +#include +#endif + +// ----------------------------------------------------------------------------------------- +// Hilfsklasse, um die Download-Funktionalitaet des SvxBrushItems unterhalb +// des SVX zu benutzen. Der Link wird im Konstruktor von SvxDialogDll gesetzt. +#ifndef _SFX_BRUSHITEMLINK_DECLARED +#define _SFX_BRUSHITEMLINK_DECLARED +#include + +#ifndef SHL_BRUSHITEM +#define SHL_BRUSHITEM SHL_SHL1 +#endif + +class Window; +class SfxItemSet; + +typedef void* (*CreateSvxBrushTabPage)(Window *pParent, const SfxItemSet &rAttrSet); +typedef USHORT* (*GetSvxBrushTabPageRanges)(); + +class Graphic; +class String; +class SfxBrushItemLink +{ +public: + virtual Graphic GetGraphic( const String& rLink, const String& rFilter) = 0; + virtual CreateSvxBrushTabPage GetBackgroundTabpageCreateFunc() = 0; + virtual GetSvxBrushTabPageRanges GetBackgroundTabpageRanges() = 0; + static SfxBrushItemLink* Get() { return *(SfxBrushItemLink**)GetAppData(SHL_BRUSHITEM); } + static void Set( SfxBrushItemLink* pLink ); +}; +#endif // _SFX_BRUSHITEMLINK_DECLARED + +#endif // _WALLITEM_HXX + diff --git a/svtools/inc/sychconv.hxx b/svtools/inc/sychconv.hxx deleted file mode 100644 index 2e570dfe2550..000000000000 --- a/svtools/inc/sychconv.hxx +++ /dev/null @@ -1,50 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: sychconv.hxx,v $ - * $Revision: 1.3.136.1 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SYCHCONV_HXX -#define _SYCHCONV_HXX - -#include -#include - -// ---------------------- -// - CharacterConverter - -// ---------------------- - -class OutputDevice; - -class SymCharConverter -{ -public: - - static BOOL Convert( Font& rFont, UniString& rString, OutputDevice* pDev = NULL ); -}; - -#endif // _CHARCONV_HXX diff --git a/svtools/inc/tabbar.hxx b/svtools/inc/tabbar.hxx deleted file mode 100644 index 5261697dd8b0..000000000000 --- a/svtools/inc/tabbar.hxx +++ /dev/null @@ -1,558 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: tabbar.hxx,v $ - * $Revision: 1.11 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _TABBAR_HXX -#define _TABBAR_HXX - -#include "svtools/svtdllapi.h" -#include -#include - -class MouseEvent; -class TrackingEvent; -class DataChangedEvent; -class ImplTabBarList; -class ImplTabButton; -class ImplTabSizer; -class TabBarEdit; - -// ----------------- -// - Dokumentation - -// ----------------- - -/* - -Erlaubte StyleBits ------------------- - -WB_SCROLL - Die Tabs koennen ueber ein Extra-Feld gescrollt werden -WB_MINSCROLL - Die Tabs koennen ueber 2 zusaetzliche Buttons gescrollt werden -WB_RANGESELECT - Zusammenhaengende Bereiche koennen selektiert werden -WB_MULTISELECT - Einzelne Tabs koennen selektiert werden -WB_BORDER - Oben und unten wird ein Strich gezeichnet -WB_TOPBORDER - Oben wird ein Border gezeichnet -WB_3DTAB - Die Tabs und der Border werden in 3D gezeichnet -WB_DRAG - Vom TabBar wird ein StartDrag-Handler gerufen, wenn - Drag and Drop gestartet werden soll. Es wird ausserdem - im TabBar mit EnableDrop() Drag and Drop eingeschaltet. -WB_SIZEABLE - Vom TabBar wird ein Split-Handler gerufen, wenn der Anwender - den TabBar in der Breite aendern will -WB_STDTABBAR - WB_BORDER - -Wenn man den TabBar zum Beispiel als Property-Bar benutzen moechte, sollten -die WinBits WB_TOPBORDER und WB_3DTAB anstatt WB_BORDER gesetzt werden. - - -Erlaubte PageBits ------------------ - -TPB_SPECIAL - Andere Darstellung des TabTextes, zum Beispiel fuer - Szenario-Seiten. - - -Handler -------- - -Select - Wird gerufen, wenn eine Tab selektiert oder - deselektiert wird -DoubleClick - Wird gerufen, wenn ein DoubleClick im TabBar ausgeloest - wurde. Innerhalb des Handlers liefert GetCurPageId() die - angeklickte Tab zurueck oder 0, wenn keine Tab angeklickt - wurde -ActivatePage - Wird gerufen, wenn eine andere Seite aktiviert wird. - GetCurPageId() gibt die aktivierte Seite zurueck. -DeactivatePage - Wird gerufen, wenn eine Seite deaktiviert wird. Wenn - eine andere Seite aktiviert werden darf, muss TRUE - zurueckgegeben werden, wenn eine andere Seite von - der Aktivierung ausgeschlossen werden soll, muss - FALSE zurueckgegeben werden. GetCurPageId() gibt die - zu deaktivierende Seite zurueck. - - - -Drag and Drop -------------- - -Fuer Drag and Drop muss das WinBit WB_DRAG gesetzt werden. Ausserdem -muss der Command-, QueryDrop-Handler und der Drop-Handler ueberlagert -werden. Dabei muss in den Handlern folgendes implementiert werden: - -Command - Wenn in diesem Handler das Dragging gestartet werden - soll, muss StartDrag() gerufen werden. Diese Methode - selektiert dann den entsprechenden Eintrag oder gibt - FALSE zurueck, wenn das Dragging nicht durchgefuhert - werden kann. - -QueryDrop - Dieser Handler wird von StarView immer dann gerufen, wenn - bei einem Drag-Vorgang die Maus ueber das Fenster gezogen - wird (siehe dazu auch SV-Doku). In diesem Handler muss - festgestellt werden, ob ein Drop moeglich ist. Die - Drop-Position kann im TabBar mit ShowDropPos() angezeigt - werden. Beim Aufruf muss die Position vom Event uebergeben - werden. Wenn sich die Position am linken oder rechten - Rand befindet, wird automatisch im TabBar gescrollt. - Diese Methode gibt auch die entsprechende Drop-Position - zurueck, die auch fuer ein Drop gebraucht wird. Wenn das - Fenster beim Drag verlassen wird, kann mit HideDropPos() - die DropPosition wieder weggenommen werden. Es ist dadurch - auch moeglich, ein von ausserhalb des TabBars ausgeloestes - Drag zu verarbeiten. - -Drop - Im Drop-Handler muessen dann die Pages verschoben werden, - oder die neuen Pages eingefuegt werden. Die entsprechende - Drop-Postion kann mit ShowDropPos() ermittelt werden. - -Folgende Methoden werden fuer Drag and Drop gebraucht und muessen von -den Handlern gerufen werden: - -StartDrag - Muss aus dem Commnad-Handler gerufen werden. Als Parameter - muss der CommandEvent uebergeben werden und eine Referenz - auf eine Region. Diese Region muss dann bei ExecuteDrag() - uebergeben werden, wenn der Rueckgabewert sagt, das - ExecuteDrag durchgefuehrt werden soll. Falls der Eintrag - nicht selektiert ist, wird er vorher als aktueller - Eintrag gesetzt. Es ist daher darauf zu achten, das aus - dieser Methode heraus der Select-Handler gerufen werden - kann. - -ShowDropPos - Diese Methode muss vom QueryDrop-Handler gerufen werden, - damit der TabBar anzeigt, wo die Tabs eingefuegt werden. - Diese Methode kann auch im Drop-Handler benutzt werden, - um die Position zu ermitteln wo die Tabs eingefuegt werden - sollen. In der Methode muss die Position vom Event - uebergeben werden. Diese Methode gibt die Position zurueck, - wo die Tabs eingefuegt werden sollen. - -HideDropPos - Diese Methode nimmt die vorher mit ShowDropPos() angezeigte - DropPosition wieder zurueck. Diese Methode sollte dann - gerufen werden, wenn bei QueryDrop() das Fenster verlassen - wird oder der Dragvorgang beendet wurde. - -Folgende Methoden koennen eingesetzt werden, wenn bei D&D die Seiten -umgeschaltet werden sollen: - -SwitchPage - Diese Methode muss vom QueryDrop-Handler gerufen werden, - wenn die Seite ueber der sich der Mousepointer befindet, - umgeschaltet werden soll. Diese Methode sollte jedesmal - gerufen werden, wenn der QueryDrop-Handler gerufen wird. - Das umschalten der Seite passiert zeitverzoegert (500 ms) - und wird automatisch von dieser Methode verwaltet. - In der Methode muss die Position vom Event uebergeben - werden. Diese Methode gibt TRUE zurueck, wenn die Page - umgeschaltet wurde. - -EndSwitchPage - Diese Methode setzt die Daten fuer das umschalten der - Seiten zurueck. Diese Methode sollte dann gerufen werden, - wenn bei QueryDrop() das Fenster verlassen wird oder - der Dragvorgang beendet wurde. - -IsInSwitching - Mit dieser Methode kann im ActivatePage()/DeactivatePage() - abgefragt werden, ob dies durch SwitchPage() veranlasst - wurde. So kann dann beispielsweise in DeactivatePage() - das Umschalten ohne eine Fehlerbox verhindert werden. - - -Fenster-Resize --------------- - -Wenn das Fenster vom Anwender in der Breite geaendert werden kann, dann -muss das WinBit WB_SIZEABLE gesetzt werden. In diesem Fall muss noch -folgender Handler ueberlagert werden: - -Split - Wenn dieser Handler gerufen wird, sollte das Fenster - auf die Breite angepasst werden, die von GetSplitSize() - zurueckgegeben wird. Dabei wird keine minimale und - maximale Breite beruecksichtig. Eine minimale Breite - kann mit GetMinSize() abgefragt werden und die maximale - Breite muss von der Anwendung selber berechnet werden. - Da nur Online-Resize unterstuetzt wird, muss das Fenster - innerhalb dieses Handlers in der Breite geaendert - werden und eventuell abhaengige Fenster ebenfalls. Fuer - diesen Handler kann auch mit SetSplitHdl() ein - Link gesetzt werden. - -Folgende Methoden liefern beim Splitten weitere Informationen: - -GetSplitSize() - Liefert die Breite des TabBars zurueck, auf die der - Anwender das Fenster resizen will. Dabei wird keine - minimale oder maximale Breite beruecksichtigt. Es wird - jedoch nie eine Breite < 5 zurueckgeliefert. Diese Methode - liefert nur solange richtige Werte, wie Splitten aktiv - ist. - -GetMinSize() - Mit dieser Methode kann eine minimale Fensterbreite - abgefragt werden, so das min. etwas eines Tabs sichtbar - ist. Jedoch kann der TabBar immer noch schmaler gesetzt - werden, als die Breite, die diese Methode zurueckliefert. - Diese Methode kann auch aufgerufen werden, wenn kein - Splitten aktiv ist. - - -Edit-Modus ----------- - -Der Tabbar bietet auch Moeglichkeiten, das der Anwender in den Tabreitern -die Namen aendern kann. - -EnableEditMode - Damit kann eingestellt werden, das bei Alt+LeftClick - StartEditMode() automatisch vom TabBar gerufen wird. - Im StartRenaming()-Handler kann dann das Umbenennen - noch abgelehnt werden. -StartEditMode - Mit dieser Methode wird der EditModus auf einem - Tab gestartet. FALSE wird zurueckgegeben, wenn - der Editmodus schon aktiv ist, mit StartRenaming() - der Modus abgelehnt wurde oder kein Platz zum - Editieren vorhanden ist. -EndEditMode - Mit dieser Methode wird der EditModus beendet. -SetEditText - Mit dieser Methode kann der Text im AllowRenaming()- - Handler noch durch einen anderen Text ersetzt werden. -GetEditText - Mit dieser Methode kann im AllowRenaming()-Handler - der Text abgefragt werden, den der Anwender eingegeben - hat. -IsInEditMode - Mit dieser Methode kann abgefragt werden, ob der - Editmodus aktiv ist. -IsEditModeCanceled - Mit dieser Methode kann im EndRenaming()- - Handler abgefragt werden, ob die Umbenenung - abgebrochen wurde. -GetEditPageId - Mit dieser Methode wird in den Renaming-Handlern - abgefragt, welcher Tab umbenannt wird/wurde. - -StartRenaming() - Dieser Handler wird gerufen, wenn ueber StartEditMode() - der Editmodus gestartet wurde. Mit GetEditPageId() - kann abgefragt werden, welcher Tab umbenannt werden - soll. FALSE sollte zurueckgegeben werden, wenn - der Editmodus nicht gestartet werden soll. -AllowRenaming() - Dieser Handler wird gerufen, wenn der Editmodus - beendet wird (nicht bei Cancel). In diesem Handler - kann dann getestet werden, ob der Text OK ist. - Mit GetEditPageId() kann abgefragt werden, welcher Tab - umbenannt wurde. - Es sollte einer der folgenden Werte zurueckgegeben - werden: - TAB_RENAMING_YES - Der Tab wird umbenannt. - TAB_RENAMING_NO - Der Tab wird nicht umbenannt, der Editmodus bleibt - jedoch aktiv, so das der Anwender den Namen - entsprechent anpassen kann. - TAB_RENAMING_CANCEL - Der Editmodus wird abgebrochen und der alte - Text wieder hergestellt. -EndRenaming() - Dieser Handler wird gerufen, wenn der Editmodus - beendet wurde. Mit GetEditPageId() kann abgefragt - werden, welcher Tab umbenannt wurde. Mit - IsEditModeCanceled() kann abgefragt werden, ob der - Modus abgebrochen wurde und der Name dadurch nicht - geaendert wurde. - - -Maximale Pagebreite -------------------- - -Die Pagebreite der Tabs kann begrenzt werden, damit ein einfacheres -Navigieren ueber diese moeglich ist. Wenn der Text dann nicht komplett -angezeigt werden kann, wird er mit ... abgekuerzt und in der Tip- -oder der aktiven Hilfe (wenn kein Hilfetext gesetzt ist) wird dann der -ganze Text angezeigt. Mit EnableAutoMaxPageWidth() kann eingestellt -werden, ob die maximale Pagebreite sich nach der gerade sichtbaren -Breite richten soll (ist der default). Ansonsten kann auch die -maximale Pagebreite mit SetMaxPageWidth() (in Pixeln) gesetzt werden -(die AutoMaxPageWidth wird dann ignoriert). - - -KontextMenu ------------ - -Wenn ein kontextsensitives PopupMenu anzeigt werden soll, muss der -Command-Handler ueberlagert werden. Mit GetPageId() und bei -Uebergabe der Mausposition kann ermittelt werden, ob der Mausclick -ueber einem bzw. ueber welchem Item durchgefuehrt wurde. -*/ - -// ----------- -// - WinBits - -// ----------- - -#define WB_RANGESELECT ((WinBits)0x00200000) -#define WB_MULTISELECT ((WinBits)0x00400000) -#define WB_TOPBORDER ((WinBits)0x04000000) -#define WB_3DTAB ((WinBits)0x08000000) -#define WB_MINSCROLL ((WinBits)0x20000000) -#define WB_STDTABBAR WB_BORDER - -// ------------------ -// - TabBarPageBits - -// ------------------ - -typedef USHORT TabBarPageBits; - -// ------------------------- -// - Bits fuer TabBarPages - -// ------------------------- - -#define TPB_SPECIAL ((TabBarPageBits)0x0001) - -// ---------------- -// - TabBar-Types - -// ---------------- - -#define TABBAR_APPEND ((USHORT)0xFFFF) -#define TABBAR_PAGE_NOTFOUND ((USHORT)0xFFFF) - -#define TABBAR_RENAMING_YES ((long)TRUE) -#define TABBAR_RENAMING_NO ((long)FALSE) -#define TABBAR_RENAMING_CANCEL ((long)2) - -// ---------- -// - TabBar - -// ---------- -struct TabBar_Impl; - -class SVT_DLLPUBLIC TabBar : public Window -{ - friend class ImplTabButton; - friend class ImplTabSizer; - -private: - ImplTabBarList* mpItemList; - ImplTabButton* mpFirstBtn; - ImplTabButton* mpPrevBtn; - ImplTabButton* mpNextBtn; - ImplTabButton* mpLastBtn; - TabBar_Impl* mpImpl; - TabBarEdit* mpEdit; - XubString maEditText; - Color maSelColor; - Color maSelTextColor; - Size maWinSize; - long mnMaxPageWidth; - long mnCurMaxWidth; - long mnOffX; - long mnOffY; - long mnLastOffX; - long mnSplitSize; - ULONG mnSwitchTime; - WinBits mnWinStyle; - USHORT mnCurPageId; - USHORT mnFirstPos; - USHORT mnDropPos; - USHORT mnSwitchId; - USHORT mnEditId; - BOOL mbFormat; - BOOL mbFirstFormat; - BOOL mbSizeFormat; - BOOL mbAutoMaxWidth; - BOOL mbInSwitching; - BOOL mbAutoEditMode; - BOOL mbEditCanceled; - BOOL mbDropPos; - BOOL mbInSelect; - BOOL mbSelColor; - BOOL mbSelTextColor; - BOOL mbMirrored; - Link maSelectHdl; - Link maDoubleClickHdl; - Link maSplitHdl; - Link maActivatePageHdl; - Link maDeactivatePageHdl; - Link maStartRenamingHdl; - Link maAllowRenamingHdl; - Link maEndRenamingHdl; - - using Window::ImplInit; - SVT_DLLPRIVATE void ImplInit( WinBits nWinStyle ); - SVT_DLLPRIVATE void ImplInitSettings( BOOL bFont, BOOL bBackground ); - SVT_DLLPRIVATE void ImplGetColors( Color& rFaceColor, Color& rFaceTextColor, - Color& rSelectColor, Color& rSelectTextColor ); - SVT_DLLPRIVATE void ImplShowPage( USHORT nPos ); - SVT_DLLPRIVATE BOOL ImplCalcWidth(); - SVT_DLLPRIVATE void ImplFormat(); - SVT_DLLPRIVATE USHORT ImplGetLastFirstPos(); - SVT_DLLPRIVATE void ImplInitControls(); - SVT_DLLPRIVATE void ImplEnableControls(); - SVT_DLLPRIVATE void ImplSelect(); - SVT_DLLPRIVATE void ImplActivatePage(); - SVT_DLLPRIVATE long ImplDeactivatePage(); - DECL_DLLPRIVATE_LINK( ImplClickHdl, ImplTabButton* ); - -public: - TabBar( Window* pParent, WinBits nWinStyle = WB_STDTABBAR ); - virtual ~TabBar(); - - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); - virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual void StateChanged( StateChangedType nStateChange ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - - virtual void Select(); - virtual void DoubleClick(); - virtual void Split(); - virtual void ActivatePage(); - virtual long DeactivatePage(); - virtual long StartRenaming(); - virtual long AllowRenaming(); - virtual void EndRenaming(); - virtual void Mirror(); - - void InsertPage( USHORT nPageId, const XubString& rText, - TabBarPageBits nBits = 0, - USHORT nPos = TABBAR_APPEND ); - void RemovePage( USHORT nPageId ); - void MovePage( USHORT nPageId, USHORT nNewPos ); - void Clear(); - - void EnablePage( USHORT nPageId, BOOL bEnable = TRUE ); - BOOL IsPageEnabled( USHORT nPageId ) const; - - void SetPageBits( USHORT nPageId, TabBarPageBits nBits = 0 ); - TabBarPageBits GetPageBits( USHORT nPageId ) const; - - USHORT GetPageCount() const; - USHORT GetPageId( USHORT nPos ) const; - USHORT GetPagePos( USHORT nPageId ) const; - USHORT GetPageId( const Point& rPos ) const; - Rectangle GetPageRect( USHORT nPageId ) const; - // returns the rectangle in which page tabs are drawn - Rectangle GetPageArea() const; - - void SetCurPageId( USHORT nPageId ); - USHORT GetCurPageId() const { return mnCurPageId; } - - void SetFirstPageId( USHORT nPageId ); - USHORT GetFirstPageId() const { return GetPageId( mnFirstPos ); } - void MakeVisible( USHORT nPageId ); - - void SelectPage( USHORT nPageId, BOOL bSelect = TRUE ); - void SelectPageRange( BOOL bSelect = FALSE, - USHORT nStartPos = 0, - USHORT nEndPos = TABBAR_APPEND ); - USHORT GetSelectPage( USHORT nSelIndex = 0 ) const; - USHORT GetSelectPageCount() const; - BOOL IsPageSelected( USHORT nPageId ) const; - - void EnableAutoMaxPageWidth( BOOL bEnable = TRUE ) { mbAutoMaxWidth = bEnable; } - BOOL IsAutoMaxPageWidthEnabled() const { return mbAutoMaxWidth; } - void SetMaxPageWidth( long nMaxWidth ); - long GetMaxPageWidth() const { return mnMaxPageWidth; } - void ResetMaxPageWidth() { SetMaxPageWidth( 0 ); } - BOOL IsMaxPageWidth() const { return mnMaxPageWidth != 0; } - - void EnableEditMode( BOOL bEnable = TRUE ) { mbAutoEditMode = bEnable; } - BOOL IsEditModeEnabled() const { return mbAutoEditMode; } - BOOL StartEditMode( USHORT nPageId ); - void EndEditMode( BOOL bCancel = FALSE ); - void SetEditText( const XubString& rText ) { maEditText = rText; } - const XubString& GetEditText() const { return maEditText; } - BOOL IsInEditMode() const { return (mpEdit != NULL); } - BOOL IsEditModeCanceled() const { return mbEditCanceled; } - USHORT GetEditPageId() const { return mnEditId; } - - /** Mirrors the entire control including position of buttons and splitter. - Mirroring is done relative to the current direction of the GUI. - @param bMirrored TRUE = the control will draw itself RTL in LTR GUI, - and vice versa; FALSE = the control behaves according to the - current direction of the GUI. */ - void SetMirrored( BOOL bMirrored = TRUE ); - /** Returns TRUE, if the control is set to mirrored mode (see SetMirrored()). */ - BOOL IsMirrored() const { return mbMirrored; } - - /** Sets the control to LTR or RTL mode regardless of the GUI direction. - @param bRTL FALSE = the control will draw from left to right; - TRUE = the control will draw from right to left. */ - void SetEffectiveRTL( BOOL bRTL ); - /** Returns TRUE, if the control draws from right to left (see SetEffectiveRTL()). */ - BOOL IsEffectiveRTL() const; - - BOOL StartDrag( const CommandEvent& rCEvt, Region& rRegion ); - USHORT ShowDropPos( const Point& rPos ); - void HideDropPos(); - BOOL SwitchPage( const Point& rPos ); - void EndSwitchPage(); - BOOL IsInSwitching() { return mbInSwitching; } - - void SetSelectColor(); - void SetSelectColor( const Color& rColor ); - const Color& GetSelectColor() const { return maSelColor; } - BOOL IsSelectColor() const { return mbSelColor; } - void SetSelectTextColor(); - void SetSelectTextColor( const Color& rColor ); - const Color& GetSelectTextColor() const { return maSelTextColor; } - BOOL IsSelectTextColor() const { return mbSelTextColor; } - - void SetPageText( USHORT nPageId, const XubString& rText ); - XubString GetPageText( USHORT nPageId ) const; - void SetHelpText( USHORT nPageId, const XubString& rText ); - XubString GetHelpText( USHORT nPageId ) const; - void SetHelpId( USHORT nPageId, ULONG nHelpId ); - ULONG GetHelpId( USHORT nPageId ) const; - - long GetSplitSize() const { return mnSplitSize; } - long GetMinSize() const; - - void SetHelpText( const XubString& rText ) - { Window::SetHelpText( rText ); } - XubString GetHelpText() const - { return Window::GetHelpText(); }; - void SetHelpId( ULONG nId ) - { Window::SetHelpId( nId ); } - ULONG GetHelpId() const - { return Window::GetHelpId(); } - - void SetStyle( WinBits nStyle ); - WinBits GetStyle() const { return mnWinStyle; } - - Size CalcWindowSizePixel() const; - - void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } - const Link& GetSelectHdl() const { return maSelectHdl; } - void SetDoubleClickHdl( const Link& rLink ) { maDoubleClickHdl = rLink; } - const Link& GetDoubleClickHdl() const { return maDoubleClickHdl; } - void SetSplitHdl( const Link& rLink ) { maSplitHdl = rLink; } - const Link& GetSplitHdl() const { return maSplitHdl; } - void SetActivatePageHdl( const Link& rLink ) { maActivatePageHdl = rLink; } - const Link& GetActivatePageHdl() const { return maActivatePageHdl; } - void SetDeactivatePageHdl( const Link& rLink ) { maDeactivatePageHdl = rLink; } - const Link& GetDeactivatePageHdl() const { return maDeactivatePageHdl; } - void SetStartRenamingHdl( const Link& rLink ) { maStartRenamingHdl = rLink; } - const Link& GetStartRenamingHdl() const { return maStartRenamingHdl; } - void SetAllowRenamingHdl( const Link& rLink ) { maAllowRenamingHdl = rLink; } - const Link& GetAllowRenamingHdl() const { return maAllowRenamingHdl; } - void SetEndRenamingHdl( const Link& rLink ) { maEndRenamingHdl = rLink; } - const Link& GetEndRenamingHdl() const { return maEndRenamingHdl; } - - // accessibility - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); -}; - -#endif // _TABBAR_HXX diff --git a/svtools/inc/taskbar.hxx b/svtools/inc/taskbar.hxx deleted file mode 100644 index af373749248c..000000000000 --- a/svtools/inc/taskbar.hxx +++ /dev/null @@ -1,493 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: taskbar.hxx,v $ - * $Revision: 1.7 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _TASKBAR_HXX -#define _TASKBAR_HXX - -#include "svtools/svtdllapi.h" -#include -#ifndef _TOOLS_LIST_HXX -#include -#endif -#include -#include -#include - -class TaskBar; -class TaskStatusFieldItem; -class ImplTaskItemList; -class ImplTaskSBItemList; -class ImplTaskBarFloat; -struct ImplTaskSBFldItem; - -// ----------------- -// - Dokumentation - -// ----------------- - -/* - -TaskToolBox -=========== - -StartUpdateTask()/UpdateTask()/EndUpdateTask() -Diese muessen gerufen werden, wenn die Task upgedatet werden muessen. -Dann muss StartUpdateTask() gerufen werden, dann UpdateTask() fuer alle -Task's und danach EndUpdateTask() wo dann die TaskButtons entsprechend -neu angeordnet werden. - -ActivateTask() -Handler der gerufen wird, wenn ein Task aktiviert werden muss. Mit -GetTaskItem() kann abgefragt werden, welcher Task aktiviert werden muss. - -ContextMenu() -Dieser Handler wird gerufen, wenn ein ContextMenu angezeigt werden soll. -Mit GetTaskMode() kann abgefragt werden, ob fuer einen Task oder ein -Item. - -GetTaskItem() -Diese Methode liefert das Item zurueck, welches bei UpdateTask an der -entsprechenden Position eingefuegt wurde. - -GetContextMenuPos() -Liefert die Position zurueck, wo das Contextmenu angezeigt werden soll. - - -TaskStatusBar -============= - -InsertStatusField()/RemoveStatusField() -Fuegt ein Statusfeld ein, wo die aktuelle Uhrzeit angezeigt wird. In -dieses Feld koennen dann mit AddStatusFielItem(), ModifyStatusFielItem() -und RemoveStatusFielItem() Status-Items eingefuegt werden. Bei diesen -muss man ein Image angeben, welches dann angezeigt wird. Ausserdem kann -man bei diesen noch Hilfe-Texte angeben oder sagen, ob sie blinken -sollen und ein Notify-Object, worueber man informiert wird, wenn ein -Kontextmenu angezeigt wird oder das Item angeklickt wird. Am -TaskStatusBar kann auch ein Notify-Object gesetzt werden, wenn man -benachrichtigt werden will, wenn die Uhrzeit oder die TaskStatusBar -angeklickt wird. Wenn der Notify fuer die Uhrzeit kommt, ist die -Id TASKSTATUSBAR_CLOCKID, wenn er fuer die TaskStatusBar kommt, ist -die Id 0. Mit SetFieldFlags() kann am TaskStatusBar auch die Flags -hinterher umgesetzt werden, um zum Beispiel die Uhrzeit ein- und -auszuschalten. - - -TaskBar -======= - -Erlaubte StyleBits ------------------- - -WB_BORDER - Border an der oberen Kante -WB_SIZEABLE - Zwischen TaskToolBox und TaskStatusBar kann der Anwender - die Groesse aendern. - -Wenn WB_SIZEABLE gesetzt ist, kann die Breite des StatusBars gesetzt und -abgefragt werden. Dazu kann man SetStatusSize()/GetStatusSize() aufrufen. -0 steht dabei fuer optimale Groesse, was auch der Default ist. Bei einem -Doppelklick auf den Trenner kann der Anwender auch wieder die optimale -Groesse einstellen. - -Wichtige Methoden ------------------- - -virtual TaskToolBox* TaskBar::CreateButtonBar(); -virtual TaskToolBox* TaskBar::CreateTaskToolBox(); -virtual TaskStatusBar* TaskBar::CreateTaskStatusBar(); - -Diese Methoden muesste man ueberladen, wenn man eine eigene Klasse anlegen -will. - -void TaskBar::ShowStatusText( const String& rText ); -void TaskBar::HideStatusText(); - -Blendet den ButtonBar und die TaskBar ein bzw. aus um den Hilfetexte in der -gesammten Zeile anzuzeigen. -*/ - -// ----------------- -// - TaskButtonBar - -// ----------------- - -class TaskButtonBar : public ToolBox -{ - friend class TaskBar; - -private: - TaskBar* mpNotifyTaskBar; - void* mpDummy1; - void* mpDummy2; - void* mpDummy3; - void* mpDummy4; - -public: - TaskButtonBar( Window* pParent, WinBits nWinStyle = 0 ); - ~TaskButtonBar(); - - virtual void RequestHelp( const HelpEvent& rHEvt ); - - void InsertButton( USHORT nItemId, - const Image& rImage, const String& rText, - USHORT nPos = TOOLBOX_APPEND ) - { InsertItem( nItemId, rImage, rText, TIB_LEFT | TIB_AUTOSIZE, nPos ); } - void RemoveButton( USHORT nItemId ) - { RemoveItem( nItemId ); } -}; - -// --------------------- -// - TaskToolBox-Types - -// --------------------- - -#define TASKTOOLBOX_TASK_NOTFOUND ((USHORT)0xFFFF) - -// --------------- -// - TaskToolBox - -// --------------- - -class SVT_DLLPUBLIC TaskToolBox : public ToolBox -{ - friend class TaskBar; - -private: - ImplTaskItemList* mpItemList; - TaskBar* mpNotifyTaskBar; - Point maContextMenuPos; - ULONG mnOldItemCount; - long mnMaxTextWidth; - long mnDummy1; - USHORT mnUpdatePos; - USHORT mnUpdateNewPos; - USHORT mnActiveItemId; - USHORT mnNewActivePos; - USHORT mnTaskItem; - USHORT mnSmallItem; - USHORT mnDummy2; - BOOL mbMinActivate; - BOOL mbDummy1; - Link maActivateTaskHdl; - Link maContextMenuHdl; - -#ifdef _TASKBAR_CXX - SVT_DLLPRIVATE void ImplFormatTaskToolBox(); -#endif - - // Forbidden and not implemented. - TaskToolBox (const TaskToolBox &); - TaskToolBox & operator= (const TaskToolBox &); - -public: - TaskToolBox( Window* pParent, WinBits nWinStyle = 0 ); - ~TaskToolBox(); - - void ActivateTaskItem( USHORT nItemId, - BOOL bMinActivate = FALSE ); - USHORT GetTaskItem( const Point& rPos ) const; - - virtual void ActivateTask(); - virtual void ContextMenu(); - - virtual void Select(); - - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void Resize(); - virtual void Command( const CommandEvent& rCEvt ); - virtual void RequestHelp( const HelpEvent& rHEvt ); - - void StartUpdateTask(); - void UpdateTask( const Image& rImage, const String& rText, - BOOL bActive = FALSE ); - void EndUpdateTask(); - - const Point& GetContextMenuPos() const { return maContextMenuPos; } - USHORT GetTaskItem() const { return mnTaskItem; } - BOOL IsMinActivate() const { return mbMinActivate; } - - void SetActivateTaskHdl( const Link& rLink ) { maActivateTaskHdl = rLink; } - const Link& GetActivateTaskHdl() const { return maActivateTaskHdl; } - void SetContextMenuHdl( const Link& rLink ) { maContextMenuHdl = rLink; } - const Link& GetContextMenuHdl() const { return maContextMenuHdl; } -}; - -inline USHORT TaskToolBox::GetTaskItem( const Point& rPos ) const -{ - USHORT nId = GetItemId( rPos ); - if ( nId ) - return nId-1; - else - return TASKTOOLBOX_TASK_NOTFOUND; -} - -// --------------------- -// - ITaskStatusNotify - -// --------------------- - -class ITaskStatusNotify -{ -public: - virtual BOOL MouseButtonDown( USHORT nItemd, const MouseEvent& rMEvt ); - virtual BOOL MouseButtonUp( USHORT nItemd, const MouseEvent& rMEvt ); - virtual BOOL MouseMove( USHORT nItemd, const MouseEvent& rMEvt ); - virtual BOOL Command( USHORT nItemd, const CommandEvent& rCEvt ); - virtual BOOL UpdateHelp( USHORT nItemd ); -}; - -// ----------------------- -// - TaskStatusFieldItem - -// ----------------------- - -#define TASKSTATUSFIELDITEM_FLASH ((USHORT)0x0001) - -class TaskStatusFieldItem -{ -private: - ITaskStatusNotify* mpNotify; - Image maImage; - XubString maQuickHelpText; - XubString maHelpText; - ULONG mnHelpId; - USHORT mnFlags; - -public: - TaskStatusFieldItem(); - TaskStatusFieldItem( const TaskStatusFieldItem& rItem ); - TaskStatusFieldItem( ITaskStatusNotify* pNotify, - const Image& rImage, - const XubString& rQuickHelpText, - const XubString& rHelpText, - USHORT nFlags ); - ~TaskStatusFieldItem(); - - void SetNotifyObject( ITaskStatusNotify* pNotify ) { mpNotify = pNotify; } - ITaskStatusNotify* GetNotifyObject() const { return mpNotify; } - void SetImage( const Image& rImage ) { maImage = rImage; } - const Image& GetImage() const { return maImage; } - void SetQuickHelpText( const XubString& rStr ) { maQuickHelpText = rStr; } - const XubString& GetQuickHelpText() const { return maQuickHelpText; } - void SetHelpText( const XubString& rStr ) { maHelpText = rStr; } - const XubString& GetHelpText() const { return maHelpText; } - void SetHelpId( ULONG nHelpId ) { mnHelpId = nHelpId; } - ULONG GetHelpId() const { return mnHelpId; } - void SetFlags( USHORT nFlags ) { mnFlags = nFlags; } - USHORT GetFlags() const { return mnFlags; } - - const TaskStatusFieldItem& operator=( const TaskStatusFieldItem& rItem ); -}; - -// ----------------- -// - TaskStatusBar - -// ----------------- - -#define TASKSTATUSBAR_STATUSFIELDID ((USHORT)61000) - -#define TASKSTATUSBAR_CLOCKID ((USHORT)61000) -#define TASKSTATUSFIELD_CLOCK ((USHORT)0x0001) - -class SVT_DLLPUBLIC TaskStatusBar : public StatusBar -{ - friend class TaskBar; - -private: - ImplTaskSBItemList* mpFieldItemList; - TaskBar* mpNotifyTaskBar; - ITaskStatusNotify* mpNotify; - Time maTime; - XubString maTimeText; - AutoTimer maTimer; - long mnClockWidth; - long mnItemWidth; - long mnFieldWidth; - USHORT mnFieldFlags; - USHORT mnDummy1; - BOOL mbFlashItems; - BOOL mbOutInterval; - BOOL mbDummy1; - BOOL mbDummy2; - -#ifdef _TASKBAR_CXX - SVT_DLLPRIVATE ImplTaskSBFldItem* ImplGetFieldItem( USHORT nItemId ) const; - SVT_DLLPRIVATE ImplTaskSBFldItem* ImplGetFieldItem( const Point& rPos, BOOL& rFieldRect ) const; - SVT_DLLPRIVATE BOOL ImplUpdateClock(); - SVT_DLLPRIVATE BOOL ImplUpdateFlashItems(); - SVT_DLLPRIVATE void ImplUpdateField( BOOL bItems ); - DECL_DLLPRIVATE_LINK( ImplTimerHdl, Timer* ); -#endif - -public: - TaskStatusBar( Window* pParent, WinBits nWinStyle = WB_LEFT ); - ~TaskStatusBar(); - - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void Command( const CommandEvent& rCEvt ); - virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual void UserDraw( const UserDrawEvent& rUDEvt ); - - void InsertStatusField( long nOffset = STATUSBAR_OFFSET, - USHORT nPos = STATUSBAR_APPEND, - USHORT nFlags = TASKSTATUSFIELD_CLOCK ); - void RemoveStatusField() - { maTimer.Stop(); RemoveItem( TASKSTATUSBAR_STATUSFIELDID ); } - void SetFieldFlags( USHORT nFlags ); - USHORT GetFieldFlags() const { return mnFieldFlags; } - void SetNotifyObject( ITaskStatusNotify* pNotify ) { mpNotify = pNotify; } - ITaskStatusNotify* GetNotifyObject() const { return mpNotify; } - - void AddStatusFieldItem( USHORT nItemId, const TaskStatusFieldItem& rItem, - USHORT nPos = 0xFFFF ); - void ModifyStatusFieldItem( USHORT nItemId, const TaskStatusFieldItem& rItem ); - void RemoveStatusFieldItem( USHORT nItemId ); - BOOL GetStatusFieldItem( USHORT nItemId, TaskStatusFieldItem& rItem ) const; -}; - -// ----------- -// - TaskBar - -// ----------- - -class SVT_DLLPUBLIC TaskBar : public Window -{ -private: - ImplTaskBarFloat* mpAutoHideBar; - TaskButtonBar* mpButtonBar; - TaskToolBox* mpTaskToolBox; - TaskStatusBar* mpStatusBar; - void* mpDummy1; - void* mpDummy2; - void* mpDummy3; - void* mpDummy4; - String maOldText; - long mnStatusWidth; - long mnMouseOff; - long mnOldStatusWidth; - long mnDummy1; - long mnDummy2; - long mnDummy3; - long mnDummy4; - WinBits mnWinBits; - USHORT mnLines; - BOOL mbStatusText; - BOOL mbShowItems; - BOOL mbAutoHide; - BOOL mbAlignDummy1; - BOOL mbDummy1; - BOOL mbDummy2; - BOOL mbDummy3; - BOOL mbDummy4; - Link maTaskResizeHdl; - -#ifdef _TASKBAR_CXX - SVT_DLLPRIVATE void ImplInitSettings(); - SVT_DLLPRIVATE void ImplNewHeight( long nNewHeight ); -#endif - -public: - TaskBar( Window* pParent, WinBits nWinStyle = WB_BORDER | WB_SIZEABLE ); - ~TaskBar(); - - virtual void TaskResize(); - - virtual TaskButtonBar* CreateButtonBar(); - virtual TaskToolBox* CreateTaskToolBox(); - virtual TaskStatusBar* CreateTaskStatusBar(); - - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void Tracking( const TrackingEvent& rMEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - - void Format(); - - void SetLines( USHORT nLines ); - USHORT GetLines() const { return mnLines; } - void EnableAutoHide( BOOL bAutoHide = TRUE ); - BOOL IsAutoHideEnabled() const { return mbAutoHide; } - - void ShowStatusText( const String& rText ); - void HideStatusText(); - - void SetStatusSize( long nNewSize ) - { mnStatusWidth=nNewSize; Resize(); } - long GetStatusSize() const { return mnStatusWidth; } - - Size CalcWindowSizePixel() const; - - TaskButtonBar* GetButtonBar() const; - TaskToolBox* GetTaskToolBox() const; - TaskStatusBar* GetStatusBar() const; - - void SetTaskResizeHdl( const Link& rLink ) { maTaskResizeHdl = rLink; } - const Link& GetTaskResizeHdl() const { return maTaskResizeHdl; } -}; - -// ----------------------- -// - WindowArrange-Types - -// ----------------------- - -#define WINDOWARRANGE_TILE 1 -#define WINDOWARRANGE_HORZ 2 -#define WINDOWARRANGE_VERT 3 -#define WINDOWARRANGE_CASCADE 4 - -class ImplWindowArrangeList; - -// ----------------------- -// - class WindowArrange - -// ----------------------- - -class SVT_DLLPUBLIC WindowArrange -{ -private: - List* mpWinList; - void* mpDummy; - ULONG mnDummy; - -#ifdef _TASKBAR_CXX - SVT_DLLPRIVATE void ImplTile( const Rectangle& rRect ); - SVT_DLLPRIVATE void ImplHorz( const Rectangle& rRect ); - SVT_DLLPRIVATE void ImplVert( const Rectangle& rRect ); - SVT_DLLPRIVATE void ImplCascade( const Rectangle& rRect ); -#endif - -public: - WindowArrange(); - ~WindowArrange(); - - void AddWindow( Window* pWindow, ULONG nPos = LIST_APPEND ) - { mpWinList->Insert( (void*)pWindow, nPos ); } - void RemoveAllWindows() - { mpWinList->Clear(); } - - void Arrange( USHORT nType, const Rectangle& rRect ); -}; - -#endif // _TASKBAR_HXX diff --git a/svtools/inc/templatefoldercache.hxx b/svtools/inc/templatefoldercache.hxx deleted file mode 100644 index 8a6b6d9c1a3a..000000000000 --- a/svtools/inc/templatefoldercache.hxx +++ /dev/null @@ -1,111 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: templatefoldercache.hxx,v $ - * $Revision: 1.5 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef SFX2_TEMPLATEFOLDERCACHE_HXX -#define SFX2_TEMPLATEFOLDERCACHE_HXX - -#include "svtools/svtdllapi.h" -#include - -//......................................................................... -namespace svt -{ -//......................................................................... - - //===================================================================== - //= TemplateFolderCache - //===================================================================== - class TemplateFolderCacheImpl; - /** allows to cache the state of the template directories of OOo -

    Usually, this class is used together with an instance of a the - DocumentTemplates service. It allows to scan the template folders - of the Office, and updates the configuration so that it reflects the most recent state of the folders.
    - As this is an expensive, the TemplateFolderCache has been introduced. It caches the state of the template - folders, and allows to determine if the DocumentTemplates service needs to be invoked to do the (much more expensive) - update.

    - @example C++ - - TemplateFolderCache aTemplateFolders; - if ( aTemplateFolders.needsUpdate() ) - { - // store the current state - aCache.storeState(); - - // create the DocumentTemplates instance - Reference< XDocumentTemplates > xTemplates = ...; - - // update the templates configuration - xTemplates->update(); - } - - // do anything which relies on a up-to-date template configuration - - */ - class SVT_DLLPUBLIC TemplateFolderCache - { - private: - TemplateFolderCacheImpl* m_pImpl; - - public: - /** ctor. - @param _bAutoStoreState - Set this to if you want the instance to automatically store the state of the template folders upon - destruction.
    - If set to , you would epplicitly need to call storeState to do this.
    - If the current state is not known (e.g. because you did not call needsUpdate, which retrieves it), - it is not retrieved in the dtor, regardless of the _bAutoStoreState flag. - */ - TemplateFolderCache( sal_Bool _bAutoStoreState = sal_False ); - ~TemplateFolderCache( ); - - /** determines whether or not the template configuration needs to be updated - @param _bForceCheck - set this to if you want the object to rescan the template folders in every case. The default () - means that once the information has been retrieved in a first call, every second call returns the same result - as the first one, even if in the meantime the template folders changed. - @return - if the template configuration needs to be updated - */ - sal_Bool needsUpdate( sal_Bool _bForceCheck = sal_False ); - - /** stores the current state of the template folders in the cache - @param _bForceRetrieval - if set to , the current state of the template folders is retrieved again, even if it is already known. - Usually, you set this to : After calling needsUpdate, the state is know and does not - need to be read again. - */ - void storeState( sal_Bool _bForceRetrieval = sal_False ); - }; - -//......................................................................... -} // namespace svt -//......................................................................... - -#endif // SFX2_TEMPLATEFOLDERCACHE_HXX diff --git a/svtools/inc/templdlg.hxx b/svtools/inc/templdlg.hxx deleted file mode 100644 index 4b2d644d6f6b..000000000000 --- a/svtools/inc/templdlg.hxx +++ /dev/null @@ -1,95 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: templdlg.hxx,v $ - * $Revision: 1.16 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVTOOLS_TEMPLDLG_HXX -#define _SVTOOLS_TEMPLDLG_HXX - -#include "svtools/svtdllapi.h" - -#include -#include -#include -#include - -struct SvtTmplDlg_Impl; - -// class SvtDocumentTemplateDialog --------------------------------------- - -class SvtTemplateWindow; - -class SVT_DLLPUBLIC SvtDocumentTemplateDialog : public ModalDialog -{ -private: - svt::FixedHyperlink aMoreTemplatesLink; - FixedLine aLine; - PushButton aManageBtn; - PushButton aEditBtn; - OKButton aOKBtn; - CancelButton aCancelBtn; - HelpButton aHelpBtn; - - SvtTmplDlg_Impl* pImpl; - - DECL_DLLPRIVATE_LINK( SelectHdl_Impl, SvtTemplateWindow* ); - DECL_DLLPRIVATE_LINK( DoubleClickHdl_Impl, SvtTemplateWindow* ); - DECL_DLLPRIVATE_LINK( NewFolderHdl_Impl, SvtTemplateWindow* ); - DECL_DLLPRIVATE_LINK( SendFocusHdl_Impl, SvtTemplateWindow* ); - DECL_DLLPRIVATE_LINK( OKHdl_Impl, PushButton* ); - DECL_DLLPRIVATE_LINK( OrganizerHdl_Impl, PushButton* ); - DECL_DLLPRIVATE_LINK( UpdateHdl_Impl, Timer* ); - DECL_DLLPRIVATE_LINK( OpenLinkHdl_Impl, svt::FixedHyperlink* ); - -public: - SvtDocumentTemplateDialog( Window* pParent ); - - /** ctor for calling the dialog for selection only, not for opening a document -

    If you use this ctor, the dialog will behave differently in the following areas: -

    • The Edit button will be hidden.
      • -
    • Upon pressing em>Open, the selected file will not be opened. Instead, it's - URL is available (see GetSelectedFileURL).
      • -
    - - */ - struct SelectOnly { }; - SvtDocumentTemplateDialog( Window* _pParent, SelectOnly ); - - ~SvtDocumentTemplateDialog(); - - sal_Bool IsFileSelected( ) const; - String GetSelectedFileURL( ) const; - - void SelectTemplateFolder(); - -private: - SVT_DLLPRIVATE void InitImpl( ); - SVT_DLLPRIVATE sal_Bool CanEnableEditBtn() const; -}; - -#endif // _SVTOOLS_TEMPLDLG_HXX - diff --git a/svtools/inc/testtool.hxx b/svtools/inc/testtool.hxx deleted file mode 100644 index 5d4ec5c6208e..000000000000 --- a/svtools/inc/testtool.hxx +++ /dev/null @@ -1,78 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: testtool.hxx,v $ - * $Revision: 1.5 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef SVTOOLS_TESTTOOL_HXX -#define SVTOOLS_TESTTOOL_HXX - -#include -#include -#include - -class Application; -class SvStream; - -class StatementFlow; -class CommunicationManager; -class CommunicationLink; -#if OSL_DEBUG_LEVEL > 1 -class EditWindow; -#endif -class ImplRC; - -class RemoteControl -{ - friend class StatementFlow; - - BOOL m_bIdleInserted; -#if OSL_DEBUG_LEVEL > 1 - EditWindow *m_pDbgWin; -#endif - ImplRC* pImplRC; - -public: - RemoteControl(); - ~RemoteControl(); - BOOL QueCommands( ULONG nServiceId, SvStream *pIn ); - SvStream* GetReturnStream(); - - DECL_LINK( IdleHdl, Application* ); - DECL_LINK( CommandHdl, Application* ); - - DECL_LINK( QueCommandsEvent, CommunicationLink* ); - ULONG nStoredServiceId; - SvStream *pStoredStream; - - void ExecuteURL( String &aURL ); - -protected: - CommunicationManager *pServiceMgr; - SvStream *pRetStream; -}; - -#endif // SVTOOLS_TESTTOOL_HXX diff --git a/svtools/inc/tooltiplbox.hxx b/svtools/inc/tooltiplbox.hxx deleted file mode 100644 index a72a2042a9cc..000000000000 --- a/svtools/inc/tooltiplbox.hxx +++ /dev/null @@ -1,70 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: tooltiplbox.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef SVTOOLS_TOOLTIPLBOX_HXX -#define SVTOOLS_TOOLTIPLBOX_HXX - -#include "svtools/svtdllapi.h" -#include - -namespace svtools { - -// ============================================================================ - -/** ListBox with tool tips for long entries. */ -class ToolTipListBox : public ListBox -{ -public: - ToolTipListBox( Window* pParent, WinBits nStyle = WB_BORDER ); - ToolTipListBox( Window* pParent, const ResId& rResId ); - -protected: - virtual void RequestHelp( const HelpEvent& rHEvt ); -}; - -// ---------------------------------------------------------------------------- - -/** MultiListBox with tool tips for long entries. */ -class SVT_DLLPUBLIC ToolTipMultiListBox : public MultiListBox -{ -public: - ToolTipMultiListBox( Window* pParent, WinBits nStyle = WB_BORDER ); - ToolTipMultiListBox( Window* pParent, const ResId& rResId ); - -protected: - virtual void RequestHelp( const HelpEvent& rHEvt ); -}; - -// ============================================================================ - -} // namespace svtools - -#endif - diff --git a/svtools/inc/txtattr.hxx b/svtools/inc/txtattr.hxx deleted file mode 100644 index 4d4432f782bb..000000000000 --- a/svtools/inc/txtattr.hxx +++ /dev/null @@ -1,238 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: txtattr.hxx,v $ - * $Revision: 1.11 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _TXTATTR_HXX -#define _TXTATTR_HXX - -#include "svtools/svtdllapi.h" -#include -#include -#include -#include - -class Font; - -#define TEXTATTR_INVALID 0 -#define TEXTATTR_FONTCOLOR 1 -#define TEXTATTR_HYPERLINK 2 -#define TEXTATTR_FONTWEIGHT 3 - -#define TEXTATTR_USER_START 1000 //start id for user defined text attributes -#define TEXTATTR_PROTECTED 4 - - -class SVT_DLLPUBLIC TextAttrib -{ -private: - USHORT mnWhich; - -protected: - TextAttrib( USHORT nWhich ) { mnWhich = nWhich; } - TextAttrib( const TextAttrib& rAttr ) { mnWhich = rAttr.mnWhich; } - -public: - - virtual ~TextAttrib(); - - USHORT Which() const { return mnWhich; } - - virtual void SetFont( Font& rFont ) const = 0; - virtual TextAttrib* Clone() const = 0; - virtual int operator==( const TextAttrib& rAttr ) const = 0; - int operator!=( const TextAttrib& rAttr ) const - { return !(*this == rAttr ); } -}; - - - -class SVT_DLLPUBLIC TextAttribFontColor : public TextAttrib -{ -private: - Color maColor; - -public: - TextAttribFontColor( const Color& rColor ); - TextAttribFontColor( const TextAttribFontColor& rAttr ); - ~TextAttribFontColor(); - - const Color& GetColor() const { return maColor; } - - virtual void SetFont( Font& rFont ) const; - virtual TextAttrib* Clone() const; - virtual int operator==( const TextAttrib& rAttr ) const; - -}; - -class SVT_DLLPUBLIC TextAttribFontWeight : public TextAttrib -{ -private: - FontWeight meWeight; - -public: - TextAttribFontWeight( FontWeight eWeight ); - TextAttribFontWeight( const TextAttribFontWeight& rAttr ); - ~TextAttribFontWeight(); - - virtual void SetFont( Font& rFont ) const; - virtual TextAttrib* Clone() const; - virtual int operator==( const TextAttrib& rAttr ) const; - - inline FontWeight getFontWeight() const { return meWeight; } -}; - - -class TextAttribHyperLink : public TextAttrib -{ -private: - XubString maURL; - XubString maDescription; - Color maColor; - -public: - TextAttribHyperLink( const XubString& rURL ); - TextAttribHyperLink( const XubString& rURL, const XubString& rDescription ); - TextAttribHyperLink( const TextAttribHyperLink& rAttr ); - ~TextAttribHyperLink(); - - void SetURL( const XubString& rURL ) { maURL = rURL; } - const XubString& GetURL() const { return maURL; } - - void SetDescription( const XubString& rDescr ) { maDescription = rDescr; } - const XubString& GetDescription() const { return maDescription; } - - void SetColor( const Color& rColor ) { maColor = rColor; } - const Color& GetColor() const { return maColor; } - - virtual void SetFont( Font& rFont ) const; - virtual TextAttrib* Clone() const; - virtual int operator==( const TextAttrib& rAttr ) const; -}; - -class SVT_DLLPUBLIC TextAttribProtect : public TextAttrib -{ -public: - TextAttribProtect(); - TextAttribProtect( const TextAttribProtect& rAttr ); - ~TextAttribProtect(); - - virtual void SetFont( Font& rFont ) const; - virtual TextAttrib* Clone() const; - virtual int operator==( const TextAttrib& rAttr ) const; - -}; - - -class TextCharAttrib -{ -private: - TextAttrib* mpAttr; - USHORT mnStart; - USHORT mnEnd; - -protected: - -public: - - TextCharAttrib( const TextAttrib& rAttr, USHORT nStart, USHORT nEnd ); - TextCharAttrib( const TextCharAttrib& rTextCharAttrib ); - ~TextCharAttrib(); - - const TextAttrib& GetAttr() const { return *mpAttr; } - - USHORT Which() const { return mpAttr->Which(); } - - USHORT GetStart() const { return mnStart; } - USHORT& GetStart() { return mnStart; } - - USHORT GetEnd() const { return mnEnd; } - USHORT& GetEnd() { return mnEnd; } - - inline USHORT GetLen() const; - - inline void MoveForward( USHORT nDiff ); - inline void MoveBackward( USHORT nDiff ); - - inline void Expand( USHORT nDiff ); - inline void Collaps( USHORT nDiff ); - - inline BOOL IsIn( USHORT nIndex ); - inline BOOL IsInside( USHORT nIndex ); - inline BOOL IsEmpty(); - -}; - -inline USHORT TextCharAttrib::GetLen() const -{ - DBG_ASSERT( mnEnd >= mnStart, "TextCharAttrib: nEnd < nStart!" ); - return mnEnd-mnStart; -} - -inline void TextCharAttrib::MoveForward( USHORT nDiff ) -{ - DBG_ASSERT( ((long)mnEnd + nDiff) <= 0xFFFF, "TextCharAttrib: MoveForward?!" ); - mnStart = mnStart + nDiff; - mnEnd = mnEnd + nDiff; -} - -inline void TextCharAttrib::MoveBackward( USHORT nDiff ) -{ - DBG_ASSERT( ((long)mnStart - nDiff) >= 0, "TextCharAttrib: MoveBackward?!" ); - mnStart = mnStart - nDiff; - mnEnd = mnEnd - nDiff; -} - -inline void TextCharAttrib::Expand( USHORT nDiff ) -{ - DBG_ASSERT( ( ((long)mnEnd + nDiff) <= (long)0xFFFF ), "TextCharAttrib: Expand?!" ); - mnEnd = mnEnd + nDiff; -} - -inline void TextCharAttrib::Collaps( USHORT nDiff ) -{ - DBG_ASSERT( (long)mnEnd - nDiff >= (long)mnStart, "TextCharAttrib: Collaps?!" ); - mnEnd = mnEnd - nDiff; -} - -inline BOOL TextCharAttrib::IsIn( USHORT nIndex ) -{ - return ( ( mnStart <= nIndex ) && ( mnEnd >= nIndex ) ); -} - -inline BOOL TextCharAttrib::IsInside( USHORT nIndex ) -{ - return ( ( mnStart < nIndex ) && ( mnEnd > nIndex ) ); -} - -inline BOOL TextCharAttrib::IsEmpty() -{ - return mnStart == mnEnd; -} - -#endif // _TXTATTR_HXX diff --git a/svtools/inc/txtcmp.hxx b/svtools/inc/txtcmp.hxx deleted file mode 100644 index e40e578401cb..000000000000 --- a/svtools/inc/txtcmp.hxx +++ /dev/null @@ -1,36 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: txtcmp.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _TXTCMP_HXX -#define _TXTCMP_HXX - -#include - -#endif - diff --git a/svtools/inc/unoevent.hxx b/svtools/inc/unoevent.hxx deleted file mode 100644 index e8507722e31b..000000000000 --- a/svtools/inc/unoevent.hxx +++ /dev/null @@ -1,332 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: unoevent.hxx,v $ - * $Revision: 1.5.136.1 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVTOOLS_UNOEVENT_HXX_ -#define _SVTOOLS_UNOEVENT_HXX_ - -#include "svtools/svtdllapi.h" -#include -#include -#include -#include - -class SvxMacroTableDtor; -class SvxMacroItem; -class SvxMacro; - -/** SvEventDescription: Description of a single event. - mnEvent is the id used by SvxMacroItem - mpEventName is the api name for this event - - the last event in an array is indicated by mnEvent && mpEventName == 0 -*/ -struct SvEventDescription -{ - sal_uInt16 mnEvent; - const sal_Char* mpEventName; -}; - -/** - * SvBaseEventDescriptor: Abstract class that implements the basics - * of an XNameReplace that is delivered by the - * XEventsSupplier::getEvents() method. - * - * The functionality this class provides is: - * 1) Which elements are in the XNameReplace? - * 2) Mapping from Api names to item IDs. - * 3) conversion from SvxMacroItem to Any and vice versa. - * - * All details of how to actually get and set SvxMacroItem(s) have to - * be supplied by the base class. - */ -class SVT_DLLPUBLIC SvBaseEventDescriptor : public cppu::WeakImplHelper2 -< - ::com::sun::star::container::XNameReplace, - ::com::sun::star::lang::XServiceInfo -> -{ - const ::rtl::OUString sEventType; - const ::rtl::OUString sMacroName; - const ::rtl::OUString sLibrary; - const ::rtl::OUString sStarBasic; - const ::rtl::OUString sJavaScript; - const ::rtl::OUString sScript; - const ::rtl::OUString sNone; - - - /// name of own service - const ::rtl::OUString sServiceName; - -protected: - const ::rtl::OUString sEmpty; - - /// last element is 0, 0 - const SvEventDescription* mpSupportedMacroItems; - sal_Int16 mnMacroItems; - -public: - - SvBaseEventDescriptor(const SvEventDescription* pSupportedMacroItems); - - virtual ~SvBaseEventDescriptor(); - - - // XNameReplace - /// calls replaceByName(const sal_uInt16, const SvxMacro&) - virtual void SAL_CALL replaceByName( - const ::rtl::OUString& rName, /// API name of event - const ::com::sun::star::uno::Any& rElement ) /// event (PropertyValues) - throw( - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); - - // XNameAccess (via XNameReplace) - /// calls getByName(sal_uInt16) - virtual ::com::sun::star::uno::Any SAL_CALL getByName( - const ::rtl::OUString& rName ) /// API name of event - throw( - ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); - - // XNameAxcess (via XNameReplace) - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL - getElementNames() - throw(::com::sun::star::uno::RuntimeException); - - // XNameAccess (via XNameReplace) - virtual sal_Bool SAL_CALL hasByName( - const ::rtl::OUString& rName ) - throw(::com::sun::star::uno::RuntimeException); - - // XElementAccess (via XNameReplace) - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException); - - // XElementAccess (via XNameReplace) - virtual sal_Bool SAL_CALL hasElements() - throw(::com::sun::star::uno::RuntimeException); - - // XServiceInfo - /// must be implemented in subclass - virtual rtl::OUString SAL_CALL getImplementationName(void) - throw( ::com::sun::star::uno::RuntimeException ) = 0; - - // XServiceInfo - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) - throw( ::com::sun::star::uno::RuntimeException ); - - // XServiceInfo - virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL - getSupportedServiceNames(void) - throw( ::com::sun::star::uno::RuntimeException ); - -protected: - - /// Must be implemented in subclass. - virtual void replaceByName( - const sal_uInt16 nEvent, /// item ID of event - const SvxMacro& rMacro) /// event (will be copied) - throw( - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException) = 0; - - /// Must be implemented in subclass. - virtual void getByName( - SvxMacro& rMacro, - const sal_uInt16 nEvent ) - throw( - ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException) = 0; - - /// convert an API event name to the event ID as used by SvxMacroItem - sal_uInt16 mapNameToEventID(const ::rtl::OUString& rName) const; - - /// convert an event ID to an API event name - ::rtl::OUString mapEventIDToName(sal_uInt16 nPoolID) const; - - /// get the event ID for the name; return 0 if not supported - sal_uInt16 getMacroID(const ::rtl::OUString& rName) const; - - /// create PropertyValues and Any from macro - void getAnyFromMacro( - ::com::sun::star::uno::Any& aAny, // Any to be filled by Macro values - const SvxMacro& rMacro); - - /// create macro from PropertyValues (in an Any) - void getMacroFromAny( - SvxMacro& aMacro, // reference to be filled by Any - const ::com::sun::star::uno::Any& rAny) - throw ( - ::com::sun::star::lang::IllegalArgumentException); - -}; - - - - -/** - * SvEventDescriptor: Implement the XNameReplace that is delivered by - * the XEventsSupplier::getEvents() method. The SvEventDescriptor has - * to be subclassed to implement the events for a specific - * objects. The subclass has to - * 1) supply the super class constructor with a list of known events (item IDs) - * 2) supply the super class constructor with a reference of it's parent object - * (to prevent destruction) - * 3) implement getItem() and setItem(...) methods. - * - * If no object is available to which the SvEventDescriptor can attach itself, - * the class SvDetachedEventDescriptor should be used. - */ -class SVT_DLLPUBLIC SvEventDescriptor : public SvBaseEventDescriptor -{ - /// keep reference to parent to prevent it from being destroyed - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XInterface > xParentRef; - -public: - - SvEventDescriptor(::com::sun::star::uno::XInterface& rParent, - const SvEventDescription* pSupportedMacroItems); - - virtual ~SvEventDescriptor(); - - -protected: - - - using SvBaseEventDescriptor::replaceByName; - virtual void replaceByName( - const sal_uInt16 nEvent, /// item ID of event - const SvxMacro& rMacro) /// event (will be copied) - throw( - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); - - using SvBaseEventDescriptor::getByName; - virtual void getByName( - SvxMacro& rMacros, /// macro to be filled with values - const sal_uInt16 nEvent ) /// item ID of event - throw( - ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); - - - /// Get the SvxMacroItem from the parent. - /// must be implemented by subclass - virtual const SvxMacroItem& getMacroItem() = 0; - - /// Set the SvxMacroItem at the parent. - /// must be implemented by subclass - virtual void setMacroItem(const SvxMacroItem& rItem) = 0; - - /// Get the SvxMacroItem Which Id needed for the current application - /// must be implemented by subclass - virtual sal_uInt16 getMacroItemWhich() const = 0; -}; - - -/** - * SvDetachedEventDescriptor: - */ -class SVT_DLLPUBLIC SvDetachedEventDescriptor : public SvBaseEventDescriptor -{ - // the macros; aMacros[i] is the value for aSupportedMacroItemIDs[i] - SvxMacro** aMacros; - - const ::rtl::OUString sImplName; - -public: - - SvDetachedEventDescriptor(const SvEventDescription* pSupportedMacroItems); - - virtual ~SvDetachedEventDescriptor(); - - //XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName(void) - throw( ::com::sun::star::uno::RuntimeException ); - -protected: - - sal_Int16 getIndex(const sal_uInt16 nID) const; - - using SvBaseEventDescriptor::replaceByName; - virtual void replaceByName( - const sal_uInt16 nEvent, /// item ID of event - const SvxMacro& rMacro) /// event (will be copied) - throw( - ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); - - using SvBaseEventDescriptor::getByName; - virtual void getByName( - SvxMacro& rMacro, /// macro to be filled - const sal_uInt16 nEvent ) /// item ID of event - throw( - ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); - - /// do we have an event? - /// return sal_True: we have a macro for the event - /// return sal_False: no macro; getByName() will return an empty macro - /// IllegalArgumentException: the event is not supported - using SvBaseEventDescriptor::hasByName; - virtual sal_Bool hasByName( - const sal_uInt16 nEvent ) const /// item ID of event - throw( - ::com::sun::star::lang::IllegalArgumentException); - -}; - -class SVT_DLLPUBLIC SvMacroTableEventDescriptor : public SvDetachedEventDescriptor -{ -public: - - SvMacroTableEventDescriptor(const SvEventDescription* pSupportedMacroItems); - SvMacroTableEventDescriptor(const SvxMacroTableDtor& aFmt, - const SvEventDescription* pSupportedMacroItems); - - virtual ~SvMacroTableEventDescriptor(); - - void copyMacrosFromTable(const SvxMacroTableDtor& aFmt); - void copyMacrosIntoTable(SvxMacroTableDtor& aFmt); -}; - -#endif diff --git a/svtools/inc/unoimap.hxx b/svtools/inc/unoimap.hxx deleted file mode 100644 index f3a5aae50844..000000000000 --- a/svtools/inc/unoimap.hxx +++ /dev/null @@ -1,48 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: unoimap.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVTOOLS_UNOIMAP_HXX -#define _SVTOOLS_UNOIMAP_HXX - -#include "svtools/svtdllapi.h" -#include - -class ImageMap; -struct SvEventDescription; - -SVT_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SvUnoImageMapRectangleObject_createInstance( const SvEventDescription* pSupportedMacroItems ); -SVT_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SvUnoImageMapCircleObject_createInstance( const SvEventDescription* pSupportedMacroItems ); -SVT_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SvUnoImageMapPolygonObject_createInstance( const SvEventDescription* pSupportedMacroItems ); - -SVT_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SvUnoImageMap_createInstance( const SvEventDescription* pSupportedMacroItems ); -SVT_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SvUnoImageMap_createInstance( const ImageMap& rMap, const SvEventDescription* pSupportedMacroItems ); -SVT_DLLPUBLIC sal_Bool SvUnoImageMap_fillImageMap( com::sun::star::uno::Reference< com::sun::star::uno::XInterface > xImageMap, ImageMap& rMap ); - -#endif diff --git a/svtools/inc/wallitem.hxx b/svtools/inc/wallitem.hxx deleted file mode 100644 index 7f3e04ce2a8c..000000000000 --- a/svtools/inc/wallitem.hxx +++ /dev/null @@ -1,68 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: wallitem.hxx,v $ - * $Revision: 1.5 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _WALLITEM_HXX -#define _WALLITEM_HXX - -#ifndef SHL_HXX -#include -#endif - -// ----------------------------------------------------------------------------------------- -// Hilfsklasse, um die Download-Funktionalitaet des SvxBrushItems unterhalb -// des SVX zu benutzen. Der Link wird im Konstruktor von SvxDialogDll gesetzt. -#ifndef _SFX_BRUSHITEMLINK_DECLARED -#define _SFX_BRUSHITEMLINK_DECLARED -#include - -#ifndef SHL_BRUSHITEM -#define SHL_BRUSHITEM SHL_SHL1 -#endif - -class Window; -class SfxItemSet; - -typedef void* (*CreateSvxBrushTabPage)(Window *pParent, const SfxItemSet &rAttrSet); -typedef USHORT* (*GetSvxBrushTabPageRanges)(); - -class Graphic; -class String; -class SfxBrushItemLink -{ -public: - virtual Graphic GetGraphic( const String& rLink, const String& rFilter) = 0; - virtual CreateSvxBrushTabPage GetBackgroundTabpageCreateFunc() = 0; - virtual GetSvxBrushTabPageRanges GetBackgroundTabpageRanges() = 0; - static SfxBrushItemLink* Get() { return *(SfxBrushItemLink**)GetAppData(SHL_BRUSHITEM); } - static void Set( SfxBrushItemLink* pLink ); -}; -#endif // _SFX_BRUSHITEMLINK_DECLARED - -#endif // _WALLITEM_HXX - diff --git a/svtools/source/config/apearcfg.cxx b/svtools/source/config/apearcfg.cxx index 0d4865ee563e..e8024598563c 100644 --- a/svtools/source/config/apearcfg.cxx +++ b/svtools/source/config/apearcfg.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#include "apearcfg.hxx" +#include #include "com/sun/star/uno/Any.hxx" #include "tools/debug.hxx" diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx index 89bf41ac9f58..184dc8a70b3e 100644 --- a/svtools/source/config/extcolorcfg.cxx +++ b/svtools/source/config/extcolorcfg.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#include "extcolorcfg.hxx" +#include #include #include #include diff --git a/svtools/source/config/fontsubstconfig.cxx b/svtools/source/config/fontsubstconfig.cxx index dc9bfa64e6d4..1feb1dafc44f 100644 --- a/svtools/source/config/fontsubstconfig.cxx +++ b/svtools/source/config/fontsubstconfig.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#include "fontsubstconfig.hxx" +#include #include #include #include diff --git a/svtools/source/config/itemholder2.cxx b/svtools/source/config/itemholder2.cxx index 759fabbee686..4c399b51e530 100644 --- a/svtools/source/config/itemholder2.cxx +++ b/svtools/source/config/itemholder2.cxx @@ -39,10 +39,10 @@ #include #include -#include +#include #include #include -#include +#include #include #include #include diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx index af6861a5104f..d489a820a292 100644 --- a/svtools/source/config/miscopt.cxx +++ b/svtools/source/config/miscopt.cxx @@ -48,7 +48,7 @@ #include #include "itemholder2.hxx" -#include +#include #include //_________________________________________________________________________________________________________________ diff --git a/svtools/source/contnr/cont_pch.cxx b/svtools/source/contnr/cont_pch.cxx deleted file mode 100644 index fb711ff12e7d..000000000000 --- a/svtools/source/contnr/cont_pch.cxx +++ /dev/null @@ -1,44 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: cont_pch.cxx,v $ - * $Revision: 1.5 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" - -#include -#include -#include -#include -#include -#include "svimpbox.hxx" -#include "svimpicn.hxx" -#include -#include - - diff --git a/svtools/source/contnr/contentenumeration.cxx b/svtools/source/contnr/contentenumeration.cxx index a0e6b353dfb6..7f6b82a41812 100644 --- a/svtools/source/contnr/contentenumeration.cxx +++ b/svtools/source/contnr/contentenumeration.cxx @@ -33,7 +33,7 @@ #include "contentenumeration.hxx" #include #include -#include "imagemgr.hxx" +#include /** === begin UNO includes === **/ #include diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 7fddf18ee266..89cc14f4506c 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -31,12 +31,11 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#include "fileview.hxx" +#include #include -#include "imagemgr.hxx" +#include #include #include - #include #include "fileview.hrc" #include "contentenumeration.hxx" @@ -57,7 +56,6 @@ #include #include #include - #include #include #include @@ -67,9 +65,7 @@ #include #include #include -#ifndef INCLUDED_RTL_MATH_H #include -#endif #include #include #include diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx index d443beb7fff9..653b6e97b513 100644 --- a/svtools/source/contnr/imivctl.hxx +++ b/svtools/source/contnr/imivctl.hxx @@ -44,7 +44,7 @@ #include -#include "ivctrl.hxx" +#include #include class IcnCursor_Impl; diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index 954c8a7ca179..bdd41c1687ca 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -43,7 +43,7 @@ #include #include -#include "ivctrl.hxx" +#include #include "imivctl.hxx" #include diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx index 916738af70ae..73cd8bb2962a 100644 --- a/svtools/source/contnr/ivctrl.cxx +++ b/svtools/source/contnr/ivctrl.cxx @@ -31,10 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#ifndef GCC -#endif - -#include "ivctrl.hxx" +#include #include "imivctl.hxx" #include #include diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx index f2674279f4df..52d775f23310 100644 --- a/svtools/source/contnr/svimpbox.cxx +++ b/svtools/source/contnr/svimpbox.cxx @@ -32,15 +32,10 @@ #include "precompiled_svtools.hxx" #include #include - -#ifndef _HELP_HXX #include -#endif -#include +#include -#ifndef _STACK_ #include -#endif #define _SVTREEBX_CXX #include @@ -48,10 +43,7 @@ #include #include #include - -#ifndef _SVTOOLS_HRC #include -#endif // #102891# -------------------- #ifndef _UNOTOOLS_PROCESSFACTORY_HXX diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx index 06de35ba19aa..4634d9130b3f 100644 --- a/svtools/source/contnr/templwin.cxx +++ b/svtools/source/contnr/templwin.cxx @@ -31,31 +31,24 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" #include "templwin.hxx" -#include "templdlg.hxx" +#include #include #include #include #include #include #include -#include "imagemgr.hxx" +#include #include -#include "templatefoldercache.hxx" -#include "imgdef.hxx" -#include "txtattr.hxx" -#ifndef _SVTOOLS_HRC +#include +#include +#include #include -#endif -#ifndef _SVTOOLS_TEMPLWIN_HRC #include "templwin.hrc" -#endif -#ifndef _SVT_HELPID_HRC #include -#endif #include #include #include - #include "unotools/configmgr.hxx" #include #include @@ -90,7 +83,7 @@ #include #include #include -#include "DocumentInfoPreview.hxx" +#include #include #include diff --git a/svtools/source/contnr/templwin.hxx b/svtools/source/contnr/templwin.hxx index 050ba7ab6739..3f38b814cba5 100644 --- a/svtools/source/contnr/templwin.hxx +++ b/svtools/source/contnr/templwin.hxx @@ -35,8 +35,8 @@ #include #include #include -#include "fileview.hxx" -#include "ivctrl.hxx" +#include +#include #include #include #include diff --git a/svtools/source/contnr/templwin.src b/svtools/source/contnr/templwin.src index f7f42b7e176b..bfb39fa2f2ef 100644 --- a/svtools/source/contnr/templwin.src +++ b/svtools/source/contnr/templwin.src @@ -31,7 +31,7 @@ // includes ------------------------------------------------------------------ #include "templwin.hrc" -#include "controldims.hrc" +#include #include #include diff --git a/svtools/source/contnr/tooltiplbox.cxx b/svtools/source/contnr/tooltiplbox.cxx index f33b7e4c24ea..067c63acdea3 100644 --- a/svtools/source/contnr/tooltiplbox.cxx +++ b/svtools/source/contnr/tooltiplbox.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#include "tooltiplbox.hxx" +#include #include // ============================================================================ diff --git a/svtools/source/control/asynclink.cxx b/svtools/source/control/asynclink.cxx index 1e47c71de5d4..4296920d5c02 100644 --- a/svtools/source/control/asynclink.cxx +++ b/svtools/source/control/asynclink.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#include +#include #include #include #include diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx index 481f6f2ceeae..99b4a453cb54 100644 --- a/svtools/source/control/calendar.cxx +++ b/svtools/source/control/calendar.cxx @@ -31,30 +31,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#ifndef _APP_HXX #include -#endif -#ifndef _TABLE_HXX #include -#endif -#ifndef _HELP_HXX #include -#endif -#ifndef _MENU_HXX #include -#endif -#ifndef _DECOVIEW_HXX #include -#endif -#ifndef _FLOATWIN_HXX #include -#endif -#ifndef _BUTTON_HXX #include -#endif -#ifndef _FIXED_HXX #include -#endif #include #include #include @@ -64,7 +48,7 @@ #define _SV_CALENDAR_CXX #include #include -#include +#include // ======================================================================= diff --git a/svtools/source/control/collatorres.cxx b/svtools/source/control/collatorres.cxx index c976d7442bc0..be8615ec7995 100644 --- a/svtools/source/control/collatorres.cxx +++ b/svtools/source/control/collatorres.cxx @@ -33,9 +33,7 @@ #include "precompiled_svtools.hxx" #include #include - - -#include +#include // ------------------------------------------------------------------------- // diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index b0d20bf7ce30..ef1a8289980a 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -33,19 +33,15 @@ #define _CTRLBOX_CXX #include -#ifndef _APP_HXX #include -#endif -#ifndef _FIELD_HXX #include -#endif #include #include #include #include -#include -#include +#include +#include #include diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx index 1573ed531662..3c3bee6e240e 100644 --- a/svtools/source/control/ctrltool.cxx +++ b/svtools/source/control/ctrltool.cxx @@ -35,19 +35,14 @@ #include -#ifndef TOOLS_DEBUG_HXX #include -#endif #include -#ifndef _VCL_WINDOW_HXX #include -#endif #include #include - #include #include -#include +#include // ======================================================================= diff --git a/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx index d820dce097ed..0f58f4ae595a 100644 --- a/svtools/source/control/filectrl.cxx +++ b/svtools/source/control/filectrl.cxx @@ -34,13 +34,8 @@ #define _SV_FIELCTRL_CXX #include #include -#include -#ifndef _SV_FILECTRL_HRC +#include #include -#endif - -#ifndef GCC -#endif // ======================================================================= diff --git a/svtools/source/control/filectrl2.cxx b/svtools/source/control/filectrl2.cxx index 0ea28fbf96bd..22ad930215c1 100644 --- a/svtools/source/control/filectrl2.cxx +++ b/svtools/source/control/filectrl2.cxx @@ -32,7 +32,7 @@ #include "precompiled_svtools.hxx" // this file contains code from filectrl.cxx which needs to be compiled with enabled exception hanling -#include +#include #include #include #include diff --git a/svtools/source/control/indexentryres.cxx b/svtools/source/control/indexentryres.cxx index f69e9b34e5ea..820eca0f8c85 100644 --- a/svtools/source/control/indexentryres.cxx +++ b/svtools/source/control/indexentryres.cxx @@ -33,9 +33,7 @@ #include "precompiled_svtools.hxx" #include #include - - -#include +#include // ------------------------------------------------------------------------- // diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index b4904afee418..11d6fefe5f6a 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -36,7 +36,6 @@ #include #endif - #include #include #include @@ -44,27 +43,16 @@ #include #include #include - -#ifndef _COM_SUN_STAR_TASK_XINTERACTIONHANDLER_HDL_ #include -#endif #include #include #include #include #include - -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include -#endif - #include -#ifndef _VOS_THREAD_HXX //autogen #include -#endif -#ifndef _VOS_MUTEX_HXX //autogen #include -#endif #include #include #include @@ -80,9 +68,8 @@ #include #include #include - #include "iodlg.hrc" -#include +#include #include #include diff --git a/svtools/source/control/prgsbar.cxx b/svtools/source/control/prgsbar.cxx index b6702e93af4d..164744f2b7d3 100644 --- a/svtools/source/control/prgsbar.cxx +++ b/svtools/source/control/prgsbar.cxx @@ -33,13 +33,9 @@ #define _SV_PRGSBAR_CXX -#ifndef _TOOLS_DEBUGS_HXX #include -#endif -#ifndef _VCL_STATUS_HXX #include -#endif -#include +#include // ======================================================================= diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx index 693bca733813..f2bcdcb4603d 100644 --- a/svtools/source/control/roadmap.cxx +++ b/svtools/source/control/roadmap.cxx @@ -30,23 +30,16 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#include +#include #ifndef _STRING_HXX #define _STRING_HXX #endif -#ifndef __SGI_STL_VECTOR #include -#endif - #include #include #include - -#ifndef _RTL_USTRING_HXX_ -#include -#endif #include #define ROADMAP_INDENT_X 4 diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index c3f10f1866aa..489e43732489 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -35,11 +35,10 @@ #include #include #include - #include #define _SV_RULER_CXX -#include +#include // ======================================================================= diff --git a/svtools/source/control/scriptedtext.cxx b/svtools/source/control/scriptedtext.cxx index 04f3d55c35b0..540c18a16702 100644 --- a/svtools/source/control/scriptedtext.cxx +++ b/svtools/source/control/scriptedtext.cxx @@ -30,11 +30,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#include "scriptedtext.hxx" - -#ifndef __SGI_STL_VECTOR +#include #include -#endif #include #include #include diff --git a/svtools/source/control/scrwin.cxx b/svtools/source/control/scrwin.cxx index 162f23948385..18387bda989c 100644 --- a/svtools/source/control/scrwin.cxx +++ b/svtools/source/control/scrwin.cxx @@ -32,7 +32,7 @@ #include "precompiled_svtools.hxx" #define _SVT_SCRWIN_CXX -#include +#include //=================================================================== diff --git a/svtools/source/control/stdmenu.cxx b/svtools/source/control/stdmenu.cxx index 35250753de1e..f60370428e2e 100644 --- a/svtools/source/control/stdmenu.cxx +++ b/svtools/source/control/stdmenu.cxx @@ -32,15 +32,10 @@ #include "precompiled_svtools.hxx" #include - -#ifndef _APP_HXX #include -#endif - #include - -#include -#include +#include +#include // ======================================================================== diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index ed1abbe53a2a..6259433951f4 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#include "tabbar.hxx" +#include #include #include #include diff --git a/svtools/source/control/taskbar.cxx b/svtools/source/control/taskbar.cxx index 146fa4933af3..45b6c36cf3a0 100644 --- a/svtools/source/control/taskbar.cxx +++ b/svtools/source/control/taskbar.cxx @@ -33,16 +33,11 @@ #define _TASKBAR_CXX -#ifndef _TOOLS_LIST_HXX #include -#endif #include - -#ifndef _VCL_FLOATWIN_HXX #include -#endif -#include +#include // ======================================================================= diff --git a/svtools/source/control/taskbox.cxx b/svtools/source/control/taskbox.cxx index 72a7345f1660..4633e509f40c 100644 --- a/svtools/source/control/taskbox.cxx +++ b/svtools/source/control/taskbox.cxx @@ -33,14 +33,11 @@ #define _TASKBAR_CXX -#ifndef _TOOLS_LIST_HXX #include -#endif #include #include #include - -#include +#include // ======================================================================= diff --git a/svtools/source/control/taskmisc.cxx b/svtools/source/control/taskmisc.cxx index bada5926d639..c86702ed5554 100644 --- a/svtools/source/control/taskmisc.cxx +++ b/svtools/source/control/taskmisc.cxx @@ -33,13 +33,10 @@ #define _TASKBAR_CXX -#ifndef _TOOLS_LIST_HXX #include -#endif #include #include - -#include +#include // ======================================================================= diff --git a/svtools/source/control/taskstat.cxx b/svtools/source/control/taskstat.cxx index 82165a711285..6ec8680c6bfe 100644 --- a/svtools/source/control/taskstat.cxx +++ b/svtools/source/control/taskstat.cxx @@ -33,18 +33,15 @@ #define _TASKBAR_CXX -#ifndef _TOOLS_LIST_HXX #include -#endif #include #include #include #include #include #include - #include -#include +#include // ======================================================================= diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index aa18a3683916..09e9e9bb0ab0 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -32,18 +32,10 @@ #include "precompiled_svtools.hxx" #include - - -#include "addresstemplate.hxx" -#ifndef _SVT_ADDRESSTEMPLATE_HRC_ +#include #include "addresstemplate.hrc" -#endif -#ifndef _SVTOOLS_HRC #include -#endif -#ifndef _SVT_HELPID_HRC #include -#endif #include #include #include @@ -52,9 +44,7 @@ #include #include #include -#ifndef _CPPUHELPER_EXTRACT_HXX_ #include -#endif #include #include #include @@ -68,12 +58,9 @@ #include #include #include -#include "localresaccess.hxx" -#ifndef SVTOOLS_FILENOTATION_HXX_ +#include #include "svl/filenotation.hxx" -#endif #include - #include // ....................................................................... diff --git a/svtools/source/dialogs/addresstemplate.src b/svtools/source/dialogs/addresstemplate.src index 63c0e6475597..56e5fcef3d40 100644 --- a/svtools/source/dialogs/addresstemplate.src +++ b/svtools/source/dialogs/addresstemplate.src @@ -28,15 +28,9 @@ * ************************************************************************/ -#ifndef _SVTOOLS_HRC #include -#endif -#ifndef _SVT_ADDRESSTEMPLATE_HRC_ #include "addresstemplate.hrc" -#endif -#ifndef _SVT_CONTROLDIMS_HRC_ -#include "controldims.hrc" -#endif +#include #define FIELD_ROW_HEIGHT 17 diff --git a/svtools/source/dialogs/filedlg.cxx b/svtools/source/dialogs/filedlg.cxx index b543aa895a8e..f8d686022393 100644 --- a/svtools/source/dialogs/filedlg.cxx +++ b/svtools/source/dialogs/filedlg.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#include +#include #include PathDialog::PathDialog( Window* _pParent, WinBits nStyle, BOOL bCreateDir ) : diff --git a/svtools/source/dialogs/filedlg2.cxx b/svtools/source/dialogs/filedlg2.cxx index 5a03ab3885b5..bd1f82223719 100644 --- a/svtools/source/dialogs/filedlg2.cxx +++ b/svtools/source/dialogs/filedlg2.cxx @@ -31,17 +31,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" #include -#ifndef _SV_BUTTON_HXX //autogen #include -#endif #include #include #include #include - #include -#include -#include +#include +#include #include #include #include diff --git a/svtools/source/dialogs/filedlg2.src b/svtools/source/dialogs/filedlg2.src index ecbabc79941b..dd73536dfc83 100644 --- a/svtools/source/dialogs/filedlg2.src +++ b/svtools/source/dialogs/filedlg2.src @@ -28,7 +28,8 @@ * ************************************************************************/ -#include +#include + String STR_FILEDLG_SELECT { Text [ en-US ] = "Select Directory" ; diff --git a/svtools/source/dialogs/formats.src b/svtools/source/dialogs/formats.src index a3a738a705fb..7117229e77e4 100644 --- a/svtools/source/dialogs/formats.src +++ b/svtools/source/dialogs/formats.src @@ -28,7 +28,7 @@ * ************************************************************************/ -#include "sores.hxx" +#include String STR_FORMAT_STRING { diff --git a/svtools/source/dialogs/insdlg.cxx b/svtools/source/dialogs/insdlg.cxx index a1bbbd9b9edb..757c04a59f60 100644 --- a/svtools/source/dialogs/insdlg.cxx +++ b/svtools/source/dialogs/insdlg.cxx @@ -36,7 +36,7 @@ // include --------------------------------------------------------------- #include -#include "sores.hxx" +#include #include #include diff --git a/svtools/source/dialogs/logindlg.cxx b/svtools/source/dialogs/logindlg.cxx index 791e373086af..a0f56da986f2 100644 --- a/svtools/source/dialogs/logindlg.cxx +++ b/svtools/source/dialogs/logindlg.cxx @@ -30,16 +30,11 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#include +#include #include #include - -#ifndef _SVTOOLS_LOGINDLG_HRC_ #include "logindlg.hrc" -#endif -#ifndef _SVTOOLS_HRC #include -#endif #include #ifdef UNX diff --git a/svtools/source/dialogs/printdlg.cxx b/svtools/source/dialogs/printdlg.cxx index a006f209af18..a58b98daec6c 100644 --- a/svtools/source/dialogs/printdlg.cxx +++ b/svtools/source/dialogs/printdlg.cxx @@ -31,26 +31,19 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" #include -#ifndef _SV_APP_HXX #include -#endif -#ifndef _VCL_PRINT_HXX #include -#endif #include #include #include - #include "printdlg.hrc" -#include "controldims.hrc" +#include #include #include #include -#include +#include #include "svl/pickerhelper.hxx" -#ifndef _SVT_HELPID_HRC #include -#endif #include #include #include diff --git a/svtools/source/dialogs/propctrl.cxx b/svtools/source/dialogs/propctrl.cxx deleted file mode 100644 index 40fd55fb1586..000000000000 --- a/svtools/source/dialogs/propctrl.cxx +++ /dev/null @@ -1,506 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: propctrl.cxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" - - -#ifndef _USR_INTROSP_HXX -#include -#endif -#ifndef _USR_SERINFO_HXX -#include -#endif -#ifndef _USR_INTROSP_HXX -#include -#endif - -#include -#include - - -// Controller-Implementation -class PropertyEditorControler_Impl : public SvPropertyDataControl -{ - XIntrospectionAccessRef mxUnoAccess; - PropertySequence mPropSeq; - XPropertyEditorRef mxEditor; - SvPropertyBox* mpPropBox; - UsrAny maUnoObj; - -public: - // Provisorisch direkt Window mitgeben - PropertyEditorControler_Impl( SvPropertyBox* pPropBox_ ); - //SimplePropertyEditor_Impl( void ); - - // Objekt zum Editieren setzen, dies loest das Eintragen - // der Properties in die PropertyBox aus - void setObject( XPropertyEditorRef xEditor_, const UsrAny& aToEditObj, - /* HACK fuer History-Interface*/String aPath, BOOL bBack=FALSE, BOOL bForward=FALSE ); - - /* SPAETER - SMART_UNO_DECLARATION(ImplIntrospection,UsrObject); - - // Methoden von XInterface - XInterface * queryInterface( Uik aUik ); - XIdlClassRef getIdlClass(); - */ - - // Methoden von SvPropertyDataControl - virtual void Modified( const String& aName, - const String& aVal, - void* pData); - - virtual void Clicked( const String& aName, - const String& aVal, - void* pData); - - virtual void Commit( const String& aName, - const String& aVal, - void* pData); - - virtual void Select( const String& aName, - void* pData); - - virtual void LinkClicked(const String& aName, - void* pData); - - // TODO: Das muss raus, sehr unglueckliche Schnittstelle - // PropertyBox erzwingt Zustand des Controllers - virtual String GetTheCorrectProperty() const; -}; - -// Methoden von XPropertyEditor -PropertyEditorControler_Impl::PropertyEditorControler_Impl( SvPropertyBox* pPropBox_ ) -{ - mpPropBox = pPropBox_; -} - -void PropertyEditorControler_Impl::setObject( XPropertyEditorRef xEditor_, const UsrAny& aToEditObj, - /* HACK fuer History-Interface*/ String aPath, BOOL bBack, BOOL bForward ) -{ - static XIntrospectionRef xIntrospection; - - // Ohne Fenster laeuft gar nix - if( !mpPropBox ) - return; - - // Fenster aufraeumen - mpPropBox->ClearAll(); - - // Editor und Objekt übernehmen - mxEditor = xEditor_; - maUnoObj = aToEditObj; - - if( !xIntrospection.is() ) - { - // Introspection-Service holen - XServiceManagerRef xServiceManager = getGlobalServiceManager(); - XServiceProviderRef xProv = xServiceManager->getServiceProvider - ( "com.sun.star.beans.Introspection", UikSequence(), UikSequence() ); - xIntrospection = (XIntrospection *)xProv->newInstance() - ->queryInterface( XIntrospection::getSmartUik() ); - } - if( !xIntrospection.is() ) - return; - - // und unspecten - mxUnoAccess = xIntrospection->inspect( maUnoObj ); - if( !mxUnoAccess.Is() ) - return; - - // Uns als Controler anmelden - mpPropBox->SetController( this ); - - // Properties anlegen - mPropSeq = mxUnoAccess->getProperties(); - UINT32 nPropCount = mPropSeq.getLen(); - const Property* pProps = mPropSeq.getConstArray(); - - // 1. Seite anlegen - USHORT nPropPageId = mpPropBox->AppendPage("Properties"); - - // Beim Eintragen solls nicht flimmern - mpPropBox->DisableUpdate(); - - // Dummy-Properties fuer Path und Navigation - SvPropertyData aProperty; - if( aPath.Len() ) - { - // Interface und Structs werden Hyperlinks - aProperty.bIsHyperLink = FALSE; - aProperty.bIsLocked = TRUE; - aProperty.bHasVisibleXButton = FALSE; - aProperty.eKind = KOC_EDIT; - aProperty.pControl = NULL; - aProperty.pDataPtr = NULL; - aProperty.aName = "Path"; - aProperty.aValue = aPath; - mpPropBox->InsertEntry( aProperty ); - } - if( bBack || bForward ) - { - // Interface und Structs werden Hyperlinks - aProperty.bIsHyperLink = TRUE; - aProperty.bIsLocked = TRUE; - // HACK, solange Hyperlink nicht funktioniert - aProperty.bHasVisibleXButton = aProperty.bIsHyperLink; - aProperty.eKind = KOC_EDIT; - UINT32 iHandle; - aProperty.pControl = NULL; - if( bBack ) - { - iHandle = 1000001; - aProperty.pDataPtr = (void*)iHandle; - aProperty.aName = "<-"; - aProperty.aValue = "Back"; - mpPropBox->InsertEntry( aProperty ); - } - if( bForward ) - { - iHandle = 1000000; - aProperty.pDataPtr = (void*)iHandle; - aProperty.aName = "->"; - aProperty.aValue = "Forward"; - mpPropBox->InsertEntry( aProperty ); - } - } - - // Properties eintragen - // TODO: Wo kommen die Strings her - UINT32 i; - for( i = 0 ; i < nPropCount ; i++ ) - { - const Property& rProp = pProps[ i ]; - - // TypeClass des Property ermitteln - XIdlClassRef xPropClass = rProp.Type; - if( !xPropClass.is() ) - { - DBG_ERROR( "PropertyEditorControler_Impl::Commit(), Property without type" ) - return; - } - TypeClass eType = xPropClass->getTypeClass(); - - // Interface und Structs werden Hyperlinks - aProperty.bIsHyperLink = ( eType == TYPECLASS_INTERFACE || eType == TYPECLASS_STRUCT ); - aProperty.bIsLocked = ((rProp.Attributes & PROPERTY_READONLY) != 0 ); - - // HACK, solange Hyperlink nicht funktioniert - aProperty.bHasVisibleXButton = aProperty.bIsHyperLink; - - // Wert holen und in String wandeln - UsrAny aVal = mxUnoAccess->getPropertyValueByIndex( maUnoObj, i ); - String aStrVal = AnyToString( aVal ); - - // Properties reinbraten - aProperty.eKind = KOC_EDIT; - aProperty.aName = rProp.Name; - aProperty.aValue = aStrVal; - aProperty.pDataPtr = (void*)i; - aProperty.pControl = NULL; - //aProperty.theValues.Insert(new String("1"),aProperty.theValues.Count()); - //aProperty.theValues.Insert(new String("2"),aProperty.theValues.Count()); - //aProperty.theValues.Insert(new String("3"),aProperty.theValues.Count()); - //aProperty.theValues.Insert(new String("4"),aProperty.theValues.Count()); - mpPropBox->InsertEntry( aProperty ); - } - - // 2. Seite fuer Listener - // TODO: Wo kommen die Eintraege her - USHORT nListenerPageId = mpPropBox->AppendPage("Listener"); - - XIdlClassSequence aSupportedListenerSeq = mxUnoAccess->getSupportedListeners(); - const XIdlClassRef* pListenerArray = aSupportedListenerSeq.getConstArray(); - UINT32 nIfaceCount = aSupportedListenerSeq.getLen(); - - // Property-Data vorfuellen - aProperty.eKind = KOC_EDIT; - //aProperty.eKind = KOC_UNDEFINED; - aProperty.aValue = "Listener-Value"; - aProperty.bHasVisibleXButton = TRUE; - // TEST - //aProperty.bIsHyperLink = TRUE; - aProperty.bIsHyperLink = FALSE; - aProperty.bIsLocked = TRUE; - //aProperty.bIsLocked = FALSE; - aProperty.pDataPtr = NULL; - aProperty.pControl = NULL; - - for( UINT32 j = 0 ; j < nIfaceCount ; j++ ) - { - const XIdlClassRef& rxIfaceClass = pListenerArray[j]; - aProperty.aName = rxIfaceClass->getName(); - mpPropBox->InsertEntry( aProperty ); - } - mpPropBox->EnableUpdate(); - mpPropBox->SetPage( nPropPageId ); -} - -void PropertyEditorControler_Impl::Modified -( const String& aName, const String& aVal, void* pData) -{ -} - -void PropertyEditorControler_Impl::Clicked -( const String& aName, const String& aVal, void* pData) -{ - // HACK, solange LinkClicked nicht funktioniert - UINT32 iPos = (UINT32)pData; - UINT32 nPropCount = mPropSeq.getLen(); - if( iPos >= nPropCount ) - { - // Spezial-IDs fuer forward/back? - BOOL bForward = (iPos == 1000000); - BOOL bBack = (iPos == 1000001); - if( bForward || bBack ) - { - // Unterstuetzt der PropertyEditor das? - XPropertyEditorNavigationRef xPropEdNav = (XPropertyEditorNavigation*) - mxEditor->queryInterface( XPropertyEditorNavigation::getSmartUik() ); - if( xPropEdNav.is() ) - { - if( bForward ) - xPropEdNav->forward(); - else - xPropEdNav->back(); - } - } - return; - } - - const Property* pProps = mPropSeq.getConstArray(); - const Property& rProp = pProps[ iPos ]; - XIdlClassRef xPropClass = rProp.Type; - if( !xPropClass.is() ) - { - DBG_ERROR( "PropertyEditorControler_Impl::Commit(), Property without type" ) - return; - } - TypeClass eType = xPropClass->getTypeClass(); - if( eType == TYPECLASS_INTERFACE || eType == TYPECLASS_STRUCT ) - LinkClicked( aName, pData ); -} - -void PropertyEditorControler_Impl::Commit -( const String& aName, const String& aVal, void* pData) -{ - UINT32 iPos = (UINT32)pData; - UINT32 nPropCount = mPropSeq.getLen(); - if( iPos >= nPropCount ) - return; - - // String in Property-Typ wandeln - const Property* pProps = mPropSeq.getConstArray(); - const Property& rProp = pProps[ iPos ]; - XIdlClassRef xPropClass = rProp.Type; - if( !xPropClass.is() ) - { - DBG_ERROR( "PropertyEditorControler_Impl::Commit(), Property without type" ) - return; - } - TypeClass eType = xPropClass->getTypeClass(); - UsrAny aValue = StringToAny( aVal, eType ); - - // Wert setzen - mxUnoAccess->setPropertyValueByIndex( maUnoObj, iPos, aValue ); - - // Wert neu holen und ggf. neu setzen - UsrAny aNewVal = mxUnoAccess->getPropertyValueByIndex( maUnoObj, iPos ); - String aNewStrVal = AnyToString( aNewVal ); - if( aNewStrVal != aVal ) - mpPropBox->SetPropertyValue( aName, aNewStrVal ); -} - -void PropertyEditorControler_Impl::Select -( const String& aName, void* pData) -{ -} - -void PropertyEditorControler_Impl::LinkClicked(const String& aName, void* pData) -{ - UINT32 iPos = (UINT32)pData; - UINT32 nPropCount = mPropSeq.getLen(); - if( iPos >= nPropCount ) - return; - - // Wert holen und an Master-Controller zurueckgeben - UsrAny aNewObj = mxUnoAccess->getPropertyValueByIndex( maUnoObj, iPos ); - mxEditor->setObject( aNewObj, aName ); -} - - -// TODO: Das muss raus, sehr unglueckliche Schnittstelle -// PropertyBox erzwingt Zustand des Controllers -String PropertyEditorControler_Impl::GetTheCorrectProperty() const -{ - return String(); -} - - -SMART_UNO_IMPLEMENTATION(SimplePropertyEditor_Impl,UsrObject); - -// Methoden von XInterface -XInterface * SimplePropertyEditor_Impl::queryInterface( Uik aUik ) -{ - if( aUik == XPropertyEditor::getSmartUik() ) - return (XPropertyEditor *)this; - if( aUik == XPropertyEditorNavigation::getSmartUik() ) - return (XPropertyEditorNavigation *)this; - return UsrObject::queryInterface( aUik ); -} - -XIdlClassRef SimplePropertyEditor_Impl::getIdlClass() -{ - // TODO: Unterstuetzen - return NULL; -} - - -// Methoden von SimplePropertyEditor_Impl -SimplePropertyEditor_Impl::SimplePropertyEditor_Impl( Window *pParent ) - : maHistorySeq( 10 ), maHistoryNames( 10 ), bSimpleHistory( FALSE ) -{ - //XVCLComponent xC = pParent->getVCLComponent - //xC->addVCLComponentListener( MyListener ) - - pActiveControler = NULL; - mpPropBox = new SvPropertyBox( pParent ); - mpPropBox->Show(); - - long cxOut = pParent->GetOutputSizePixel().Width(); - long cyOut = pParent->GetOutputSizePixel().Height(); - Size aSize( cxOut, cyOut ); - mpPropBox->SetPosSizePixel( Point( 0, 0 ), aSize ); - - mnHistoryCount = 0; - mnActualHistoryLevel = -1; -} - -SimplePropertyEditor_Impl::~SimplePropertyEditor_Impl() -{ - delete mpPropBox; - if( pActiveControler ) - delete pActiveControler; -} - -// Private Methode zum Anlegen/Aktivieren der Controller -void SimplePropertyEditor_Impl::showObject( const UsrAny& aToShowObj ) -{ - if( pActiveControler ) - delete pActiveControler; - - // Neuen Controller auf der Wiese anlegen (TODO: Controller cachen?) - pActiveControler = new PropertyEditorControler_Impl( mpPropBox ); - - XPropertyEditorRef xThis = (XPropertyEditor *)this; - pActiveControler->setObject( xThis, aToShowObj, - /*aPath*/bSimpleHistory ? getPath() : String(), - /*bBack*/bSimpleHistory && mnActualHistoryLevel > 0, - /*bForward*/bSimpleHistory && (INT32)mnHistoryCount > mnActualHistoryLevel ); -} - -String SimplePropertyEditor_Impl::getPath( void ) -{ - String aRetStr; - const String* pStr = maHistoryNames.getConstArray(); - for( INT32 i = 0 ; i <= mnActualHistoryLevel ; i++ ) - { - String aName = pStr[i]; - - // Root speziell behandeln - if( i == 0 ) - { - aRetStr += aName; - } - else - { - // Ist es ein Index? - long l = (long)aName; - String aNumStr( l ); - if( aNumStr == aName ) - { - aRetStr += '['; - aRetStr += aName; - aRetStr += ']'; - } - else - { - aRetStr += '.'; - aRetStr += aName; - } - } - } - return aRetStr; -} - -// Methoden von XPropertyEditor -void SimplePropertyEditor_Impl::setObject( const UsrAny& aToEditObj, const XubString& aObjName ) -{ - // History pflegen - mnActualHistoryLevel++; - mnHistoryCount = (UINT32)mnActualHistoryLevel; - UINT32 iHistorySize = maHistorySeq.getLen(); - if( mnHistoryCount > iHistorySize ) - { - maHistorySeq.realloc( iHistorySize + 10 ); - maHistoryNames.realloc( iHistorySize + 10 ); - } - - // Neues Object eintragen - maHistorySeq.getArray()[ mnHistoryCount ] = aToEditObj; - maHistoryNames.getArray()[ mnHistoryCount ] = aObjName; - - // Object anzeigen - showObject( aToEditObj ); -} - -// Methoden von PropertyEditorNavigation -void SimplePropertyEditor_Impl::forward(void) -{ - if( (INT32)mnHistoryCount > mnActualHistoryLevel ) - { - // Naechstes Object darstellen - mnActualHistoryLevel++; - showObject( maHistorySeq.getConstArray()[mnActualHistoryLevel] ); - } -} - -void SimplePropertyEditor_Impl::back(void) -{ - if( mnActualHistoryLevel > 0 ) - { - // Voriges Object darstellen - mnActualHistoryLevel--; - showObject( maHistorySeq.getConstArray()[mnActualHistoryLevel] ); - } -} - - diff --git a/svtools/source/dialogs/propctrl.hxx b/svtools/source/dialogs/propctrl.hxx deleted file mode 100644 index 59019fc21b90..000000000000 --- a/svtools/source/dialogs/propctrl.hxx +++ /dev/null @@ -1,118 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: propctrl.hxx,v $ - * $Revision: 1.5 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -/* -#include -#include -#include "sbx.hxx" -#include "sbxbase.hxx" -#include "sbxres.hxx" -#include - */ - - -#ifndef __PROPED_HXX__ -#include -#endif -#ifndef _UNO_HXX -#include -#endif -#ifndef _USR_SEQU_HXX -#include -#endif -#ifndef __TOOLSIDL_HXX__ -#include -#endif - -/* -class XPropertyEditor - : public XInterface -{ -public: - - virtual void setObject(const UsrAny& aToInspectObj) = 0; - - static Uik getSmartUik() { return(385); } -}; -*/ - -class PropertyEditorControler_Impl; -class SvPropertyBox; -class Window; - -class SimplePropertyEditor_Impl : - public XPropertyEditor, - public XPropertyEditorNavigation, - public UsrObject -{ - PropertyEditorControler_Impl* pActiveControler; - SvPropertyBox* mpPropBox; - UsrAny maStartUnoObj; - UsrAny maActiveUnoObj; - - // History der Objekte speichern - AnySequence maHistorySeq; - WSStringSequence maHistoryNames; - UINT32 mnHistoryCount; - INT32 mnActualHistoryLevel; - - // Einfache History via Dummy-Properties - BOOL bSimpleHistory; - - // Methode zum Anlegen/Aktivieren der Controller - void showObject( const UsrAny& aToShowObj ); - String getPath( void ); - -public: - // Provisorischer Ctor mit Parent-Window - SimplePropertyEditor_Impl( Window *pParent ); - ~SimplePropertyEditor_Impl(); - - // HACK fuer History-Test - void enableSimpleHistory( BOOL bHistory_ ) { bSimpleHistory = bHistory_; } - - SMART_UNO_DECLARATION(ImplIntrospection,UsrObject); - - // Methoden von XInterface - XInterface * queryInterface( Uik aUik ); - XIdlClassRef getIdlClass(); - - // Methoden von XPropertyEditor - virtual void setObject(const UsrAny& aToInspectObj, const XubString& aObjName); - - // Methoden von PropertyEditorNavigation - virtual void forward(void); - virtual void back(void); - -}; - - - - diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx index c7473e446986..746121104a0a 100644 --- a/svtools/source/dialogs/roadmapwizard.cxx +++ b/svtools/source/dialogs/roadmapwizard.cxx @@ -34,7 +34,7 @@ #include #include #include -#include "roadmap.hxx" +#include #include #include diff --git a/svtools/source/dialogs/so3res.src b/svtools/source/dialogs/so3res.src index c99b917d891e..219bb8edd9ae 100644 --- a/svtools/source/dialogs/so3res.src +++ b/svtools/source/dialogs/so3res.src @@ -28,10 +28,11 @@ * ************************************************************************/ -#include "sores.hxx" +#include "svtools/sores.hxx" #define __RSC -#include "soerr.hxx" +#include #define S_MAX 0x7fff + Resource RID_SO_ERROR_HANDLER { String ERRCODE_SO_GENERALERROR&S_MAX diff --git a/svtools/source/edit/editsyntaxhighlighter.cxx b/svtools/source/edit/editsyntaxhighlighter.cxx index 990e3041d903..ea5c31d35a03 100644 --- a/svtools/source/edit/editsyntaxhighlighter.cxx +++ b/svtools/source/edit/editsyntaxhighlighter.cxx @@ -34,7 +34,7 @@ #include #include #include -#include "../../inc/txtattr.hxx" +#include MultiLineEditSyntaxHighlight::MultiLineEditSyntaxHighlight( Window* pParent, WinBits nWinStyle, diff --git a/svtools/source/edit/sychconv.cxx b/svtools/source/edit/sychconv.cxx index 0a394207d051..e68307d01a57 100644 --- a/svtools/source/edit/sychconv.cxx +++ b/svtools/source/edit/sychconv.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#include "sychconv.hxx" +#include #include BOOL SymCharConverter::Convert( Font& rFont, UniString& rString, OutputDevice* pDev ) diff --git a/svtools/source/edit/textdoc.cxx b/svtools/source/edit/textdoc.cxx index 09fd6b36fdb2..cca29b2fe0d0 100644 --- a/svtools/source/edit/textdoc.cxx +++ b/svtools/source/edit/textdoc.cxx @@ -30,7 +30,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" - #include #include diff --git a/svtools/source/edit/textdoc.hxx b/svtools/source/edit/textdoc.hxx index b940bb6f4da7..397394cdf736 100644 --- a/svtools/source/edit/textdoc.hxx +++ b/svtools/source/edit/textdoc.hxx @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include diff --git a/svtools/source/edit/txtattr.cxx b/svtools/source/edit/txtattr.cxx index e860a3a0cfd4..90785a366b62 100644 --- a/svtools/source/edit/txtattr.cxx +++ b/svtools/source/edit/txtattr.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#include +#include #include diff --git a/svtools/source/filter.vcl/filter/filter.cxx b/svtools/source/filter.vcl/filter/filter.cxx index 306307a0bf91..8c184ae10697 100644 --- a/svtools/source/filter.vcl/filter/filter.cxx +++ b/svtools/source/filter.vcl/filter/filter.cxx @@ -98,10 +98,6 @@ #endif -// Compilerfehler, wenn Optimierung bei WNT & MSC -#ifdef _MSC_VER -#pragma optimize( "", off ) -#endif // ----------- // - statics - diff --git a/svtools/source/filter.vcl/filter/gradwrap.cxx b/svtools/source/filter.vcl/filter/gradwrap.cxx deleted file mode 100644 index d13767f494ef..000000000000 --- a/svtools/source/filter.vcl/filter/gradwrap.cxx +++ /dev/null @@ -1,573 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: gradwrap.cxx,v $ - * $Revision: 1.8 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" - -#include -#include -#include -#include - -// ------------------- -// - GradientWrapper - -// ------------------- - -GradientWrapper::GradientWrapper(const Link& rDrawPolyRecordHdl, - const Link& rDrawPolyPolyRecordHdl, - const Link& rSetFillInBrushRecordHdl) : - aDrawPolyRecordHdl (rDrawPolyRecordHdl), - aDrawPolyPolyRecordHdl (rDrawPolyPolyRecordHdl), - aSetFillInBrushRecordHdl(rSetFillInBrushRecordHdl) -{ -} - -// ------------------------------------------------------------------------ - -GradientWrapper::~GradientWrapper() -{ -} - -// ------------------------------------------------------------------------ - -void GradientWrapper::WriteLinearGradient(const Rectangle& rRect, - const Gradient& rGradient) -{ - USHORT nStepCount = 100; - - Rectangle aRect = rRect; - aRect.Left()--; - aRect.Top()--; - aRect.Right()++; - aRect.Bottom()++; - - // rotiertes BoundRect ausrechnen - double fAngle = (rGradient.GetAngle() % 3600) * F_PI1800; - double fWidth = aRect.GetWidth(); - double fHeight = aRect.GetHeight(); - double fDX = fWidth * fabs( cos( fAngle ) ) + - fHeight * fabs( sin( fAngle ) ); - double fDY = fHeight * fabs( cos( fAngle ) ) + - fWidth * fabs( sin( fAngle ) ); - fDX = (fDX - fWidth) * 0.5 + 0.5; - fDY = (fDY - fHeight) * 0.5 + 0.5; - aRect.Left() -= (long)fDX; - aRect.Right() += (long)fDX; - aRect.Top() -= (long)fDY; - aRect.Bottom() += (long)fDY; - - // Rand berechnen und Rechteck neu setzen - Point aCenter = rRect.Center(); - Rectangle aFullRect = aRect; - long nBorder = (long)rGradient.GetBorder() * aRect.GetHeight() / 100; - BOOL bLinear; - - // Rand berechnen und Rechteck neu setzen fuer linearen Farbverlauf - if ( rGradient.GetStyle() == GRADIENT_LINEAR ) - { - bLinear = TRUE; - aRect.Top() += nBorder; - } - // Rand berechnen und Rechteck neu setzen fuer axiale Farbverlauf - else - { - bLinear = FALSE; - nBorder >>= 1; - - aRect.Top() += nBorder; - aRect.Bottom() -= nBorder; - } - - // Top darf nicht groesser als Bottom sein - aRect.Top() = Min( aRect.Top(), (long)(aRect.Bottom() - 1) ); - - long nMinRect = aRect.GetHeight(); - - // Anzahl der Schritte berechnen, falls nichts uebergeben wurde - if ( !nStepCount ) - { - long nInc = ((nMinRect >> 9) + 1) << 3; - - if ( !nInc ) - nInc = 1; - - nStepCount = (USHORT)(nMinRect / nInc); - } - // minimal drei Schritte - long nSteps = Max( nStepCount, (USHORT)3 ); - - // Falls axialer Farbverlauf, muss die Schrittanzahl ungerade sein - if ( !bLinear && !(nSteps & 1) ) - nSteps++; - - // Berechnung ueber Double-Addition wegen Genauigkeit - double fScanLine = aRect.Top(); - double fScanInc = (double)aRect.GetHeight() / (double)nSteps; - - // Intensitaeten von Start- und Endfarbe ggf. aendern und - // Farbschrittweiten berechnen - long nFactor; - const Color& rStartCol = rGradient.GetStartColor(); - const Color& rEndCol = rGradient.GetEndColor(); - long nRed = rStartCol.GetRed(); - long nGreen = rStartCol.GetGreen(); - long nBlue = rStartCol.GetBlue(); - long nEndRed = rEndCol.GetRed(); - long nEndGreen = rEndCol.GetGreen(); - long nEndBlue = rEndCol.GetBlue(); - nFactor = rGradient.GetStartIntensity(); - nRed = (nRed * nFactor) / 100; - nGreen = (nGreen * nFactor) / 100; - nBlue = (nBlue * nFactor) / 100; - nFactor = rGradient.GetEndIntensity(); - nEndRed = (nEndRed * nFactor) / 100; - nEndGreen = (nEndGreen * nFactor) / 100; - nEndBlue = (nEndBlue * nFactor) / 100; - long nStepRed = (nEndRed - nRed) / nSteps; - long nStepGreen = (nEndGreen - nGreen) / nSteps; - long nStepBlue = (nEndBlue - nBlue) / nSteps; - long nSteps2; - - if ( bLinear ) - { - // Um 1 erhoeht, um die Border innerhalb der Schleife - // zeichnen zu koennen - nSteps2 = nSteps + 1; - } - else - { - nStepRed <<= 1; - nStepGreen <<= 1; - nStepBlue <<= 1; - nRed = nEndRed; - nGreen = nEndGreen; - nBlue = nEndBlue; - - // Um 2 erhoeht, um die Border innerhalb der Schleife - // zeichnen zu koennen - nSteps2 = nSteps + 2; - } - Color aCol( (BYTE) nRed, (BYTE) nGreen, (BYTE) nBlue ); - - // GDI-Objekte sichern und setzen - aSetFillInBrushRecordHdl.Call(&aCol); - - // Startpolygon erzeugen (== Borderpolygon) - Polygon aPoly( 4 ); - Polygon aTempPoly( 2 ); - aPoly[0] = aFullRect.TopLeft(); - aPoly[1] = aFullRect.TopRight(); - aPoly[2] = aRect.TopRight(); - aPoly[3] = aRect.TopLeft(); - aPoly.Rotate( aCenter, rGradient.GetAngle() ); - - // Schleife, um rotierten Verlauf zu fuellen - for ( long i = 0; i < nSteps2; i++ ) - { - Polygon aTempPoly = aPoly; - aTempPoly.Clip( rRect ); - aDrawPolyRecordHdl.Call(&aTempPoly); - aTempPoly.SetSize( 2 ); - - // neues Polygon berechnen - aRect.Top() = (long)(fScanLine += fScanInc); - - // unteren Rand komplett fuellen - if ( i == nSteps ) - { - aTempPoly[0] = aFullRect.BottomLeft(); - aTempPoly[1] = aFullRect.BottomRight(); - } - else - { - aTempPoly[0] = aRect.TopLeft(); - aTempPoly[1] = aRect.TopRight(); - } - aTempPoly.Rotate( aCenter, rGradient.GetAngle() ); - - aPoly[0] = aPoly[3]; - aPoly[1] = aPoly[2]; - aPoly[2] = aTempPoly[1]; - aPoly[3] = aTempPoly[0]; - - // Farbintensitaeten aendern... - // fuer lineare FV - if ( bLinear ) - { - nRed += nStepRed; - nGreen += nStepGreen; - nBlue += nStepBlue; - } - // fuer radiale FV - else - { - if ( i <= (nSteps >> 1) ) - { - nRed -= nStepRed; - nGreen -= nStepGreen; - nBlue -= nStepBlue; - } - // genau die Mitte und hoeher - else - { - nRed += nStepRed; - nGreen += nStepGreen; - nBlue += nStepBlue; - } - } - - nRed = MinMax( nRed, 0, 255 ); - nGreen = MinMax( nGreen, 0, 255 ); - nBlue = MinMax( nBlue, 0, 255 ); - - // fuer lineare FV ganz normale Bestimmung der Farbe - if ( bLinear || (i <= nSteps) ) - { - aCol = Color( (BYTE) nRed, (BYTE) nGreen, (BYTE) nBlue ); - } - // fuer axiale FV muss die letzte Farbe der ersten - // Farbe entsprechen - else - { - aCol = Color( (BYTE) nEndRed, (BYTE) nEndGreen, (BYTE) nEndBlue ); - } - - aSetFillInBrushRecordHdl.Call(&aCol); - } -} - -// ------------------------------------------------------------------------ - -void GradientWrapper::WriteRadialGradient(const Rectangle& rRect, - const Gradient& rGradient) -{ - USHORT nStepCount = 100; - Rectangle aClipRect = rRect; - Rectangle aRect = rRect; - long nZWidth = aRect.GetWidth() * (long)rGradient.GetOfsX() / 100; - long nZHeight= aRect.GetHeight() * (long)rGradient.GetOfsY() / 100; - Size aSize = aRect.GetSize(); - Point aCenter( aRect.Left() + nZWidth, aRect.Top() + nZHeight ); - - // Radien-Berechnung fuer Kreisausgabe (Kreis schliesst Rechteck ein) - if ( rGradient.GetStyle() == GRADIENT_RADIAL ) - { - aSize.Width() = (long)(0.5 + sqrt((double)aSize.Width()*(double)aSize.Width() + - (double)aSize.Height()*(double)aSize.Height())); - aSize.Height() = aSize.Width(); - } - // Radien-Berechnung fuer Ellipse - else - { - aSize.Width() = (long)(0.5 + (double)aSize.Width() * 1.4142); - aSize.Height() = (long)(0.5 + (double)aSize.Height() * 1.4142); - } - - long nBorderX = (long)rGradient.GetBorder() * aSize.Width() / 100; - long nBorderY = (long)rGradient.GetBorder() * aSize.Height() / 100; - aSize.Width() -= nBorderX; - aSize.Height() -= nBorderY; - aRect.Left() = aCenter.X() - (aSize.Width() >> 1); - aRect.Top() = aCenter.Y() - (aSize.Height() >> 1); - aRect.SetSize( aSize ); - - long nMinRect = Min( aRect.GetWidth(), aRect.GetHeight() ); - - // Anzahl der Schritte berechnen, falls nichts uebergeben wurde - if ( !nStepCount ) - { - long nInc = ((nMinRect >> 9) + 1) << 3; - - if ( !nInc ) - nInc = 1; - - nStepCount = (USHORT)(nMinRect / nInc); - } - // minimal drei Schritte - long nSteps = Max( nStepCount, (USHORT)3 ); - - // Ausgabebegrenzungen und Schrittweite fuer jede Richtung festlegen - double fScanLeft = aRect.Left(); - double fScanTop = aRect.Top(); - double fScanRight = aRect.Right(); - double fScanBottom = aRect.Bottom(); - double fScanInc = (double)nMinRect / (double)nSteps * 0.5; - - // Intensitaeten von Start- und Endfarbe ggf. aendern und - // Farbschrittweiten berechnen - long nFactor; - const Color& rStartCol = rGradient.GetStartColor(); - const Color& rEndCol = rGradient.GetEndColor(); - long nRed = rStartCol.GetRed(); - long nGreen = rStartCol.GetGreen(); - long nBlue = rStartCol.GetBlue(); - long nEndRed = rEndCol.GetRed(); - long nEndGreen = rEndCol.GetGreen(); - long nEndBlue = rEndCol.GetBlue(); - nFactor = rGradient.GetStartIntensity(); - nRed = (nRed * nFactor) / 100; - nGreen = (nGreen * nFactor) / 100; - nBlue = (nBlue * nFactor) / 100; - nFactor = rGradient.GetEndIntensity(); - nEndRed = (nEndRed * nFactor) / 100; - nEndGreen = (nEndGreen * nFactor) / 100; - nEndBlue = (nEndBlue * nFactor) / 100; - long nStepRed = (nEndRed - nRed) / nSteps; - long nStepGreen = (nEndGreen - nGreen) / nSteps; - long nStepBlue = (nEndBlue - nBlue) / nSteps; - Color aCol( (BYTE) nRed, (BYTE) nGreen, (BYTE) nBlue ); - - // GDI-Objekte sichern und setzen - aSetFillInBrushRecordHdl.Call(&aCol); - - // Recteck erstmal ausgeben - PolyPolygon aPolyPoly( 2 ); - Polygon aPoly( rRect ); - - aPolyPoly.Insert( aPoly ); - aPoly = Polygon( aRect ); - aPoly.Rotate( aCenter, rGradient.GetAngle() ); - aPolyPoly.Insert( aPoly ); - - // erstes Polygon zeichnen (entspricht Rechteck) - PolyPolygon aTempPolyPoly = aPolyPoly; - aTempPolyPoly.Clip( aClipRect ); - aDrawPolyPolyRecordHdl.Call(&aTempPolyPoly); - - for ( long i = 0; i < nSteps; i++ ) - { - Color aCol( (BYTE) nRed, (BYTE) nGreen, (BYTE) nBlue ); - aSetFillInBrushRecordHdl.Call(&aCol); - - // neues Polygon berechnen - aRect.Left() = (long)(fScanLeft += fScanInc); - aRect.Top() = (long)(fScanTop += fScanInc); - aRect.Right() = (long)(fScanRight -= fScanInc); - aRect.Bottom() = (long)(fScanBottom -= fScanInc); - - if ( (aRect.GetWidth() < 2) || (aRect.GetHeight() < 2) ) - break; - - aPoly = Polygon( aRect.Center(), - aRect.GetWidth() >> 1, aRect.GetHeight() >> 1 ); - aPoly.Rotate( aCenter, rGradient.GetAngle() ); - - aPolyPoly.Replace( aPolyPoly.GetObject( 1 ), 0 ); - aPolyPoly.Replace( aPoly, 1 ); - - PolyPolygon aTempPolyPoly = aPolyPoly; - aTempPolyPoly.Clip( aClipRect ); - aDrawPolyPolyRecordHdl.Call(&aTempPolyPoly); - - // Farbe entsprechend anpassen - nRed += nStepRed; - nGreen += nStepGreen; - nBlue += nStepBlue; - - nRed = MinMax( nRed, 0, 0xFF ); - nGreen = MinMax( nGreen, 0, 0xFF ); - nBlue = MinMax( nBlue, 0, 0xFF ); - } - - // Falls PolyPolygon-Ausgabe, muessen wir noch ein letztes - // inneres Polygon zeichnen - aCol = Color( (BYTE) nRed, (BYTE) nGreen, (BYTE) nBlue ); - aSetFillInBrushRecordHdl.Call(&aCol); - - aPoly = aPolyPoly.GetObject( 1 ); - if ( !aPoly.GetBoundRect().IsEmpty() ) - { - aPoly.Clip( aClipRect ); - aDrawPolyRecordHdl.Call(&aPoly); - } -} - -// ------------------------------------------------------------------------ - -void GradientWrapper::WriteRectGradient(const Rectangle& rRect, - const Gradient& rGradient) -{ - USHORT nStepCount = 100; - Rectangle aClipRect = rRect; - Rectangle aRect = rRect; - - aRect.Left()--; - aRect.Top()--; - aRect.Right()++; - aRect.Bottom()++; - - // rotiertes BoundRect ausrechnen - double fAngle = (rGradient.GetAngle() % 3600) * F_PI1800; - double fWidth = aRect.GetWidth(); - double fHeight = aRect.GetHeight(); - double fDX = fWidth * fabs( cos( fAngle ) ) + - fHeight * fabs( sin( fAngle ) ); - double fDY = fHeight * fabs( cos( fAngle ) ) + - fWidth * fabs( sin( fAngle ) ); - fDX = (fDX - fWidth) * 0.5 + 0.5; - fDY = (fDY - fHeight) * 0.5 + 0.5; - aRect.Left() -= (long)fDX; - aRect.Right() += (long)fDX; - aRect.Top() -= (long)fDY; - aRect.Bottom() += (long)fDY; - - // Quadratisch machen, wenn angefordert; - Size aSize = aRect.GetSize(); - if ( rGradient.GetStyle() == GRADIENT_SQUARE ) - { - if ( aSize.Width() > aSize.Height() ) - aSize.Height() = aSize.Width(); - else - aSize.Width() = aSize.Height(); - } - - // neue Mittelpunkte berechnen - long nZWidth = aRect.GetWidth() * (long)rGradient.GetOfsX() / 100; - long nZHeight = aRect.GetHeight() * (long)rGradient.GetOfsY() / 100; - long nBorderX = (long)rGradient.GetBorder() * aSize.Width() / 100; - long nBorderY = (long)rGradient.GetBorder() * aSize.Height() / 100; - Point aCenter( aRect.Left() + nZWidth, aRect.Top() + nZHeight ); - - // Rand beruecksichtigen - aSize.Width() -= nBorderX; - aSize.Height() -= nBorderY; - - // Ausgaberechteck neu setzen - aRect.Left() = aCenter.X() - (aSize.Width() >> 1); - aRect.Top() = aCenter.Y() - (aSize.Height() >> 1); - aRect.SetSize( aSize ); - - long nMinRect = Min( aRect.GetWidth(), aRect.GetHeight() ); - - // Anzahl der Schritte berechnen, falls nichts uebergeben wurde - if ( !nStepCount ) - { - long nInc = ((nMinRect >> 9) + 1) << 3; - - if ( !nInc ) - nInc = 1; - - nStepCount = (USHORT)(nMinRect / nInc); - } - // minimal drei Schritte - long nSteps = Max( nStepCount, (USHORT)3 ); - - // Ausgabebegrenzungen und Schrittweite fuer jede Richtung festlegen - double fScanLeft = aRect.Left(); - double fScanTop = aRect.Top(); - double fScanRight = aRect.Right(); - double fScanBottom = aRect.Bottom(); - double fScanInc = (double)nMinRect / (double)nSteps * 0.5; - - // Intensitaeten von Start- und Endfarbe ggf. aendern und - // Farbschrittweiten berechnen - long nFactor; - const Color& rStartCol = rGradient.GetStartColor(); - const Color& rEndCol = rGradient.GetEndColor(); - long nRed = rStartCol.GetRed(); - long nGreen = rStartCol.GetGreen(); - long nBlue = rStartCol.GetBlue(); - long nEndRed = rEndCol.GetRed(); - long nEndGreen = rEndCol.GetGreen(); - long nEndBlue = rEndCol.GetBlue(); - nFactor = rGradient.GetStartIntensity(); - nRed = (nRed * nFactor) / 100; - nGreen = (nGreen * nFactor) / 100; - nBlue = (nBlue * nFactor) / 100; - nFactor = rGradient.GetEndIntensity(); - nEndRed = (nEndRed * nFactor) / 100; - nEndGreen = (nEndGreen * nFactor) / 100; - nEndBlue = (nEndBlue * nFactor) / 100; - long nStepRed = (nEndRed - nRed) / nSteps; - long nStepGreen = (nEndGreen - nGreen) / nSteps; - long nStepBlue = (nEndBlue - nBlue) / nSteps; - Color aCol( (BYTE) nRed, (BYTE) nGreen, (BYTE) nBlue ); - - // GDI-Objekte sichern und setzen - aSetFillInBrushRecordHdl.Call(&aCol); - - // Recteck erstmal ausgeben - PolyPolygon aPolyPoly( 2 ); - Polygon aPoly( rRect ); - - aPolyPoly.Insert( aPoly ); - aPoly = Polygon( aRect ); - aPoly.Rotate( aCenter, rGradient.GetAngle() ); - aPolyPoly.Insert( aPoly ); - - PolyPolygon aTempPolyPoly = aPolyPoly; - aTempPolyPoly.Clip( aClipRect ); - aDrawPolyPolyRecordHdl.Call(&aTempPolyPoly); - - // Schleife, um nacheinander die Polygone/PolyPolygone auszugeben - for ( long i = 0; i < nSteps; i++ ) - { - Color aCol( (BYTE) nRed, (BYTE) nGreen, (BYTE) nBlue ); - aSetFillInBrushRecordHdl.Call(&aCol); - - // neues Polygon berechnen - aRect.Left() = (long)(fScanLeft += fScanInc); - aRect.Top() = (long)(fScanTop += fScanInc); - aRect.Right() = (long)(fScanRight -= fScanInc); - aRect.Bottom() = (long)(fScanBottom-= fScanInc); - - if ( (aRect.GetWidth() < 2) || (aRect.GetHeight() < 2) ) - break; - - aPoly = Polygon( aRect ); - aPoly.Rotate( aCenter, rGradient.GetAngle() ); - - aPolyPoly.Replace( aPolyPoly.GetObject( 1 ), 0 ); - aPolyPoly.Replace( aPoly, 1 ); - - PolyPolygon aTempPolyPoly = aPolyPoly; - aTempPolyPoly.Clip( aClipRect ); - aDrawPolyPolyRecordHdl.Call(&aTempPolyPoly); - - // Farben aendern - nRed += nStepRed; - nGreen += nStepGreen; - nBlue += nStepBlue; - - nRed = MinMax( nRed, 0, 0xFF ); - nGreen = MinMax( nGreen, 0, 0xFF ); - nBlue = MinMax( nBlue, 0, 0xFF ); - } - - aCol = Color( (BYTE) nRed, (BYTE) nGreen, (BYTE) nBlue ); - aSetFillInBrushRecordHdl.Call(&aCol); - - aPoly = aPolyPoly.GetObject( 1 ); - if ( !aPoly.GetBoundRect().IsEmpty() ) - { - aPoly.Clip( aClipRect ); - aDrawPolyRecordHdl.Call(&aPoly); - } -} diff --git a/svtools/source/java/makefile.mk b/svtools/source/java/makefile.mk index 9d9679644685..e8e85db2185d 100644 --- a/svtools/source/java/makefile.mk +++ b/svtools/source/java/makefile.mk @@ -45,10 +45,6 @@ ENABLE_EXCEPTIONS=TRUE SRS1NAME= javaerror SRC1FILES= javaerror.src -SRS2NAME= patchjavaerror -SRC2FILES= patchjavaerror.src - - SLOFILES= \ $(SLO)$/javainteractionhandler.obj \ $(SLO)$/javacontext.obj diff --git a/svtools/source/java/patchjavaerror.src b/svtools/source/java/patchjavaerror.src deleted file mode 100644 index 2d2ad06a9592..000000000000 --- a/svtools/source/java/patchjavaerror.src +++ /dev/null @@ -1,96 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: patchjavaerror.src,v $ - * $Revision: 1.7 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include - -WarningBox WARNINGBOX_JAVANOTFOUND -{ - Buttons = WB_OK ; - DefButton = WB_DEF_OK ; - Message[ en-US ] ="%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. Please install a JRE and restart %PRODUCTNAME."; -}; - -WarningBox WARNINGBOX_INVALIDJAVASETTINGS -{ - Buttons = WB_OK ; - DefButton = WB_DEF_OK ; - Message[ en-US ] ="The %PRODUCTNAME configuration has been changed. Under Tools - Options - %PRODUCTNAME - Java, select the Java runtime environment you want to have used by %PRODUCTNAME."; -}; - -QueryBox QBX_JAVADISABLED -{ - Buttons = WB_YES_NO_CANCEL ; - DefButton = WB_DEF_YES ; - Message[ en-US ] = "%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. However, use of a JRE has been disabled. Do you want to enable the use of a JRE now?"; -}; - -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."; -}; - -ErrorBox ERRORBOX_RESTARTREQUIRED -{ - Buttons = WB_OK; - DefButton = WB_DEF_OK ; - Message[ en-US ] = "For the selected Java runtime environment to work properly, %PRODUCTNAME must be restarted. Please restart %PRODUCTNAME now."; -}; - - - -String STR_WARNING_JAVANOTFOUND -{ - Text[ en-US ] = "JRE Required" ; -}; - -String STR_WARNING_INVALIDJAVASETTINGS -{ - Text[ en-US ] = "Select JRE"; -}; - -String STR_ERROR_RESTARTREQUIRED -{ - Text[ en-US ] = "Restart Required"; -}; - -String STR_QUESTION_JAVADISABLED -{ - Text[ en-US ] = "Enable JRE" ; -}; - - -String STR_ERROR_JVMCREATIONFAILED -{ - Text[ en-US ] = "JRE is Defective" ; -}; - - diff --git a/svtools/source/misc/acceleratorexecute.cxx b/svtools/source/misc/acceleratorexecute.cxx index 16bc8339a0d9..e352d79ab3bf 100644 --- a/svtools/source/misc/acceleratorexecute.cxx +++ b/svtools/source/misc/acceleratorexecute.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#include "acceleratorexecute.hxx" +#include //=============================================== // includes diff --git a/svtools/source/misc/cliplistener.cxx b/svtools/source/misc/cliplistener.cxx index c8c6428233e8..6f656bc5760e 100644 --- a/svtools/source/misc/cliplistener.cxx +++ b/svtools/source/misc/cliplistener.cxx @@ -37,7 +37,7 @@ #include #include -#include "cliplistener.hxx" +#include #include using namespace ::com::sun::star; diff --git a/svtools/source/misc/dialogclosedlistener.cxx b/svtools/source/misc/dialogclosedlistener.cxx index 582d2bbf4879..4bc7cff4e3bd 100644 --- a/svtools/source/misc/dialogclosedlistener.cxx +++ b/svtools/source/misc/dialogclosedlistener.cxx @@ -29,7 +29,7 @@ ************************************************************************/ #include "precompiled_svtools.hxx" -#include "dialogclosedlistener.hxx" +#include //......................................................................... namespace svt diff --git a/svtools/source/misc/dialogcontrolling.cxx b/svtools/source/misc/dialogcontrolling.cxx index d461e5898227..bbfa47f00145 100644 --- a/svtools/source/misc/dialogcontrolling.cxx +++ b/svtools/source/misc/dialogcontrolling.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#include "dialogcontrolling.hxx" +#include #include #include diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx index 4084aa47bc80..36bf73c27903 100644 --- a/svtools/source/misc/ehdl.cxx +++ b/svtools/source/misc/ehdl.cxx @@ -46,7 +46,7 @@ #include #include #include -#include "sfxecode.hxx" +#include //========================================================================= diff --git a/svtools/source/misc/ehdl.src b/svtools/source/misc/ehdl.src index 5267d13765c3..50487f398785 100644 --- a/svtools/source/misc/ehdl.src +++ b/svtools/source/misc/ehdl.src @@ -30,7 +30,8 @@ #define __RSC #include -#include "sfxecode.hxx" +#include + // pragma ---------------------------------------------------------------- String STR_ERR_HDLMESS diff --git a/svtools/source/misc/errtxt.src b/svtools/source/misc/errtxt.src index 3ab58ef92dbf..306ccf7f164d 100644 --- a/svtools/source/misc/errtxt.src +++ b/svtools/source/misc/errtxt.src @@ -30,7 +30,7 @@ #define __RSC #include -#include "sfxecode.hxx" +#include "svtools/sfxecode.hxx" // pragma ---------------------------------------------------------------- Resource RID_ERRCTX { diff --git a/svtools/source/misc/helpagentwindow.cxx b/svtools/source/misc/helpagentwindow.cxx index 51cd7ebfb740..7f35e516212c 100644 --- a/svtools/source/misc/helpagentwindow.cxx +++ b/svtools/source/misc/helpagentwindow.cxx @@ -30,20 +30,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#include "helpagentwindow.hxx" +#include #include -#ifndef _SV_BUTTON_HXX #include -#endif #include #include - -#ifndef _SVTOOLS_HRC #include -#endif -#ifndef _SVT_HELPID_HRC #include -#endif #define WB_AGENT_STYLE 0 diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx index 76752b27354e..9ced32d82535 100644 --- a/svtools/source/misc/imagemgr.cxx +++ b/svtools/source/misc/imagemgr.cxx @@ -33,7 +33,7 @@ // includes -------------------------------------------------------------- -#include "imagemgr.hxx" +#include #include #include #include @@ -42,9 +42,7 @@ #include #include #include -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include -#endif #include #include #include @@ -54,9 +52,8 @@ #include #include #include - #include -#include "imagemgr.hrc" +#include #include #include diff --git a/svtools/source/misc/imagemgr.src b/svtools/source/misc/imagemgr.src index e082398beaa1..3797698e01f6 100644 --- a/svtools/source/misc/imagemgr.src +++ b/svtools/source/misc/imagemgr.src @@ -30,7 +30,7 @@ // includes ****************************************************************** #include -#include "imagemgr.hrc" +#include // images ******************************************************************** diff --git a/svtools/source/misc/imageresourceaccess.cxx b/svtools/source/misc/imageresourceaccess.cxx index b27bf6fa0174..219e3a8dda29 100644 --- a/svtools/source/misc/imageresourceaccess.cxx +++ b/svtools/source/misc/imageresourceaccess.cxx @@ -31,9 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#ifndef SVTOOLS_SOURCE_MISC_IMAGERESOURCEACCESS_HXX -#include "imageresourceaccess.hxx" -#endif +#include /** === begin UNO includes === **/ #include diff --git a/svtools/source/misc/itemdel.cxx b/svtools/source/misc/itemdel.cxx index 9db70f852d30..a7b939ebd3ca 100644 --- a/svtools/source/misc/itemdel.cxx +++ b/svtools/source/misc/itemdel.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#include "itemdel.hxx" +#include #include #include #include diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx index 348a9638399b..a3505f50a426 100644 --- a/svtools/source/misc/templatefoldercache.cxx +++ b/svtools/source/misc/templatefoldercache.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#include "templatefoldercache.hxx" +#include #include #include #include diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index 4a814637e1af..4f2d1593326a 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -45,12 +45,8 @@ #include #include #include -#ifndef DEBUG_HXX #include -#endif -#ifndef URLOBJ_HXX #include -#endif #include #include #include @@ -63,21 +59,15 @@ #include #include #include - #include #include #include -#ifndef _COM_SUN_STAR_DATATRANSFER_CLIPBOARD_XMIMECONTENTTYPEFACTORY_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_DATATRANSFER_CLIPBOARD_XMIMECONTENTTYPE_HPP_ #include -#endif #include #include - #include "svl/urlbmk.hxx" -#include "inetimg.hxx" +#include #include #include #include diff --git a/svtools/source/misc/transfer2.cxx b/svtools/source/misc/transfer2.cxx index 027dbc31572d..c18d40426409 100644 --- a/svtools/source/misc/transfer2.cxx +++ b/svtools/source/misc/transfer2.cxx @@ -31,12 +31,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" #include -#ifndef DEBUG_HXX #include -#endif -#ifndef URLOBJ_HXX #include -#endif #include #include #include @@ -46,12 +42,9 @@ #include #include #include -#ifndef _COM_SUN_STAR_DATATRANSFER_DND_DROPTARGETDRAGCONTEXT_HPP_ #include -#endif - #include "svl/urlbmk.hxx" -#include "inetimg.hxx" +#include #include #include diff --git a/svtools/source/misc/wallitem.cxx b/svtools/source/misc/wallitem.cxx index 6ceb414db003..f3b4d2daf0a3 100644 --- a/svtools/source/misc/wallitem.cxx +++ b/svtools/source/misc/wallitem.cxx @@ -51,7 +51,7 @@ #include #include -#include "wallitem.hxx" +#include #include // ----------------------------------------------------------------------- diff --git a/svtools/source/plugapp/commtest.cxx b/svtools/source/plugapp/commtest.cxx deleted file mode 100644 index 7ae43194c2c9..000000000000 --- a/svtools/source/plugapp/commtest.cxx +++ /dev/null @@ -1,264 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: commtest.cxx,v $ - * $Revision: 1.6 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" -#include -#include -#include - - -#include -#include "communi.hxx" -#include "brooker.hxx" -//#include - -#include "commtest.hrc" - - - -#define TCP_PORT 17612 - -#define CUniString( constAsciiStr ) UniString( RTL_CONSTASCII_USTRINGPARAM ( constAsciiStr ) ) - - -class PacketSender : public Timer -{ - SvStream* mpData; - CommunicationLinkRef mxCL; - -public: - PacketSender( ULONG nDelay, SvStream* pData, CommunicationLink* pCL ); - virtual void Timeout(); -}; - -PacketSender::PacketSender( ULONG nDelay, SvStream* pData, CommunicationLink* pCL ) -: mpData( pData ) -, mxCL( pCL ) -{ - SetTimeout( nDelay ); - Start(); -} - -void PacketSender::Timeout() -{ - mxCL->TransferDataStream( mpData ); - delete mpData; - delete this; -} - - - -class DelayedDeleter : public Timer -{ - CommunicationManager *mpManager; - -public: - DelayedDeleter( ULONG nDelay, CommunicationManager *pManager ); - virtual void Timeout(); -}; - -DelayedDeleter::DelayedDeleter( ULONG nDelay, CommunicationManager *pManager ) -: mpManager( pManager ) -{ - SetTimeout( nDelay ); - Start(); -} - -void DelayedDeleter::Timeout() -{ - delete mpManager; - delete this; -} - - - - -class CommunicationTester : public Application -{ - DECL_LINK( TBClick, ToolBox* ); - DECL_LINK( DataReceived, CommunicationLink* ); - DECL_LINK( ConnectionOpened, CommunicationLink* ); - DECL_LINK( ConnectionClosed, CommunicationLink* ); - - - CommunicationManager *pClientTcp, *pServerTcp; - InformationBroadcaster *pBCSTSend; - InformationBroadcaster *pBCSTListen; - InformationBrooker *pBCSTBrooker; -public: - CommunicationTester(); - - virtual void Main(); -}; - -CommunicationTester IchSelber; - -CommunicationTester::CommunicationTester() -: pClientTcp( NULL ) -, pServerTcp( NULL ) -, pBCSTSend( NULL ) -, pBCSTListen( NULL ) -, pBCSTBrooker( NULL ) -{} - -void CommunicationTester::Main() -{ - ResMgr *pRes = ResMgr::CreateResMgr( "commtest" ); - Resource::SetResManager( pRes ); - WorkWindow aWW( NULL, WB_APP | WB_STDWORK ); - aWW.Show(); - ToolBox aTB( &aWW, ResId( TBMenu ) ); - aTB.Show(); - aTB.RecalcItems(); - aTB.SetFloatingMode( TRUE ); - aTB.SetFloatingMode( FALSE ); - aTB.SetClickHdl( LINK( this, CommunicationTester, TBClick ) ); - - 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; \ - pManager->SetConnectionOpenedHdl( LINK( this, CommunicationTester, ConnectionOpened ) );\ - pManager->SetConnectionClosedHdl( LINK( this, CommunicationTester, ConnectionClosed ) );\ - pManager->SetDataReceivedHdl( LINK( this, CommunicationTester, DataReceived ) );\ - pTB->SetItemState( pTB->GetCurItemId(), STATE_CHECK ); \ - } \ -} - - -IMPL_LINK( CommunicationTester, TBClick, ToolBox*, pTB ) -{ - switch ( pTB->GetCurItemId() ) - { - case SERVER_TCP: - { - SWITCH( pServerTcp, CommunicationManagerServerViaSocket( TCP_PORT, (USHORT) 32000 ) ); - if ( pServerTcp ) - pServerTcp->StartCommunication(); // Am Port horchen - } - break; - case CLIENT_TCP: - { - SWITCH( pClientTcp, CommunicationManagerClientViaSocket( "localhost", TCP_PORT ) ); - if ( pClientTcp ) - pClientTcp->StartCommunication(); // Eine Verbindung aufbauen - } - break; - case BCST_BROOKER: - { - if ( pBCSTBrooker ) - { - delete pBCSTBrooker; - pBCSTBrooker = NULL; - } - else - { - pBCSTBrooker = new InformationBrooker(); - } - } - break; - case BCST_LISTEN: - { - if ( pBCSTListen ) - { - delete pBCSTListen; - pBCSTListen = NULL; - } - else - { - pBCSTListen = new InformationBroadcaster(); - } - } - case BCST_SEND: - { - if ( pBCSTSend ) - { - pBCSTSend->Broadcast( BCST_CAT_PL2X, "Message: BCST_CAT_PL2X" ); - pBCSTSend->Broadcast( BCST_CAT_MINORCOPY, "Message: BCST_CAT_MINORCOPY" ); - pBCSTSend->Broadcast( BCST_CAT_DELIVER, "Message: BCST_CAT_DELIVER" ); - pBCSTSend->Broadcast( BCST_CAT_ALL, "Message: BCST_CAT_ALL" ); - } - else - { - pBCSTSend = new InformationBroadcaster(); - } - } - break; - } - return 0; -} - -IMPL_LINK( CommunicationTester, ConnectionOpened, CommunicationLink*, pCL ) -{ - SvStream *pData = pCL->GetBestCommunicationStream(); - while ( pData->Tell() < 70 ) *pData << 123; - - pCL->TransferDataStream( pData ); - return 0; -} - -IMPL_LINK( CommunicationTester, ConnectionClosed, CommunicationLink*, pCL ) -{ - return 0; -} - -IMPL_LINK( CommunicationTester, DataReceived, CommunicationLink*, pCL ) -{ - // Find Manager - CommunicationManager* pManager; - if ( pClientTcp && pClientTcp->IsLinkValid( pCL ) ) - { - pManager = pClientTcp; - } - if ( pServerTcp && pServerTcp->IsLinkValid( pCL ) ) - { - DBG_ASSERT( !pManager, "CommunicationLink bei mehreren Managern eingetragen"); - pManager = pServerTcp; - } - DBG_ASSERT( pCL->GetCommunicationManager() == pManager, "Manager des Link != Manager bei dem der Link Valid ist"); - - // Send Data Back (Echo) - new PacketSender( 1000, pCL->GetServiceData(), pCL ); - - return 0; -} - diff --git a/svtools/source/plugapp/commtest.hrc b/svtools/source/plugapp/commtest.hrc deleted file mode 100644 index c2e1db262e6a..000000000000 --- a/svtools/source/plugapp/commtest.hrc +++ /dev/null @@ -1,37 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: commtest.hrc,v $ - * $Revision: 1.3 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#define TBMenu 256 - - -#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 deleted file mode 100644 index beb9be750eb1..000000000000 --- a/svtools/source/plugapp/commtest.src +++ /dev/null @@ -1,63 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: commtest.src,v $ - * $Revision: 1.3 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#include "commtest.hrc" - -ToolBox TBMenu { - Border = TRUE; - SVLook = TRUE; - Dockable = TRUE; - Pos = MAP_APPFONT( 0, 0 ); - Size = MAP_APPFONT( 100, 20 ); - LineCount = 2; -// FloatingLines = 2; - ItemList = { - ToolBoxItem { - Identifier = SERVER_TCP; - Text = "Server TCP"; - }; - ToolBoxItem { - Identifier = CLIENT_TCP; - Text = "Client TCP"; - }; - ToolBoxItem { - Identifier = BCST_BROOKER; - Text = "BroadcastBrooker"; - }; - ToolBoxItem { - Identifier = BCST_SEND; - Text = "BroadcastClientSend"; - }; - ToolBoxItem { - Identifier = BCST_LISTEN; - Text = "BroadcastClientListen"; - }; - }; - Scroll = TRUE; -}; diff --git a/svtools/source/plugapp/makefile.mk b/svtools/source/plugapp/makefile.mk index d37e374917ac..dc4bbaed7a05 100644 --- a/svtools/source/plugapp/makefile.mk +++ b/svtools/source/plugapp/makefile.mk @@ -52,12 +52,6 @@ SRC2FILES= testtool.src LIB1TARGET= $(SLB)$/plugapp.lib LIB1OBJFILES= $(SLOFILES) -######## Testapplikation ######### - -SRC1FILES= commtest.src -SRS1NAME= commtest - -######## Ende Testapplikation ######### # --- Tagets ------------------------------------------------------- diff --git a/svtools/source/svhtml/htmlkywd.cxx b/svtools/source/svhtml/htmlkywd.cxx index 052b10d2c564..d2ffe5a784e1 100644 --- a/svtools/source/svhtml/htmlkywd.cxx +++ b/svtools/source/svhtml/htmlkywd.cxx @@ -37,8 +37,8 @@ #include #include -#include "htmlkywd.hxx" -#include "htmltokn.h" +#include +#include // die Tabelle muss noch sortiert werden struct HTML_TokenEntry diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx index 5bb26367075e..735e8eaf434d 100644 --- a/svtools/source/svhtml/htmlout.cxx +++ b/svtools/source/svhtml/htmlout.cxx @@ -39,7 +39,7 @@ #include #include -#include "htmlkywd.hxx" +#include #include #include #include diff --git a/svtools/source/svhtml/htmlsupp.cxx b/svtools/source/svhtml/htmlsupp.cxx index 9103161afb51..e4ef79accf22 100644 --- a/svtools/source/svhtml/htmlsupp.cxx +++ b/svtools/source/svhtml/htmlsupp.cxx @@ -40,8 +40,8 @@ #endif #include -#include "htmltokn.h" -#include "htmlkywd.hxx" +#include +#include /* */ diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx index b4eb6c05cffd..b25e6a8cb328 100644 --- a/svtools/source/svhtml/parhtml.cxx +++ b/svtools/source/svhtml/parhtml.cxx @@ -51,8 +51,8 @@ #include #include -#include "htmltokn.h" -#include "htmlkywd.hxx" +#include +#include using namespace ::com::sun::star; diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx index cb40b1d1f4e9..4b6b637fc073 100644 --- a/svtools/source/svrtf/parrtf.cxx +++ b/svtools/source/svrtf/parrtf.cxx @@ -37,8 +37,8 @@ #include #include #include -#include "rtftoken.h" -#include "rtfkeywd.hxx" +#include +#include #include const int MAX_STRING_LEN = 1024; diff --git a/svtools/source/svrtf/rtfkey2.cxx b/svtools/source/svrtf/rtfkey2.cxx deleted file mode 100644 index 5c4e1039d92c..000000000000 --- a/svtools/source/svrtf/rtfkey2.cxx +++ /dev/null @@ -1,1162 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: rtfkey2.cxx,v $ - * $Revision: 1.14.134.1 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" - -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ - -#include "rtfkeywd.hxx" - -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HEXCHAR, "\\'" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_IGNORE, "\\*" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OPTHYPH, "\\-" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SUBENTRY, "\\:" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ABSH, "\\absh" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ABSW, "\\absw" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ALT, "\\alt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ANNOTATION, "\\annotation" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ANSI, "\\ansi" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ATNID, "\\atnid" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AUTHOR, "\\author" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_B, "\\b" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BGBDIAG, "\\bgbdiag" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BGCROSS, "\\bgcross" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BGDCROSS, "\\bgdcross" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BGDKBDIAG, "\\bgdkbdiag" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BGDKCROSS, "\\bgdkcross" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BGDKDCROSS, "\\bgdkdcross" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BGDKFDIAG, "\\bgdkfdiag" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BGDKHORIZ, "\\bgdkhoriz" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BGDKVERT, "\\bgdkvert" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BGFDIAG, "\\bgfdiag" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BGHORIZ, "\\bghoriz" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BGVERT, "\\bgvert" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BIN, "\\bin" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BINFSXN, "\\binfsxn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BINSXN, "\\binsxn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BKMKCOLF, "\\bkmkcolf" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BKMKCOLL, "\\bkmkcoll" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BKMKEND, "\\bkmkend" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BKMKSTART, "\\bkmkstart" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BLUE, "\\blue" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BOX, "\\box" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRB, "\\brdrb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRBAR, "\\brdrbar" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRBTW, "\\brdrbtw" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRCF, "\\brdrcf" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRDB, "\\brdrdb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRDOT, "\\brdrdot" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRHAIR, "\\brdrhair" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRL, "\\brdrl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRR, "\\brdrr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRS, "\\brdrs" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRSH, "\\brdrsh" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRT, "\\brdrt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRTH, "\\brdrth" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRW, "\\brdrw" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRSP, "\\brsp" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BULLET, "\\bullet" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BUPTIM, "\\buptim" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BXE, "\\bxe" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CAPS, "\\caps" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CB, "\\cb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CBPAT, "\\cbpat" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CELL, "\\cell" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CELLX, "\\cellx" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CF, "\\cf" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CFPAT, "\\cfpat" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHATN, "\\chatn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHDATE, "\\chdate" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHDPA, "\\chdpa" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHDPL, "\\chdpl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHFTN, "\\chftn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHFTNSEP, "\\chftnsep" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHFTNSEPC, "\\chftnsepc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHPGN, "\\chpgn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHTIME, "\\chtime" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLBGBDIAG, "\\clbgbdiag" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLBGCROSS, "\\clbgcross" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLBGDCROSS, "\\clbgdcross" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLBGDKBDIAG, "\\clbgdkbdiag" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLBGDKCROSS, "\\clbgdkcross" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLBGDKDCROSS, "\\clbgdkdcross" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLBGDKFDIAG, "\\clbgdkfdiag" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLBGDKHOR, "\\clbgdkhor" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLBGDKVERT, "\\clbgdkvert" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLBGFDIAG, "\\clbgfdiag" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLBGHORIZ, "\\clbghoriz" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLBGVERT, "\\clbgvert" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLBRDRB, "\\clbrdrb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLBRDRL, "\\clbrdrl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLBRDRR, "\\clbrdrr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLBRDRT, "\\clbrdrt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLCBPAT, "\\clcbpat" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLCFPAT, "\\clcfpat" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLMGF, "\\clmgf" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLMRG, "\\clmrg" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLSHDNG, "\\clshdng" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_COLNO, "\\colno" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_COLORTBL, "\\colortbl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_COLS, "\\cols" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_COLSR, "\\colsr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_COLSX, "\\colsx" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_COLUMN, "\\column" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_COLW, "\\colw" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_COMMENT, "\\comment" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CREATIM, "\\creatim" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CTRL, "\\ctrl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DEFF, "\\deff" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DEFFORMAT, "\\defformat" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DEFLANG, "\\deflang" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DEFTAB, "\\deftab" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DELETED, "\\deleted" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DFRMTXTX, "\\dfrmtxtx" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DFRMTXTY, "\\dfrmtxty" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DIBITMAP, "\\dibitmap" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DN, "\\dn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DOCCOMM, "\\doccomm" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DOCTEMP, "\\doctemp" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DROPCAPLI, "\\dropcapli" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DROPCAPT, "\\dropcapt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ABSNOOVRLP, "\\absnoovrlp" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DXFRTEXT, "\\dxfrtext" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DY, "\\dy" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_EDMINS, "\\edmins" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_EMDASH, "\\emdash" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ENDASH, "\\endash" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ENDDOC, "\\enddoc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ENDNHERE, "\\endnhere" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ENDNOTES, "\\endnotes" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_EXPND, "\\expnd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_EXPNDTW, "\\expndtw" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_F, "\\f" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FACINGP, "\\facingp" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FACPGSXN, "\\facpgsxn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FALT, "\\falt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FCHARSET, "\\fcharset" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FDECOR, "\\fdecor" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FI, "\\fi" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FIELD, "\\field" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLDDIRTY, "\\flddirty" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLDEDIT, "\\fldedit" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLDINST, "\\fldinst" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLDLOCK, "\\fldlock" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLDPRIV, "\\fldpriv" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLDRSLT, "\\fldrslt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FMODERN, "\\fmodern" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FN, "\\fn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FNIL, "\\fnil" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FONTTBL, "\\fonttbl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FOOTER, "\\footer" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FOOTERF, "\\footerf" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FOOTERL, "\\footerl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FOOTERR, "\\footerr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FOOTERY, "\\footery" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FOOTNOTE, "\\footnote" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FPRQ, "\\fprq" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FRACWIDTH, "\\fracwidth" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FROMAN, "\\froman" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FS, "\\fs" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FSCRIPT, "\\fscript" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FSWISS, "\\fswiss" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTECH, "\\ftech" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNBJ, "\\ftnbj" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNCN, "\\ftncn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNRESTART, "\\ftnrestart" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNSEP, "\\ftnsep" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNSEPC, "\\ftnsepc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNSTART, "\\ftnstart" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNTJ, "\\ftntj" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_GREEN, "\\green" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_GUTTER, "\\gutter" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_GUTTERSXN, "\\guttersxn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HEADER, "\\header" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HEADERF, "\\headerf" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HEADERL, "\\headerl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HEADERR, "\\headerr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HEADERY, "\\headery" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HR, "\\hr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HYPHHOTZ, "\\hyphhotz" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_I, "\\i" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ID, "\\id" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_INFO, "\\info" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_INTBL, "\\intbl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_IXE, "\\ixe" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_KEEP, "\\keep" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_KEEPN, "\\keepn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_KERNING, "\\kerning" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_KEYCODE, "\\keycode" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_KEYWORDS, "\\keywords" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LANDSCAPE, "\\landscape" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LANG, "\\lang" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LDBLQUOTE, "\\ldblquote" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LEVEL, "\\level" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LI, "\\li" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LIN, "\\lin" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LINE, "\\line" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LINEBETCOL, "\\linebetcol" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LINECONT, "\\linecont" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LINEMOD, "\\linemod" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LINEPPAGE, "\\lineppage" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LINERESTART, "\\linerestart" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LINESTART, "\\linestart" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LINESTARTS, "\\linestarts" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LINEX, "\\linex" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LNDSCPSXN, "\\lndscpsxn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LQUOTE, "\\lquote" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_MAC, "\\mac" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_MACPICT, "\\macpict" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_MAKEBACKUP, "\\makebackup" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_MARGB, "\\margb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_MARGBSXN, "\\margbsxn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_MARGL, "\\margl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_MARGLSXN, "\\marglsxn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_MARGMIRROR, "\\margmirror" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_MARGR, "\\margr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_MARGRSXN, "\\margrsxn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_MARGT, "\\margt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_MARGTSXN, "\\margtsxn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_MIN, "\\min" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_MO, "\\mo" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NEXTCSET, "\\nextcset" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NEXTFILE, "\\nextfile" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOFCHARS, "\\nofchars" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOFPAGES, "\\nofpages" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOFWORDS, "\\nofwords" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOLINE, "\\noline" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOSUPERSUB, "\\nosupersub" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOWRAP, "\\nowrap" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OPERATOR, "\\operator" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OUTL, "\\outl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PAGE, "\\page" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PAGEBB, "\\pagebb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PAPERH, "\\paperh" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PAPERW, "\\paperw" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PAR, "\\par" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PARD, "\\pard" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PC, "\\pc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PCA, "\\pca" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGHSXN, "\\pghsxn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNCONT, "\\pgncont" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNDEC, "\\pgndec" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNLCLTR, "\\pgnlcltr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNLCRM, "\\pgnlcrm" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNRESTART, "\\pgnrestart" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNSTART, "\\pgnstart" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNSTARTS, "\\pgnstarts" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNUCLTR, "\\pgnucltr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNUCRM, "\\pgnucrm" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNX, "\\pgnx" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNY, "\\pgny" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGWSXN, "\\pgwsxn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PHCOL, "\\phcol" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PHMRG, "\\phmrg" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PHPG, "\\phpg" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PICCROPB, "\\piccropb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PICCROPL, "\\piccropl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PICCROPR, "\\piccropr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PICCROPT, "\\piccropt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PICH, "\\pich" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PICHGOAL, "\\pichgoal" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PICSCALED, "\\picscaled" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PICSCALEX, "\\picscalex" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PICSCALEY, "\\picscaley" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PICT, "\\pict" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PICW, "\\picw" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PICWGOAL, "\\picwgoal" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PLAIN, "\\plain" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PMMETAFILE, "\\pmmetafile" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_POSNEGX, "\\posnegx" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_POSNEGY, "\\posnegy" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_POSX, "\\posx" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_POSXC, "\\posxc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_POSXI, "\\posxi" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_POSXL, "\\posxl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_POSXO, "\\posxo" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_POSXR, "\\posxr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_POSY, "\\posy" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_POSYB, "\\posyb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_POSYC, "\\posyc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_POSYIL, "\\posyil" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_POSYT, "\\posyt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PRINTIM, "\\printim" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PSOVER, "\\psover" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PVMRG, "\\pvmrg" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PVPARA, "\\pvpara" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PVPG, "\\pvpg" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_QC, "\\qc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_QJ, "\\qj" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_QL, "\\ql" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_QR, "\\qr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RDBLQUOTE, "\\rdblquote" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RED, "\\red" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_REVBAR, "\\revbar" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_REVISED, "\\revised" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_REVISIONS, "\\revisions" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_REVPROP, "\\revprop" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_REVTIM, "\\revtim" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RI, "\\ri" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RIN, "\\rin" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ROW, "\\row" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RQUOTE, "\\rquote" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RTF, "\\rtf" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RXE, "\\rxe" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_S, "\\s" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SA, "\\sa" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SB, "\\sb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SBASEDON, "\\sbasedon" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SBKCOL, "\\sbkcol" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SBKEVEN, "\\sbkeven" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SBKNONE, "\\sbknone" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SBKODD, "\\sbkodd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SBKPAGE, "\\sbkpage" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SBYS, "\\sbys" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SCAPS, "\\scaps" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SECT, "\\sect" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SECTD, "\\sectd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHAD, "\\shad" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHADING, "\\shading" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHIFT, "\\shift" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SL, "\\sl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SNEXT, "\\snext" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_STRIKE, "\\strike" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_STYLESHEET, "\\stylesheet" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SUB, "\\sub" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SUBJECT, "\\subject" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SUPER, "\\super" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TAB, "\\tab" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TB, "\\tb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TC, "\\tc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TCF, "\\tcf" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TCL, "\\tcl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TEMPLATE, "\\template" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TITLE, "\\title" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TITLEPG, "\\titlepg" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TLDOT, "\\tldot" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TLEQ, "\\tleq" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TLHYPH, "\\tlhyph" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TLTH, "\\tlth" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TLUL, "\\tlul" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TQC, "\\tqc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TQDEC, "\\tqdec" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TQR, "\\tqr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TQL, "\\tql" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRGAPH, "\\trgaph" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRLEFT, "\\trleft" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TROWD, "\\trowd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRQC, "\\trqc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRQL, "\\trql" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRQR, "\\trqr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRRH, "\\trrh" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TX, "\\tx" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TXE, "\\txe" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_UL, "\\ul" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULD, "\\uld" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULDB, "\\uldb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULNONE, "\\ulnone" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULW, "\\ulw" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_UP, "\\up" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_V, "\\v" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_VERN, "\\vern" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_VERSION, "\\version" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_VERTALB, "\\vertalb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_VERTALC, "\\vertalc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_VERTALJ, "\\vertalj" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_VERTALT, "\\vertalt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_WBITMAP, "\\wbitmap" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_WBMBITSPIXEL, "\\wbmbitspixel" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_WBMPLANES, "\\wbmplanes" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_WBMWIDTHBYTES, "\\wbmwidthbytes" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_WIDOWCTRL, "\\widowctrl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_WMETAFILE, "\\wmetafile" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_XE, "\\xe" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_YR, "\\yr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOBRKHYPH, "\\_" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FORMULA, "\\|" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOBREAK, "\\~" ); - - -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AB, "\\ab" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ACAPS, "\\acaps" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ACF, "\\acf" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ADDITIVE, "\\additive" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ADN, "\\adn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AENDDOC, "\\aenddoc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AENDNOTES, "\\aendnotes" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AEXPND, "\\aexpnd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AF, "\\af" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFS, "\\afs" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNBJ, "\\aftnbj" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNCN, "\\aftncn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNALC, "\\aftnnalc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNAR, "\\aftnnar" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNAUC, "\\aftnnauc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNCHI, "\\aftnnchi" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNRLC, "\\aftnnrlc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNRUC, "\\aftnnruc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNRESTART, "\\aftnrestart" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNRSTCONT, "\\aftnrstcont" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNSEP, "\\aftnsep" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNSEPC, "\\aftnsepc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNSTART, "\\aftnstart" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNTJ, "\\aftntj" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AI, "\\ai" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ALANG, "\\alang" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ALLPROT, "\\allprot" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ANNOTPROT, "\\annotprot" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AOUTL, "\\aoutl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ASCAPS, "\\ascaps" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ASHAD, "\\ashad" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ASTRIKE, "\\astrike" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ATNAUTHOR, "\\atnauthor" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ATNICN, "\\atnicn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ATNREF, "\\atnref" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ATNTIME, "\\atntime" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ATRFEND, "\\atrfend" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ATRFSTART, "\\atrfstart" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AUL, "\\aul" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AULD, "\\auld" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AULDB, "\\auldb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AULNONE, "\\aulnone" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AULW, "\\aulw" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AUP, "\\aup" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BKMKPUB, "\\bkmkpub" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRDASH, "\\brdrdash" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRKFRM, "\\brkfrm" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CCHS, "\\cchs" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CPG, "\\cpg" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CS, "\\cs" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CVMME, "\\cvmme" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DATAFIELD, "\\datafield" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DO, "\\do" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DOBXCOLUMN, "\\dobxcolumn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DOBXMARGIN, "\\dobxmargin" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DOBXPAGE, "\\dobxpage" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DOBYMARGIN, "\\dobymargin" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DOBYPAGE, "\\dobypage" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DOBYPARA, "\\dobypara" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DODHGT, "\\dodhgt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DOLOCK, "\\dolock" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPAENDHOL, "\\dpaendhol" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPAENDL, "\\dpaendl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPAENDSOL, "\\dpaendsol" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPAENDW, "\\dpaendw" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPARC, "\\dparc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPARCFLIPX, "\\dparcflipx" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPARCFLIPY, "\\dparcflipy" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPASTARTHOL, "\\dpastarthol" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPASTARTL, "\\dpastartl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPASTARTSOL, "\\dpastartsol" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPASTARTW, "\\dpastartw" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCALLOUT, "\\dpcallout" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCOA, "\\dpcoa" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCOACCENT, "\\dpcoaccent" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCOBESTFIT, "\\dpcobestfit" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCOBORDER, "\\dpcoborder" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCODABS, "\\dpcodabs" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCODBOTTOM, "\\dpcodbottom" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCODCENTER, "\\dpcodcenter" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCODTOP, "\\dpcodtop" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCOLENGTH, "\\dpcolength" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCOMINUSX, "\\dpcominusx" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCOMINUSY, "\\dpcominusy" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCOOFFSET, "\\dpcooffset" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCOSMARTA, "\\dpcosmarta" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCOTDOUBLE, "\\dpcotdouble" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCOTRIGHT, "\\dpcotright" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCOTSINGLE, "\\dpcotsingle" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCOTTRIPLE, "\\dpcottriple" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCOUNT, "\\dpcount" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPELLIPSE, "\\dpellipse" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPENDGROUP, "\\dpendgroup" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPFILLBGCB, "\\dpfillbgcb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPFILLBGCG, "\\dpfillbgcg" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPFILLBGCR, "\\dpfillbgcr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPFILLBGGRAY, "\\dpfillbggray" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPFILLBGPAL, "\\dpfillbgpal" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPFILLFGCB, "\\dpfillfgcb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPFILLFGCG, "\\dpfillfgcg" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPFILLFGCR, "\\dpfillfgcr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPFILLFGGRAY, "\\dpfillfggray" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPFILLFGPAL, "\\dpfillfgpal" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPFILLPAT, "\\dpfillpat" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPGROUP, "\\dpgroup" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPLINE, "\\dpline" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPLINECOB, "\\dplinecob" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPLINECOG, "\\dplinecog" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPLINECOR, "\\dplinecor" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPLINEDADO, "\\dplinedado" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPLINEDADODO, "\\dplinedadodo" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPLINEDASH, "\\dplinedash" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPLINEDOT, "\\dplinedot" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPLINEGRAY, "\\dplinegray" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPLINEHOLLOW, "\\dplinehollow" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPLINEPAL, "\\dplinepal" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPLINESOLID, "\\dplinesolid" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPLINEW, "\\dplinew" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPPOLYCOUNT, "\\dppolycount" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPPOLYGON, "\\dppolygon" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPPOLYLINE, "\\dppolyline" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPPTX, "\\dpptx" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPPTY, "\\dppty" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPRECT, "\\dprect" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPROUNDR, "\\dproundr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPSHADOW, "\\dpshadow" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPSHADX, "\\dpshadx" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPSHADY, "\\dpshady" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPTXBX, "\\dptxbx" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPTXBXMAR, "\\dptxbxmar" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPTXBXTEXT, "\\dptxbxtext" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPX, "\\dpx" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPXSIZE, "\\dpxsize" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPY, "\\dpy" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPYSIZE, "\\dpysize" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DS, "\\ds" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_EMSPACE, "\\emspace" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ENSPACE, "\\enspace" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FBIDI, "\\fbidi" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FET, "\\fet" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FID, "\\fid" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FILE, "\\file" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FILETBL, "\\filetbl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLDALT, "\\fldalt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FNETWORK, "\\fnetwork" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FONTEMB, "\\fontemb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FONTFILE, "\\fontfile" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FORMDISP, "\\formdisp" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FORMPROT, "\\formprot" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FORMSHADE, "\\formshade" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FOSNUM, "\\fosnum" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FRELATIVE, "\\frelative" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNALT, "\\ftnalt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNIL, "\\ftnil" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNALC, "\\ftnnalc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNAR, "\\ftnnar" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNAUC, "\\ftnnauc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNCHI, "\\ftnnchi" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNRLC, "\\ftnnrlc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNRUC, "\\ftnnruc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNRSTCONT, "\\ftnrstcont" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNRSTPG, "\\ftnrstpg" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTTRUETYPE, "\\fttruetype" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FVALIDDOS, "\\fvaliddos" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FVALIDHPFS, "\\fvalidhpfs" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FVALIDMAC, "\\fvalidmac" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FVALIDNTFS, "\\fvalidntfs" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HYPHAUTO, "\\hyphauto" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HYPHCAPS, "\\hyphcaps" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HYPHCONSEC, "\\hyphconsec" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HYPHPAR, "\\hyphpar" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LINKSELF, "\\linkself" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LINKSTYLES, "\\linkstyles" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LTRCH, "\\ltrch" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LTRDOC, "\\ltrdoc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LTRMARK, "\\ltrmark" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LTRPAR, "\\ltrpar" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LTRROW, "\\ltrrow" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LTRSECT, "\\ltrsect" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOCOLBAL, "\\nocolbal" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOEXTRASPRL, "\\noextrasprl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOTABIND, "\\notabind" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOWIDCTLPAR, "\\nowidctlpar" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJALIAS, "\\objalias" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJALIGN, "\\objalign" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJAUTLINK, "\\objautlink" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJCLASS, "\\objclass" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJCROPB, "\\objcropb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJCROPL, "\\objcropl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJCROPR, "\\objcropr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJCROPT, "\\objcropt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJDATA, "\\objdata" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJECT, "\\object" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJEMB, "\\objemb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJH, "\\objh" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJICEMB, "\\objicemb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJLINK, "\\objlink" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJLOCK, "\\objlock" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJNAME, "\\objname" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJPUB, "\\objpub" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJSCALEX, "\\objscalex" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJSCALEY, "\\objscaley" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJSECT, "\\objsect" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJSETSIZE, "\\objsetsize" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJSUB, "\\objsub" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJTIME, "\\objtime" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJTRANSY, "\\objtransy" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJUPDATE, "\\objupdate" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJW, "\\objw" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OTBLRUL, "\\otblrul" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNHN, "\\pgnhn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNHNSC, "\\pgnhnsc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNHNSH, "\\pgnhnsh" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNHNSM, "\\pgnhnsm" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNHNSN, "\\pgnhnsn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNHNSP, "\\pgnhnsp" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PICBMP, "\\picbmp" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PICBPP, "\\picbpp" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PN, "\\pn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNACROSS, "\\pnacross" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNB, "\\pnb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNCAPS, "\\pncaps" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNCARD, "\\pncard" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNCF, "\\pncf" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNDEC, "\\pndec" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNF, "\\pnf" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNFS, "\\pnfs" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNHANG, "\\pnhang" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNI, "\\pni" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNINDENT, "\\pnindent" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNLCLTR, "\\pnlcltr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNLCRM, "\\pnlcrm" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNLVL, "\\pnlvl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNLVLBLT, "\\pnlvlblt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNLVLBODY, "\\pnlvlbody" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNLVLCONT, "\\pnlvlcont" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNNUMONCE, "\\pnnumonce" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNORD, "\\pnord" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNORDT, "\\pnordt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNPREV, "\\pnprev" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNQC, "\\pnqc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNQL, "\\pnql" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNQR, "\\pnqr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNRESTART, "\\pnrestart" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNSCAPS, "\\pnscaps" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNSECLVL, "\\pnseclvl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNSP, "\\pnsp" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNSTART, "\\pnstart" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNSTRIKE, "\\pnstrike" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNTEXT, "\\pntext" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNTXTA, "\\pntxta" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNTXTB, "\\pntxtb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNUCLTR, "\\pnucltr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNUCRM, "\\pnucrm" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNUL, "\\pnul" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNULD, "\\pnuld" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNULDB, "\\pnuldb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNULNONE, "\\pnulnone" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNULW, "\\pnulw" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PRCOLBL, "\\prcolbl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PRINTDATA, "\\printdata" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PSZ, "\\psz" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PUBAUTO, "\\pubauto" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RESULT, "\\result" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_REVAUTH, "\\revauth" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_REVDTTM, "\\revdttm" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_REVPROT, "\\revprot" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_REVTBL, "\\revtbl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RSLTBMP, "\\rsltbmp" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RSLTMERGE, "\\rsltmerge" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RSLTPICT, "\\rsltpict" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RSLTRTF, "\\rsltrtf" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RSLTTXT, "\\rslttxt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RTLCH, "\\rtlch" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RTLDOC, "\\rtldoc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RTLMARK, "\\rtlmark" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RTLPAR, "\\rtlpar" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RTLROW, "\\rtlrow" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_RTLSECT, "\\rtlsect" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SEC, "\\sec" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SECTNUM, "\\sectnum" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SECTUNLOCKED, "\\sectunlocked" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SLMULT, "\\slmult" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SOFTCOL, "\\softcol" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SOFTLHEIGHT, "\\softlheight" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SOFTLINE, "\\softline" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SOFTPAGE, "\\softpage" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SPRSSPBF, "\\sprsspbf" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SPRSTSP, "\\sprstsp" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SUBDOCUMENT, "\\subdocument" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SWPBDR, "\\swpbdr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TCN, "\\tcn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRANSMF, "\\transmf" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRBRDRB, "\\trbrdrb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRBRDRH, "\\trbrdrh" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRBRDRL, "\\trbrdrl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRBRDRR, "\\trbrdrr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRBRDRT, "\\trbrdrt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRBRDRV, "\\trbrdrv" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRHDR, "\\trhdr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRKEEP, "\\trkeep" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRPADDB, "\\trpaddb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRPADDL, "\\trpaddl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRPADDR, "\\trpaddr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRPADDT, "\\trpaddt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRPADDFB, "\\trpaddfb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRPADDFL, "\\trpaddfl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRPADDFR, "\\trpaddfr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRPADDFT, "\\trpaddft" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_WRAPTRSP, "\\wraptrsp" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_XEF, "\\xef" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ZWJ, "\\zwj" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ZWNJ, "\\zwnj" ); - -// neue Tokens zur 1.5 -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ABSLOCK, "\\abslock" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ADJUSTRIGHT, "\\adjustright" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNCHOSUNG, "\\aftnnchosung" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNCNUM, "\\aftnncnum" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNDBAR, "\\aftnndbar" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNDBNUM, "\\aftnndbnum" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNDBNUMD, "\\aftnndbnumd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNDBNUMK, "\\aftnndbnumk" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNDBNUMT, "\\aftnndbnumt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNGANADA, "\\aftnnganada" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNGBNUM, "\\aftnngbnum" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNGBNUMD, "\\aftnngbnumd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNGBNUMK, "\\aftnngbnumk" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNGBNUML, "\\aftnngbnuml" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNZODIAC, "\\aftnnzodiac" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNZODIACD, "\\aftnnzodiacd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_AFTNNZODIACL, "\\aftnnzodiacl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ANIMTEXT, "\\animtext" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ANSICPG, "\\ansicpg" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BACKGROUND, "\\background" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BDBFHDR, "\\bdbfhdr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BLIPTAG, "\\bliptag" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BLIPUID, "\\blipuid" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BLIPUPI, "\\blipupi" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRART, "\\brdrart" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRDASHD, "\\brdrdashd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRDASHDD, "\\brdrdashdd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRDASHDOTSTR, "\\brdrdashdotstr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRDASHSM, "\\brdrdashsm" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDREMBOSS, "\\brdremboss" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRENGRAVE, "\\brdrengrave" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRFRAME, "\\brdrframe" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRTHTNLG, "\\brdrthtnlg" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRTHTNMG, "\\brdrthtnmg" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRTHTNSG, "\\brdrthtnsg" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRTNTHLG, "\\brdrtnthlg" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRTNTHMG, "\\brdrtnthmg" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRTNTHSG, "\\brdrtnthsg" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRTNTHTNLG, "\\brdrtnthtnlg" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRTNTHTNMG, "\\brdrtnthtnmg" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRTNTHTNSG, "\\brdrtnthtnsg" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRTRIPLE, "\\brdrtriple" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRWAVY, "\\brdrwavy" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDRWAVYDB, "\\brdrwavydb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CATEGORY, "\\category" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CGRID, "\\cgrid" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHARSCALEX, "\\charscalex" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHBGBDIAG, "\\chbgbdiag" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHBGCROSS, "\\chbgcross" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHBGDCROSS, "\\chbgdcross" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHBGDKBDIAG, "\\chbgdkbdiag" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHBGDKCROSS, "\\chbgdkcross" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHBGDKDCROSS, "\\chbgdkdcross" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHBGDKFDIAG, "\\chbgdkfdiag" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHBGDKHORIZ, "\\chbgdkhoriz" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHBGDKVERT, "\\chbgdkvert" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHBGFDIAG, "\\chbgfdiag" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHBGHORIZ, "\\chbghoriz" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHBGVERT, "\\chbgvert" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHBRDR, "\\chbrdr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHCBPAT, "\\chcbpat" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHCFPAT, "\\chcfpat" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CHSHDNG, "\\chshdng" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLPADL, "\\clpadl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLPADT, "\\clpadt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLPADB, "\\clpadb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLPADR, "\\clpadr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLPADFL, "\\clpadfl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLPADFT, "\\clpadft" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLPADFB, "\\clpadfb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLPADFR, "\\clpadfr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLTXLRTB, "\\cltxlrtb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLTXTBRL, "\\cltxtbrl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLVERTALB, "\\clvertalb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLVERTALC, "\\clvertalc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLVERTALT, "\\clvertalt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLVMGF, "\\clvmgf" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLVMRG, "\\clvmrg" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLTXTBRLV, "\\cltxtbrlv" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLTXBTLR, "\\cltxbtlr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CLTXLRTBV, "\\cltxlrtbv" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_COMPANY, "\\company" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CRAUTH, "\\crauth" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_CRDATE, "\\crdate" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DATE, "\\date" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DEFLANGFE, "\\deflangfe" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DFRAUTH, "\\dfrauth" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DFRDATE, "\\dfrdate" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DFRSTART, "\\dfrstart" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DFRSTOP, "\\dfrstop" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DFRXST, "\\dfrxst" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DGMARGIN, "\\dgmargin" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DNTBLNSBDB, "\\dntblnsbdb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DOCTYPE, "\\doctype" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DOCVAR, "\\docvar" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DPCODESCENT, "\\dpcodescent" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_EMBO, "\\embo" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_EMFBLIP, "\\emfblip" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_EXPSHRTN, "\\expshrtn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FAAUTO, "\\faauto" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FBIAS, "\\fbias" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFDEFRES, "\\ffdefres" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFDEFTEXT, "\\ffdeftext" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFENTRYMCR, "\\ffentrymcr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFEXITMCR, "\\ffexitmcr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFFORMAT, "\\ffformat" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFHASLISTBOX, "\\ffhaslistbox" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFHELPTEXT, "\\ffhelptext" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFHPS, "\\ffhps" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFL, "\\ffl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFMAXLEN, "\\ffmaxlen" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFNAME, "\\ffname" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFOWNHELP, "\\ffownhelp" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFOWNSTAT, "\\ffownstat" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFPROT, "\\ffprot" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFRECALC, "\\ffrecalc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFRES, "\\ffres" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFSIZE, "\\ffsize" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFSTATTEXT, "\\ffstattext" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFTYPE, "\\fftype" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FFTYPETXT, "\\fftypetxt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLDTYPE, "\\fldtype" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FNAME, "\\fname" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FORMFIELD, "\\formfield" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FROMTEXT, "\\fromtext" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNCHOSUNG, "\\ftnnchosung" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNCNUM, "\\ftnncnum" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNDBAR, "\\ftnndbar" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNDBNUM, "\\ftnndbnum" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNDBNUMD, "\\ftnndbnumd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNDBNUMK, "\\ftnndbnumk" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNDBNUMT, "\\ftnndbnumt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNGANADA, "\\ftnnganada" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNGBNUM, "\\ftnngbnum" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNGBNUMD, "\\ftnngbnumd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNGBNUMK, "\\ftnngbnumk" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNGBNUML, "\\ftnngbnuml" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNZODIAC, "\\ftnnzodiac" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNZODIACD, "\\ftnnzodiacd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FTNNZODIACL, "\\ftnnzodiacl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_G, "\\g" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_GCW, "\\gcw" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_GRIDTBL, "\\gridtbl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HIGHLIGHT, "\\highlight" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HLFR, "\\hlfr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HLINKBASE, "\\hlinkbase" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HLLOC, "\\hlloc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HLSRC, "\\hlsrc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ILVL, "\\ilvl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_IMPR, "\\impr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_JPEGBLIP, "\\jpegblip" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LEVELFOLLOW, "\\levelfollow" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LEVELINDENT, "\\levelindent" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LEVELJC, "\\leveljc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LEVELLEGAL, "\\levellegal" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LEVELNFC, "\\levelnfc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LEVELNORESTART, "\\levelnorestart" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LEVELNUMBERS, "\\levelnumbers" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LEVELOLD, "\\levelold" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LEVELPREV, "\\levelprev" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LEVELPREVSPACE, "\\levelprevspace" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LEVELSPACE, "\\levelspace" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LEVELSTARTAT, "\\levelstartat" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LEVELTEXT, "\\leveltext" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LINKVAL, "\\linkval" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LIST, "\\list" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LISTID, "\\listid" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LISTLEVEL, "\\listlevel" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LISTNAME, "\\listname" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LISTOVERRIDE, "\\listoverride" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LISTOVERRIDECOUNT, "\\listoverridecount" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LISTOVERRIDEFORMAT, "\\listoverrideformat" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LISTOVERRIDESTART, "\\listoverridestart" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LISTOVERRIDETABLE, "\\listoverridetable" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LISTRESTARTHDN, "\\listrestarthdn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LISTSIMPLE, "\\listsimple" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LISTTABLE, "\\listtable" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LISTTEMPLATEID, "\\listtemplateid" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LISTTEXT, "\\listtext" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LS, "\\ls" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LYTEXCTTP, "\\lytexcttp" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LYTPRTMET, "\\lytprtmet" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_MANAGER, "\\manager" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_MSMCAP, "\\msmcap" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOFCHARSWS, "\\nofcharsws" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOLEAD, "\\nolead" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NONSHPPICT, "\\nonshppict" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOSECTEXPAND, "\\nosectexpand" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOSNAPLINEGRID, "\\nosnaplinegrid" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOSPACEFORUL, "\\nospaceforul" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOULTRLSPC, "\\noultrlspc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_NOXLATTOYEN, "\\noxlattoyen" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJATTPH, "\\objattph" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJHTML, "\\objhtml" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OBJOCX, "\\objocx" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLDLINEWRAP, "\\oldlinewrap" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OUTLINELEVEL, "\\outlinelevel" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OVERLAY, "\\overlay" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PANOSE, "\\panose" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGBRDRB, "\\pgbrdrb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGBRDRFOOT, "\\pgbrdrfoot" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGBRDRHEAD, "\\pgbrdrhead" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGBRDRL, "\\pgbrdrl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGBRDROPT, "\\pgbrdropt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGBRDRR, "\\pgbrdrr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGBRDRSNAP, "\\pgbrdrsnap" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGBRDRT, "\\pgbrdrt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNCHOSUNG, "\\pgnchosung" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNCNUM, "\\pgncnum" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNDBNUMK, "\\pgndbnumk" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNDBNUMT, "\\pgndbnumt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNGANADA, "\\pgnganada" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNGBNUM, "\\pgngbnum" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNGBNUMD, "\\pgngbnumd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNGBNUMK, "\\pgngbnumk" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNGBNUML, "\\pgngbnuml" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNZODIAC, "\\pgnzodiac" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNZODIACD, "\\pgnzodiacd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGNZODIACL, "\\pgnzodiacl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PICPROP, "\\picprop" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNAIUEO, "\\pnaiueo" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNAIUEOD, "\\pnaiueod" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNCHOSUNG, "\\pnchosung" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNDBNUMD, "\\pndbnumd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNDBNUMK, "\\pndbnumk" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNDBNUML, "\\pndbnuml" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNDBNUMT, "\\pndbnumt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNGANADA, "\\pnganada" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNGBLIP, "\\pngblip" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNGBNUM, "\\pngbnum" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNGBNUMD, "\\pngbnumd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNGBNUMK, "\\pngbnumk" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNGBNUML, "\\pngbnuml" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNRAUTH, "\\pnrauth" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNRDATE, "\\pnrdate" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNRNFC, "\\pnrnfc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNRNOT, "\\pnrnot" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNRPNBR, "\\pnrpnbr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNRRGB, "\\pnrrgb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNRSTART, "\\pnrstart" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNRSTOP, "\\pnrstop" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNRXST, "\\pnrxst" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNZODIAC, "\\pnzodiac" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNZODIACD, "\\pnzodiacd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PNZODIACL, "\\pnzodiacl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_LFOLEVEL, "\\lfolevel" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_POSYIN, "\\posyin" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_POSYOUT, "\\posyout" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PRIVATE, "\\private" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PROPNAME, "\\propname" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PROPTYPE, "\\proptype" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_REVAUTHDEL, "\\revauthdel" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_REVDTTMDEL, "\\revdttmdel" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SAUTOUPD, "\\sautoupd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SECTDEFAULTCL, "\\sectdefaultcl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SECTEXPAND, "\\sectexpand" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SECTLINEGRID, "\\sectlinegrid" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SECTSPECIFYCL, "\\sectspecifycl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SECTSPECIFYL, "\\sectspecifyl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHIDDEN, "\\shidden" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPBOTTOM, "\\shpbottom" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPBXCOLUMN, "\\shpbxcolumn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPBXMARGIN, "\\shpbxmargin" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPBXPAGE, "\\shpbxpage" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPBYMARGIN, "\\shpbymargin" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPBYPAGE, "\\shpbypage" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPBYPARA, "\\shpbypara" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPFBLWTXT, "\\shpfblwtxt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPFHDR, "\\shpfhdr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPGRP, "\\shpgrp" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPLEFT, "\\shpleft" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPLID, "\\shplid" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPLOCKANCHOR, "\\shplockanchor" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPPICT, "\\shppict" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPRIGHT, "\\shpright" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPRSLT, "\\shprslt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPTOP, "\\shptop" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPTXT, "\\shptxt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPWRK, "\\shpwrk" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPWR, "\\shpwr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPZ, "\\shpz" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SPRSBSP, "\\sprsbsp" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SPRSLNSP, "\\sprslnsp" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SPRSTSM, "\\sprstsm" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_STATICVAL, "\\staticval" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_STEXTFLOW, "\\stextflow" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_STRIKED, "\\striked" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SUBFONTBYSIZE, "\\subfontbysize" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TCELLD, "\\tcelld" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TIME, "\\time" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TRUNCATEFONTHEIGHT, "\\truncatefontheight" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_UC, "\\uc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_UD, "\\ud" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULDASH, "\\uldash" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULDASHD, "\\uldashd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULDASHDD, "\\uldashdd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULTH, "\\ulth" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULWAVE, "\\ulwave" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULC, "\\ulc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_U, "\\u" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_UPR, "\\upr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_USERPROPS, "\\userprops" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_VIEWKIND, "\\viewkind" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_VIEWSCALE, "\\viewscale" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_VIEWZK, "\\viewzk" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_WIDCTLPAR, "\\widctlpar" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_WINDOWCAPTION, "\\windowcaption" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_WPEQN, "\\wpeqn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_WPJST, "\\wpjst" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_WPSP, "\\wpsp" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_YXE, "\\yxe" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FRMTXLRTB, "\\frmtxlrtb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FRMTXTBRL, "\\frmtxtbrl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FRMTXBTLR, "\\frmtxbtlr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FRMTXLRTBV, "\\frmtxlrtbv" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FRMTXTBRLV, "\\frmtxtbrlv" ); - -// MS-2000 Tokens -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULTHD, "\\ulthd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULTHDASH, "\\ulthdash" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULLDASH, "\\ulldash" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULTHLDASH, "\\ulthldash" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ULTHDASHD, "\\ulthdashd" ); -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_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_NOOVERFLOW,"\\nooverflow" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_ASPALPHA, "\\aspalpha" ); - -// SWG spezifische Attribute -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_GRFALIGNV, "\\grfalignv" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_GRFALIGNH, "\\grfalignh" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_GRFMIRROR, "\\grfmirror" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HEADERYB, "\\headeryb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HEADERXL, "\\headerxl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HEADERXR, "\\headerxr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FOOTERYT, "\\footeryt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FOOTERXL, "\\footerxl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FOOTERXR, "\\footerxr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HEADERYH, "\\headeryh" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FOOTERYH, "\\footeryh" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BALANCEDCOLUMN, "\\swcolmnblnc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_UPDNPROP, "\\updnprop" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PRTDATA, "\\prtdata" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BKMKKEY, "\\bkmkkey" ); - -// Attribute fuer die freifliegenden Rahmen -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLYPRINT, "\\flyprint" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLYOPAQUE, "\\flyopaque" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLYPRTCTD, "\\flyprtctd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLYMAINCNT, "\\flymaincnt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLYVERT, "\\flyvert" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLYHORZ, "\\flyhorz" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DFRMTXTL, "\\dfrmtxtl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DFRMTXTR, "\\dfrmtxtr" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DFRMTXTU, "\\dfrmtxtu" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_DFRMTXTW, "\\dfrmtxtw" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLYANCHOR, "\\flyanchor" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLYCNTNT, "\\flycntnt" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLYCOLUMN, "\\flycolumn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLYPAGE, "\\flypage" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_FLYINPARA, "\\flyinpara" ); - -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDBOX, "\\brdbox" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDLNCOL, "\\brdlncol" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDLNIN, "\\brdlnin" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDLNOUT, "\\brdlnout" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_BRDLNDIST, "\\brdlndist" ); - -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHADOW, "\\shadow" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHDWDIST, "\\shdwdist" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHDWSTYLE, "\\shdwstyle" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHDWCOL, "\\shdwcol" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHDWFCOL, "\\shdwfcol" ); - - -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGDSCTBL, "\\pgdsctbl" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGDSC, "\\pgdsc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGDSCUSE, "\\pgdscuse" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGDSCNXT, "\\pgdscnxt" ); - -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HYPHEN, "\\hyphen" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HYPHLEAD, "\\hyphlead" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HYPHTRAIL, "\\hyphtrail" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_HYPHMAX, "\\hyphmax" ); - -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_TLSWG, "\\tlswg" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGBRK, "\\pgbrk" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_PGDSCNO, "\\pgdscno" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SOUTLVL, "\\soutlvl" ); - -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHP, "\\shp" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SN, "\\sn" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SV, "\\sv" ); -/* -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPLEFT, "\\shpleft" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPTOP, "\\shptop" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPBOTTOM, "\\shpbottom" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPRIGHT, "\\shpright" ); -*/ - -// Support for overline attributes -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OL, "\\ol" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLD, "\\old" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLDB, "\\oldb" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLNONE, "\\olnone" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLW, "\\olw" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLDASH, "\\oldash" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLDASHD, "\\oldashd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLDASHDD, "\\oldashdd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLTH, "\\olth" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLWAVE, "\\olwave" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLC, "\\olc" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLTHD, "\\olthd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLTHDASH, "\\olthdash" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLLDASH, "\\olldash" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLTHLDASH, "\\olthldash" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLTHDASHD, "\\olthdashd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLTHDASHDD, "\\olthdashdd" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLHWAVE, "\\olhwave" ); -sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_OLOLDBWAVE, "\\ololdbwave" ); - -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/svtools/source/svrtf/rtfkeywd.cxx b/svtools/source/svrtf/rtfkeywd.cxx index 0dc90d0da8ab..710e7e4a9a76 100644 --- a/svtools/source/svrtf/rtfkeywd.cxx +++ b/svtools/source/svrtf/rtfkeywd.cxx @@ -33,8 +33,8 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ -#include "rtfkeywd.hxx" -#include "rtftoken.h" +#include +#include #include "tools/string.hxx" #include diff --git a/svtools/source/svrtf/rtfout.cxx b/svtools/source/svrtf/rtfout.cxx index 21dfefb14232..4dbd4735568b 100644 --- a/svtools/source/svrtf/rtfout.cxx +++ b/svtools/source/svrtf/rtfout.cxx @@ -35,8 +35,8 @@ #include #include #include -#include -#include +#include +#include using namespace rtl; diff --git a/svtools/source/uno/addrtempuno.cxx b/svtools/source/uno/addrtempuno.cxx index b2aff7ae711d..1bfa71cd0c09 100644 --- a/svtools/source/uno/addrtempuno.cxx +++ b/svtools/source/uno/addrtempuno.cxx @@ -31,12 +31,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" #include "svtools/genericunodialog.hxx" -#ifndef _SVT_DOC_ADDRESSTEMPLATE_HXX_ -#include "addresstemplate.hxx" -#endif -#ifndef _CPPUHELPER_EXTRACT_HXX_ +#include #include -#endif #include #include #include diff --git a/svtools/source/uno/contextmenuhelper.cxx b/svtools/source/uno/contextmenuhelper.cxx index b3ae322aa3ba..9a72ad5e4f5c 100644 --- a/svtools/source/uno/contextmenuhelper.cxx +++ b/svtools/source/uno/contextmenuhelper.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#include "contextmenuhelper.hxx" +#include #include #include diff --git a/svtools/source/uno/framestatuslistener.cxx b/svtools/source/uno/framestatuslistener.cxx index 79b496187b5a..7d526fd1102f 100644 --- a/svtools/source/uno/framestatuslistener.cxx +++ b/svtools/source/uno/framestatuslistener.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#include +#include #include #include #include diff --git a/svtools/source/uno/statusbarcontroller.cxx b/svtools/source/uno/statusbarcontroller.cxx index 91c895f416a0..f8c9c813cd08 100644 --- a/svtools/source/uno/statusbarcontroller.cxx +++ b/svtools/source/uno/statusbarcontroller.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#include +#include #include #include #include @@ -40,11 +40,9 @@ #include #include #include -#include +#include #include -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include -#endif using namespace ::cppu; using namespace ::com::sun::star::awt; diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx index a8d05c49a7ae..3c63dada33ac 100644 --- a/svtools/source/uno/toolboxcontroller.cxx +++ b/svtools/source/uno/toolboxcontroller.cxx @@ -38,12 +38,9 @@ #include #include #include -#include +#include #include - -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include -#endif #include using namespace ::cppu; diff --git a/svtools/source/uno/unoevent.cxx b/svtools/source/uno/unoevent.cxx index 6fc8b0017ad8..e5c5280c83e4 100644 --- a/svtools/source/uno/unoevent.cxx +++ b/svtools/source/uno/unoevent.cxx @@ -31,15 +31,11 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP #include -#endif #include - - #include #include -#include "unoevent.hxx" +#include #include using namespace ::com::sun::star; diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx index a1ff1ad2ac3e..de47d9651e31 100644 --- a/svtools/source/uno/unoiface.cxx +++ b/svtools/source/uno/unoiface.cxx @@ -34,12 +34,11 @@ #define _SVT_UNOIFACE_CXX #include #include - #include #include -#include "filedlg.hxx" -#include "filectrl.hxx" -#include "roadmap.hxx" +#include +#include +#include #include #include #include @@ -49,9 +48,8 @@ #include #include #include -#include -#include - +#include +#include #include #include "treecontrolpeer.hxx" #include "svtxgridcontrol.hxx" diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx index 28d8c7acdc70..c619ebc1bccf 100644 --- a/svtools/source/uno/unoimap.cxx +++ b/svtools/source/uno/unoimap.cxx @@ -39,23 +39,17 @@ #include #include #include - -#ifndef _COMPHELPER_SERVICEHELPER_HXX_ #include -#endif #include #include #include - #include - #include #include #include #include - -#include "unoevent.hxx" -#include "unoimap.hxx" +#include +#include #include #include #include diff --git a/svtools/source/urlobj/inetimg.cxx b/svtools/source/urlobj/inetimg.cxx index 61781c2b3500..23873daf5e52 100644 --- a/svtools/source/urlobj/inetimg.cxx +++ b/svtools/source/urlobj/inetimg.cxx @@ -34,10 +34,7 @@ #include #include -#ifndef GCC -#endif - -#include "inetimg.hxx" +#include #define TOKEN_SEPARATOR '\001' diff --git a/svtools/util/makefile.mk b/svtools/util/makefile.mk index 22be04f95d3f..bb754b239ff3 100644 --- a/svtools/util/makefile.mk +++ b/svtools/util/makefile.mk @@ -34,7 +34,6 @@ PRJ=.. PRJNAME=svtools TARGET=svtool RESTARGET=svt -RESTARGETPATCH=svp GEN_HID=TRUE GEN_HID_OTHER=TRUE ENABLE_EXCEPTIONS=TRUE @@ -91,10 +90,6 @@ RESLIB1SRSFILES= \ $(SRS)$/browse.srs \ $(SRS)$/javaerror.srs -RESLIB3NAME= $(RESTARGETPATCH) -RESLIB3SRSFILES= \ - $(SRS)$/patchjavaerror.srs - # build the shared library -------------------------------------------------- SHL1TARGET= svt$(DLLPOSTFIX) -- cgit From c0524d5e4df64fcebb3fa093ec909468ddd2f2f2 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 16 Apr 2010 23:02:51 +0200 Subject: CWS gnumake2: move delivered header files from sfx2/inc to sfx2/inc/sfx2; removed unused code; avoid delivering sfx.srs to solver --- svl/inc/svl/svtools.hrc | 3 + svtools/inc/svtools/svtdata.hxx | 9 +- svtools/source/misc/errtxt.src | 517 ---------------------------------------- svtools/source/misc/makefile.mk | 5 +- svtools/source/misc/svtdata.cxx | 5 + svtools/source/misc/undo.src | 47 ++++ 6 files changed, 60 insertions(+), 526 deletions(-) delete mode 100644 svtools/source/misc/errtxt.src create mode 100644 svtools/source/misc/undo.src diff --git a/svl/inc/svl/svtools.hrc b/svl/inc/svl/svtools.hrc index e4cc91cfcb49..0b2a7ec353e9 100644 --- a/svl/inc/svl/svtools.hrc +++ b/svl/inc/svl/svtools.hrc @@ -100,6 +100,9 @@ #define STR_BASICKEY_FORMAT_TRUE (RID_SVTOOLS_START+107) #define STR_BASICKEY_FORMAT_FALSE (RID_SVTOOLS_START+108) #define CONFIG_BASIC_FORMAT_END (RID_SVTOOLS_START+109) +#define STR_UNDO (RID_SVTOOLS_START+110) +#define STR_REDO (RID_SVTOOLS_START+111) +#define STR_REPEAT (RID_SVTOOLS_START+112) #define STR_INVALIDTRYBUY (RID_SVTOOLS_START+120) #define STR_OLDTRYBUY (RID_SVTOOLS_START+121) diff --git a/svtools/inc/svtools/svtdata.hxx b/svtools/inc/svtools/svtdata.hxx index b1cc8136ef68..566514b6b2a0 100644 --- a/svtools/inc/svtools/svtdata.hxx +++ b/svtools/inc/svtools/svtdata.hxx @@ -31,6 +31,7 @@ #ifndef _SVTOOLS_SVTDATA_HXX #define _SVTOOLS_SVTDATA_HXX +#include "svtools/svtdllapi.h" #include #include @@ -74,13 +75,11 @@ public: }; -class SvtResId: public ResId +class SVT_DLLPUBLIC SvtResId: public ResId { public: - SvtResId(USHORT nId, const ::com::sun::star::lang::Locale aLocale): - ResId(nId, *ImpSvtData::GetSvtData().GetResMgr(aLocale)) {} - - SvtResId(USHORT nId): ResId(nId, *ImpSvtData::GetSvtData().GetResMgr()) {} + SvtResId(USHORT nId, const ::com::sun::star::lang::Locale aLocale); + SvtResId(USHORT nId); // VCL dependant, only available in SVT, not in SVL! }; diff --git a/svtools/source/misc/errtxt.src b/svtools/source/misc/errtxt.src deleted file mode 100644 index 306ccf7f164d..000000000000 --- a/svtools/source/misc/errtxt.src +++ /dev/null @@ -1,517 +0,0 @@ -/************************************************************************* - * - * 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 - * - * $RCSfile: errtxt.src,v $ - * $Revision: 1.63 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#define __RSC -#include -#include "svtools/sfxecode.hxx" - // pragma ---------------------------------------------------------------- -Resource RID_ERRCTX -{ - String ERRCTX_ERROR - { - Text [ en-US ] = "Error" ; - }; - String ERRCTX_WARNING - { - Text [ en-US ] = "Warning" ; - }; - String ERRCTX_SFX_LOADTEMPLATE - { - Text [ en-US ] = "$(ERR) loading the template $(ARG1)" ; - }; - String ERRCTX_SFX_SAVEDOC - { - Text [ en-US ] = "$(ERR) saving the document $(ARG1)"; - }; - String ERRCTX_SFX_SAVEASDOC - { - Text [ en-US ] = "$(ERR) saving the document $(ARG1)"; - }; - String ERRCTX_SFX_DOCINFO - { - Text [ en-US ] = "$(ERR) displaying doc. information for document $(ARG1)" ; - }; - String ERRCTX_SFX_DOCTEMPLATE - { - Text [ en-US ] = "$(ERR) writing document $(ARG1) as template" ; - }; - String ERRCTX_SFX_MOVEORCOPYCONTENTS - { - Text [ en-US ] = "$(ERR) copying or moving document contents" ; - }; - String ERRCTX_SFX_DOCMANAGER - { - Text [ en-US ] = "$(ERR) starting the Document Manager" ; - }; - String ERRCTX_SFX_OPENDOC - { - Text [ en-US ] = "$(ERR) loading document $(ARG1)" ; - }; - String ERRCTX_SFX_NEWDOCDIRECT - { - Text [ en-US ] = "$(ERR) creating a new document" ; - }; - String ERRCTX_SFX_NEWDOC - { - Text [ en-US ] = "$(ERR) creating a new document" ; - }; - String ERRCTX_SFX_CREATEOBJSH - { - Text [ en-US ] = "$(ERR) expanding entry" ; - }; - String ERRCTX_SFX_LOADBASIC - { - Text [ en-US ] = "$(ERR) loading BASIC of document $(ARG1)" ; - }; - String ERRCTX_SFX_SEARCHADDRESS - { - Text [ en-US ] = "$(ERR) searching for an address"; - }; -}; -Resource RID_ERRHDL -{ - String ERRCODE_CLASS_ABORT - { - Text [ en-US ] = "Abort" ; - }; - String ERRCODE_CLASS_NOTEXISTS - { - Text [ en-US ] = "Nonexistent object" ; - }; - String ERRCODE_CLASS_ALREADYEXISTS - { - Text [ en-US ] = "Object already exists" ; - }; - String ERRCODE_CLASS_ACCESS - { - Text [ en-US ] = "Object not accessible" ; - }; - String ERRCODE_CLASS_PATH - { - Text [ en-US ] = "Inadmissible path" ; - }; - String ERRCODE_CLASS_LOCKING - { - Text [ en-US ] = "Locking problem" ; - }; - String ERRCODE_CLASS_PARAMETER - { - Text [ en-US ] = "Wrong parameter" ; - }; - String ERRCODE_CLASS_SPACE - { - Text [ en-US ] = "Resource exhausted" ; - }; - String ERRCODE_CLASS_NOTSUPPORTED - { - Text [ en-US ] = "Action not supported" ; - }; - String ERRCODE_CLASS_READ - { - Text [ en-US ] = "Read-Error" ; - }; - String ERRCODE_CLASS_WRITE - { - Text [ en-US ] = "Write Error" ; - }; - String ERRCODE_CLASS_UNKNOWN - { - Text [ en-US ] = "unknown" ; - }; - String ERRCODE_CLASS_VERSION - { - Text [ en-US ] = "Version Incompatibility" ; - }; - String ERRCODE_CLASS_GENERAL - { - Text [ en-US ] = "General Error" ; - }; - String ERRCODE_CLASS_FORMAT - { - Text [ en-US ] = "Incorrect format" ; - }; - String ERRCODE_CLASS_CREATE - { - Text [ en-US ] = "Error creating object" ; - }; - String ERRCODE_CLASS_SBX - { - Text [ en-US ] = "Inadmissible value or data type" ; - }; - String ERRCODE_CLASS_RUNTIME - { - Text [ en-US ] = "BASIC runtime error" ; - }; - String ERRCODE_CLASS_COMPILER - { - Text [ en-US ] = "BASIC syntax error" ; - }; - String 1 - { - Text [ en-US ] = "General Error" ; - }; - String ERRCODE_IO_GENERAL - { - Text [ en-US ] = "General input/output error." ; - }; - String ERRCODE_IO_MISPLACEDCHAR - { - Text [ en-US ] = "Invalid file name." ; - }; - String ERRCODE_IO_NOTEXISTS - { - Text [ en-US ] = "Nonexistent file." ; - }; - String ERRCODE_IO_ALREADYEXISTS - { - Text [ en-US ] = "File already exists." ; - }; - String ERRCODE_IO_NOTADIRECTORY - { - Text [ en-US ] = "The object is not a directory." ; - }; - String ERRCODE_IO_NOTAFILE - { - Text [ en-US ] = "The object is not a file." ; - }; - String ERRCODE_IO_INVALIDDEVICE - { - Text [ en-US ] = "The specified device is invalid." ; - }; - String ERRCODE_IO_ACCESSDENIED - { - Text [ en-US ] = "The object cannot be accessed\ndue to insufficient user rights." ; - }; - String ERRCODE_IO_LOCKVIOLATION - { - Text [ en-US ] = "Sharing violation while accessing the object." ; - }; - String ERRCODE_IO_OUTOFSPACE - { - Text [ en-US ] = "No more space on device." ; - }; - String ERRCODE_IO_ISWILDCARD - { - Text [ en-US ] = "This operation cannot be run on\nfiles containing wildcards." ; - }; - String ERRCODE_IO_NOTSUPPORTED - { - Text [ en-US ] = "This operation is not supported on this operating system." ; - }; - String ERRCODE_IO_TOOMANYOPENFILES - { - Text [ en-US ] = "There are too many files open." ; - }; - String ERRCODE_IO_CANTREAD - { - Text [ en-US ] = "Data could not be read from the file." ; - }; - String ERRCODE_IO_CANTWRITE - { - Text [ en-US ] = "The file could not be written." ; - }; - String ERRCODE_IO_OUTOFMEMORY - { - Text [ en-US ] = "The operation could not be run due to insufficient memory." ; - }; - String ERRCODE_IO_CANTSEEK - { - Text [ en-US ] = "The seek operation could not be run." ; - }; - String ERRCODE_IO_CANTTELL - { - Text [ en-US ] = "The tell operation could not be run." ; - }; - String ERRCODE_IO_WRONGVERSION - { - Text [ en-US ] = "Incorrect file version." ; - }; - String ERRCODE_IO_WRONGFORMAT - { - Text [ en-US ] = "Incorrect file format." ; - }; - String ERRCODE_IO_INVALIDCHAR - { - Text [ en-US ] = "The file name contains invalid characters." ; - }; - String ERRCODE_IO_UNKNOWN - { - Text [ en-US ] = "An unknown I/O error has occurred." ; - }; - String ERRCODE_IO_INVALIDACCESS - { - Text [ en-US ] = "An invalid attempt was made to access the file." ; - }; - String ERRCODE_IO_CANTCREATE - { - Text [ en-US ] = "The file could not be created." ; - }; - String ERRCODE_IO_INVALIDPARAMETER - { - Text [ en-US ] = "The operation was started under an invalid parameter." ; - }; - String ERRCODE_IO_ABORT - { - Text [ en-US ] = "The operation on the file was aborted." ; - }; - String ERRCODE_IO_NOTEXISTSPATH - { - Text [ en-US ] = "Path to the file does not exist." ; - }; - String ERRCODE_IO_RECURSIVE - { - Text [ en-US ] = "An object cannot be copied into itself." ; - }; - String ERRCODE_SFX_NOSTDTEMPLATE - { - Text [ en-US ] = "The default template could not be opened." ; - }; - String ERRCODE_SFX_TEMPLATENOTFOUND - { - Text [ en-US ] = "The specified template could not be found." ; - }; - String ERRCODE_SFX_NOTATEMPLATE - { - Text [ en-US ] = "The file cannot be used as template." ; - }; - String ERRCODE_SFX_CANTREADDOCINFO - { - Text [ en-US ] = "Document information could not be read from the file because\nthe document information format is unknown or because document information does not\nexist." ; - }; - String ERRCODE_SFX_ALREADYOPEN - { - Text [ en-US ] = "This document has already been opened for editing." ; - }; - String ERRCODE_SFX_WRONGPASSWORD - { - Text [ en-US ] = "The wrong password has been entered." ; - }; - String ERRCODE_SFX_DOLOADFAILED - { - Text [ en-US ] = "Error reading file." ; - }; - String ERRCODE_SFX_DOCUMENTREADONLY - { - Text [ en-US ] = "The document was opened as read-only." ; - }; - String ERRCODE_SFX_OLEGENERAL - { - Text [ en-US ] = "General OLE Error." ; - }; - String ERRCODE_INET_NAME_RESOLVE - { - Text [ en-US ] = "The host name $(ARG1) could not be resolved." ; - }; - String ERRCODE_INET_CONNECT - { - Text [ en-US ] = "Could not establish Internet connection to $(ARG1)." ; - }; - String ERRCODE_INET_READ - { - Text [ en-US ] = "Error reading data from the Internet.\nServer error message: $(ARG1)." ; - }; - String ERRCODE_INET_WRITE - { - Text [ en-US ] = "Error transferring data to the Internet.\nServer error message: $(ARG1)." ; - }; - String ERRCODE_INET_GENERAL - { - Text [ en-US ] = "General Internet error has occurred." ; - }; - String ERRCODE_INET_OFFLINE - { - Text [ en-US ] = "The requested Internet data is not available in the cache and cannot be transmitted as the Online mode has not be activated." ; - }; - String ERRCODE_SFXMSG_STYLEREPLACE - { - ExtraData = ERRCODE_MSG_ERROR | ERRCODE_BUTTON_OK_CANCEL ; - Text [ en-US ] = "Should the $(ARG1) Style be replaced?" ; - }; - String ERRCODE_SFX_NOFILTER - { - Text [ en-US ] = "A filter has not been found." ; - }; - String ERRCODE_SFX_CANTFINDORIGINAL - { - Text [ en-US ] = "The original could not be determined." ; - }; - String ERRCODE_SFX_CANTCREATECONTENT - { - Text [ en-US ] = "The contents could not be created." ; - }; - String ERRCODE_SFX_CANTCREATELINK - { - Text [ en-US ] = "The link could not be created." ; - }; - String ERRCODE_SFX_WRONGBMKFORMAT - { - Text [ en-US ] = "The link format is invalid." ; - }; - String ERRCODE_SFX_WRONGICONFILE - { - Text [ en-US ] = "The configuration of the icon display is invalid." ; - }; - String ERRCODE_SFX_CANTWRITEICONFILE - { - Text [ en-US ] = "The configuration of the icon display can not be saved." ; - }; - String ERRCODE_SFX_CANTDELICONFILE - { - Text [ en-US ] = "The configuration of the icon display could not be deleted." ; - }; - String ERRCODE_SFX_CANTRENAMECONTENT - { - Text [ en-US ] = "Contents cannot be renamed." ; - }; - String ERRCODE_SFX_INVALIDBMKPATH - { - Text [ en-US ] = "The bookmark folder is invalid." ; - }; - String ERRCODE_SFX_CANTWRITEURLCFGFILE - { - Text [ en-US ] = "The configuration of the URLs to be saved locally could not be saved." ; - }; - String ERRCODE_SFX_WRONGURLCFGFORMAT - { - Text [ en-US ] = "The configuration format of the URLs to be saved locally is invalid." ; - }; - String ERRCODE_SFX_NODOCUMENT - { - Text [ en-US ] = "This action cannot be applied to a document that does not exist." ; - }; - String ERRCODE_SFX_INVALIDLINK - { - Text [ en-US ] = "The link refers to an invalid target." ; - }; - String ERRCODE_SFX_INVALIDTRASHPATH - { - Text [ en-US ] = "The Recycle Bin path is invalid." ; - }; - String ERRCODE_SFX_NOTRESTORABLE - { - Text [ en-US ] = "The entry could not be restored." ; - }; - String ERRCODE_IO_NAMETOOLONG - { - Text [ en-US ] = "The file name is too long for the target file system." ; - }; - String ERRCODE_SFX_CONSULTUSER - { - Text [ en-US ] = "The details for running the function are incomplete." ; - }; - String ERRCODE_SFX_INVALIDSYNTAX - { - Text [ en-US ] = "The input syntax is invalid." ; - }; - String ERRCODE_SFX_CANTCREATEFOLDER - { - Text [ en-US ] = "The input syntax is invalid." ; - }; - String ERRCODE_SFX_CANTRENAMEFOLDER - { - Text [ en-US ] = "The input syntax is invalid." ; - }; - String ERRCODE_SFX_WRONG_CDF_FORMAT - { - Text [ en-US ] = "The channel document has an invalid format." ; - }; - String ERRCODE_SFX_EMPTY_SERVER - { - Text [ en-US ] = "The server must not be empty." ; - }; - String ERRCODE_SFX_NO_ABOBOX - { - Text [ en-US ] = "A subscription folder is required to install a Channel." ; - }; - String ERRCODE_IO_NOTSTORABLEINBINARYFORMAT - { - Text [ en-US ] = "This document contains attributes that cannot be saved in the selected format.\nPlease save the document in a %PRODUCTNAME %PRODUCTVERSION file format."; - }; - String ERRCODE_SFX_TARGETFILECORRUPTED - { - Text [ en-US ] = "The file $(FILENAME) cannot be saved. Please check your system settings. You can find an automatically generated backup copy of this file in folder $(PATH) named $(BACKUPNAME)."; - }; - String ERRCODE_SFX_NOMOREDOCUMENTSALLOWED - { - Text [ en-US ] = "The maximum number of documents that can be opened at the same time has been reached. You need to close one or more documents before you can open a new document."; - }; - String ERRCODE_SFX_CANTCREATEBACKUP - { - Text [ en-US ] = "Could not create backup copy." ; - }; - String ERRCODE_SFX_MACROS_SUPPORT_DISABLED - { - Text [ en-US ] = "An attempt was made to execute a macro.\nFor security reasons, macro support is disabled."; - }; - String ERRCODE_SFX_DOCUMENT_MACRO_DISABLED - { - Text [ en-US ] = "This document contains macros.\n\nMacros may contain viruses. Execution of macros is disabled due to the current macro security setting in Tools - Options - %PRODUCTNAME - Security.\n\nTherefore, some functionality may not be available." ; - }; - String ERRCODE_SFX_BROKENSIGNATURE - { - Text [ en-US ] = "The digitally signed document content and/or macros do not match the current document signature.\n\nThis could be the result of document manipulation or of structural document damage due to data transmission.\n\nWe recommend that you do not trust the content of the current document.\nExecution of macros is disabled for this document.\n " ; - }; - String ERRCODE_SFX_INCOMPLETE_ENCRYPTION - { - Text [ en-US ] = "The encrypted document contains unexpected non-encrypted streams.\n\nThis could be the result of document manipulation.\n\nWe recommend that you do not trust the content of the current document.\nExecution of macros is disabled for this document.\n " ; - }; - - String ERRCODE_IO_INVALIDLENGTH - { - Text [ en-US ] = "Invalid data length." ; - }; - String ERRCODE_IO_CURRENTDIR - { - Text [ en-US ] = "Function not possible: path contains current directory." ; - }; - String ERRCODE_IO_NOTSAMEDEVICE - { - Text [ en-US ] = "Function not possible: device (drive) not identical." ; - }; - String ERRCODE_IO_DEVICENOTREADY - { - Text [ en-US ] = "Device (drive) not ready." ; - }; - String ERRCODE_IO_BADCRC - { - Text [ en-US ] = "Wrong check amount." ; - }; - String ERRCODE_IO_WRITEPROTECTED - { - Text [ en-US ] = "Function not possible: write protected." ; - }; - String ERRCODE_SFX_SHARED_NOPASSWORDCHANGE - { - Text [ en-US ] = "The password of a shared spreadsheet cannot be set or changed.\nDeactivate sharing mode first."; - }; -}; - -// eof ------------------------------------------------------------------------ - diff --git a/svtools/source/misc/makefile.mk b/svtools/source/misc/makefile.mk index 77cf8a41a8bd..fbc89822e422 100644 --- a/svtools/source/misc/makefile.mk +++ b/svtools/source/misc/makefile.mk @@ -47,14 +47,11 @@ ENABLE_EXCEPTIONS := TRUE SRS1NAME=misc SRC1FILES=\ ehdl.src \ + undo.src \ helpagent.src \ imagemgr.src \ langtab.src -SRS2NAME=ehdl -SRC2FILES=\ - errtxt.src - SLOFILES=\ $(SLO)$/acceleratorexecute.obj \ $(SLO)$/chartprettypainter.obj \ diff --git a/svtools/source/misc/svtdata.cxx b/svtools/source/misc/svtdata.cxx index 2bc1977e9197..ba92b929e07d 100644 --- a/svtools/source/misc/svtdata.cxx +++ b/svtools/source/misc/svtdata.cxx @@ -93,3 +93,8 @@ ImpSvtData & ImpSvtData::GetSvtData() return *static_cast(*pAppData); } +SvtResId::SvtResId(USHORT nId, const ::com::sun::star::lang::Locale aLocale): + ResId(nId, *ImpSvtData::GetSvtData().GetResMgr(aLocale)) {} + +SvtResId::SvtResId(USHORT nId): ResId(nId, *ImpSvtData::GetSvtData().GetResMgr()) {} + diff --git a/svtools/source/misc/undo.src b/svtools/source/misc/undo.src new file mode 100644 index 000000000000..c3f4c388e89c --- /dev/null +++ b/svtools/source/misc/undo.src @@ -0,0 +1,47 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: app.src,v $ + * $Revision: 1.122 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + + // include ------------------------------------------------------------------ + +#include + +String STR_UNDO +{ + Text [ en-US ] = "Undo: " ; +}; +String STR_REDO +{ + Text [ en-US ] = "Re~do: " ; +}; +String STR_REPEAT +{ + Text [ en-US ] = "~Repeat: " ; +}; + -- cgit From b18f63c76e805a033a83494b9473e3296af88ab7 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 16 Apr 2010 23:04:41 +0200 Subject: CWS gnumake2: enable rsc to use cygwin compatible syntax in cmdline on Windows --- rsc/source/parser/rscibas.cxx | 4 +- rsc/source/prj/start.cxx | 2 +- rsc/source/rsc/rsc.cxx | 165 +++++++++++++++++++----------------------- 3 files changed, 78 insertions(+), 93 deletions(-) diff --git a/rsc/source/parser/rscibas.cxx b/rsc/source/parser/rscibas.cxx index 75f558398bb5..f1324e922805 100644 --- a/rsc/source/parser/rscibas.cxx +++ b/rsc/source/parser/rscibas.cxx @@ -105,7 +105,7 @@ void RscLangEnum::Init( RscNameTable& rNames ) while ( NULL != ( pLangEntry = MsLangId::getIsoLangEntry( nIndex )) && ( pLangEntry->mnLang != LANGUAGE_DONTKNOW )) { #if OSL_DEBUG_LEVEL > 2 - fprintf( stderr, "ISO Language in : %d %d %s\n", + fprintf( stderr, "ISO Language in : %d\n", (int)nIndex, pLangEntry->mnLang, MsLangId::convertLanguageToIsoByteString( pLangEntry->mnLang ).getStr() ); @@ -203,7 +203,7 @@ Atom RscLangEnum::AddLanguage( const char* pLang, RscNameTable& rNames ) mnLangId++; } #if OSL_DEBUG_LEVEL > 2 - fprintf( stderr, "AddLanguage( %s ) = 0x%lx\n", pLang, nResult ); + fprintf( stderr, "AddLanguage( %s ) = %d\n", pLang, nResult ); #endif return nResult; } diff --git a/rsc/source/prj/start.cxx b/rsc/source/prj/start.cxx index df4ce12200c5..f4e80515c596 100644 --- a/rsc/source/prj/start.cxx +++ b/rsc/source/prj/start.cxx @@ -179,7 +179,7 @@ static BOOL CallPrePro( const ByteString& rPrePro, #if ((defined OS2 || defined WNT) && (defined TCPP || defined tcpp)) || defined UNX || defined OS2 nExit = spawnvp( P_WAIT, rPrePro.GetBuffer(), (char* const*)pCmdL->GetBlock() ); #elif defined CSET - nExit = spawnvp( P_WAIT, (char*)rPrePro.GetBuffer(), char **) (const char**)pCmdL->GetBlock() ); + nExit = spawnvp( P_WAIT, (char*)rPrePro.GetBuffer(), (char **) (const char**)pCmdL->GetBlock() ); #elif defined WTC nExit = spawnvp( P_WAIT, (char*)rPrePro.GetBuffer(), (const char* const*)pCmdL->GetBlock() ); #elif defined MTW diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx index 934c41d5e9a9..67b9436ca49f 100644 --- a/rsc/source/rsc/rsc.cxx +++ b/rsc/source/rsc/rsc.cxx @@ -69,12 +69,14 @@ #include #include +#include #include #include #include #include #include +#include using namespace rtl; @@ -729,7 +731,7 @@ ERRTYPE RscCompiler :: IncludeParser( ULONG lFileKey ) *************************************************************************/ ERRTYPE RscCompiler :: ParseOneFile( ULONG lFileKey, const RscCmdLine::OutputFile* pOutputFile, - const WriteRcContext* pContext ) + const WriteRcContext* pContext ) { FILE * finput = NULL; ERRTYPE aError; @@ -807,13 +809,36 @@ ERRTYPE RscCompiler :: ParseOneFile( ULONG lFileKey, |* *************************************************************************/ -static OString do_prefix( const char* pPrefix, const OUString& rFile ) +namespace { - OStringBuffer aBuf(256); - aBuf.append( pPrefix ); - aBuf.append( ":" ); - aBuf.append( OUStringToOString( rFile, RTL_TEXTENCODING_MS_1252 ) ); - return aBuf.makeStringAndClear(); + using namespace ::osl; + class RscIoError { }; + static inline OUString lcl_getAbsoluteUrl(const OUString& i_sBaseUrl, const OString& i_sPath) + { + OUString sRelUrl, sAbsUrl; + if(FileBase::getFileURLFromSystemPath(OStringToOUString(i_sPath, RTL_TEXTENCODING_MS_1252), sRelUrl) != FileBase::E_None) + throw RscIoError(); + if(FileBase::getAbsoluteFileURL(i_sBaseUrl, sRelUrl, sAbsUrl) != FileBase::E_None) + throw RscIoError(); + return sAbsUrl; + }; + static inline OString lcl_getSystemPath(const OUString& i_sUrl) + { + OUString sSys; + if(FileBase::getSystemPathFromFileURL(i_sUrl, sSys) != FileBase::E_None) + throw RscIoError(); + OSL_TRACE("temporary file: %s", OUStringToOString(sSys, RTL_TEXTENCODING_UTF8).getStr()); + return OUStringToOString(sSys, RTL_TEXTENCODING_MS_1252); + }; + static inline OString lcl_getTempFile(OUString& sTempDirUrl) + { + // get a temp file name for the rc file + OUString sTempUrl; + if(FileBase::createTempFile(&sTempDirUrl, NULL, &sTempUrl) != FileBase::E_None) + throw RscIoError(); + OSL_TRACE("temporary url: %s", OUStringToOString(sTempUrl, RTL_TEXTENCODING_UTF8).getStr()); + return lcl_getSystemPath(sTempUrl); + }; } ERRTYPE RscCompiler::Link() @@ -822,12 +847,6 @@ ERRTYPE RscCompiler::Link() ERRTYPE aError; RscFile* pFName; -#ifdef UNX -#define PATHSEP '/' -#else -#define PATHSEP '\\' -#endif - if( !(pCL->nCommands & NOLINK_FLAG) ) { ::std::list::const_iterator it; @@ -845,87 +864,55 @@ ERRTYPE RscCompiler::Link() } } - // rc-Datei schreiben - ByteString aDir( it->aOutputRc ); - aDir.SetToken( aDir.GetTokenCount( PATHSEP )-1, PATHSEP, ByteString() ); - if( ! aDir.Len() ) - { - char aBuf[1024]; - if( getcwd( aBuf, sizeof( aBuf ) ) ) - { - aDir = aBuf; - aDir.Append( PATHSEP ); - } - } - // work dir for absolute Urls - OUString aCWD, aTmpUrl; - osl_getProcessWorkingDir( &aCWD.pData ); - // get two temp file urls OString aRcTmp, aSysListTmp, aSysList; - OUString aSysPath, aUrlDir; - aSysPath = OStringToOUString( aDir, RTL_TEXTENCODING_MS_1252 ); - if( osl_getFileURLFromSystemPath( aSysPath.pData, &aUrlDir.pData ) != osl_File_E_None ) - pTC->pEH->FatalError( ERR_OPENFILE, RscId(), do_prefix( "url conversion", aUrlDir ) ); - - if( osl_getAbsoluteFileURL( aCWD.pData, aUrlDir.pData, &aTmpUrl.pData ) != osl_File_E_None ) - pTC->pEH->FatalError( ERR_OPENFILE, RscId(), do_prefix( "absolute url", aUrlDir ) ); - aUrlDir = aTmpUrl; - - // create temp file for rc target - if( osl_createTempFile( aUrlDir.pData, NULL, &aTmpUrl.pData ) != osl_File_E_None ) - pTC->pEH->FatalError( ERR_OPENFILE, RscId(), do_prefix( "temp file creation", aUrlDir ) ); + try + { + OUString sPwdUrl; + osl_getProcessWorkingDir( &sPwdUrl.pData ); + OUString sRcUrl = lcl_getAbsoluteUrl(sPwdUrl, it->aOutputRc); + // TempDir is either the directory where the rc file is located or pwd + OUString sTempDirUrl = sRcUrl.copy(0,sRcUrl.lastIndexOf('/')); + OSL_TRACE("rc directory URL: %s", OUStringToOString(sTempDirUrl, RTL_TEXTENCODING_UTF8).getStr()); + + aRcTmp = lcl_getTempFile(sTempDirUrl); + OSL_TRACE("temporary rc file: %s", aRcTmp.getStr()); + + OUString sOilDirUrl; + if(pCL->aILDir.Len()) + sOilDirUrl = lcl_getAbsoluteUrl(sPwdUrl, pCL->aILDir); + else + sOilDirUrl = sTempDirUrl; + OSL_TRACE("ilst directory URL: %s", OUStringToOString(sOilDirUrl, RTL_TEXTENCODING_UTF8).getStr()); - if( osl_getSystemPathFromFileURL( aTmpUrl.pData, &aSysPath.pData ) != osl_File_E_None ) - pTC->pEH->FatalError( ERR_OPENFILE, RscId(), do_prefix( "sys path conversion", aTmpUrl ) ); - aRcTmp = OUStringToOString( aSysPath, RTL_TEXTENCODING_MS_1252 ); + aSysListTmp = lcl_getTempFile(sOilDirUrl); + OSL_TRACE("temporary ilst file: %s", aSysListTmp.getStr()); - if ( NULL == (fExitFile = foutput = fopen( aRcTmp.getStr(), "wb" )) ) - pTC->pEH->FatalError( ERR_OPENFILE, RscId(), aRcTmp.getStr() ); + OUString sIlstUrl, sIlstSys; + sIlstUrl = sRcUrl.copy(sRcUrl.lastIndexOf('/')+1); + sIlstUrl = sIlstUrl.copy(0,sIlstUrl.lastIndexOf('.')); + sIlstUrl += OUString::createFromAscii(".ilst"); + sIlstUrl = lcl_getAbsoluteUrl(sOilDirUrl, OUStringToOString(sIlstUrl, RTL_TEXTENCODING_UTF8)); - // make absolute path from IL dir (-oil switch) - // if no -oil was given, use the same dir as for rc file - if( pCL->aILDir.Len() ) + aSysList = lcl_getSystemPath(sIlstUrl); + OSL_TRACE("ilst file: %s", aSysList.getStr()); + } + catch (RscIoError&) { - aSysPath = OStringToOUString( pCL->aILDir, RTL_TEXTENCODING_MS_1252 ); - if( osl_getFileURLFromSystemPath( aSysPath.pData, &aTmpUrl.pData ) != osl_File_E_None ) - pTC->pEH->FatalError( ERR_OPENFILE, RscId(), do_prefix( "url conversion", aSysPath ) ); - if( osl_getAbsoluteFileURL( aCWD.pData, aTmpUrl.pData, &aUrlDir.pData ) != osl_File_E_None ) - pTC->pEH->FatalError( ERR_OPENFILE, RscId(), do_prefix( "absolute url", aTmpUrl ) ); + OString sMsg("Error with paths:\n"); + sMsg += "temporary rc file: " + aRcTmp + "\n"; + sMsg += "temporary ilst file: " + aSysListTmp + "\n"; + sMsg += "ilst file: " + aSysList + "\n"; + pTC->pEH->FatalError(ERR_OPENFILE, RscId(), sMsg); } - - if( osl_getSystemPathFromFileURL( aUrlDir.pData, &aSysPath.pData ) != osl_File_E_None ) - pTC->pEH->FatalError( ERR_OPENFILE, RscId(), do_prefix( "sys path conversion", aUrlDir ) ); - - aSysList = OUStringToOString( aSysPath, RTL_TEXTENCODING_MS_1252 ); - aSysList = aSysList + "/"; - xub_StrLen nLastSep = it->aOutputRc.SearchBackward( PATHSEP ); - if( nLastSep == STRING_NOTFOUND ) - nLastSep = 0; - xub_StrLen nLastPt = it->aOutputRc.Search( '.', nLastSep ); - if( nLastPt == STRING_NOTFOUND ) - nLastPt = it->aOutputRc.Len()+1; - aSysList = aSysList + it->aOutputRc.Copy( nLastSep+1, nLastPt - nLastSep-1 ); - aSysList = aSysList + ".ilst"; - // create temp file for sys list target - if( osl_createTempFile( aUrlDir.pData, NULL, &aTmpUrl.pData ) != osl_File_E_None ) - pTC->pEH->FatalError( ERR_OPENFILE, RscId(), do_prefix( "temp file creation", aUrlDir ) ); - - if( osl_getSystemPathFromFileURL( aTmpUrl.pData, &aSysPath.pData ) != osl_File_E_None ) - pTC->pEH->FatalError( ERR_OPENFILE, RscId(), do_prefix( "sys path conversion", aTmpUrl ) ); - aSysListTmp = OUStringToOString( aSysPath, RTL_TEXTENCODING_MS_1252 ); - - pTC->pEH->StdOut( "Generating .rc file\n" ); - - rtl_TextEncoding aEnc = RTL_TEXTENCODING_UTF8; - //if( it->aLangName.CompareIgnoreCaseToAscii( "de", 2 ) == COMPARE_EQUAL ) - // aEnc = RTL_TEXTENCODING_MS_1252; + if ( NULL == (fExitFile = foutput = fopen( aRcTmp.getStr(), "wb" )) ) + pTC->pEH->FatalError( ERR_OPENFILE, RscId(), aRcTmp.getStr() ); // Schreibe Datei sal_Char cSearchDelim = ByteString( DirEntry::GetSearchDelimiter(), RTL_TEXTENCODING_ASCII_US ).GetChar( 0 ); sal_Char cAccessDelim = ByteString( DirEntry::GetAccessDelimiter(), RTL_TEXTENCODING_ASCII_US ).GetChar( 0 ); pTC->ChangeLanguage( it->aLangName ); - pTC->SetSourceCharSet( aEnc ); + pTC->SetSourceCharSet( RTL_TEXTENCODING_UTF8 ); pTC->ClearSysNames(); ByteString aSysSearchPath( it->aLangSearchPath ); xub_StrLen nIndex = 0; @@ -941,9 +928,7 @@ ERRTYPE RscCompiler::Link() aSysSearchPath.Append( cSearchDelim ); aSysSearchPath.Append( aToken ); } -#if OSL_DEBUG_LEVEL > 1 - fprintf( stderr, "setting search path for language %s: %s\n", it->aLangName.GetBuffer(), aSysSearchPath.GetBuffer() ); -#endif + OSL_TRACE( "setting search path for language %s: %s\n", it->aLangName.GetBuffer(), aSysSearchPath.GetBuffer() ); pTC->SetSysSearchPath( aSysSearchPath ); WriteRcContext aContext; @@ -1158,7 +1143,7 @@ void RscCompiler::OpenInput( const ByteString& rInput ) |*************************************************************************/ bool RscCompiler::GetImageFilePath( const RscCmdLine::OutputFile& rOutputFile, - const WriteRcContext& rContext, + const WriteRcContext& rContext, const ByteString& rBaseFileName, ByteString& rImagePath, FILE* pSysListFile ) @@ -1248,9 +1233,9 @@ bool RscCompiler::GetImageFilePath( const RscCmdLine::OutputFile& rOutputFile, // ------------------------------------------------------------------------------ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile, - const WriteRcContext& rContext, - const DirEntry& rSrsInPath, - const DirEntry& rSrsOutPath ) + const WriteRcContext& rContext, + const DirEntry& rSrsInPath, + const DirEntry& rSrsOutPath ) { SvFileStream aIStm( rSrsInPath.GetFull(), STREAM_READ ); SvFileStream aOStm( rSrsOutPath.GetFull(), STREAM_WRITE | STREAM_TRUNC ); @@ -1358,7 +1343,7 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile, } aOStm.WriteLine( "};" ); - } + } else aOStm.WriteLine( aLine ); } -- cgit From e1577335e0c88e269995ff9164da981d800eb6bb Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Sat, 17 Apr 2010 12:41:17 +0200 Subject: CWS gnumake2: new gbuild system --- svl/Makefile | 30 +++ svl/prj/gbuild.lst | 5 + svl/prj/makefile.mk | 2 + svl/prj/target_lib_fsstorage.mk | 76 +++++++ svl/prj/target_lib_passwordcontainer.mk | 72 +++++++ svl/prj/target_lib_svl.mk | 182 +++++++++++++++++ svl/prj/target_module_svl.mk | 47 +++++ svl/prj/target_package_inc.mk | 126 ++++++++++++ svl/prj/target_res_svl.mk | 49 +++++ svtools/Makefile | 30 +++ svtools/prj/gbuild.lst | 4 + svtools/prj/makefile.mk | 2 + svtools/prj/target_exe_bmp.mk | 71 +++++++ svtools/prj/target_exe_bmpsum.mk | 67 ++++++ svtools/prj/target_exe_g2g.mk | 66 ++++++ svtools/prj/target_lib_hatchwindowfactory.mk | 74 +++++++ svtools/prj/target_lib_productregistration.mk | 75 +++++++ svtools/prj/target_lib_svt.mk | 281 ++++++++++++++++++++++++++ svtools/prj/target_module_svtools.mk | 57 ++++++ svtools/prj/target_package_inc.mk | 177 ++++++++++++++++ svtools/prj/target_res_productregistration.mk | 48 +++++ svtools/prj/target_res_svt.mk | 77 +++++++ toolkit/Makefile | 30 +++ toolkit/prj/gbuild.lst | 3 + toolkit/prj/makefile.mk | 2 + toolkit/prj/target_lib_tk.mk | 165 +++++++++++++++ toolkit/prj/target_module_toolkit.mk | 43 ++++ toolkit/prj/target_package_inc.mk | 60 ++++++ toolkit/prj/target_package_source.mk | 47 +++++ toolkit/prj/target_package_util.mk | 29 +++ toolkit/prj/target_res_tk.mk | 43 ++++ toolkit/src2xml/src-sw.lst | 1 - toolkit/src2xml/src.lst | 1 - toolkit/util/makefile.mk | 2 +- tools/Makefile | 30 +++ tools/prj/gbuild.lst | 3 + tools/prj/makefile.mk | 2 + tools/prj/target_exe_mkunroll.mk | 79 ++++++++ tools/prj/target_exe_rscdep.mk | 76 +++++++ tools/prj/target_exe_so_checksum.mk | 69 +++++++ tools/prj/target_exe_sspretty.mk | 77 +++++++ tools/prj/target_lib_tl.mk | 176 ++++++++++++++++ tools/prj/target_module_tools.mk | 56 +++++ tools/prj/target_package_inc.mk | 120 +++++++++++ 44 files changed, 2729 insertions(+), 3 deletions(-) create mode 100644 svl/Makefile create mode 100644 svl/prj/gbuild.lst create mode 100644 svl/prj/makefile.mk create mode 100644 svl/prj/target_lib_fsstorage.mk create mode 100644 svl/prj/target_lib_passwordcontainer.mk create mode 100644 svl/prj/target_lib_svl.mk create mode 100644 svl/prj/target_module_svl.mk create mode 100644 svl/prj/target_package_inc.mk create mode 100644 svl/prj/target_res_svl.mk create mode 100644 svtools/Makefile create mode 100644 svtools/prj/gbuild.lst create mode 100644 svtools/prj/makefile.mk create mode 100644 svtools/prj/target_exe_bmp.mk create mode 100644 svtools/prj/target_exe_bmpsum.mk create mode 100644 svtools/prj/target_exe_g2g.mk create mode 100644 svtools/prj/target_lib_hatchwindowfactory.mk create mode 100644 svtools/prj/target_lib_productregistration.mk create mode 100644 svtools/prj/target_lib_svt.mk create mode 100644 svtools/prj/target_module_svtools.mk create mode 100644 svtools/prj/target_package_inc.mk create mode 100644 svtools/prj/target_res_productregistration.mk create mode 100644 svtools/prj/target_res_svt.mk create mode 100644 toolkit/Makefile create mode 100644 toolkit/prj/gbuild.lst create mode 100644 toolkit/prj/makefile.mk create mode 100644 toolkit/prj/target_lib_tk.mk create mode 100644 toolkit/prj/target_module_toolkit.mk create mode 100644 toolkit/prj/target_package_inc.mk create mode 100644 toolkit/prj/target_package_source.mk create mode 100644 toolkit/prj/target_package_util.mk create mode 100644 toolkit/prj/target_res_tk.mk create mode 100644 tools/Makefile create mode 100644 tools/prj/gbuild.lst create mode 100644 tools/prj/makefile.mk create mode 100644 tools/prj/target_exe_mkunroll.mk create mode 100644 tools/prj/target_exe_rscdep.mk create mode 100644 tools/prj/target_exe_so_checksum.mk create mode 100644 tools/prj/target_exe_sspretty.mk create mode 100644 tools/prj/target_lib_tl.mk create mode 100644 tools/prj/target_module_tools.mk create mode 100644 tools/prj/target_package_inc.mk diff --git a/svl/Makefile b/svl/Makefile new file mode 100644 index 000000000000..d020b04dba7c --- /dev/null +++ b/svl/Makefile @@ -0,0 +1,30 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +include ../solenv/inc/gbuild.mk + +$(eval $(call gb_Module_make_global_targets,$(notdir $(shell pwd)))) diff --git a/svl/prj/gbuild.lst b/svl/prj/gbuild.lst new file mode 100644 index 000000000000..dc1b23e2971a --- /dev/null +++ b/svl/prj/gbuild.lst @@ -0,0 +1,5 @@ +sl svl : l10n rsc offuh ucbhelper unotools cppu cppuhelper comphelper sal sot NULL +sl svl usr1 - all svl_mkout NULL +sl svl\prj nmake - all svl_prj NULL + + diff --git a/svl/prj/makefile.mk b/svl/prj/makefile.mk new file mode 100644 index 000000000000..a5f9aa9d8248 --- /dev/null +++ b/svl/prj/makefile.mk @@ -0,0 +1,2 @@ +all: + cd .. && make -sj9 diff --git a/svl/prj/target_lib_fsstorage.mk b/svl/prj/target_lib_fsstorage.mk new file mode 100644 index 000000000000..6db23b4ae547 --- /dev/null +++ b/svl/prj/target_lib_fsstorage.mk @@ -0,0 +1,76 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,fsstorage)) + +$(eval $(call gb_Library_set_include,fsstorage,\ + $$(SOLARINC) \ + -I$(WORKDIR)/inc/svl \ + -I$(WORKDIR)/inc/ \ + -I$(SRCDIR)/svl/inc \ + -I$(SRCDIR)/svl/inc/svl \ + -I$(SRCDIR)/svl/source/inc \ + -I$(SRCDIR)/svl/inc/pch \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_Library_add_linked_libs,fsstorage,\ + comphelper \ + cppu \ + cppuhelper \ + sal \ + stl \ + tl \ + ucbhelper \ + utl \ +)) + +$(eval $(call gb_Library_add_linked_system_libs,fsstorage,\ + icuuc \ + dl \ + m \ + pthread \ +)) + +$(eval $(call gb_Library_add_exception_objects,fsstorage,\ + svl/source/fsstor/fsfactory \ + svl/source/fsstor/fsstorage \ + svl/source/fsstor/oinputstreamcontainer \ + svl/source/fsstor/ostreamcontainer \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,fsstorage,\ + kernel32 \ + msvcrt \ + oldnames \ + user32 \ + uwinapi \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/svl/prj/target_lib_passwordcontainer.mk b/svl/prj/target_lib_passwordcontainer.mk new file mode 100644 index 000000000000..4285efa53a0b --- /dev/null +++ b/svl/prj/target_lib_passwordcontainer.mk @@ -0,0 +1,72 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,passwordcontainer)) + +$(eval $(call gb_Library_set_include,passwordcontainer,\ + $$(SOLARINC) \ + -I$(WORKDIR)/inc/svl \ + -I$(WORKDIR)/inc/ \ + -I$(SRCDIR)/svl/inc \ + -I$(SRCDIR)/svl/inc/svl \ + -I$(SRCDIR)/svl/source/inc \ + -I$(SRCDIR)/svl/inc/pch \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_Library_add_linked_libs,passwordcontainer,\ + utl \ + ucbhelper \ + cppuhelper \ + cppu \ + sal \ + stl \ +)) + +$(eval $(call gb_Library_add_linked_system_libs,passwordcontainer,\ + icuuc \ + dl \ + m \ + pthread \ +)) + +$(eval $(call gb_Library_add_exception_objects,passwordcontainer,\ + svl/source/passwordcontainer/passwordcontainer \ + svl/source/passwordcontainer/syscreds \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,passwordcontainer,\ + kernel32 \ + msvcrt \ + oldnames \ + user32 \ + uwinapi \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/svl/prj/target_lib_svl.mk b/svl/prj/target_lib_svl.mk new file mode 100644 index 000000000000..da04ecc634d2 --- /dev/null +++ b/svl/prj/target_lib_svl.mk @@ -0,0 +1,182 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,svl)) + +$(call gb_Library_get_headers_target,svl) : $(call gb_Package_get_target,svl_inc) + +$(eval $(call gb_Library_set_include,svl,\ + $$(SOLARINC) \ + -I$(WORKDIR)/inc/svl \ + -I$(WORKDIR)/inc/ \ + -I$(SRCDIR)/svl/inc \ + -I$(SRCDIR)/svl/source/inc \ + -I$(SRCDIR)/svl/inc/pch \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_Library_set_defs,svl,\ + $$(DEFS) \ + -DSVL_DLLIMPLEMENTATION \ +)) + +$(eval $(call gb_Library_add_linked_libs,svl,\ + comphelper \ + cppu \ + i18nisolang1 \ + i18nutil \ + sal \ + sot \ + tl \ + ucbhelper \ + utl \ + vos3 \ + basegfx \ + cppuhelper \ + jvmfwk \ + stl \ +)) + +$(eval $(call gb_Library_add_linked_system_libs,svl,\ + icuuc \ + dl \ + m \ + pthread \ +)) + + +$(eval $(call gb_Library_add_exception_objects,svl,\ + svl/inc/pch/precompiled_svl \ + svl/source/config/cjkoptions \ + svl/source/config/ctloptions \ + svl/source/config/itemholder2 \ + svl/source/config/languageoptions \ + svl/source/filepicker/pickerhelper \ + svl/source/filepicker/pickerhistory \ + svl/source/filerec/filerec \ + svl/source/items/aeitem \ + svl/source/items/cenumitm \ + svl/source/items/cintitem \ + svl/source/items/cntwall \ + svl/source/items/ctypeitm \ + svl/source/items/custritm \ + svl/source/items/dateitem \ + svl/source/items/eitem \ + svl/source/items/flagitem \ + svl/source/items/globalnameitem \ + svl/source/items/ilstitem \ + svl/source/items/imageitm \ + svl/source/items/intitem \ + svl/source/items/itemiter \ + svl/source/items/itempool \ + svl/source/items/itemprop \ + svl/source/items/itemset \ + svl/source/items/lckbitem \ + svl/source/items/macitem \ + svl/source/items/poolcach \ + svl/source/items/poolio \ + svl/source/items/poolitem \ + svl/source/items/ptitem \ + svl/source/items/rectitem \ + svl/source/items/rngitem \ + svl/source/items/sfontitm \ + svl/source/items/sitem \ + svl/source/items/slstitm \ + svl/source/items/stritem \ + svl/source/items/style \ + svl/source/items/stylepool \ + svl/source/items/szitem \ + svl/source/items/visitem \ + svl/source/items/whiter \ + svl/source/memtools/svarray \ + svl/source/misc/PasswordHelper \ + svl/source/misc/adrparse \ + svl/source/misc/documentlockfile \ + svl/source/misc/filenotation \ + svl/source/misc/folderrestriction \ + svl/source/misc/fstathelper \ + svl/source/misc/inethist \ + svl/source/misc/inettype \ + svl/source/misc/lngmisc \ + svl/source/misc/lockfilecommon \ + svl/source/misc/ownlist \ + svl/source/misc/restrictedpaths \ + svl/source/misc/sharecontrolfile \ + svl/source/misc/strmadpt \ + svl/source/misc/svldata \ + svl/source/misc/urihelper \ + svl/source/notify/brdcst \ + svl/source/notify/broadcast \ + svl/source/notify/cancel \ + svl/source/notify/hint \ + svl/source/notify/isethint \ + svl/source/notify/listener \ + svl/source/notify/listenerbase \ + svl/source/notify/listeneriter \ + svl/source/notify/lstner \ + svl/source/notify/smplhint \ + svl/source/numbers/nbdll \ + svl/source/numbers/numfmuno \ + svl/source/numbers/numhead \ + svl/source/numbers/numuno \ + svl/source/numbers/supservs \ + svl/source/numbers/zforfind \ + svl/source/numbers/zforlist \ + svl/source/numbers/zformat \ + svl/source/numbers/zforscan \ + svl/source/svsql/converter \ + svl/source/undo/undo \ + svl/source/uno/pathservice \ + svl/source/uno/registerservices \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_exception_objects,svl,\ + svl/source/svdde/ddecli \ + svl/source/svdde/ddedata \ + svl/source/svdde/ddeinf \ + svl/source/svdde/ddestrg \ + svl/source/svdde/ddesvr \ + svl/source/svdde/ddewrap \ +)) + +$(eval $(call gb_Library_add_linked_libs,svl,\ + advapi32 \ + kernel32 \ + gdi32 \ + msvcrt \ + shell32 \ + user32 \ + uwinapi \ +)) +else +$(eval $(call gb_Library_add_exception_objects,svl,\ + svl/unx/source/svdde/ddedummy \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/svl/prj/target_module_svl.mk b/svl/prj/target_module_svl.mk new file mode 100644 index 000000000000..ac4a2ba621fe --- /dev/null +++ b/svl/prj/target_module_svl.mk @@ -0,0 +1,47 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Module_read_includes,svl,\ + lib_svl \ + lib_fsstorage \ + lib_passwordcontainer \ + res_svl \ + package_inc \ +)) + +$(eval $(call gb_Module_Module,svl,\ + $(call gb_AllLangResTarget_get_target,svl) \ + $(call gb_Library_get_target,fsstorage) \ + $(call gb_Library_get_target,passwordcontainer) \ + $(call gb_Library_get_target,svl) \ + $(call gb_Package_get_target,svl_inc) \ +)) + + +#todo: dde platform dependent +#todo: package_inc +#todo: map file diff --git a/svl/prj/target_package_inc.mk b/svl/prj/target_package_inc.mk new file mode 100644 index 000000000000..bab50a4af197 --- /dev/null +++ b/svl/prj/target_package_inc.mk @@ -0,0 +1,126 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,svl_inc,$(SRCDIR)/svl/inc)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/cancel.hxx,svl/cancel.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/macitem.hxx,svl/macitem.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/nfversi.hxx,svl/nfversi.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/rectitem.hxx,svl/rectitem.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/itemset.hxx,svl/itemset.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/solar.hrc,svl/solar.hrc)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/languageoptions.hxx,svl/languageoptions.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/hint.hxx,svl/hint.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/slstitm.hxx,svl/slstitm.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/rngitem.hxx,svl/rngitem.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/itempool.hxx,svl/itempool.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/custritm.hxx,svl/custritm.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/poolitem.hxx,svl/poolitem.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/zforlist.hxx,svl/zforlist.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/ondemand.hxx,svl/ondemand.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/sharecontrolfile.hxx,svl/sharecontrolfile.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/restrictedpaths.hxx,svl/restrictedpaths.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/eitem.hxx,svl/eitem.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/visitem.hxx,svl/visitem.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/lockfilecommon.hxx,svl/lockfilecommon.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/intitem.hxx,svl/intitem.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/svldllapi.h,svl/svldllapi.h)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/brdcst.hxx,svl/brdcst.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/szitem.hxx,svl/szitem.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/ownlist.hxx,svl/ownlist.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/itemiter.hxx,svl/itemiter.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/cnclhint.hxx,svl/cnclhint.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/cntwall.hxx,svl/cntwall.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/cjkoptions.hxx,svl/cjkoptions.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/svstdarr.hxx,svl/svstdarr.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/imageitm.hxx,svl/imageitm.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/httpcook.hxx,svl/httpcook.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/filerec.hxx,svl/filerec.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/svtools.hrc,svl/svtools.hrc)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/inethist.hxx,svl/inethist.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/cenumitm.hxx,svl/cenumitm.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/smplhint.hxx,svl/smplhint.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/ilstitem.hxx,svl/ilstitem.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/stritem.hxx,svl/stritem.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/cintitem.hxx,svl/cintitem.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/ctloptions.hxx,svl/ctloptions.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/ptitem.hxx,svl/ptitem.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/nranges.hxx,svl/nranges.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/zformat.hxx,svl/zformat.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/lstner.hxx,svl/lstner.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/urlfilter.hxx,svl/urlfilter.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/metitem.hxx,svl/metitem.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/undo.hxx,svl/undo.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/inettype.hxx,svl/inettype.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/style.hxx,svl/style.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/isethint.hxx,svl/isethint.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/itemprop.hxx,svl/itemprop.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/flagitem.hxx,svl/flagitem.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/svarray.hxx,svl/svarray.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/aeitem.hxx,svl/aeitem.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/svldata.hxx,svl/svldata.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/svdde.hxx,svl/svdde.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/style.hrc,svl/style.hrc)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/sfontitm.hxx,svl/sfontitm.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/ctypeitm.hxx,svl/ctypeitm.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/globalnameitem.hxx,svl/globalnameitem.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/dateitem.hxx,svl/dateitem.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/lckbitem.hxx,svl/lckbitem.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/nfkeytab.hxx,svl/nfkeytab.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/documentlockfile.hxx,svl/documentlockfile.hxx)) + +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/adrparse.hxx,svl/adrparse.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/cntwids.hrc,svl/cntwids.hrc)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/xmlement.hxx,svl/xmlement.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/urihelper.hxx,svl/urihelper.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/cntnrsrt.hxx,svl/cntnrsrt.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/listener.hxx,svl/listener.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/poolcach.hxx,svl/poolcach.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/PasswordHelper.hxx,svl/PasswordHelper.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/pickerhistoryaccess.hxx,svl/pickerhistoryaccess.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/memberid.hrc,svl/memberid.hrc)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/filenotation.hxx,svl/filenotation.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/strmadpt.hxx,svl/strmadpt.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/outstrm.hxx,svl/outstrm.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/stylepool.hxx,svl/stylepool.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/numuno.hxx,svl/numuno.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/inetstrm.hxx,svl/inetstrm.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/converter.hxx,svl/converter.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/urlbmk.hxx,svl/urlbmk.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/broadcast.hxx,svl/broadcast.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/listeneriter.hxx,svl/listeneriter.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/inetmsg.hxx,svl/inetmsg.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/inetdef.hxx,svl/inetdef.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/fstathelper.hxx,svl/fstathelper.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/instrm.hxx,svl/instrm.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/folderrestriction.hxx,svl/folderrestriction.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/lngmisc.hxx,svl/lngmisc.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/pickerhistory.hxx,svl/pickerhistory.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/pickerhelper.hxx,svl/pickerhelper.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/whiter.hxx,svl/whiter.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/nfsymbol.hxx,svl/nfsymbol.hxx)) + + diff --git a/svl/prj/target_res_svl.mk b/svl/prj/target_res_svl.mk new file mode 100644 index 000000000000..6759202a5fa4 --- /dev/null +++ b/svl/prj/target_res_svl.mk @@ -0,0 +1,49 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_AllLangResTarget_AllLangResTarget,svl)) + +$(eval $(call gb_AllLangResTarget_add_srs,svl,\ + svl/res \ +)) + +$(eval $(call gb_SrsTarget_SrsTarget,svl/res)) + +$(eval $(call gb_SrsTarget_set_include,svl/res,\ + $$(INCLUDE) \ + -I$(WORKDIR)/inc \ + -I$(SRCDIR)/svl/source/inc \ + -I$(SRCDIR)/svl/inc/ \ + -I$(SRCDIR)/svl/inc/svl \ +)) + +$(eval $(call gb_SrsTarget_add_files,svl/res,\ + svl/source/misc/mediatyp.src \ + svl/source/items/cstitem.src \ +)) + + diff --git a/svtools/Makefile b/svtools/Makefile new file mode 100644 index 000000000000..d020b04dba7c --- /dev/null +++ b/svtools/Makefile @@ -0,0 +1,30 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +include ../solenv/inc/gbuild.mk + +$(eval $(call gb_Module_make_global_targets,$(notdir $(shell pwd)))) diff --git a/svtools/prj/gbuild.lst b/svtools/prj/gbuild.lst new file mode 100644 index 000000000000..17542856e75c --- /dev/null +++ b/svtools/prj/gbuild.lst @@ -0,0 +1,4 @@ +st svtools : l10n svl offuh toolkit ucbhelper unotools JPEG:jpeg cppu cppuhelper comphelper sal sot jvmfwk NULL +st svtools usr1 - all st_mkout NULL +st svtools\prj nmake - all st_prj NULL + diff --git a/svtools/prj/makefile.mk b/svtools/prj/makefile.mk new file mode 100644 index 000000000000..a5f9aa9d8248 --- /dev/null +++ b/svtools/prj/makefile.mk @@ -0,0 +1,2 @@ +all: + cd .. && make -sj9 diff --git a/svtools/prj/target_exe_bmp.mk b/svtools/prj/target_exe_bmp.mk new file mode 100644 index 000000000000..b323f8039450 --- /dev/null +++ b/svtools/prj/target_exe_bmp.mk @@ -0,0 +1,71 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Executable_Executable,bmp)) + +$(eval $(call gb_Executable_set_include,bmp,\ + $$(INCLUDE) \ + -I$(WORKDIR)/inc/svtools \ + -I$(WORKDIR)/inc/ \ + -I$(OUTDIR)/inc/ \ + -I$(SRCDIR)/svtools/inc \ + -I$(SRCDIR)/svtools/inc/svtools \ + -I$(SRCDIR)/svtools/source/inc \ + -I$(SRCDIR)/svtools/inc/pch \ + -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Executable_add_linked_libs,bmp,\ + vcl \ + tl \ + vos3 \ + sal \ +)) + +$(eval $(call gb_Executable_add_exception_objects,bmp,\ + svtools/bmpmaker/bmp \ + svtools/bmpmaker/bmpcore \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_Executable_add_linked_libs,bmp,\ + kernel32 \ + msvcrt \ + oldnames \ + stl \ + user32 \ + uwinapi \ +)) +endif + +ifeq ($(OS),LINUX) +$(eval $(call gb_Executable_add_linked_libs,bmp,\ + pthread \ + dl \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/svtools/prj/target_exe_bmpsum.mk b/svtools/prj/target_exe_bmpsum.mk new file mode 100644 index 000000000000..d06a25c09ec7 --- /dev/null +++ b/svtools/prj/target_exe_bmpsum.mk @@ -0,0 +1,67 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Executable_Executable,bmpsum)) + +$(eval $(call gb_Executable_set_include,bmpsum,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/ \ + -I$(OUTDIR)/inc/offuh/ \ + -I$(SRCDIR)/svtools/inc/ \ + -I$(SRCDIR)/svtools/inc/pch/ \ + -I$(SRCDIR)/svtools/inc/svtools/ \ +)) + +$(eval $(call gb_Executable_add_linked_libs,bmpsum,\ + vcl \ + tl \ + vos3 \ + sal \ +)) + +$(eval $(call gb_Executable_add_exception_objects,bmpsum,\ + svtools/bmpmaker/bmpsum \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_Executable_add_linked_libs,bmpsum,\ + kernel32 \ + msvcrt \ + oldnames \ + stl \ + user32 \ + uwinapi \ +)) +endif + +ifeq ($(OS),LINUX) +$(eval $(call gb_Executable_add_linked_libs,bmpsum,\ + pthread \ + dl \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/svtools/prj/target_exe_g2g.mk b/svtools/prj/target_exe_g2g.mk new file mode 100644 index 000000000000..b78821860a30 --- /dev/null +++ b/svtools/prj/target_exe_g2g.mk @@ -0,0 +1,66 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Executable_Executable,g2g)) + +$(eval $(call gb_Executable_set_include,g2g,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/ \ + -I$(OUTDIR)/inc/offuh/ \ + -I$(SRCDIR)/svtools/inc/ \ + -I$(SRCDIR)/svtools/inc/pch/ \ + -I$(SRCDIR)/svtools/inc/svtools/ \ +)) + +$(eval $(call gb_Executable_add_linked_libs,g2g,\ + vcl \ + tl \ + vos3 \ + svt \ + sal \ +)) + +$(eval $(call gb_Executable_add_exception_objects,g2g,\ + svtools/bmpmaker/g2g \ +)) +ifeq ($(OS),WNT) +$(eval $(call gb_Executable_add_linked_libs,g2g,\ + kernel32 \ + msvcrt \ + oldnames \ + stl \ + user32 \ + uwinapi \ +)) +endif +ifeq ($(OS),LINUX) +$(eval $(call gb_Executable_add_linked_libs,g2g,\ + pthread \ + dl \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/svtools/prj/target_lib_hatchwindowfactory.mk b/svtools/prj/target_lib_hatchwindowfactory.mk new file mode 100644 index 000000000000..448517271e19 --- /dev/null +++ b/svtools/prj/target_lib_hatchwindowfactory.mk @@ -0,0 +1,74 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,hatchwindowfactory)) + +$(eval $(call gb_Library_set_include,hatchwindowfactory,\ + $$(INCLUDE) \ + -I$(WORKDIR)/inc/svtools \ + -I$(WORKDIR)/inc/ \ + -I$(SRCDIR)/svtools/inc/pch/ \ + -I$(OUTDIR)/inc/ \ + -I$(SRCDIR)/svtools/inc \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_Library_add_linked_libs,hatchwindowfactory,\ + tk \ + tl \ + cppu \ + cppuhelper \ + sal \ + vcl \ +)) + +$(eval $(call gb_Library_add_exception_objects,hatchwindowfactory,\ + svtools/source/hatchwindow/hatchwindowfactory \ + svtools/source/hatchwindow/documentcloser \ + svtools/source/hatchwindow/ipwin \ + svtools/source/hatchwindow/hatchwindow \ +)) + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,hatchwindowfactory,\ + dl \ + m \ + pthread \ +)) +endif +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,hatchwindowfactory,\ + kernel32 \ + msvcrt \ + oldnames \ + stl \ + user32 \ + uwinapi \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/svtools/prj/target_lib_productregistration.mk b/svtools/prj/target_lib_productregistration.mk new file mode 100644 index 000000000000..7dc480c8ea5a --- /dev/null +++ b/svtools/prj/target_lib_productregistration.mk @@ -0,0 +1,75 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,productregistration)) + +$(eval $(call gb_Library_set_include,productregistration,\ + $$(SOLARINC) \ + -I$(WORKDIR)/inc/svtools \ + -I$(WORKDIR)/inc/ \ + -I$(SRCDIR)/svtools/inc/pch/ \ + -I$(OUTDIR)/inc/ \ + -I$(SRCDIR)/svtools/inc \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_Library_add_linked_libs,productregistration,\ + svl \ + tk \ + tl \ + cppu \ + cppuhelper \ + sal \ + stl \ + utl \ + vcl \ +)) + +$(eval $(call gb_Library_add_exception_objects,productregistration,\ + svtools/source/productregistration/productregistration \ + svtools/source/productregistration/registrationdlg \ +)) + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,productregistration,\ + dl \ + m \ + pthread \ +)) +endif + +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,productregistration,\ + kernel32 \ + msvcrt \ + oldnames \ + user32 \ + uwinapi \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/svtools/prj/target_lib_svt.mk b/svtools/prj/target_lib_svt.mk new file mode 100644 index 000000000000..223e7fc44650 --- /dev/null +++ b/svtools/prj/target_lib_svt.mk @@ -0,0 +1,281 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,svt)) + +$(call gb_Library_get_headers_target,svt) : $(call gb_Package_get_target,svtools_inc) + +$(eval $(call gb_Library_set_include,svt,\ + $$(INCLUDE) \ + -I$(WORKDIR)/inc/svtools \ + -I$(WORKDIR)/inc/ \ + -I$(OUTDIR)/inc/ \ + -I$(SRCDIR)/svtools/inc \ + -I$(SRCDIR)/svtools/inc/svtools \ + -I$(SRCDIR)/svtools/source/inc \ + -I$(SRCDIR)/svtools/inc/pch \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_Library_set_defs,svt,\ + $$(DEFS) \ + -DSVT_DLLIMPLEMENTATION \ +)) + +$(eval $(call gb_Library_add_linked_libs,svt,\ + basegfx \ + comphelper \ + cppu \ + cppuhelper \ + i18nisolang1 \ + i18nutil \ + icuuc \ + jvmfwk \ + sal \ + sot \ + stl \ + svl \ + tk \ + tl \ + ucbhelper \ + utl \ + vcl \ + vos3 \ +)) + +ifeq ($(SYSTEM_JPEG),YES) +$(eval $(call gb_Library_add_linked_libs,svt,\ + jpeg \ +)) +else +$(eval $(call gb_Library_add_linked_static_libs,svt,\ + jpeglib \ +)) +endif + +$(eval $(call gb_Library_add_exception_objects,svt,\ + svtools/source/edit/svmedit \ + svtools/source/edit/svmedit2 \ + svtools/source/edit/textundo \ + svtools/source/edit/syntaxhighlight \ + svtools/source/edit/textwindowpeer \ + svtools/source/edit/sychconv \ + svtools/source/edit/xtextedt \ + svtools/source/edit/txtattr \ + svtools/source/edit/textdoc \ + svtools/source/edit/texteng \ + svtools/source/edit/textdata \ + svtools/source/edit/editsyntaxhighlighter \ + svtools/source/edit/textview \ + svtools/source/urlobj/inetimg \ + svtools/source/java/javainteractionhandler \ + svtools/source/java/javacontext \ + svtools/source/svhtml/htmlout \ + svtools/source/svhtml/htmlsupp \ + svtools/source/svhtml/parhtml \ + svtools/source/svhtml/htmlkywd \ + svtools/source/config/itemholder2 \ + svtools/source/config/optionsdrawinglayer \ + svtools/source/config/menuoptions \ + svtools/source/config/helpopt \ + svtools/source/config/accessibilityoptions \ + svtools/source/config/printoptions \ + svtools/source/config/miscopt \ + svtools/source/config/extcolorcfg \ + svtools/source/config/colorcfg \ + svtools/source/config/fontsubstconfig \ + svtools/source/config/apearcfg \ + svtools/source/misc/svtaccessiblefactory \ + svtools/source/misc/templatefoldercache \ + svtools/source/misc/imagemgr \ + svtools/source/misc/imap3 \ + svtools/source/misc/acceleratorexecute \ + svtools/source/misc/helpagentwindow \ + svtools/source/misc/imap \ + svtools/source/misc/wallitem \ + svtools/source/misc/langtab \ + svtools/source/misc/dialogclosedlistener \ + svtools/source/misc/itemdel \ + svtools/source/misc/dialogcontrolling \ + svtools/source/misc/svtdata \ + svtools/source/misc/transfer2 \ + svtools/source/misc/chartprettypainter \ + svtools/source/misc/imageresourceaccess \ + svtools/source/misc/imap2 \ + svtools/source/misc/ehdl \ + svtools/source/misc/embedtransfer \ + svtools/source/misc/embedhlp \ + svtools/source/misc/cliplistener \ + svtools/source/misc/transfer \ + svtools/source/misc/stringtransfer \ + svtools/source/plugapp/ttprops \ + svtools/source/control/ctrlbox \ + svtools/source/control/valueacc \ + svtools/source/control/valueset \ + svtools/source/control/taskbar \ + svtools/source/control/urlcontrol \ + svtools/source/control/scriptedtext \ + svtools/source/control/headbar \ + svtools/source/control/fileurlbox \ + svtools/source/control/fmtfield \ + svtools/source/control/collatorres \ + svtools/source/control/indexentryres \ + svtools/source/control/filectrl \ + svtools/source/control/scrwin \ + svtools/source/control/taskbox \ + svtools/source/control/hyperlabel \ + svtools/source/control/filectrl2 \ + svtools/source/control/fixedhyper \ + svtools/source/control/taskstat \ + svtools/source/control/inettbc \ + svtools/source/control/calendar \ + svtools/source/control/roadmap \ + svtools/source/control/ctrltool \ + svtools/source/control/asynclink \ + svtools/source/control/stdctrl \ + svtools/source/control/ctrldll \ + svtools/source/control/tabbar \ + svtools/source/control/ruler \ + svtools/source/control/stdmenu \ + svtools/source/control/prgsbar \ + svtools/source/control/taskmisc \ + svtools/source/dialogs/insdlg \ + svtools/source/dialogs/roadmapwizard \ + svtools/source/dialogs/mcvmath \ + svtools/source/dialogs/logindlg \ + svtools/source/dialogs/wizdlg \ + svtools/source/dialogs/addresstemplate \ + svtools/source/dialogs/printdlg \ + svtools/source/dialogs/filedlg2 \ + svtools/source/dialogs/colctrl \ + svtools/source/dialogs/colrdlg \ + svtools/source/dialogs/wizardmachine \ + svtools/source/dialogs/prnsetup \ + svtools/source/dialogs/filedlg \ + svtools/source/dialogs/property \ + svtools/source/table/tablecontrol \ + svtools/source/table/tablegeometry \ + svtools/source/table/gridtablerenderer \ + svtools/source/table/tabledatawindow \ + svtools/source/table/defaultinputhandler \ + svtools/source/table/tablecontrol_impl \ + svtools/source/contnr/svlbox \ + svtools/source/contnr/svtabbx \ + svtools/source/contnr/ivctrl \ + svtools/source/contnr/templwin \ + svtools/source/contnr/svicnvw \ + svtools/source/contnr/contentenumeration \ + svtools/source/contnr/svimpbox \ + svtools/source/contnr/imivctl1 \ + svtools/source/contnr/svtreebx \ + svtools/source/contnr/fileview \ + svtools/source/contnr/svimpicn \ + svtools/source/contnr/svlbitm \ + svtools/source/contnr/ctrdll \ + svtools/source/contnr/tooltiplbox \ + svtools/source/contnr/treelist \ + svtools/source/contnr/imivctl2 \ + svtools/source/uno/unoiface \ + svtools/source/uno/genericunodialog \ + svtools/source/uno/unocontroltablemodel \ + svtools/source/uno/contextmenuhelper \ + svtools/source/uno/toolboxcontroller \ + svtools/source/uno/generictoolboxcontroller \ + svtools/source/uno/addrtempuno \ + svtools/source/uno/miscservices \ + svtools/source/uno/statusbarcontroller \ + svtools/source/uno/svtxgridcontrol \ + svtools/source/uno/unoimap \ + svtools/source/uno/unoevent \ + svtools/source/uno/treecontrolpeer \ + svtools/source/uno/framestatuslistener \ + svtools/source/brwbox/editbrowsebox \ + svtools/source/brwbox/brwhead \ + svtools/source/brwbox/brwbox3 \ + svtools/source/brwbox/brwbox1 \ + svtools/source/brwbox/ebbcontrols \ + svtools/source/brwbox/brwbox2 \ + svtools/source/brwbox/datwin \ + svtools/source/brwbox/editbrowsebox2 \ + svtools/source/svrtf/rtfkeywd \ + svtools/source/svrtf/svparser \ + svtools/source/svrtf/parrtf \ + svtools/source/svrtf/rtfout \ + svtools/source/filter.vcl/filter/dlgepng \ + svtools/source/filter.vcl/filter/filter2 \ + svtools/source/filter.vcl/filter/FilterConfigItem \ + svtools/source/filter.vcl/filter/sgvspln \ + svtools/source/filter.vcl/filter/filter \ + svtools/source/filter.vcl/filter/sgvtext \ + svtools/source/filter.vcl/filter/sgfbram \ + svtools/source/filter.vcl/filter/SvFilterOptionsDialog \ + svtools/source/filter.vcl/filter/dlgexpor \ + svtools/source/filter.vcl/filter/fldll \ + svtools/source/filter.vcl/filter/sgvmain \ + svtools/source/filter.vcl/filter/FilterConfigCache \ + svtools/source/filter.vcl/filter/dlgejpg \ + svtools/source/filter.vcl/wmf/winwmf \ + svtools/source/filter.vcl/wmf/winmtf \ + svtools/source/filter.vcl/wmf/emfwr \ + svtools/source/filter.vcl/wmf/wmf \ + svtools/source/filter.vcl/wmf/enhwmf \ + svtools/source/filter.vcl/wmf/wmfwr \ + svtools/source/filter.vcl/igif/decode \ + svtools/source/filter.vcl/igif/gifread \ + svtools/source/filter.vcl/ixbm/xbmread \ + svtools/source/filter.vcl/jpeg/jpeg \ + svtools/source/filter.vcl/ixpm/xpmread \ +)) + +$(eval $(call gb_Library_add_cobjects,svt,\ + svtools/source/filter.vcl/jpeg/jpegc \ +)) + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,svt,\ + dl \ + m \ + pthread \ +)) +endif + +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,svt,\ + advapi32 \ + gdi32 \ + kernel32 \ + msvcrt \ + oldnames \ + ole32 \ + oleaut32 \ + user32 \ + uuid \ + uwinapi \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/svtools/prj/target_module_svtools.mk b/svtools/prj/target_module_svtools.mk new file mode 100644 index 000000000000..0d474b4d794f --- /dev/null +++ b/svtools/prj/target_module_svtools.mk @@ -0,0 +1,57 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Module_Module,svtools,\ + $(call gb_AllLangResTarget_get_target,svt) \ + $(call gb_AllLangResTarget_get_target,productregistration) \ + $(call gb_Executable_get_target,bmp) \ + $(call gb_Executable_get_target,bmpsum) \ + $(call gb_Executable_get_target,g2g) \ + $(call gb_Library_get_target,hatchwindowfactory) \ + $(call gb_Library_get_target,productregistration) \ + $(call gb_Library_get_target,svt) \ + $(call gb_Package_get_target,svtools_inc) \ +)) + +$(eval $(call gb_Module_read_includes,svtools,\ + exe_bmp \ + exe_bmpsum \ + exe_g2g \ + lib_hatchwindowfactory \ + lib_productregistration \ + lib_svt \ + package_inc \ +)) + #res_svt \ + res_productregistration \ + +#todo: javapatchres +#todo: jpeg on mac in svtools/util/makefile.mk +#todo: deliver errtxt.src as ehdl.srs +#todo: nooptfiles filter, filterconfigitem, FilterConfigCache, SvFilterOptionsDialog +#todo: map file +# vim: set noet sw=4 ts=4: diff --git a/svtools/prj/target_package_inc.mk b/svtools/prj/target_package_inc.mk new file mode 100644 index 000000000000..4b7fd56be3fa --- /dev/null +++ b/svtools/prj/target_package_inc.mk @@ -0,0 +1,177 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,svtools_inc,$(SRCDIR)/svtools/inc)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/DocumentInfoPreview.hxx,svtools/DocumentInfoPreview.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/QueryFolderName.hxx,svtools/QueryFolderName.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/acceleratorexecute.hxx,svtools/acceleratorexecute.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/addresstemplate.hxx,svtools/addresstemplate.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/apearcfg.hxx,svtools/apearcfg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/asynclink.hxx,svtools/asynclink.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/calendar.hxx,svtools/calendar.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/cliplistener.hxx,svtools/cliplistener.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/collatorres.hxx,svtools/collatorres.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/contextmenuhelper.hxx,svtools/contextmenuhelper.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/controldims.hrc,svtools/controldims.hrc)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ctrlbox.hxx,svtools/ctrlbox.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ctrltool.hxx,svtools/ctrltool.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/dialogclosedlistener.hxx,svtools/dialogclosedlistener.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/dialogcontrolling.hxx,svtools/dialogcontrolling.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/expander.hxx,svtools/expander.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/extcolorcfg.hxx,svtools/extcolorcfg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filectrl.hxx,svtools/filectrl.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filedlg.hxx,svtools/filedlg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filedlg2.hrc,svtools/filedlg2.hrc)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fileview.hxx,svtools/fileview.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fltdefs.hxx,svtools/fltdefs.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fontsubstconfig.hxx,svtools/fontsubstconfig.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/framestatuslistener.hxx,svtools/framestatuslistener.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/helpagentwindow.hxx,svtools/helpagentwindow.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/htmlkywd.hxx,svtools/htmlkywd.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/htmltokn.h,svtools/htmltokn.h)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imagemgr.hrc,svtools/imagemgr.hrc)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imagemgr.hxx,svtools/imagemgr.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imageresourceaccess.hxx,svtools/imageresourceaccess.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imgdef.hxx,svtools/imgdef.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/indexentryres.hxx,svtools/indexentryres.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/inetimg.hxx,svtools/inetimg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/itemdel.hxx,svtools/itemdel.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ivctrl.hxx,svtools/ivctrl.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/localresaccess.hxx,svtools/localresaccess.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/prgsbar.hxx,svtools/prgsbar.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/roadmap.hxx,svtools/roadmap.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/rtfkeywd.hxx,svtools/rtfkeywd.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/rtfout.hxx,svtools/rtfout.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/rtftoken.h,svtools/rtftoken.h)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ruler.hxx,svtools/ruler.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/scriptedtext.hxx,svtools/scriptedtext.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/scrwin.hxx,svtools/scrwin.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/sfxecode.hxx,svtools/sfxecode.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/soerr.hxx,svtools/soerr.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/sores.hxx,svtools/sores.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/statusbarcontroller.hxx,svtools/statusbarcontroller.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/stdmenu.hxx,svtools/stdmenu.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/sychconv.hxx,svtools/sychconv.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/tabbar.hxx,svtools/tabbar.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/taskbar.hxx,svtools/taskbar.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/templatefoldercache.hxx,svtools/templatefoldercache.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/templdlg.hxx,svtools/templdlg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/testtool.hxx,svtools/testtool.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/tooltiplbox.hxx,svtools/tooltiplbox.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/txtattr.hxx,svtools/txtattr.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/txtcmp.hxx,svtools/txtcmp.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/unoevent.hxx,svtools/unoevent.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/unoimap.hxx,svtools/unoimap.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wallitem.hxx,svtools/wallitem.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/AccessibleBrowseBoxObjType.hxx,svtools/AccessibleBrowseBoxObjType.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/FilterConfigItem.hxx,svtools/FilterConfigItem.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibilityoptions.hxx,svtools/accessibilityoptions.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessiblefactory.hxx,svtools/accessiblefactory.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibletable.hxx,svtools/accessibletable.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibletableprovider.hxx,svtools/accessibletableprovider.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/brwbox.hxx,svtools/brwbox.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/brwhead.hxx,svtools/brwhead.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/chartprettypainter.hxx,svtools/chartprettypainter.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/colctrl.hxx,svtools/colctrl.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/colorcfg.hxx,svtools/colorcfg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/colrdlg.hxx,svtools/colrdlg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/editbrowsebox.hxx,svtools/editbrowsebox.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/editimplementation.hxx,svtools/editimplementation.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/editsyntaxhighlighter.hxx,svtools/editsyntaxhighlighter.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ehdl.hxx,svtools/ehdl.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/embedhlp.hxx,svtools/embedhlp.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/embedtransfer.hxx,svtools/embedtransfer.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/extensionlistbox.hxx,svtools/extensionlistbox.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fileurlbox.hxx,svtools/fileurlbox.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filter.hxx,svtools/filter.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fixedhyper.hxx,svtools/fixedhyper.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fltcall.hxx,svtools/fltcall.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fmtfield.hxx,svtools/fmtfield.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/generictoolboxcontroller.hxx,svtools/generictoolboxcontroller.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/genericunodialog.hxx,svtools/genericunodialog.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/headbar.hxx,svtools/headbar.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/helpid.hrc,svtools/helpid.hrc)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/helpopt.hxx,svtools/helpopt.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/htmlout.hxx,svtools/htmlout.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/hyperlabel.hxx,svtools/hyperlabel.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imap.hxx,svtools/imap.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imapcirc.hxx,svtools/imapcirc.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imapobj.hxx,svtools/imapobj.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imappoly.hxx,svtools/imappoly.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imaprect.hxx,svtools/imaprect.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/inettbc.hxx,svtools/inettbc.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/insdlg.hxx,svtools/insdlg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/javacontext.hxx,svtools/javacontext.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/javainteractionhandler.hxx,svtools/javainteractionhandler.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/langtab.hxx,svtools/langtab.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/logindlg.hxx,svtools/logindlg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/menuoptions.hxx,svtools/menuoptions.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/miscopt.hxx,svtools/miscopt.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/optionsdrawinglayer.hxx,svtools/optionsdrawinglayer.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/parhtml.hxx,svtools/parhtml.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/parrtf.hxx,svtools/parrtf.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/printdlg.hxx,svtools/printdlg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/printoptions.hxx,svtools/printoptions.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/prnsetup.hxx,svtools/prnsetup.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/roadmapwizard.hxx,svtools/roadmapwizard.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/stdctrl.hxx,svtools/stdctrl.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/stringtransfer.hxx,svtools/stringtransfer.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svicnvw.hxx,svtools/svicnvw.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svlbitm.hxx,svtools/svlbitm.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svlbox.hxx,svtools/svlbox.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svmedit.hxx,svtools/svmedit.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svmedit2.hxx,svtools/svmedit2.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svparser.hxx,svtools/svparser.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtabbx.hxx,svtools/svtabbx.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtdata.hxx,svtools/svtdata.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtdllapi.h,svtools/svtdllapi.h)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtreebx.hxx,svtools/svtreebx.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/syntaxhighlight.hxx,svtools/syntaxhighlight.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/textdata.hxx,svtools/textdata.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/texteng.hxx,svtools/texteng.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/textview.hxx,svtools/textview.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/textwindowpeer.hxx,svtools/textwindowpeer.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolboxcontroller.hxx,svtools/toolboxcontroller.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/transfer.hxx,svtools/transfer.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/treelist.hxx,svtools/treelist.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ttprops.hxx,svtools/ttprops.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/urlcontrol.hxx,svtools/urlcontrol.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/valueset.hxx,svtools/valueset.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wizardmachine.hxx,svtools/wizardmachine.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wizdlg.hxx,svtools/wizdlg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wmf.hxx,svtools/wmf.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/xtextedt.hxx,svtools/xtextedt.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/abstracttablecontrol.hxx,svtools/table/abstracttablecontrol.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/defaultinputhandler.hxx,svtools/table/defaultinputhandler.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/gridtablerenderer.hxx,svtools/table/gridtablerenderer.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tablecontrol.hxx,svtools/table/tablecontrol.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tabledatawindow.hxx,svtools/table/tabledatawindow.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tableinputhandler.hxx,svtools/table/tableinputhandler.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tablemodel.hxx,svtools/table/tablemodel.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tablerenderer.hxx,svtools/table/tablerenderer.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tabletypes.hxx,svtools/table/tabletypes.hxx)) + diff --git a/svtools/prj/target_res_productregistration.mk b/svtools/prj/target_res_productregistration.mk new file mode 100644 index 000000000000..c9c4c42e194f --- /dev/null +++ b/svtools/prj/target_res_productregistration.mk @@ -0,0 +1,48 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_AllLangResTarget_AllLangResTarget,productregistration)) + +$(eval $(call gb_AllLangResTarget_add_srs,productregistration,\ + svt/productregistration \ +)) + +$(eval $(call gb_SrsTarget_SrsTarget,svt/productregistration)) + +$(eval $(call gb_SrsTarget_set_include,svt/productregistration,\ + $$(INCLUDE) \ + -I$(WORKDIR)/inc \ + -I$(SRCDIR)/svtools/source/inc \ + -I$(SRCDIR)/svtools/inc/ \ + -I$(SRCDIR)/svtools/inc/svtools \ +)) + +$(eval $(call gb_SrsTarget_add_files,svt/productregistration,\ + svtools/source/productregistration/registrationdlg.src \ +)) + + diff --git a/svtools/prj/target_res_svt.mk b/svtools/prj/target_res_svt.mk new file mode 100644 index 000000000000..8a4bdaa30e07 --- /dev/null +++ b/svtools/prj/target_res_svt.mk @@ -0,0 +1,77 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_AllLangResTarget_AllLangResTarget,svt)) + +$(eval $(call gb_AllLangResTarget_add_srs,svt,\ + svt/res \ +)) + +$(eval $(call gb_SrsTarget_SrsTarget,svt/res)) + +$(eval $(call gb_SrsTarget_set_include,svt/res,\ + $$(INCLUDE) \ + -I$(WORKDIR)/inc \ + -I$(SRCDIR)/svtools/source/uno \ + -I$(SRCDIR)/svtools/source/inc \ + -I$(SRCDIR)/svtools/inc/ \ + -I$(SRCDIR)/svtools/inc/svtools \ +)) + +$(eval $(call gb_SrsTarget_add_files,svt/res,\ + svtools/source/java/javaerror.src \ + svtools/source/misc/helpagent.src \ + svtools/source/misc/langtab.src \ + svtools/source/misc/ehdl.src \ + svtools/source/misc/undo.src \ + svtools/source/misc/imagemgr.src \ + svtools/source/plugapp/testtool.src \ + svtools/source/control/filectrl.src \ + svtools/source/control/calendar.src \ + svtools/source/control/ctrlbox.src \ + svtools/source/control/ctrltool.src \ + svtools/source/dialogs/so3res.src \ + svtools/source/dialogs/prnsetup.src \ + svtools/source/dialogs/colrdlg.src \ + svtools/source/dialogs/addresstemplate.src \ + svtools/source/dialogs/filedlg2.src \ + svtools/source/dialogs/printdlg.src \ + svtools/source/dialogs/formats.src \ + svtools/source/dialogs/logindlg.src \ + svtools/source/dialogs/wizardmachine.src \ + svtools/source/contnr/templwin.src \ + svtools/source/contnr/fileview.src \ + svtools/source/contnr/svcontnr.src \ + svtools/source/uno/unoifac2.src \ + svtools/source/brwbox/editbrowsebox.src \ + svtools/source/filter.vcl/filter/dlgexpor.src \ + svtools/source/filter.vcl/filter/dlgejpg.src \ + svtools/source/filter.vcl/filter/dlgepng.src \ + svtools/source/filter.vcl/filter/strings.src \ +)) + + diff --git a/toolkit/Makefile b/toolkit/Makefile new file mode 100644 index 000000000000..d020b04dba7c --- /dev/null +++ b/toolkit/Makefile @@ -0,0 +1,30 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +include ../solenv/inc/gbuild.mk + +$(eval $(call gb_Module_make_global_targets,$(notdir $(shell pwd)))) diff --git a/toolkit/prj/gbuild.lst b/toolkit/prj/gbuild.lst new file mode 100644 index 000000000000..b9403f4fd164 --- /dev/null +++ b/toolkit/prj/gbuild.lst @@ -0,0 +1,3 @@ +ti toolkit : vcl NULL +ti toolkit usr1 - all ti_mkout NULL +ti toolkit\prj nmake - all ti_prj NULL diff --git a/toolkit/prj/makefile.mk b/toolkit/prj/makefile.mk new file mode 100644 index 000000000000..a5f9aa9d8248 --- /dev/null +++ b/toolkit/prj/makefile.mk @@ -0,0 +1,2 @@ +all: + cd .. && make -sj9 diff --git a/toolkit/prj/target_lib_tk.mk b/toolkit/prj/target_lib_tk.mk new file mode 100644 index 000000000000..3d70d3753dc1 --- /dev/null +++ b/toolkit/prj/target_lib_tk.mk @@ -0,0 +1,165 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,tk)) + +$(call gb_Library_get_headers_target,tk) : $(call gb_Package_get_target,toolkit_inc) + +$(eval $(call gb_Library_set_include,tk,\ + $$(INCLUDE) \ + -I$(WORKDIR)/inc/toolkit/ \ + -I$(SRCDIR)/toolkit/inc \ + -I$(SRCDIR)/toolkit/inc/pch \ + -I$(SRCDIR)/toolkit/source \ + -I$(OUTDIR)/inc/toolkit \ + -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_set_defs,tk,\ + $$(DEFS) \ + -DTOOLKIT_DLLIMPLEMENTATION \ +)) + +$(eval $(call gb_Library_add_linked_libs,tk,\ + comphelper \ + stl \ + tl \ + cppu \ + cppuhelper \ + sal \ + utl \ + vcl \ +)) + +$(eval $(call gb_Library_add_exception_objects,tk,\ + toolkit/source/awt/asynccallback \ + toolkit/source/awt/vclxaccessiblecomponent \ + toolkit/source/awt/vclxbitmap \ + toolkit/source/awt/vclxbutton \ + toolkit/source/awt/vclxcontainer \ + toolkit/source/awt/vclxdevice \ + toolkit/source/awt/vclxdialog \ + toolkit/source/awt/vclxfixedline \ + toolkit/source/awt/vclxfont \ + toolkit/source/awt/vclxgraphics \ + toolkit/source/awt/vclxmenu \ + toolkit/source/awt/vclxplugin \ + toolkit/source/awt/vclxpointer \ + toolkit/source/awt/vclxprinter \ + toolkit/source/awt/vclxregion \ + toolkit/source/awt/vclxscroller \ + toolkit/source/awt/vclxspinbutton \ + toolkit/source/awt/vclxsplitter \ + toolkit/source/awt/vclxsystemdependentwindow \ + toolkit/source/awt/vclxtabcontrol \ + toolkit/source/awt/vclxtabpage \ + toolkit/source/awt/vclxtoolkit \ + toolkit/source/awt/vclxtopwindow \ + toolkit/source/awt/vclxwindow \ + toolkit/source/awt/vclxwindow1 \ + toolkit/source/awt/vclxwindows \ + toolkit/source/awt/xsimpleanimation \ + toolkit/source/awt/xthrobber \ + toolkit/source/controls/accessiblecontrolcontext \ + toolkit/source/controls/dialogcontrol \ + toolkit/source/controls/eventcontainer \ + toolkit/source/controls/formattedcontrol \ + toolkit/source/controls/geometrycontrolmodel \ + toolkit/source/controls/grid/defaultgridcolumnmodel \ + toolkit/source/controls/grid/defaultgriddatamodel \ + toolkit/source/controls/grid/gridcolumn \ + toolkit/source/controls/grid/gridcontrol \ + toolkit/source/controls/roadmapcontrol \ + toolkit/source/controls/roadmapentry \ + toolkit/source/controls/stdtabcontroller \ + toolkit/source/controls/stdtabcontrollermodel \ + toolkit/source/controls/tkscrollbar \ + toolkit/source/controls/tksimpleanimation \ + toolkit/source/controls/tkspinbutton \ + toolkit/source/controls/tkthrobber \ + toolkit/source/controls/tree/treecontrol \ + toolkit/source/controls/tree/treedatamodel \ + toolkit/source/controls/unocontrol \ + toolkit/source/controls/unocontrolbase \ + toolkit/source/controls/unocontrolcontainer \ + toolkit/source/controls/unocontrolcontainermodel \ + toolkit/source/controls/unocontrolmodel \ + toolkit/source/controls/unocontrols \ + toolkit/source/helper/accessibilityclient \ + toolkit/source/helper/externallock \ + toolkit/source/helper/fixedhyperbase \ + toolkit/source/helper/formpdfexport \ + toolkit/source/helper/imagealign \ + toolkit/source/helper/listenermultiplexer \ + toolkit/source/helper/property \ + toolkit/source/helper/registerservices \ + toolkit/source/helper/servicenames \ + toolkit/source/helper/throbberimpl \ + toolkit/source/helper/tkresmgr \ + toolkit/source/helper/unomemorystream \ + toolkit/source/helper/unopropertyarrayhelper \ + toolkit/source/helper/unowrapper \ + toolkit/source/helper/vclunohelper \ + toolkit/source/layout/core/bin \ + toolkit/source/layout/core/box \ + toolkit/source/layout/core/box-base \ + toolkit/source/layout/core/byteseq \ + toolkit/source/layout/core/container \ + toolkit/source/layout/core/dialogbuttonhbox \ + toolkit/source/layout/core/factory \ + toolkit/source/layout/core/flow \ + toolkit/source/layout/core/helper \ + toolkit/source/layout/core/import \ + toolkit/source/layout/core/localized-string \ + toolkit/source/layout/core/proplist \ + toolkit/source/layout/core/root \ + toolkit/source/layout/core/table \ + toolkit/source/layout/core/timer \ + toolkit/source/layout/core/translate \ + toolkit/source/layout/core/vcl \ + toolkit/source/layout/vcl/wbutton \ + toolkit/source/layout/vcl/wcontainer \ + toolkit/source/layout/vcl/wfield \ + toolkit/source/layout/vcl/wrapper \ +)) + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,tk,\ + X11 \ + dl \ + m \ + pthread \ +)) +endif +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,tk,\ + kernel32 \ + msvcrt \ + uwinapi \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/toolkit/prj/target_module_toolkit.mk b/toolkit/prj/target_module_toolkit.mk new file mode 100644 index 000000000000..b6723fd8403d --- /dev/null +++ b/toolkit/prj/target_module_toolkit.mk @@ -0,0 +1,43 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Module_read_includes,toolkit,\ + lib_tk \ + package_inc \ + package_source \ + package_util \ + res_tk \ +)) + +$(eval $(call gb_Module_Module,toolkit,\ + $(call gb_AllLangResTarget_get_target,tk) \ + $(call gb_Library_get_target,tk) \ + $(call gb_Package_get_target,toolkit_inc) \ + $(call gb_Package_get_target,toolkit_source) \ + $(call gb_Package_get_target,toolkit_util) \ +)) +# vim: set noet sw=4 ts=4: diff --git a/toolkit/prj/target_package_inc.mk b/toolkit/prj/target_package_inc.mk new file mode 100644 index 000000000000..be23e1a95a1c --- /dev/null +++ b/toolkit/prj/target_package_inc.mk @@ -0,0 +1,60 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,toolkit_inc,$(SRCDIR)/toolkit/inc)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/layout/layout-post.hxx,layout/layout-post.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/layout/layout-pre.hxx,layout/layout-pre.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/layout/layout.hxx,layout/layout.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxaccessiblecomponent.hxx,toolkit/awt/vclxaccessiblecomponent.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxcontainer.hxx,toolkit/awt/vclxcontainer.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxdevice.hxx,toolkit/awt/vclxdevice.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxfont.hxx,toolkit/awt/vclxfont.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxmenu.hxx,toolkit/awt/vclxmenu.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxtoolkit.hxx,toolkit/awt/vclxtoolkit.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxtopwindow.hxx,toolkit/awt/vclxtopwindow.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxwindow.hxx,toolkit/awt/vclxwindow.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxwindows.hxx,toolkit/awt/vclxwindows.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/controls/unocontrol.hxx,toolkit/controls/unocontrol.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/controls/unocontrolbase.hxx,toolkit/controls/unocontrolbase.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/controls/unocontrolmodel.hxx,toolkit/controls/unocontrolmodel.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/controls/unocontrols.hxx,toolkit/controls/unocontrols.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/dllapi.h,toolkit/dllapi.h)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/accessiblefactory.hxx,toolkit/helper/accessiblefactory.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/convert.hxx,toolkit/helper/convert.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/emptyfontdescriptor.hxx,toolkit/helper/emptyfontdescriptor.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/externallock.hxx,toolkit/helper/externallock.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/fixedhyperbase.hxx,toolkit/helper/fixedhyperbase.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/formpdfexport.hxx,toolkit/helper/formpdfexport.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/listenermultiplexer.hxx,toolkit/helper/listenermultiplexer.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/macros.hxx,toolkit/helper/macros.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/mutexandbroadcasthelper.hxx,toolkit/helper/mutexandbroadcasthelper.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/mutexhelper.hxx,toolkit/helper/mutexhelper.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/property.hxx,toolkit/helper/property.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/servicenames.hxx,toolkit/helper/servicenames.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/unowrapper.hxx,toolkit/helper/unowrapper.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/vclunohelper.hxx,toolkit/helper/vclunohelper.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/unohlp.hxx,toolkit/helper/vclunohelper.hxx)) diff --git a/toolkit/prj/target_package_source.mk b/toolkit/prj/target_package_source.mk new file mode 100644 index 000000000000..8a5aa5ffc3cb --- /dev/null +++ b/toolkit/prj/target_package_source.mk @@ -0,0 +1,47 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,toolkit_source,$(SRCDIR)/toolkit/source)) +$(eval $(call gb_Package_add_file,toolkit_source,inc/toolkit/awt/vclxdialog.hxx,awt/vclxdialog.hxx)) +$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/bin.hxx,layout/core/bin.hxx)) +$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/box-base.hxx,layout/core/box-base.hxx)) +$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/box.hxx,layout/core/box.hxx)) +$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/container.hxx,layout/core/container.hxx)) +$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/dialogbuttonhbox.hxx,layout/core/dialogbuttonhbox.hxx)) +$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/factory.hxx,layout/core/factory.hxx)) +$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/flow.hxx,layout/core/flow.hxx)) +$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/helper.hxx,layout/core/helper.hxx)) +$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/import.hxx,layout/core/import.hxx)) +$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/localized-string.hxx,layout/core/localized-string.hxx)) +$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/precompiled_xmlscript.hxx,layout/core/precompiled_xmlscript.hxx)) +$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/proplist.hxx,layout/core/proplist.hxx)) +$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/root.hxx,layout/core/root.hxx)) +$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/table.hxx,layout/core/table.hxx)) +$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/timer.hxx,layout/core/timer.hxx)) +$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/translate.hxx,layout/core/translate.hxx)) +$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/vcl.hxx,layout/core/vcl.hxx)) +$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/vcl/wrapper.hxx,layout/vcl/wrapper.hxx)) diff --git a/toolkit/prj/target_package_util.mk b/toolkit/prj/target_package_util.mk new file mode 100644 index 000000000000..990248eb142d --- /dev/null +++ b/toolkit/prj/target_package_util.mk @@ -0,0 +1,29 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,toolkit_util,$(SRCDIR)/toolkit/util)) +$(eval $(call gb_Package_add_file,toolkit_util,xml/toolkit.xml,toolkit.xml)) diff --git a/toolkit/prj/target_res_tk.mk b/toolkit/prj/target_res_tk.mk new file mode 100644 index 000000000000..ea971f0041b0 --- /dev/null +++ b/toolkit/prj/target_res_tk.mk @@ -0,0 +1,43 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_AllLangResTarget_AllLangResTarget,tk)) + +$(eval $(call gb_AllLangResTarget_add_srs,tk,\ + toolkit/awt \ +)) + +$(eval $(call gb_SrsTarget_SrsTarget,toolkit/awt)) + +$(eval $(call gb_SrsTarget_set_include,toolkit/awt,\ + $$(INCLUDE) \ + -I$(SRCDIR)/toolkit/source/awt \ +)) + +$(eval $(call gb_SrsTarget_add_files,toolkit/awt,\ + toolkit/source/awt/xthrobber.src \ +)) diff --git a/toolkit/src2xml/src-sw.lst b/toolkit/src2xml/src-sw.lst index 8d43400462d8..a0e7245fc4f4 100644 --- a/toolkit/src2xml/src-sw.lst +++ b/toolkit/src2xml/src-sw.lst @@ -51,7 +51,6 @@ ../../sw/source/ui/fldui/DropDownFieldDialog.src ../../sw/source/ui/fldui/fldui.src ../../sw/source/ui/fmtui/tmpdlg.src -../../sw/source/ui/fmtui/fmtui.src ../../sw/source/ui/index/cnttab.src ../../sw/source/ui/index/multmrk.src ../../sw/source/ui/index/idxmrk.src diff --git a/toolkit/src2xml/src.lst b/toolkit/src2xml/src.lst index 5375af00b8f0..5414fabb723c 100644 --- a/toolkit/src2xml/src.lst +++ b/toolkit/src2xml/src.lst @@ -170,7 +170,6 @@ ../../sw/source/ui/fldui/DropDownFieldDialog.src ../../sw/source/ui/fldui/fldui.src ../../sw/source/ui/fmtui/tmpdlg.src -../../sw/source/ui/fmtui/fmtui.src ../../sw/source/ui/index/cnttab.src ../../sw/source/ui/index/multmrk.src ../../sw/source/ui/index/idxmrk.src diff --git a/toolkit/util/makefile.mk b/toolkit/util/makefile.mk index 3c5da82d0dd9..3dd1f3c5e697 100644 --- a/toolkit/util/makefile.mk +++ b/toolkit/util/makefile.mk @@ -80,7 +80,7 @@ DEF1DEPN =$(LIB1TARGET) DEF1DES =TK DEFLIB1NAME =tk -RESLIB1IMAGES=$(PRJ)$/source$/awt +RESLIB1IMAGES=$(PRJ)$/source$/awt $(SOLARSRC)/$(RSCDEFIMG)/$(TARGET)/res RES1FILELIST=$(SRS)$/awt.srs RESLIB1NAME=$(TARGET) RESLIB1SRSFILES=$(RES1FILELIST) diff --git a/tools/Makefile b/tools/Makefile new file mode 100644 index 000000000000..d020b04dba7c --- /dev/null +++ b/tools/Makefile @@ -0,0 +1,30 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +include ../solenv/inc/gbuild.mk + +$(eval $(call gb_Module_make_global_targets,$(notdir $(shell pwd)))) diff --git a/tools/prj/gbuild.lst b/tools/prj/gbuild.lst new file mode 100644 index 000000000000..3194cbb4e87c --- /dev/null +++ b/tools/prj/gbuild.lst @@ -0,0 +1,3 @@ +tl tools : cppu external offuh vos ZLIB:zlib EXPAT:expat basegfx comphelper i18npool NULL +tl tools usr1 - all tl_mkout NULL +tl tools\prj nmake - all tl_prj NULL diff --git a/tools/prj/makefile.mk b/tools/prj/makefile.mk new file mode 100644 index 000000000000..a5f9aa9d8248 --- /dev/null +++ b/tools/prj/makefile.mk @@ -0,0 +1,2 @@ +all: + cd .. && make -sj9 diff --git a/tools/prj/target_exe_mkunroll.mk b/tools/prj/target_exe_mkunroll.mk new file mode 100644 index 000000000000..9d00d75b4bc1 --- /dev/null +++ b/tools/prj/target_exe_mkunroll.mk @@ -0,0 +1,79 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Executable_Executable,mkunroll)) + +$(eval $(call gb_Executable_set_include,mkunroll,\ + $$(INCLUDE) \ + -I$(SRCDIR)/tools/inc/ \ + -I$(SRCDIR)/tools/inc/pch \ + -I$(SRCDIR)/tools/bootstrp/ \ +)) + +$(eval $(call gb_Executable_set_cxxflags,mkunroll,\ + $$(CXXFLAGS) \ + -D_TOOLS_STRINGLIST \ +)) + +$(eval $(call gb_Executable_add_linked_libs,mkunroll,\ + basegfx \ + sal \ + stl \ + tl \ + vos3 \ +)) + +# used to link against basegfxlx comphelp4gcc3 i18nisolang1gcc3 ucbhelper4gcc3 uno_cppu uno_cppuhelpergcc3 uno_salhelpergcc3 - seems to be superficial + +$(eval $(call gb_Executable_add_exception_objects,mkunroll,\ + tools/bootstrp/addexes2/mkfilt \ + tools/bootstrp/appdef \ + tools/bootstrp/command \ + tools/bootstrp/cppdep \ + tools/bootstrp/inimgr \ + tools/bootstrp/mkcreate \ + tools/bootstrp/prj \ + tools/bootstrp/sstring \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_Executable_add_linked_libs,mkunroll,\ + kernel32 \ + user32 \ + msvcrt \ + oldnames \ + uwinapi \ +)) +endif + +ifeq ($(OS),LINUX) +$(eval $(call gb_Executable_add_linked_libs,mkunroll,\ + pthread \ + dl \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/tools/prj/target_exe_rscdep.mk b/tools/prj/target_exe_rscdep.mk new file mode 100644 index 000000000000..99a717470f19 --- /dev/null +++ b/tools/prj/target_exe_rscdep.mk @@ -0,0 +1,76 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Executable_Executable,rscdep)) + +$(eval $(call gb_Executable_set_include,rscdep,\ + $$(INCLUDE) \ + -I$(SRCDIR)/tools/inc/ \ + -I$(SRCDIR)/tools/inc/pch \ + -I$(SRCDIR)/tools/bootstrp/ \ +)) + +$(eval $(call gb_Executable_set_cxxflags,rscdep,\ + $$(CXXFLAGS) \ + -D_TOOLS_STRINGLIST \ +)) + +$(eval $(call gb_Executable_add_linked_libs,rscdep,\ + sal \ + stl \ + tl \ + vos3 \ +)) + +$(eval $(call gb_Executable_add_exception_objects,rscdep,\ + tools/bootstrp/appdef \ + tools/bootstrp/command \ + tools/bootstrp/cppdep \ + tools/bootstrp/inimgr \ + tools/bootstrp/mkcreate \ + tools/bootstrp/prj \ + tools/bootstrp/rscdep \ + tools/bootstrp/sstring \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_Executable_add_linked_libs,rscdep,\ + kernel32 \ + user32 \ + msvcrt \ + oldnames \ + uwinapi \ +)) +endif + +ifeq ($(OS),LINUX) +$(eval $(call gb_Executable_add_linked_libs,rscdep,\ + pthread \ + dl \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/tools/prj/target_exe_so_checksum.mk b/tools/prj/target_exe_so_checksum.mk new file mode 100644 index 000000000000..d852c22ef5de --- /dev/null +++ b/tools/prj/target_exe_so_checksum.mk @@ -0,0 +1,69 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Executable_Executable,so_checksum)) + +$(eval $(call gb_Executable_set_include,so_checksum,\ + $$(INCLUDE) \ + -I$(SRCDIR)/tools/inc/ \ + -I$(SRCDIR)/tools/inc/pch \ + -I$(SRCDIR)/tools/bootstrp/ \ +)) + +$(eval $(call gb_Executable_set_cxxflags,so_checksum,\ + $$(CXXFLAGS) \ + -D_TOOLS_STRINGLIST \ +)) + +$(eval $(call gb_Executable_add_linked_libs,so_checksum,\ + sal \ + tl \ +)) +# used to link against basegfxlx comphelp4gcc3 i18nisolang1gcc3 ucbhelper4gcc3 uno_cppu uno_cppuhelpergcc3 uno_salhelpergcc3 vos3gcc3 - seems to be superficial + +$(eval $(call gb_Executable_add_exception_objects,so_checksum,\ + tools/bootstrp/md5 \ + tools/bootstrp/so_checksum \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_Executable_add_linked_libs,so_checksum,\ + kernel32 \ + user32 \ + msvcrt \ + oldnames \ + uwinapi \ +)) +endif + +ifeq ($(OS),LINUX) +$(eval $(call gb_Executable_add_linked_libs,so_checksum,\ + pthread \ + dl \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/tools/prj/target_exe_sspretty.mk b/tools/prj/target_exe_sspretty.mk new file mode 100644 index 000000000000..6751c53fae84 --- /dev/null +++ b/tools/prj/target_exe_sspretty.mk @@ -0,0 +1,77 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Executable_Executable,sspretty)) + +$(eval $(call gb_Executable_set_include,sspretty,\ + $$(INCLUDE) \ + -I$(SRCDIR)/tools/inc/ \ + -I$(SRCDIR)/tools/inc/pch \ + -I$(SRCDIR)/tools/bootstrp/ \ +)) + +$(eval $(call gb_Executable_set_cxxflags,sspretty,\ + $$(CXXFLAGS) \ + -D_TOOLS_STRINGLIST \ +)) + +$(eval $(call gb_Executable_add_linked_libs,sspretty,\ + sal \ + stl \ + tl \ + vos3 \ +)) +# used to link against basegfxlx comphelp4gcc3 i18nisolang1gcc3 ucbhelper4gcc3 uno_cppu uno_cppuhelpergcc3 uno_salhelpergcc3 - seems to be superficial + +$(eval $(call gb_Executable_add_exception_objects,sspretty,\ + tools/bootstrp/appdef \ + tools/bootstrp/command \ + tools/bootstrp/cppdep \ + tools/bootstrp/inimgr \ + tools/bootstrp/mkcreate \ + tools/bootstrp/prj \ + tools/bootstrp/sspretty \ + tools/bootstrp/sstring \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_Executable_add_linked_libs,sspretty,\ + kernel32 \ + user32 \ + msvcrt \ + oldnames \ + uwinapi \ +)) +endif + +ifeq ($(OS),LINUX) +$(eval $(call gb_Executable_add_linked_libs,sspretty,\ + pthread \ + dl \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/tools/prj/target_lib_tl.mk b/tools/prj/target_lib_tl.mk new file mode 100644 index 000000000000..3379a194e024 --- /dev/null +++ b/tools/prj/target_lib_tl.mk @@ -0,0 +1,176 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,tl)) + +$(call gb_Library_get_headers_target,tl) : $(call gb_Package_get_target,tools_inc) + +$(eval $(call gb_Library_set_include,tl,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc \ + -I$(WORKDIR)/inc/tools \ + -I$(SRCDIR)/tools/inc \ + -I$(SRCDIR)/tools/inc/pch \ + -I$(SRCDIR)/solenv/inc \ + -I$(SRCDIR)/solenv/inc/Xp31 \ + -I$(OUTDIR)/inc/tools \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc/stl \ +)) + +$(eval $(call gb_Library_set_cxxflags,tl,\ + $$(CXXFLAGS) \ + -DSHARED_LIB \ + -DTOOLS_DLLIMPLEMENTATION \ + -DVCL \ +)) + +$(eval $(call gb_Library_add_linked_libs,tl,\ + basegfx \ + comphelper \ + i18nisolang1 \ + stl \ + cppu \ + sal \ + vos3 \ +)) + + +$(eval $(call gb_Library_add_exception_objects,tl,\ + tools/source/communi/parser \ + tools/source/datetime/tdate \ + tools/source/datetime/ttime \ + tools/source/debug/stcktree \ + tools/source/fsys/tdir \ + tools/source/fsys/tempfile \ + tools/source/fsys/urlobj \ + tools/source/fsys/wldcrd \ + tools/source/generic/line \ + tools/source/generic/link \ + tools/source/generic/poly \ + tools/source/generic/poly2 \ + tools/source/generic/svborder \ + tools/source/generic/toolsin \ + tools/source/inet/inetmime \ + tools/source/inet/inetmsg \ + tools/source/inet/inetstrm \ + tools/source/memtools/mempool \ + tools/source/memtools/multisel \ + tools/source/memtools/table \ + tools/source/memtools/unqidx \ + tools/source/misc/solarmutex \ + tools/source/rc/isofallback \ + tools/source/rc/rc \ + tools/source/rc/resary \ + tools/source/rc/resmgr \ + tools/source/ref/globname \ + tools/source/ref/pstm \ + tools/source/ref/ref \ + tools/source/stream/stream \ + tools/source/stream/strmsys \ + tools/source/stream/vcompat \ + tools/source/string/tenccvt \ + tools/source/string/tstring \ + tools/source/string/tustring \ + tools/source/testtoolloader/testtoolloader \ + tools/source/communi/geninfo \ + tools/source/datetime/datetime \ + tools/source/debug/debug \ + tools/source/fsys/comdep \ + tools/source/fsys/dirent \ + tools/source/fsys/filecopy \ + tools/source/fsys/fstat \ + tools/source/generic/bigint \ + tools/source/generic/color \ + tools/source/generic/config \ + tools/source/generic/fract \ + tools/source/generic/gen \ + tools/source/memtools/contnr \ + tools/source/misc/appendunixshellword \ + tools/source/misc/extendapplicationenvironment \ + tools/source/misc/getprocessworkingdir \ + tools/source/ref/errinf \ + tools/source/stream/cachestr \ + tools/source/string/debugprint \ + tools/source/zcodec/zcodec \ +)) + +ifeq ($(GUI),unx) +$(eval $(call gb_Library_add_exception_objects,tl,\ + tools/unx/source/dll/toolsdll \ +)) +endif + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,tl,\ + dl \ + m \ + pthread \ +)) +ifeq ($(SYSTEM_ZLIB),YES) +$(eval $(call gb_Library_set_cxxflags,tl,\ + $$(CXXFLAGS) \ + -DSYSTEM_ZLIB \ +)) +$(eval $(call gb_Library_add_linked_libs,tl,\ + z \ +)) +else +$(eval $(call gb_Library_add_linked_static_libs,tl,\ + zlib \ +)) +endif +endif + +ifeq ($(OS),WNT) +$(eval $(call gb_Library_set_include,tl,\ + $$(INCLUDE) \ + -I$(SRCDIR)/tools/win/inc \ +)) + +$(eval $(call gb_Library_add_exception_objects,tl,\ + tools/source/win/source/dll/toolsdll \ +)) + +$(eval $(call gb_Library_add_linked_libs,tl,\ + advapi32 \ + kernel32 \ + mpr \ + msvcrt \ + oldnames \ + ole32 \ + shell32 \ + user32 \ + uuid \ + uwinapi \ +)) +endif +# tools/source/string/debugprint -DDEBUG -DEXCEPTIONS_OFF -DOSL_DEBUG_LEVEL=2 -DSHAREDLIB -DTOOLS_DLLIMPLEMENTATION -D_DLL_ -O0 -fno-exceptions -fpic -fvisibility=hidden -g +# -DOPTIMIZE +# no -DTOOLS_DLLIMPLEMENTATION on toolsdll +# -DEXCEPTIONS_OFF -fno-exceptions on geninfo parser datetime tdate ttime bigint color config fract gen line link poly2 svborder toolsin inetmime inetmsg inetstrm contnr mempool multisel table unqidx cachestr stream strmsys vcompat tenccvt tstring tustring testtoolloader +# vim: set noet sw=4 ts=4: diff --git a/tools/prj/target_module_tools.mk b/tools/prj/target_module_tools.mk new file mode 100644 index 000000000000..b566c1d65b86 --- /dev/null +++ b/tools/prj/target_module_tools.mk @@ -0,0 +1,56 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Module_Module,tools,\ + $(call gb_Executable_get_target,mkunroll) \ + $(call gb_Executable_get_target,rscdep) \ + $(call gb_Executable_get_target,so_checksum) \ + $(call gb_Executable_get_target,sspretty) \ + $(call gb_Library_get_target,tl) \ + $(call gb_Package_get_target,tools_inc) \ +)) + +$(eval $(call gb_Module_read_includes,tools,\ + exe_mkunroll \ + exe_rscdep \ + exe_so_checksum \ + exe_sspretty \ + lib_tl \ + package_inc \ +)) + +# TODO: +#COPY tools/unxlngx6.pro/lib/atools.lib unxlngx6.pro/lib/atools.lib +#COPY tools/unxlngx6.pro/lib/bootstrp2.lib unxlngx6.pro/lib/bootstrp2.lib +#COPY tools/unxlngx6.pro/lib/btstrp.lib unxlngx6.pro/lib/btstrp.lib +#COPY tools/unxlngx6.pro/lib/libatools.a unxlngx6.pro/lib/libatools.a +#COPY tools/unxlngx6.pro/lib/libbootstrp2.a unxlngx6.pro/lib/libbootstrp2.a +#COPY tools/unxlngx6.pro/lib/libbtstrp.a unxlngx6.pro/lib/libbtstrp.a +#COPY tools/unxlngx6.pro/lib/libstdstrm.a unxlngx6.pro/lib/libstdstrm.a +#COPY tools/unxlngx6.pro/lib/stdstrm.lib unxlngx6.pro/lib/stdstrm.lib +#COPY tools/unxlngx6.pro/obj/pathutils.obj unxlngx6.pro/lib/pathutils-obj.obj +#COPY tools/unxlngx6.pro/slo/pathutils.obj unxlngx6.pro/lib/pathutils-slo.obj diff --git a/tools/prj/target_package_inc.mk b/tools/prj/target_package_inc.mk new file mode 100644 index 000000000000..92bb02034e7d --- /dev/null +++ b/tools/prj/target_package_inc.mk @@ -0,0 +1,120 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,tools_inc,$(SRCDIR)/tools/inc)) +$(eval $(call gb_Package_add_file,tools_inc,inc/bootstrp/command.hxx,bootstrp/command.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/bootstrp/inimgr.hxx,bootstrp/inimgr.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/bootstrp/listmacr.hxx,bootstrp/listmacr.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/bootstrp/mkcreate.hxx,bootstrp/mkcreate.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/bootstrp/prj.hxx,bootstrp/prj.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/bootstrp/sstring.hxx,bootstrp/sstring.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/StringListResource.hxx,tools/StringListResource.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/agapi.hxx,tools/agapi.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/agitem.hxx,tools/agitem.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/appendunixshellword.hxx,tools/appendunixshellword.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/bigint.hxx,tools/bigint.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/cachestr.hxx,tools/cachestr.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/chapi.hxx,tools/chapi.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/color.hxx,tools/color.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/config.hxx,tools/config.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/contnr.hxx,tools/contnr.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/date.hxx,tools/date.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/datetime.hxx,tools/datetime.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/debug.hxx,tools/debug.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/diagnose_ex.h,tools/diagnose_ex.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/download.hxx,tools/download.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/dynary.hxx,tools/dynary.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/eacopier.hxx,tools/eacopier.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/errcode.hxx,tools/errcode.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/errinf.hxx,tools/errinf.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/extendapplicationenvironment.hxx,tools/extendapplicationenvironment.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/fldunit.hxx,tools/fldunit.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/fontenum.hxx,tools/fontenum.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/fract.hxx,tools/fract.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/fsys.hxx,tools/fsys.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/gen.hxx,tools/gen.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/geninfo.hxx,tools/geninfo.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/getprocessworkingdir.hxx,tools/getprocessworkingdir.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/globname.hxx,tools/globname.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/inetdef.hxx,tools/inetdef.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/inetmime.hxx,tools/inetmime.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/inetmsg.hxx,tools/inetmsg.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/inetstrm.hxx,tools/inetstrm.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/iparser.hxx,tools/iparser.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/isofallback.hxx,tools/isofallback.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/line.hxx,tools/line.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/link.hxx,tools/link.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/list.hxx,tools/list.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/mapunit.hxx,tools/mapunit.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/mempool.hxx,tools/mempool.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/multisel.hxx,tools/multisel.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/ownlist.hxx,tools/ownlist.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/pathutils.hxx,tools/pathutils.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/poly.hxx,tools/poly.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/postsys.h,tools/postsys.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/postwin.h,tools/postwin.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/postx.h,tools/postx.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/presys.h,tools/presys.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/prewin.h,tools/prewin.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/prex.h,tools/prex.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/pstm.hxx,tools/pstm.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/queue.hxx,tools/queue.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/rc.h,tools/rc.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/rc.hxx,tools/rc.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/rcid.h,tools/rcid.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/ref.hxx,tools/ref.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/resary.hxx,tools/resary.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/resid.hxx,tools/resid.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/resmgr.hxx,tools/resmgr.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/rtti.hxx,tools/rtti.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/shl.hxx,tools/shl.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/simplerm.hxx,tools/simplerm.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/solar.h,tools/solar.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/solarmutex.hxx,tools/solarmutex.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/stack.hxx,tools/stack.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/stream.hxx,tools/stream.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/string.hxx,tools/string.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/svborder.hxx,tools/svborder.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/svwin.h,tools/svwin.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/table.hxx,tools/table.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/tempfile.hxx,tools/tempfile.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/tenccvt.hxx,tools/tenccvt.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/testtoolloader.hxx,tools/testtoolloader.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/time.hxx,tools/time.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/tools.h,tools/tools.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/toolsdllapi.h,tools/toolsdllapi.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/unqid.hxx,tools/unqid.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/unqidx.hxx,tools/unqidx.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/urlkeys.hxx,tools/urlkeys.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/urlobj.hxx,tools/urlobj.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/vcompat.hxx,tools/vcompat.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/vector2d.hxx,tools/vector2d.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/weakbase.h,tools/weakbase.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/weakbase.hxx,tools/weakbase.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/wintypes.hxx,tools/wintypes.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/wldcrd.hxx,tools/wldcrd.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/zcodec.hxx,tools/zcodec.hxx)) -- cgit From 3729a89512242899e1e46802befca8c825b3c45a Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Mon, 19 Apr 2010 15:02:20 +0200 Subject: CWS gnumake2: made resource location in default_images customizable for nonconforming modules (toolkit,framework,sfx2) --- toolkit/prj/target_res_tk.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/toolkit/prj/target_res_tk.mk b/toolkit/prj/target_res_tk.mk index ea971f0041b0..571d5dfbff70 100644 --- a/toolkit/prj/target_res_tk.mk +++ b/toolkit/prj/target_res_tk.mk @@ -27,6 +27,8 @@ $(eval $(call gb_AllLangResTarget_AllLangResTarget,tk)) +$(eval $(call gb_AllLangResTarget_set_reslocation,tk,toolkit/source/awt)) + $(eval $(call gb_AllLangResTarget_add_srs,tk,\ toolkit/awt \ )) -- cgit From 68423011aeed10e3d7fef51b4e8a044edaf50514 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 19 Apr 2010 17:54:47 +0200 Subject: CWS gnumake2: removed files in svl; typo in svtools makefile; missing include in sfx2 makefile --- svl/inc/svl/cancel.hxx | 142 ----------------------------------- svl/inc/svl/cnclhint.hxx | 48 ------------ svl/prj/target_package_inc.mk | 1 - svtools/prj/target_module_svtools.mk | 4 +- 4 files changed, 2 insertions(+), 193 deletions(-) delete mode 100644 svl/inc/svl/cancel.hxx delete mode 100644 svl/inc/svl/cnclhint.hxx diff --git a/svl/inc/svl/cancel.hxx b/svl/inc/svl/cancel.hxx deleted file mode 100644 index d268044a611d..000000000000 --- a/svl/inc/svl/cancel.hxx +++ /dev/null @@ -1,142 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SFXCANCEL_HXX -#define _SFXCANCEL_HXX - -#include "svl/svldllapi.h" -#include -#include -#include -#include - -class SfxCancellable; - -#ifdef _SFX_CANCEL_CXX -#include - -SV_DECL_PTRARR( SfxCancellables_Impl, SfxCancellable*, 0, 4 ) - -#else - -typedef SvPtrarr SfxCancellables_Impl; - -#endif - -//------------------------------------------------------------------------- - -class SVL_DLLPUBLIC SfxCancelManager: public SfxBroadcaster -, public SvWeakBase - -/* [Beschreibung] - - An Instanzen dieser Klasse k"onnen nebenl"aufige Prozesse angemeldet - werden, um vom Benutzer abbrechbar zu sein. Werden abbrechbare - Prozesse (Instanzen von ) an- oder abgemeldet, wird - dies durch einen mit dem Flag SFX_HINT_CANCELLABLE - gebroadcastet. - - SfxCancelManager k"onnen hierarchisch angeordnet werden, so k"onnen - z.B. Dokument-lokale Prozesse getrennt gecancelt werden. - - [Beispiel] - - SfxCancelManager *pMgr = new SfxCancelManager; - StartListening( pMgr ); - pMailSystem->SetCancelManager( pMgr ) -*/ - -{ - SfxCancelManager* _pParent; - SfxCancellables_Impl _aJobs; - -public: - SfxCancelManager( SfxCancelManager *pParent = 0 ); - ~SfxCancelManager(); - - BOOL CanCancel() const; - void Cancel( BOOL bDeep ); - SfxCancelManager* GetParent() const { return _pParent; } - - void InsertCancellable( SfxCancellable *pJob ); - void RemoveCancellable( SfxCancellable *pJob ); - USHORT GetCancellableCount() const - { return _aJobs.Count(); } - SfxCancellable* GetCancellable( USHORT nPos ) const - { return (SfxCancellable*) _aJobs[nPos]; } -}; - -SV_DECL_WEAK( SfxCancelManager ) -//------------------------------------------------------------------------- - -class SVL_DLLPUBLIC SfxCancellable - -/* [Beschreibung] - - Instanzen dieser Klasse werden immer an einem Cancel-Manager angemeldet, - der dadurch dem Benutzer signalisieren kann, ob abbrechbare Prozesse - vorhanden sind und der die SfxCancellable-Instanzen auf 'abgebrochen' - setzen kann. - - Die im Ctor "ubergebene -Instanz mu\s die Instanz - dieser Klasse "uberleben! - - [Beispiel] - - { - SfxCancellable aCancel( pCancelMgr ); - while ( !aCancel && GetData() ) - Reschedule(); - } - -*/ - -{ - SfxCancelManager* _pMgr; - BOOL _bCancelled; - String _aTitle; - -public: - SfxCancellable( SfxCancelManager *pMgr, - const String &rTitle ) - : _pMgr( pMgr ), - _bCancelled( FALSE ), - _aTitle( rTitle ) - { pMgr->InsertCancellable( this ); } - - virtual ~SfxCancellable(); - - void SetManager( SfxCancelManager *pMgr ); - SfxCancelManager* GetManager() const { return _pMgr; } - - virtual void Cancel(); - BOOL IsCancelled() const { return _bCancelled; } - operator BOOL() const { return _bCancelled; } - const String& GetTitle() const { return _aTitle; } -}; - -#endif - diff --git a/svl/inc/svl/cnclhint.hxx b/svl/inc/svl/cnclhint.hxx deleted file mode 100644 index 17a6627f31b6..000000000000 --- a/svl/inc/svl/cnclhint.hxx +++ /dev/null @@ -1,48 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SFXCNCLHINT_HXX -#define _SFXCNCLHINT_HXX - -#include -#include -#include - -#define SFXCANCELHINT_REMOVED 1 - -class SfxCancelHint: public SfxHint -{ -private: - SfxCancellable* pCancellable; - USHORT nAction; -public: - TYPEINFO(); - SfxCancelHint( SfxCancellable*, USHORT nAction ); - USHORT GetAction() const { return nAction; } - const SfxCancellable& GetCancellable() const { return *pCancellable; } -}; - -#endif diff --git a/svl/prj/target_package_inc.mk b/svl/prj/target_package_inc.mk index bab50a4af197..ebd398949e10 100644 --- a/svl/prj/target_package_inc.mk +++ b/svl/prj/target_package_inc.mk @@ -26,7 +26,6 @@ #************************************************************************* $(eval $(call gb_Package_Package,svl_inc,$(SRCDIR)/svl/inc)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/cancel.hxx,svl/cancel.hxx)) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/macitem.hxx,svl/macitem.hxx)) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/nfversi.hxx,svl/nfversi.hxx)) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/rectitem.hxx,svl/rectitem.hxx)) diff --git a/svtools/prj/target_module_svtools.mk b/svtools/prj/target_module_svtools.mk index 0d474b4d794f..e57397b4890a 100644 --- a/svtools/prj/target_module_svtools.mk +++ b/svtools/prj/target_module_svtools.mk @@ -45,9 +45,9 @@ $(eval $(call gb_Module_read_includes,svtools,\ lib_productregistration \ lib_svt \ package_inc \ -)) - #res_svt \ + res_svt \ res_productregistration \ +)) #todo: javapatchres #todo: jpeg on mac in svtools/util/makefile.mk -- cgit From 86c8dc781b3a5aef3126931ee43d1f190a0143a5 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 19 Apr 2010 18:27:03 +0200 Subject: CWS gnumake2: remove duplicate header in solver: vcl/imagebtn.hxx is just a copy of vcl/button.hxx --- rsc/source/parser/rscdb.cxx | 2 +- svtools/inc/svtools/addresstemplate.hxx | 2 +- svtools/inc/svtools/editbrowsebox.hxx | 2 +- vcl/prj/d.lst | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx index 97d23d4e3b53..d003b9a1f321 100644 --- a/rsc/source/parser/rscdb.cxx +++ b/rsc/source/parser/rscdb.cxx @@ -902,7 +902,7 @@ ERRTYPE RscTypCont :: WriteHxx( FILE * fOutput, ULONG nFileKey ) fprintf( fOutput, "#include \n" ); fprintf( fOutput, "#include \n" ); fprintf( fOutput, "#include \n" ); - fprintf( fOutput, "#include \n" ); + fprintf( fOutput, "#include \n" ); fprintf( fOutput, "#include \n" ); fprintf( fOutput, "#include \n" ); fprintf( fOutput, "#include \n" ); diff --git a/svtools/inc/svtools/addresstemplate.hxx b/svtools/inc/svtools/addresstemplate.hxx index f29ea2478b4e..bb4ee44647e9 100644 --- a/svtools/inc/svtools/addresstemplate.hxx +++ b/svtools/inc/svtools/addresstemplate.hxx @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svtools/inc/svtools/editbrowsebox.hxx b/svtools/inc/svtools/editbrowsebox.hxx index f97449e1880c..26ff11e11ca2 100644 --- a/svtools/inc/svtools/editbrowsebox.hxx +++ b/svtools/inc/svtools/editbrowsebox.hxx @@ -37,7 +37,7 @@ #include #ifndef _IMAGEBTN_HXX -#include +#include #endif #include #include diff --git a/vcl/prj/d.lst b/vcl/prj/d.lst index 8345b155ce58..5d6a25d6323a 100644 --- a/vcl/prj/d.lst +++ b/vcl/prj/d.lst @@ -22,7 +22,6 @@ mkdir: %_DEST%\inc%_EXT%\vcl ..\inc\vcl\bmpacc.hxx %_DEST%\inc%_EXT%\vcl\bmpacc.hxx ..\inc\vcl\btndlg.hxx %_DEST%\inc%_EXT%\vcl\btndlg.hxx ..\inc\vcl\button.hxx %_DEST%\inc%_EXT%\vcl\button.hxx -..\inc\vcl\button.hxx %_DEST%\inc%_EXT%\vcl\imagebtn.hxx ..\inc\vcl\cmdevt.h %_DEST%\inc%_EXT%\vcl\cmdevt.h ..\inc\vcl\cmdevt.hxx %_DEST%\inc%_EXT%\vcl\cmdevt.hxx ..\inc\vcl\combobox.h %_DEST%\inc%_EXT%\vcl\combobox.h @@ -153,4 +152,4 @@ mkdir: %_DEST%\inc%_EXT%\vcl ..\inc\vcl\ppdparser.hxx %_DEST%\inc%_EXT%\vcl\ppdparser.hxx ..\inc\vcl\helper.hxx %_DEST%\inc%_EXT%\vcl\helper.hxx ..\inc\vcl\strhelper.hxx %_DEST%\inc%_EXT%\vcl\strhelper.hxx -..\inc\vcl\lazydelete.hxx %_DEST%\inc%_EXT%\vcl\lazydelete.hxx \ No newline at end of file +..\inc\vcl\lazydelete.hxx %_DEST%\inc%_EXT%\vcl\lazydelete.hxx -- cgit From 63235d8839c205063b1d5a604a3a2555d1749526 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Tue, 20 Apr 2010 08:21:09 +0200 Subject: CWS gnumake2: move all delivered rsc headers to inc/rsc --- rsc/inc/rsc/rscsfx.hxx | 62 +++++++++++++++++++++++++++++++++++++++++++ rsc/inc/rscsfx.hxx | 62 ------------------------------------------- rsc/prj/d.lst | 2 +- rsc/source/parser/rscicpx.cxx | 2 +- 4 files changed, 64 insertions(+), 64 deletions(-) create mode 100644 rsc/inc/rsc/rscsfx.hxx delete mode 100644 rsc/inc/rscsfx.hxx diff --git a/rsc/inc/rsc/rscsfx.hxx b/rsc/inc/rsc/rscsfx.hxx new file mode 100644 index 000000000000..830bbcf37baa --- /dev/null +++ b/rsc/inc/rsc/rscsfx.hxx @@ -0,0 +1,62 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _RSCSFX_HXX +#define _RSCSFX_HXX + +// StarView (RSC_NOTYPE) bis (RSC_NOTYPE + 0x190) +// Sfx (RSC_NOTYPE + 0x200) bis (RSC_NOTYPE + 0x20F) +#define RSC_SFX_STYLE_FAMILIES (0x100 + 0x201) +#define RSC_SFX_STYLE_FAMILY_ITEM (0x100 + 0x202) +#define RSC_SFX_SLOT_INFO (0x100 + 0x203) +// StarMoney (RSC_NOTYPE + 0x210) bis (RSC_NOTYPE + 0x22F) +// Public (RSC_NOTYPE + 0x300) bis (RSC_NOTYPE + 0x3FF) + +//========== S F X ======================================= +enum SfxStyleFamily { SFX_STYLE_FAMILY_CHAR = 1, + SFX_STYLE_FAMILY_PARA = 2, + SFX_STYLE_FAMILY_FRAME = 4, + SFX_STYLE_FAMILY_PAGE = 8, + SFX_STYLE_FAMILY_PSEUDO = 16, + SFX_STYLE_FAMILY_ALL = 0x7fff + }; + + +// SfxTemplateDialog +#define RSC_SFX_STYLE_ITEM_LIST 0x1 +#define RSC_SFX_STYLE_ITEM_BITMAP 0x2 +#define RSC_SFX_STYLE_ITEM_TEXT 0x4 +#define RSC_SFX_STYLE_ITEM_HELPTEXT 0x8 +#define RSC_SFX_STYLE_ITEM_STYLEFAMILY 0x10 +#define RSC_SFX_STYLE_ITEM_IMAGE 0x20 + + +// SfxSlotInfo +#define RSC_SFX_SLOT_INFO_SLOTNAME 0x1 +#define RSC_SFX_SLOT_INFO_HELPTEXT 0x2 + + +#endif diff --git a/rsc/inc/rscsfx.hxx b/rsc/inc/rscsfx.hxx deleted file mode 100644 index 830bbcf37baa..000000000000 --- a/rsc/inc/rscsfx.hxx +++ /dev/null @@ -1,62 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _RSCSFX_HXX -#define _RSCSFX_HXX - -// StarView (RSC_NOTYPE) bis (RSC_NOTYPE + 0x190) -// Sfx (RSC_NOTYPE + 0x200) bis (RSC_NOTYPE + 0x20F) -#define RSC_SFX_STYLE_FAMILIES (0x100 + 0x201) -#define RSC_SFX_STYLE_FAMILY_ITEM (0x100 + 0x202) -#define RSC_SFX_SLOT_INFO (0x100 + 0x203) -// StarMoney (RSC_NOTYPE + 0x210) bis (RSC_NOTYPE + 0x22F) -// Public (RSC_NOTYPE + 0x300) bis (RSC_NOTYPE + 0x3FF) - -//========== S F X ======================================= -enum SfxStyleFamily { SFX_STYLE_FAMILY_CHAR = 1, - SFX_STYLE_FAMILY_PARA = 2, - SFX_STYLE_FAMILY_FRAME = 4, - SFX_STYLE_FAMILY_PAGE = 8, - SFX_STYLE_FAMILY_PSEUDO = 16, - SFX_STYLE_FAMILY_ALL = 0x7fff - }; - - -// SfxTemplateDialog -#define RSC_SFX_STYLE_ITEM_LIST 0x1 -#define RSC_SFX_STYLE_ITEM_BITMAP 0x2 -#define RSC_SFX_STYLE_ITEM_TEXT 0x4 -#define RSC_SFX_STYLE_ITEM_HELPTEXT 0x8 -#define RSC_SFX_STYLE_ITEM_STYLEFAMILY 0x10 -#define RSC_SFX_STYLE_ITEM_IMAGE 0x20 - - -// SfxSlotInfo -#define RSC_SFX_SLOT_INFO_SLOTNAME 0x1 -#define RSC_SFX_SLOT_INFO_HELPTEXT 0x2 - - -#endif diff --git a/rsc/prj/d.lst b/rsc/prj/d.lst index e59c9b2e9f3a..e79c03d9bb63 100644 --- a/rsc/prj/d.lst +++ b/rsc/prj/d.lst @@ -6,4 +6,4 @@ ..\%__SRC%\bin\rscpp %_DEST%\bin%_EXT%\rscpp mkdir: %_DEST%\inc%_EXT%\rsc -..\inc\rscsfx.hxx %_DEST%\inc%_EXT%\rsc\rscsfx.hxx +..\inc\rsc/rscsfx.hxx %_DEST%\inc%_EXT%\rsc\rscsfx.hxx diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx index 625417769f45..a444178195d5 100644 --- a/rsc/source/parser/rscicpx.cxx +++ b/rsc/source/parser/rscicpx.cxx @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include "rsclex.hxx" #include -- cgit From c2c78301270fb56b405f31b215c4acbb44669f10 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Tue, 20 Apr 2010 08:42:04 +0200 Subject: CWS gnumake2: move all delivered sot headers to inc/sot --- sot/inc/absdev.hxx | 48 --- sot/inc/agg.hxx | 68 ----- sot/inc/clsids.hxx | 33 -- sot/inc/filelist.hxx | 76 ----- sot/inc/sot/absdev.hxx | 48 +++ sot/inc/sot/agg.hxx | 68 +++++ sot/inc/sot/clsids.hxx | 33 ++ sot/inc/sot/filelist.hxx | 76 +++++ sot/inc/sot/stg.hxx | 398 +++++++++++++++++++++++++ sot/inc/sot/storinfo.hxx | 72 +++++ sot/inc/stg.hxx | 398 ------------------------- sot/inc/storinfo.hxx | 72 ----- sot/prj/d.lst | 17 +- sot/source/base/exchange.cxx | 2 +- sot/source/base/factory.cxx | 2 +- sot/source/base/filelist.cxx | 2 +- sot/source/base/formats.cxx | 4 +- sot/source/base/object.cxx | 2 +- sot/source/sdstor/sdintern.hdb | 22 -- sot/source/sdstor/stg.cxx | 4 +- sot/source/sdstor/stgcache.cxx | 2 +- sot/source/sdstor/stgdir.cxx | 2 +- sot/source/sdstor/stgelem.cxx | 2 +- sot/source/sdstor/stgelem.hxx | 2 +- sot/source/sdstor/stgio.cxx | 2 +- sot/source/sdstor/stgole.cxx | 2 +- sot/source/sdstor/stgole.hxx | 2 +- sot/source/sdstor/stgstrms.cxx | 2 +- sot/source/sdstor/storage.cxx | 4 +- sot/source/sdstor/storinfo.cxx | 4 +- sot/source/sdstor/ucbstorage.cxx | 6 +- sot/source/sdstor/unostorageholder.cxx | 2 +- sot/source/unoolestorage/xolesimplestorage.cxx | 2 +- sot/source/unoolestorage/xolesimplestorage.hxx | 2 +- sot/util/makefile.mk | 8 +- 35 files changed, 727 insertions(+), 762 deletions(-) delete mode 100644 sot/inc/absdev.hxx delete mode 100644 sot/inc/agg.hxx delete mode 100644 sot/inc/clsids.hxx delete mode 100644 sot/inc/filelist.hxx create mode 100644 sot/inc/sot/absdev.hxx create mode 100644 sot/inc/sot/agg.hxx create mode 100644 sot/inc/sot/clsids.hxx create mode 100644 sot/inc/sot/filelist.hxx create mode 100644 sot/inc/sot/stg.hxx create mode 100644 sot/inc/sot/storinfo.hxx delete mode 100644 sot/inc/stg.hxx delete mode 100644 sot/inc/storinfo.hxx delete mode 100644 sot/source/sdstor/sdintern.hdb diff --git a/sot/inc/absdev.hxx b/sot/inc/absdev.hxx deleted file mode 100644 index 3d251d98e0b6..000000000000 --- a/sot/inc/absdev.hxx +++ /dev/null @@ -1,48 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SOT_ABSDEV_HXX -#define _SOT_ABSDEV_HXX - -#ifndef _TOOLS_SOLAR_H -#include -#endif - -class JobSetup; -class AbstractDeviceData -{ -protected: - JobSetup * pJobSetup; -public: - virtual ~AbstractDeviceData() {} - virtual AbstractDeviceData * Copy() const = 0; - virtual BOOL Equals( const AbstractDeviceData & ) const = 0; - - JobSetup * GetJobSetup() const { return pJobSetup; } -}; - -#endif // _SOT_ABSDEV_HXX diff --git a/sot/inc/agg.hxx b/sot/inc/agg.hxx deleted file mode 100644 index 2f8cc7587458..000000000000 --- a/sot/inc/agg.hxx +++ /dev/null @@ -1,68 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SOT_AGG_HXX -#define _SOT_AGG_HXX - -#include - -/************** class SvAggregate ***************************************/ -/************************************************************************/ -class SotFactory; -class SotObject; -struct SvAggregate -{ - union - { - SotFactory * pFact; - SotObject * pObj; - }; - BOOL bFactory; - BOOL bMainObj; // TRUE, das Objekt, welches das casting steuert - - SvAggregate() - : pFact( NULL ) - , bFactory( FALSE ) - , bMainObj( FALSE ) {} - SvAggregate( SotObject * pObjP, BOOL bMainP ) - : pObj( pObjP ) - , bFactory( FALSE ) - , bMainObj( bMainP ) {} - SvAggregate( SotFactory * pFactP ) - : pFact( pFactP ) - , bFactory( TRUE ) - , bMainObj( FALSE ) {} -}; - -/************** class SvAggregateMemberList *****************************/ -/************************************************************************/ -class SvAggregateMemberList -{ - PRV_SV_DECL_OWNER_LIST(SvAggregateMemberList,SvAggregate) -}; - -#endif // _AGG_HXX diff --git a/sot/inc/clsids.hxx b/sot/inc/clsids.hxx deleted file mode 100644 index a64df510dd07..000000000000 --- a/sot/inc/clsids.hxx +++ /dev/null @@ -1,33 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SOT_CLSIDS_HXX -#define _SOT_CLSIDS_HXX - -// all the definitions of the class ids are moved to the comphelper -#include - -#endif diff --git a/sot/inc/filelist.hxx b/sot/inc/filelist.hxx deleted file mode 100644 index 4c6c55534319..000000000000 --- a/sot/inc/filelist.hxx +++ /dev/null @@ -1,76 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _FILELIST_HXX -#define _FILELIST_HXX - -#include -#include "sot/sotdllapi.h" - -class FileStringList; - -class SOT_DLLPUBLIC FileList : public SvDataCopyStream -{ - FileStringList* pStrList; - -protected: - - // SvData-Methoden - virtual void Load( SvStream& ); - virtual void Save( SvStream& ); - virtual void Assign( const SvDataCopyStream& ); - - // Liste loeschen; - void ClearAll( void ); - -public: - - TYPEINFO(); - FileList(); - ~FileList(); - - // Zuweisungsoperator - FileList& operator=( const FileList& rFileList ); - - - // Im-/Export - SOT_DLLPUBLIC friend SvStream& operator<<( SvStream& rOStm, const FileList& rFileList ); - SOT_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStm, FileList& rFileList ); - - // Clipboard, D&D usw. - static ULONG GetFormat(); - - - // Liste fuellen/abfragen - void AppendFile( const String& rStr ); - String GetFile( ULONG i ) const; - ULONG Count( void ) const; - -}; - -#endif // _FILELIST_HXX - diff --git a/sot/inc/sot/absdev.hxx b/sot/inc/sot/absdev.hxx new file mode 100644 index 000000000000..3d251d98e0b6 --- /dev/null +++ b/sot/inc/sot/absdev.hxx @@ -0,0 +1,48 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _SOT_ABSDEV_HXX +#define _SOT_ABSDEV_HXX + +#ifndef _TOOLS_SOLAR_H +#include +#endif + +class JobSetup; +class AbstractDeviceData +{ +protected: + JobSetup * pJobSetup; +public: + virtual ~AbstractDeviceData() {} + virtual AbstractDeviceData * Copy() const = 0; + virtual BOOL Equals( const AbstractDeviceData & ) const = 0; + + JobSetup * GetJobSetup() const { return pJobSetup; } +}; + +#endif // _SOT_ABSDEV_HXX diff --git a/sot/inc/sot/agg.hxx b/sot/inc/sot/agg.hxx new file mode 100644 index 000000000000..2f8cc7587458 --- /dev/null +++ b/sot/inc/sot/agg.hxx @@ -0,0 +1,68 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _SOT_AGG_HXX +#define _SOT_AGG_HXX + +#include + +/************** class SvAggregate ***************************************/ +/************************************************************************/ +class SotFactory; +class SotObject; +struct SvAggregate +{ + union + { + SotFactory * pFact; + SotObject * pObj; + }; + BOOL bFactory; + BOOL bMainObj; // TRUE, das Objekt, welches das casting steuert + + SvAggregate() + : pFact( NULL ) + , bFactory( FALSE ) + , bMainObj( FALSE ) {} + SvAggregate( SotObject * pObjP, BOOL bMainP ) + : pObj( pObjP ) + , bFactory( FALSE ) + , bMainObj( bMainP ) {} + SvAggregate( SotFactory * pFactP ) + : pFact( pFactP ) + , bFactory( TRUE ) + , bMainObj( FALSE ) {} +}; + +/************** class SvAggregateMemberList *****************************/ +/************************************************************************/ +class SvAggregateMemberList +{ + PRV_SV_DECL_OWNER_LIST(SvAggregateMemberList,SvAggregate) +}; + +#endif // _AGG_HXX diff --git a/sot/inc/sot/clsids.hxx b/sot/inc/sot/clsids.hxx new file mode 100644 index 000000000000..a64df510dd07 --- /dev/null +++ b/sot/inc/sot/clsids.hxx @@ -0,0 +1,33 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _SOT_CLSIDS_HXX +#define _SOT_CLSIDS_HXX + +// all the definitions of the class ids are moved to the comphelper +#include + +#endif diff --git a/sot/inc/sot/filelist.hxx b/sot/inc/sot/filelist.hxx new file mode 100644 index 000000000000..4c6c55534319 --- /dev/null +++ b/sot/inc/sot/filelist.hxx @@ -0,0 +1,76 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _FILELIST_HXX +#define _FILELIST_HXX + +#include +#include "sot/sotdllapi.h" + +class FileStringList; + +class SOT_DLLPUBLIC FileList : public SvDataCopyStream +{ + FileStringList* pStrList; + +protected: + + // SvData-Methoden + virtual void Load( SvStream& ); + virtual void Save( SvStream& ); + virtual void Assign( const SvDataCopyStream& ); + + // Liste loeschen; + void ClearAll( void ); + +public: + + TYPEINFO(); + FileList(); + ~FileList(); + + // Zuweisungsoperator + FileList& operator=( const FileList& rFileList ); + + + // Im-/Export + SOT_DLLPUBLIC friend SvStream& operator<<( SvStream& rOStm, const FileList& rFileList ); + SOT_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStm, FileList& rFileList ); + + // Clipboard, D&D usw. + static ULONG GetFormat(); + + + // Liste fuellen/abfragen + void AppendFile( const String& rStr ); + String GetFile( ULONG i ) const; + ULONG Count( void ) const; + +}; + +#endif // _FILELIST_HXX + diff --git a/sot/inc/sot/stg.hxx b/sot/inc/sot/stg.hxx new file mode 100644 index 000000000000..84373e26d596 --- /dev/null +++ b/sot/inc/sot/stg.hxx @@ -0,0 +1,398 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _STG_HXX +#define _STG_HXX + +#include +#include + +#ifndef _COM_SUN_STAR_IO_XINPUTSTREAM_H_ +#include +#endif + +#ifndef _COM_SUN_STAR_UCB_XCOMMANDENVIRONMENT_H_ +#include +#endif + +#ifndef _COM_SUN_STAR_EMBED_XSTORAGE_H_ +#include +#endif + + +#include +#ifndef _TOOLS_STREAM_HXX //autogen +#include +#endif +#ifndef _TOOLS_GLOBNAME_HXX //autogen +#include +#endif +#include "sot/sotdllapi.h" + +#include +class UNOStorageHolder; +typedef ::std::list< UNOStorageHolder* > UNOStorageHolderList; + +class Storage; +class StorageStream; +class StgIo; +class StgDirEntry; +class StgStrm; +class SvGlobalName; +struct ClsId +{ + INT32 n1; + INT16 n2, n3; + UINT8 n4, n5, n6, n7, n8, n9, n10, n11; +}; + +class SOT_DLLPUBLIC StorageBase : public SvRefBase +{ +protected: + ULONG m_nError; // error code + StreamMode m_nMode; // open mode + BOOL m_bAutoCommit; + StorageBase(); + virtual ~StorageBase(); +public: + TYPEINFO(); + virtual const SvStream* GetSvStream() const = 0; + virtual BOOL Validate( BOOL=FALSE ) const = 0; + virtual BOOL ValidateMode( StreamMode ) const = 0; + void ResetError() const; + void SetError( ULONG ) const; + ULONG GetError() const; + BOOL Good() const { return BOOL( m_nError == SVSTREAM_OK ); } + StreamMode GetMode() const { return m_nMode; } + void SetAutoCommit( BOOL bSet ) + { m_bAutoCommit = bSet; } +}; + +class BaseStorageStream : public StorageBase +{ +public: + TYPEINFO(); + virtual ULONG Read( void * pData, ULONG nSize ) = 0; + virtual ULONG Write( const void* pData, ULONG nSize ) = 0; + virtual ULONG Seek( ULONG nPos ) = 0; + virtual ULONG Tell() = 0; + virtual void Flush() = 0; + virtual BOOL SetSize( ULONG nNewSize ) = 0; + virtual BOOL CopyTo( BaseStorageStream * pDestStm ) = 0; + virtual BOOL Commit() = 0; + virtual BOOL Revert() = 0; + virtual BOOL Equals( const BaseStorageStream& rStream ) const = 0; +}; + +class SvStorageInfoList; +class BaseStorage : public StorageBase +{ +public: + TYPEINFO(); + virtual const String& GetName() const = 0; + virtual BOOL IsRoot() const = 0; + virtual void SetClassId( const ClsId& ) = 0; + virtual const ClsId& GetClassId() const = 0; + virtual void SetDirty() = 0; + virtual void SetClass( const SvGlobalName & rClass, + ULONG nOriginalClipFormat, + const String & rUserTypeName ) = 0; + virtual void SetConvertClass( const SvGlobalName & rConvertClass, + ULONG nOriginalClipFormat, + const String & rUserTypeName ) = 0; + virtual SvGlobalName GetClassName() = 0; + virtual ULONG GetFormat() = 0; + virtual String GetUserName() = 0; + virtual BOOL ShouldConvert() = 0; + virtual void FillInfoList( SvStorageInfoList* ) const = 0; + virtual BOOL CopyTo( BaseStorage* pDestStg ) const = 0; + virtual BOOL Commit() = 0; + virtual BOOL Revert() = 0; + virtual BaseStorageStream* OpenStream( const String & rEleName, + StreamMode = STREAM_STD_READWRITE, + BOOL bDirect = TRUE, const ByteString* pKey=0 ) = 0; + virtual BaseStorage* OpenStorage( const String & rEleName, + StreamMode = STREAM_STD_READWRITE, + BOOL bDirect = FALSE ) = 0; + virtual BaseStorage* OpenUCBStorage( const String & rEleName, + StreamMode = STREAM_STD_READWRITE, + BOOL bDirect = FALSE ) = 0; + virtual BaseStorage* OpenOLEStorage( const String & rEleName, + StreamMode = STREAM_STD_READWRITE, + BOOL bDirect = FALSE ) = 0; + virtual BOOL IsStream( const String& rEleName ) const = 0; + virtual BOOL IsStorage( const String& rEleName ) const = 0; + virtual BOOL IsContained( const String& rEleName ) const = 0; + virtual BOOL Remove( const String & rEleName ) = 0; + virtual BOOL Rename( const String & rEleName, const String & rNewName ) = 0; + virtual BOOL CopyTo( const String & rEleName, BaseStorage * pDest, const String & rNewName ) = 0; + virtual BOOL MoveTo( const String & rEleName, BaseStorage * pDest, const String & rNewName ) = 0; + virtual BOOL ValidateFAT() = 0; + virtual BOOL Equals( const BaseStorage& rStream ) const = 0; +}; + +class OLEStorageBase +{ +protected: + StreamMode& nStreamMode; // open mode + StgIo* pIo; // I/O subsystem + StgDirEntry* pEntry; // the dir entry + OLEStorageBase( StgIo*, StgDirEntry*, StreamMode& ); + ~OLEStorageBase(); + BOOL Validate_Impl( BOOL=FALSE ) const; + BOOL ValidateMode_Impl( StreamMode, StgDirEntry* p = NULL ) const ; + const SvStream* GetSvStream_Impl() const; +public: +}; + +class StorageStream : public BaseStorageStream, public OLEStorageBase +{ +//friend class Storage; + ULONG nPos; // current position +protected: + ~StorageStream(); +public: + TYPEINFO(); + StorageStream( StgIo*, StgDirEntry*, StreamMode ); + virtual ULONG Read( void * pData, ULONG nSize ); + virtual ULONG Write( const void* pData, ULONG nSize ); + virtual ULONG Seek( ULONG nPos ); + virtual ULONG Tell() { return nPos; } + virtual void Flush(); + virtual BOOL SetSize( ULONG nNewSize ); + virtual BOOL CopyTo( BaseStorageStream * pDestStm ); + virtual BOOL Commit(); + virtual BOOL Revert(); + virtual BOOL Validate( BOOL=FALSE ) const; + virtual BOOL ValidateMode( StreamMode ) const; + BOOL ValidateMode( StreamMode, StgDirEntry* p ) const; + const SvStream* GetSvStream() const; + virtual BOOL Equals( const BaseStorageStream& rStream ) const; +}; + +class UCBStorageStream; + +class SOT_DLLPUBLIC Storage : public BaseStorage, public OLEStorageBase +{ + String aName; + BOOL bIsRoot; + void Init( BOOL bCreate ); + Storage( StgIo*, StgDirEntry*, StreamMode ); +protected: + ~Storage(); +public: + TYPEINFO(); + Storage( const String &, StreamMode = STREAM_STD_READWRITE, BOOL bDirect = TRUE ); + Storage( SvStream& rStrm, BOOL bDirect = TRUE ); + Storage( UCBStorageStream& rStrm, BOOL bDirect = TRUE ); + + static BOOL IsStorageFile( const String & rFileName ); + static BOOL IsStorageFile( SvStream* ); + + virtual const String& GetName() const; + virtual BOOL IsRoot() const { return bIsRoot; } + virtual void SetClassId( const ClsId& ); + virtual const ClsId& GetClassId() const; + virtual void SetDirty(); + virtual void SetClass( const SvGlobalName & rClass, + ULONG nOriginalClipFormat, + const String & rUserTypeName ); + virtual void SetConvertClass( const SvGlobalName & rConvertClass, + ULONG nOriginalClipFormat, + const String & rUserTypeName ); + virtual SvGlobalName GetClassName(); + virtual ULONG GetFormat(); + virtual String GetUserName(); + virtual BOOL ShouldConvert(); + virtual void FillInfoList( SvStorageInfoList* ) const; + virtual BOOL CopyTo( BaseStorage* pDestStg ) const; + virtual BOOL Commit(); + virtual BOOL Revert(); + virtual BaseStorageStream* OpenStream( const String & rEleName, + StreamMode = STREAM_STD_READWRITE, + BOOL bDirect = TRUE, const ByteString* pKey=0 ); + virtual BaseStorage* OpenStorage( const String & rEleName, + StreamMode = STREAM_STD_READWRITE, + BOOL bDirect = FALSE ); + virtual BaseStorage* OpenUCBStorage( const String & rEleName, + StreamMode = STREAM_STD_READWRITE, + BOOL bDirect = FALSE ); + virtual BaseStorage* OpenOLEStorage( const String & rEleName, + StreamMode = STREAM_STD_READWRITE, + BOOL bDirect = FALSE ); + virtual BOOL IsStream( const String& rEleName ) const; + virtual BOOL IsStorage( const String& rEleName ) const; + virtual BOOL IsContained( const String& rEleName ) const; + virtual BOOL Remove( const String & rEleName ); + virtual BOOL Rename( const String & rEleName, const String & rNewName ); + virtual BOOL CopyTo( const String & rEleName, BaseStorage * pDest, const String & rNewName ); + virtual BOOL MoveTo( const String & rEleName, BaseStorage * pDest, const String & rNewName ); + virtual BOOL ValidateFAT(); + virtual BOOL Validate( BOOL=FALSE ) const; + virtual BOOL ValidateMode( StreamMode ) const; + BOOL ValidateMode( StreamMode, StgDirEntry* p ) const; + virtual const SvStream* GetSvStream() const; + virtual BOOL Equals( const BaseStorage& rStream ) const; +}; + +class UCBStorageStream_Impl; +class UCBStorageStream : public BaseStorageStream +{ +friend class UCBStorage; + + UCBStorageStream_Impl* + pImp; +protected: + ~UCBStorageStream(); +public: + TYPEINFO(); + UCBStorageStream( const String& rName, StreamMode nMode, BOOL bDirect, const ByteString* pKey=0 ); + UCBStorageStream( const String& rName, StreamMode nMode, BOOL bDirect, const ByteString* pKey, BOOL bRepair, ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XProgressHandler > xProgress ); + UCBStorageStream( UCBStorageStream_Impl* ); + + virtual ULONG Read( void * pData, ULONG nSize ); + virtual ULONG Write( const void* pData, ULONG nSize ); + virtual ULONG Seek( ULONG nPos ); + virtual ULONG Tell(); + virtual void Flush(); + virtual BOOL SetSize( ULONG nNewSize ); + virtual BOOL CopyTo( BaseStorageStream * pDestStm ); + virtual BOOL Commit(); + virtual BOOL Revert(); + virtual BOOL Validate( BOOL=FALSE ) const; + virtual BOOL ValidateMode( StreamMode ) const; + const SvStream* GetSvStream() const; + virtual BOOL Equals( const BaseStorageStream& rStream ) const; + BOOL SetProperty( const String& rName, const ::com::sun::star::uno::Any& rValue ); + BOOL GetProperty( const String& rName, ::com::sun::star::uno::Any& rValue ); + + SvStream* GetModifySvStream(); + + ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetXInputStream() const; +}; + +namespace ucbhelper +{ + class Content; +} + +class UCBStorage_Impl; +struct UCBStorageElement_Impl; +class SOT_DLLPUBLIC UCBStorage : public BaseStorage +{ + UCBStorage_Impl* pImp; + +protected: + ~UCBStorage(); +public: + static BOOL IsStorageFile( SvStream* ); + static BOOL IsStorageFile( const String& rName ); + static BOOL IsDiskSpannedFile( SvStream* ); + static String GetLinkedFile( SvStream& ); + static String CreateLinkFile( const String& rName ); + + UCBStorage( const ::ucbhelper::Content& rContent, const String& rName, StreamMode nMode, BOOL bDirect = TRUE, BOOL bIsRoot = TRUE ); + UCBStorage( const String& rName, + StreamMode nMode, + BOOL bDirect = TRUE, + BOOL bIsRoot = TRUE ); + + UCBStorage( const String& rName, + StreamMode nMode, + BOOL bDirect, + BOOL bIsRoot, + BOOL bIsRepair, + ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XProgressHandler > + xProgressHandler ); + + UCBStorage( UCBStorage_Impl* ); + UCBStorage( SvStream& rStrm, BOOL bDirect = TRUE ); + + TYPEINFO(); + virtual const String& GetName() const; + virtual BOOL IsRoot() const; + virtual void SetClassId( const ClsId& ); + virtual const ClsId& GetClassId() const; + virtual void SetDirty(); + virtual void SetClass( const SvGlobalName & rClass, + ULONG nOriginalClipFormat, + const String & rUserTypeName ); + virtual void SetConvertClass( const SvGlobalName & rConvertClass, + ULONG nOriginalClipFormat, + const String & rUserTypeName ); + virtual SvGlobalName GetClassName(); + virtual ULONG GetFormat(); + virtual String GetUserName(); + virtual BOOL ShouldConvert(); + virtual void FillInfoList( SvStorageInfoList* ) const; + virtual BOOL CopyTo( BaseStorage* pDestStg ) const; + virtual BOOL Commit(); + virtual BOOL Revert(); + virtual BaseStorageStream* OpenStream( const String & rEleName, + StreamMode = STREAM_STD_READWRITE, + BOOL bDirect = TRUE, const ByteString* pKey=0 ); + virtual BaseStorage* OpenStorage( const String & rEleName, + StreamMode = STREAM_STD_READWRITE, + BOOL bDirect = FALSE ); + virtual BaseStorage* OpenUCBStorage( const String & rEleName, + StreamMode = STREAM_STD_READWRITE, + BOOL bDirect = FALSE ); + virtual BaseStorage* OpenOLEStorage( const String & rEleName, + StreamMode = STREAM_STD_READWRITE, + BOOL bDirect = FALSE ); + virtual BOOL IsStream( const String& rEleName ) const; + virtual BOOL IsStorage( const String& rEleName ) const; + virtual BOOL IsContained( const String& rEleName ) const; + virtual BOOL Remove( const String & rEleName ); + virtual BOOL Rename( const String & rEleName, const String & rNewName ); + virtual BOOL CopyTo( const String & rEleName, BaseStorage * pDest, const String & rNewName ); + virtual BOOL MoveTo( const String & rEleName, BaseStorage * pDest, const String & rNewName ); + virtual BOOL ValidateFAT(); + virtual BOOL Validate( BOOL=FALSE ) const; + virtual BOOL ValidateMode( StreamMode ) const; + virtual const SvStream* GetSvStream() const; + virtual BOOL Equals( const BaseStorage& rStream ) const; + BOOL SetProperty( const String& rName, const ::com::sun::star::uno::Any& rValue ); + BOOL GetProperty( const String& rName, ::com::sun::star::uno::Any& rValue ); + BOOL GetProperty( const String& rEleName, const String& rName, ::com::sun::star::uno::Any& rValue ); + + // HACK to avoid incompatible build, can be done since this feature is only for development + // should be removed before release + UNOStorageHolderList* GetUNOStorageHolderList(); + +//#if _SOLAR__PRIVATE + UCBStorageElement_Impl* FindElement_Impl( const String& rName ) const; + BOOL CopyStorageElement_Impl( UCBStorageElement_Impl& rElement, + BaseStorage* pDest, const String& rNew ) const; + BaseStorage* OpenStorage_Impl( const String & rEleName, + StreamMode, BOOL bDirect, BOOL bForceUCBStorage ); +//#endif + +}; + + +#endif diff --git a/sot/inc/sot/storinfo.hxx b/sot/inc/sot/storinfo.hxx new file mode 100644 index 000000000000..dab1f6d4540e --- /dev/null +++ b/sot/inc/sot/storinfo.hxx @@ -0,0 +1,72 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _SOT_STORINFO_HXX +#define _SOT_STORINFO_HXX + +#include +#include +#include +#include "sot/sotdllapi.h" + +class StgDirEntry; +class SvStorageInfo +{ +friend class SvStorage; + String aName; + SvGlobalName aClassName; + ULONG nSize; + BOOL bStream:1, + bStorage:1; + + SvStorageInfo(){}; // Fuer SvStorage +public: + SvStorageInfo( const StgDirEntry& ); + SvStorageInfo( const String& rName, ULONG nSz, BOOL bIsStorage ) + : aName( rName ) + , nSize( nSz ) + , bStream( !bIsStorage ) + , bStorage( bIsStorage ) + {} + + const SvGlobalName & GetClassName() const { return aClassName; } + const String & GetName() const { return aName; } + BOOL IsStream() const { return bStream; } + BOOL IsStorage() const { return bStorage; } + ULONG GetSize() const { return nSize; } +}; + +class SOT_DLLPUBLIC SvStorageInfoList +{ + PRV_SV_DECL_OWNER_LIST(SvStorageInfoList,SvStorageInfo) + const SvStorageInfo * Get( const String & rName ); +}; + +SOT_DLLPUBLIC ULONG ReadClipboardFormat( SvStream & rStm ); +SOT_DLLPUBLIC void WriteClipboardFormat( SvStream & rStm, ULONG nFormat ); + +#endif // _STORINFO_HXX diff --git a/sot/inc/stg.hxx b/sot/inc/stg.hxx deleted file mode 100644 index 84373e26d596..000000000000 --- a/sot/inc/stg.hxx +++ /dev/null @@ -1,398 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _STG_HXX -#define _STG_HXX - -#include -#include - -#ifndef _COM_SUN_STAR_IO_XINPUTSTREAM_H_ -#include -#endif - -#ifndef _COM_SUN_STAR_UCB_XCOMMANDENVIRONMENT_H_ -#include -#endif - -#ifndef _COM_SUN_STAR_EMBED_XSTORAGE_H_ -#include -#endif - - -#include -#ifndef _TOOLS_STREAM_HXX //autogen -#include -#endif -#ifndef _TOOLS_GLOBNAME_HXX //autogen -#include -#endif -#include "sot/sotdllapi.h" - -#include -class UNOStorageHolder; -typedef ::std::list< UNOStorageHolder* > UNOStorageHolderList; - -class Storage; -class StorageStream; -class StgIo; -class StgDirEntry; -class StgStrm; -class SvGlobalName; -struct ClsId -{ - INT32 n1; - INT16 n2, n3; - UINT8 n4, n5, n6, n7, n8, n9, n10, n11; -}; - -class SOT_DLLPUBLIC StorageBase : public SvRefBase -{ -protected: - ULONG m_nError; // error code - StreamMode m_nMode; // open mode - BOOL m_bAutoCommit; - StorageBase(); - virtual ~StorageBase(); -public: - TYPEINFO(); - virtual const SvStream* GetSvStream() const = 0; - virtual BOOL Validate( BOOL=FALSE ) const = 0; - virtual BOOL ValidateMode( StreamMode ) const = 0; - void ResetError() const; - void SetError( ULONG ) const; - ULONG GetError() const; - BOOL Good() const { return BOOL( m_nError == SVSTREAM_OK ); } - StreamMode GetMode() const { return m_nMode; } - void SetAutoCommit( BOOL bSet ) - { m_bAutoCommit = bSet; } -}; - -class BaseStorageStream : public StorageBase -{ -public: - TYPEINFO(); - virtual ULONG Read( void * pData, ULONG nSize ) = 0; - virtual ULONG Write( const void* pData, ULONG nSize ) = 0; - virtual ULONG Seek( ULONG nPos ) = 0; - virtual ULONG Tell() = 0; - virtual void Flush() = 0; - virtual BOOL SetSize( ULONG nNewSize ) = 0; - virtual BOOL CopyTo( BaseStorageStream * pDestStm ) = 0; - virtual BOOL Commit() = 0; - virtual BOOL Revert() = 0; - virtual BOOL Equals( const BaseStorageStream& rStream ) const = 0; -}; - -class SvStorageInfoList; -class BaseStorage : public StorageBase -{ -public: - TYPEINFO(); - virtual const String& GetName() const = 0; - virtual BOOL IsRoot() const = 0; - virtual void SetClassId( const ClsId& ) = 0; - virtual const ClsId& GetClassId() const = 0; - virtual void SetDirty() = 0; - virtual void SetClass( const SvGlobalName & rClass, - ULONG nOriginalClipFormat, - const String & rUserTypeName ) = 0; - virtual void SetConvertClass( const SvGlobalName & rConvertClass, - ULONG nOriginalClipFormat, - const String & rUserTypeName ) = 0; - virtual SvGlobalName GetClassName() = 0; - virtual ULONG GetFormat() = 0; - virtual String GetUserName() = 0; - virtual BOOL ShouldConvert() = 0; - virtual void FillInfoList( SvStorageInfoList* ) const = 0; - virtual BOOL CopyTo( BaseStorage* pDestStg ) const = 0; - virtual BOOL Commit() = 0; - virtual BOOL Revert() = 0; - virtual BaseStorageStream* OpenStream( const String & rEleName, - StreamMode = STREAM_STD_READWRITE, - BOOL bDirect = TRUE, const ByteString* pKey=0 ) = 0; - virtual BaseStorage* OpenStorage( const String & rEleName, - StreamMode = STREAM_STD_READWRITE, - BOOL bDirect = FALSE ) = 0; - virtual BaseStorage* OpenUCBStorage( const String & rEleName, - StreamMode = STREAM_STD_READWRITE, - BOOL bDirect = FALSE ) = 0; - virtual BaseStorage* OpenOLEStorage( const String & rEleName, - StreamMode = STREAM_STD_READWRITE, - BOOL bDirect = FALSE ) = 0; - virtual BOOL IsStream( const String& rEleName ) const = 0; - virtual BOOL IsStorage( const String& rEleName ) const = 0; - virtual BOOL IsContained( const String& rEleName ) const = 0; - virtual BOOL Remove( const String & rEleName ) = 0; - virtual BOOL Rename( const String & rEleName, const String & rNewName ) = 0; - virtual BOOL CopyTo( const String & rEleName, BaseStorage * pDest, const String & rNewName ) = 0; - virtual BOOL MoveTo( const String & rEleName, BaseStorage * pDest, const String & rNewName ) = 0; - virtual BOOL ValidateFAT() = 0; - virtual BOOL Equals( const BaseStorage& rStream ) const = 0; -}; - -class OLEStorageBase -{ -protected: - StreamMode& nStreamMode; // open mode - StgIo* pIo; // I/O subsystem - StgDirEntry* pEntry; // the dir entry - OLEStorageBase( StgIo*, StgDirEntry*, StreamMode& ); - ~OLEStorageBase(); - BOOL Validate_Impl( BOOL=FALSE ) const; - BOOL ValidateMode_Impl( StreamMode, StgDirEntry* p = NULL ) const ; - const SvStream* GetSvStream_Impl() const; -public: -}; - -class StorageStream : public BaseStorageStream, public OLEStorageBase -{ -//friend class Storage; - ULONG nPos; // current position -protected: - ~StorageStream(); -public: - TYPEINFO(); - StorageStream( StgIo*, StgDirEntry*, StreamMode ); - virtual ULONG Read( void * pData, ULONG nSize ); - virtual ULONG Write( const void* pData, ULONG nSize ); - virtual ULONG Seek( ULONG nPos ); - virtual ULONG Tell() { return nPos; } - virtual void Flush(); - virtual BOOL SetSize( ULONG nNewSize ); - virtual BOOL CopyTo( BaseStorageStream * pDestStm ); - virtual BOOL Commit(); - virtual BOOL Revert(); - virtual BOOL Validate( BOOL=FALSE ) const; - virtual BOOL ValidateMode( StreamMode ) const; - BOOL ValidateMode( StreamMode, StgDirEntry* p ) const; - const SvStream* GetSvStream() const; - virtual BOOL Equals( const BaseStorageStream& rStream ) const; -}; - -class UCBStorageStream; - -class SOT_DLLPUBLIC Storage : public BaseStorage, public OLEStorageBase -{ - String aName; - BOOL bIsRoot; - void Init( BOOL bCreate ); - Storage( StgIo*, StgDirEntry*, StreamMode ); -protected: - ~Storage(); -public: - TYPEINFO(); - Storage( const String &, StreamMode = STREAM_STD_READWRITE, BOOL bDirect = TRUE ); - Storage( SvStream& rStrm, BOOL bDirect = TRUE ); - Storage( UCBStorageStream& rStrm, BOOL bDirect = TRUE ); - - static BOOL IsStorageFile( const String & rFileName ); - static BOOL IsStorageFile( SvStream* ); - - virtual const String& GetName() const; - virtual BOOL IsRoot() const { return bIsRoot; } - virtual void SetClassId( const ClsId& ); - virtual const ClsId& GetClassId() const; - virtual void SetDirty(); - virtual void SetClass( const SvGlobalName & rClass, - ULONG nOriginalClipFormat, - const String & rUserTypeName ); - virtual void SetConvertClass( const SvGlobalName & rConvertClass, - ULONG nOriginalClipFormat, - const String & rUserTypeName ); - virtual SvGlobalName GetClassName(); - virtual ULONG GetFormat(); - virtual String GetUserName(); - virtual BOOL ShouldConvert(); - virtual void FillInfoList( SvStorageInfoList* ) const; - virtual BOOL CopyTo( BaseStorage* pDestStg ) const; - virtual BOOL Commit(); - virtual BOOL Revert(); - virtual BaseStorageStream* OpenStream( const String & rEleName, - StreamMode = STREAM_STD_READWRITE, - BOOL bDirect = TRUE, const ByteString* pKey=0 ); - virtual BaseStorage* OpenStorage( const String & rEleName, - StreamMode = STREAM_STD_READWRITE, - BOOL bDirect = FALSE ); - virtual BaseStorage* OpenUCBStorage( const String & rEleName, - StreamMode = STREAM_STD_READWRITE, - BOOL bDirect = FALSE ); - virtual BaseStorage* OpenOLEStorage( const String & rEleName, - StreamMode = STREAM_STD_READWRITE, - BOOL bDirect = FALSE ); - virtual BOOL IsStream( const String& rEleName ) const; - virtual BOOL IsStorage( const String& rEleName ) const; - virtual BOOL IsContained( const String& rEleName ) const; - virtual BOOL Remove( const String & rEleName ); - virtual BOOL Rename( const String & rEleName, const String & rNewName ); - virtual BOOL CopyTo( const String & rEleName, BaseStorage * pDest, const String & rNewName ); - virtual BOOL MoveTo( const String & rEleName, BaseStorage * pDest, const String & rNewName ); - virtual BOOL ValidateFAT(); - virtual BOOL Validate( BOOL=FALSE ) const; - virtual BOOL ValidateMode( StreamMode ) const; - BOOL ValidateMode( StreamMode, StgDirEntry* p ) const; - virtual const SvStream* GetSvStream() const; - virtual BOOL Equals( const BaseStorage& rStream ) const; -}; - -class UCBStorageStream_Impl; -class UCBStorageStream : public BaseStorageStream -{ -friend class UCBStorage; - - UCBStorageStream_Impl* - pImp; -protected: - ~UCBStorageStream(); -public: - TYPEINFO(); - UCBStorageStream( const String& rName, StreamMode nMode, BOOL bDirect, const ByteString* pKey=0 ); - UCBStorageStream( const String& rName, StreamMode nMode, BOOL bDirect, const ByteString* pKey, BOOL bRepair, ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XProgressHandler > xProgress ); - UCBStorageStream( UCBStorageStream_Impl* ); - - virtual ULONG Read( void * pData, ULONG nSize ); - virtual ULONG Write( const void* pData, ULONG nSize ); - virtual ULONG Seek( ULONG nPos ); - virtual ULONG Tell(); - virtual void Flush(); - virtual BOOL SetSize( ULONG nNewSize ); - virtual BOOL CopyTo( BaseStorageStream * pDestStm ); - virtual BOOL Commit(); - virtual BOOL Revert(); - virtual BOOL Validate( BOOL=FALSE ) const; - virtual BOOL ValidateMode( StreamMode ) const; - const SvStream* GetSvStream() const; - virtual BOOL Equals( const BaseStorageStream& rStream ) const; - BOOL SetProperty( const String& rName, const ::com::sun::star::uno::Any& rValue ); - BOOL GetProperty( const String& rName, ::com::sun::star::uno::Any& rValue ); - - SvStream* GetModifySvStream(); - - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetXInputStream() const; -}; - -namespace ucbhelper -{ - class Content; -} - -class UCBStorage_Impl; -struct UCBStorageElement_Impl; -class SOT_DLLPUBLIC UCBStorage : public BaseStorage -{ - UCBStorage_Impl* pImp; - -protected: - ~UCBStorage(); -public: - static BOOL IsStorageFile( SvStream* ); - static BOOL IsStorageFile( const String& rName ); - static BOOL IsDiskSpannedFile( SvStream* ); - static String GetLinkedFile( SvStream& ); - static String CreateLinkFile( const String& rName ); - - UCBStorage( const ::ucbhelper::Content& rContent, const String& rName, StreamMode nMode, BOOL bDirect = TRUE, BOOL bIsRoot = TRUE ); - UCBStorage( const String& rName, - StreamMode nMode, - BOOL bDirect = TRUE, - BOOL bIsRoot = TRUE ); - - UCBStorage( const String& rName, - StreamMode nMode, - BOOL bDirect, - BOOL bIsRoot, - BOOL bIsRepair, - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XProgressHandler > - xProgressHandler ); - - UCBStorage( UCBStorage_Impl* ); - UCBStorage( SvStream& rStrm, BOOL bDirect = TRUE ); - - TYPEINFO(); - virtual const String& GetName() const; - virtual BOOL IsRoot() const; - virtual void SetClassId( const ClsId& ); - virtual const ClsId& GetClassId() const; - virtual void SetDirty(); - virtual void SetClass( const SvGlobalName & rClass, - ULONG nOriginalClipFormat, - const String & rUserTypeName ); - virtual void SetConvertClass( const SvGlobalName & rConvertClass, - ULONG nOriginalClipFormat, - const String & rUserTypeName ); - virtual SvGlobalName GetClassName(); - virtual ULONG GetFormat(); - virtual String GetUserName(); - virtual BOOL ShouldConvert(); - virtual void FillInfoList( SvStorageInfoList* ) const; - virtual BOOL CopyTo( BaseStorage* pDestStg ) const; - virtual BOOL Commit(); - virtual BOOL Revert(); - virtual BaseStorageStream* OpenStream( const String & rEleName, - StreamMode = STREAM_STD_READWRITE, - BOOL bDirect = TRUE, const ByteString* pKey=0 ); - virtual BaseStorage* OpenStorage( const String & rEleName, - StreamMode = STREAM_STD_READWRITE, - BOOL bDirect = FALSE ); - virtual BaseStorage* OpenUCBStorage( const String & rEleName, - StreamMode = STREAM_STD_READWRITE, - BOOL bDirect = FALSE ); - virtual BaseStorage* OpenOLEStorage( const String & rEleName, - StreamMode = STREAM_STD_READWRITE, - BOOL bDirect = FALSE ); - virtual BOOL IsStream( const String& rEleName ) const; - virtual BOOL IsStorage( const String& rEleName ) const; - virtual BOOL IsContained( const String& rEleName ) const; - virtual BOOL Remove( const String & rEleName ); - virtual BOOL Rename( const String & rEleName, const String & rNewName ); - virtual BOOL CopyTo( const String & rEleName, BaseStorage * pDest, const String & rNewName ); - virtual BOOL MoveTo( const String & rEleName, BaseStorage * pDest, const String & rNewName ); - virtual BOOL ValidateFAT(); - virtual BOOL Validate( BOOL=FALSE ) const; - virtual BOOL ValidateMode( StreamMode ) const; - virtual const SvStream* GetSvStream() const; - virtual BOOL Equals( const BaseStorage& rStream ) const; - BOOL SetProperty( const String& rName, const ::com::sun::star::uno::Any& rValue ); - BOOL GetProperty( const String& rName, ::com::sun::star::uno::Any& rValue ); - BOOL GetProperty( const String& rEleName, const String& rName, ::com::sun::star::uno::Any& rValue ); - - // HACK to avoid incompatible build, can be done since this feature is only for development - // should be removed before release - UNOStorageHolderList* GetUNOStorageHolderList(); - -//#if _SOLAR__PRIVATE - UCBStorageElement_Impl* FindElement_Impl( const String& rName ) const; - BOOL CopyStorageElement_Impl( UCBStorageElement_Impl& rElement, - BaseStorage* pDest, const String& rNew ) const; - BaseStorage* OpenStorage_Impl( const String & rEleName, - StreamMode, BOOL bDirect, BOOL bForceUCBStorage ); -//#endif - -}; - - -#endif diff --git a/sot/inc/storinfo.hxx b/sot/inc/storinfo.hxx deleted file mode 100644 index dab1f6d4540e..000000000000 --- a/sot/inc/storinfo.hxx +++ /dev/null @@ -1,72 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SOT_STORINFO_HXX -#define _SOT_STORINFO_HXX - -#include -#include -#include -#include "sot/sotdllapi.h" - -class StgDirEntry; -class SvStorageInfo -{ -friend class SvStorage; - String aName; - SvGlobalName aClassName; - ULONG nSize; - BOOL bStream:1, - bStorage:1; - - SvStorageInfo(){}; // Fuer SvStorage -public: - SvStorageInfo( const StgDirEntry& ); - SvStorageInfo( const String& rName, ULONG nSz, BOOL bIsStorage ) - : aName( rName ) - , nSize( nSz ) - , bStream( !bIsStorage ) - , bStorage( bIsStorage ) - {} - - const SvGlobalName & GetClassName() const { return aClassName; } - const String & GetName() const { return aName; } - BOOL IsStream() const { return bStream; } - BOOL IsStorage() const { return bStorage; } - ULONG GetSize() const { return nSize; } -}; - -class SOT_DLLPUBLIC SvStorageInfoList -{ - PRV_SV_DECL_OWNER_LIST(SvStorageInfoList,SvStorageInfo) - const SvStorageInfo * Get( const String & rName ); -}; - -SOT_DLLPUBLIC ULONG ReadClipboardFormat( SvStream & rStm ); -SOT_DLLPUBLIC void WriteClipboardFormat( SvStream & rStm, ULONG nFormat ); - -#endif // _STORINFO_HXX diff --git a/sot/prj/d.lst b/sot/prj/d.lst index 528b6863ef3c..29c92260e178 100644 --- a/sot/prj/d.lst +++ b/sot/prj/d.lst @@ -1,20 +1,7 @@ mkdir: %_DEST%\inc%_EXT%\sot -..\inc\clsids.hxx %_DEST%\inc%_EXT%\sot\clsids.hxx -..\inc\sot\object.hxx %_DEST%\inc%_EXT%\sot\object.hxx -..\inc\sot\factory.hxx %_DEST%\inc%_EXT%\sot\factory.hxx -..\inc\sot\sotdata.hxx %_DEST%\inc%_EXT%\sot\sotdata.hxx -..\inc\agg.hxx %_DEST%\inc%_EXT%\sot\agg.hxx -..\inc\sot\storage.hxx %_DEST%\inc%_EXT%\sot\storage.hxx -..\inc\storinfo.hxx %_DEST%\inc%_EXT%\sot\storinfo.hxx -..\inc\sot\sotref.hxx %_DEST%\inc%_EXT%\sot\sotref.hxx -..\inc\sot\exchange.hxx %_DEST%\inc%_EXT%\sot\exchange.hxx -..\inc\sot\formats.hxx %_DEST%\inc%_EXT%\sot\formats.hxx -..\inc\absdev.hxx %_DEST%\inc%_EXT%\sot\absdev.hxx -..\inc\stg.hxx %_DEST%\inc%_EXT%\sot\stg.hxx -..\inc\filelist.hxx %_DEST%\inc%_EXT%\sot\filelist.hxx -..\inc\sot\sotdllapi.h %_DEST%\inc%_EXT%\sot\sotdllapi.h +..\inc\sot/*.hxx %_DEST%\inc%_EXT%\sot\*.hxx +..\inc\sot\*.h %_DEST%\inc%_EXT%\sot\*.h -..\%__SRC%\inc\sdintern.hxx %_DEST%\inc%_EXT%\sot\sdintern.hxx ..\%__SRC%\lib\sot.lib %_DEST%\lib%_EXT%\sot.lib ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% ..\%__SRC%\lib\lib*.so.* %_DEST%\lib%_EXT% diff --git a/sot/source/base/exchange.cxx b/sot/source/base/exchange.cxx index 67c2b64f105f..d860c8b0f572 100644 --- a/sot/source/base/exchange.cxx +++ b/sot/source/base/exchange.cxx @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sot/source/base/factory.cxx b/sot/source/base/factory.cxx index 4934f99e78c6..ca753265b082 100644 --- a/sot/source/base/factory.cxx +++ b/sot/source/base/factory.cxx @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include diff --git a/sot/source/base/filelist.cxx b/sot/source/base/filelist.cxx index 4f854add304d..048f19e65bd7 100644 --- a/sot/source/base/filelist.cxx +++ b/sot/source/base/filelist.cxx @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include TYPEINIT1_AUTOFACTORY( FileList, SvDataCopyStream ); diff --git a/sot/source/base/formats.cxx b/sot/source/base/formats.cxx index baddde6e716f..58b08fb53f18 100644 --- a/sot/source/base/formats.cxx +++ b/sot/source/base/formats.cxx @@ -34,8 +34,8 @@ #include #include -#include "filelist.hxx" -#include "clsids.hxx" +#include "sot/filelist.hxx" +#include "sot/clsids.hxx" #include #include diff --git a/sot/source/base/object.cxx b/sot/source/base/object.cxx index 403a1c6bb61d..9af1b441b37a 100644 --- a/sot/source/base/object.cxx +++ b/sot/source/base/object.cxx @@ -33,7 +33,7 @@ #include #include #include -#include +#include /************** class SvAggregateMemberList *****************************/ /************************************************************************/ diff --git a/sot/source/sdstor/sdintern.hdb b/sot/source/sdstor/sdintern.hdb deleted file mode 100644 index 4dfbc69be013..000000000000 --- a/sot/source/sdstor/sdintern.hdb +++ /dev/null @@ -1,22 +0,0 @@ -write "/*************************************************************************" -write "* SDINTERN.HXX" -write "* __DATE__" -write "* (c) 1992-1995 STAR DIVISION" -write "*************************************************************************/" -write "#ifndef _SDINTERN_HXX" -write "#define _SDINTERN_HXX" -write "#ifndef _SOLAR_H" -write "#include " -write "#endif" -write "#ifndef _STREAM_HXX" -write "#include " -write "#endif" -file stg.hxx -file stgelem.hxx -file stgcache.hxx -file stgio.hxx -file stgstrms.hxx -file stgavl.hxx -file stgdir.hxx -write "#endif" - diff --git a/sot/source/sdstor/stg.cxx b/sot/source/sdstor/stg.cxx index 1c749aa05cb8..c057b2d0aac0 100644 --- a/sot/source/sdstor/stg.cxx +++ b/sot/source/sdstor/stg.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sot.hxx" -#include +#include #include #include #include @@ -42,7 +42,7 @@ #include #include -#include "stg.hxx" +#include "sot/stg.hxx" #include "stgelem.hxx" #include "stgcache.hxx" #include "stgstrms.hxx" diff --git a/sot/source/sdstor/stgcache.cxx b/sot/source/sdstor/stgcache.cxx index 88a8187ee9dd..f4461383c0ba 100644 --- a/sot/source/sdstor/stgcache.cxx +++ b/sot/source/sdstor/stgcache.cxx @@ -41,7 +41,7 @@ #include #include -#include "stg.hxx" +#include "sot/stg.hxx" #include "stgelem.hxx" #include "stgcache.hxx" #include "stgstrms.hxx" diff --git a/sot/source/sdstor/stgdir.cxx b/sot/source/sdstor/stgdir.cxx index f093dc60cbe7..504fed55ce4d 100644 --- a/sot/source/sdstor/stgdir.cxx +++ b/sot/source/sdstor/stgdir.cxx @@ -30,7 +30,7 @@ #include // memcpy() -#include "stg.hxx" +#include "sot/stg.hxx" #include "stgelem.hxx" #include "stgcache.hxx" #include "stgstrms.hxx" diff --git a/sot/source/sdstor/stgelem.cxx b/sot/source/sdstor/stgelem.cxx index 46d7f1803140..b140c7fb27e2 100644 --- a/sot/source/sdstor/stgelem.cxx +++ b/sot/source/sdstor/stgelem.cxx @@ -32,7 +32,7 @@ #include #include #include -#include "stg.hxx" +#include "sot/stg.hxx" #include "stgelem.hxx" #include "stgcache.hxx" #include "stgstrms.hxx" diff --git a/sot/source/sdstor/stgelem.hxx b/sot/source/sdstor/stgelem.hxx index 7a5b7bc52b26..951d3503adbc 100644 --- a/sot/source/sdstor/stgelem.hxx +++ b/sot/source/sdstor/stgelem.hxx @@ -35,7 +35,7 @@ #include #endif -#include +#include class StgIo; class SvStream; diff --git a/sot/source/sdstor/stgio.cxx b/sot/source/sdstor/stgio.cxx index 00dd454233e2..fab908716a37 100644 --- a/sot/source/sdstor/stgio.cxx +++ b/sot/source/sdstor/stgio.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sot.hxx" -#include "stg.hxx" +#include "sot/stg.hxx" #include "stgelem.hxx" #include "stgcache.hxx" #include "stgstrms.hxx" diff --git a/sot/source/sdstor/stgole.cxx b/sot/source/sdstor/stgole.cxx index 148f1e87585c..0bb5887eed76 100644 --- a/sot/source/sdstor/stgole.cxx +++ b/sot/source/sdstor/stgole.cxx @@ -31,7 +31,7 @@ #include "rtl/string.h" #include "rtl/string.h" #include "stgole.hxx" -#include "storinfo.hxx" // Read/WriteClipboardFormat() +#include "sot/storinfo.hxx" // Read/WriteClipboardFormat() #include #if defined(_MSC_VER) && (_MSC_VER>=1400) diff --git a/sot/source/sdstor/stgole.hxx b/sot/source/sdstor/stgole.hxx index 346f21035f06..a9eebe1aae68 100644 --- a/sot/source/sdstor/stgole.hxx +++ b/sot/source/sdstor/stgole.hxx @@ -30,7 +30,7 @@ #include // memset() -#include "stg.hxx" +#include "sot/stg.hxx" #include "stgelem.hxx" class StgInternalStream : public SvStream diff --git a/sot/source/sdstor/stgstrms.cxx b/sot/source/sdstor/stgstrms.cxx index 07711133bf4b..cd56c1f62464 100644 --- a/sot/source/sdstor/stgstrms.cxx +++ b/sot/source/sdstor/stgstrms.cxx @@ -34,7 +34,7 @@ #include #include -#include "stg.hxx" +#include "sot/stg.hxx" #include "stgelem.hxx" #include "stgcache.hxx" #include "stgstrms.hxx" diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx index 136abb29a98e..e09c5fc864fc 100644 --- a/sot/source/sdstor/storage.cxx +++ b/sot/source/sdstor/storage.cxx @@ -35,8 +35,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/sot/source/sdstor/storinfo.cxx b/sot/source/sdstor/storinfo.cxx index 2aaaadd5a151..f912dc6fc83f 100644 --- a/sot/source/sdstor/storinfo.cxx +++ b/sot/source/sdstor/storinfo.cxx @@ -28,8 +28,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sot.hxx" -#include -#include +#include +#include #include diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx index ea3b656272db..4f265490a05e 100644 --- a/sot/source/sdstor/ucbstorage.cxx +++ b/sot/source/sdstor/ucbstorage.cxx @@ -66,12 +66,12 @@ #include #include -#include "stg.hxx" -#include "storinfo.hxx" +#include "sot/stg.hxx" +#include "sot/storinfo.hxx" #include #include #include -#include "clsids.hxx" +#include "sot/clsids.hxx" #include "unostorageholder.hxx" diff --git a/sot/source/sdstor/unostorageholder.cxx b/sot/source/sdstor/unostorageholder.cxx index 55c205557648..6224925c1820 100644 --- a/sot/source/sdstor/unostorageholder.cxx +++ b/sot/source/sdstor/unostorageholder.cxx @@ -36,7 +36,7 @@ #include #include "unostorageholder.hxx" -#include +#include using namespace ::com::sun::star; diff --git a/sot/source/unoolestorage/xolesimplestorage.cxx b/sot/source/unoolestorage/xolesimplestorage.cxx index 68686ff8c8f5..478309330e80 100644 --- a/sot/source/unoolestorage/xolesimplestorage.cxx +++ b/sot/source/unoolestorage/xolesimplestorage.cxx @@ -39,7 +39,7 @@ #include -#include +#include #include "xolesimplestorage.hxx" diff --git a/sot/source/unoolestorage/xolesimplestorage.hxx b/sot/source/unoolestorage/xolesimplestorage.hxx index c9f1b5c68b0a..18bd6ee64f9e 100644 --- a/sot/source/unoolestorage/xolesimplestorage.hxx +++ b/sot/source/unoolestorage/xolesimplestorage.hxx @@ -43,7 +43,7 @@ #include -#include +#include class OLESimpleStorage : public ::cppu::WeakImplHelper3 diff --git a/sot/util/makefile.mk b/sot/util/makefile.mk index 60b34c356217..cd1af59a5879 100644 --- a/sot/util/makefile.mk +++ b/sot/util/makefile.mk @@ -57,16 +57,16 @@ SHL1DEF= $(MISC)$/$(SHL1TARGET).def DEF1NAME =$(SHL1TARGET) DEF1DEPN =$(MISC)$/$(SHL1TARGET).flt \ - $(PRJ)$/inc$/absdev.hxx \ - $(PRJ)$/inc$/agg.hxx \ + $(PRJ)$/inc$/sot/absdev.hxx \ + $(PRJ)$/inc$/sot/agg.hxx \ $(PRJ)$/inc$/sot$/exchange.hxx \ $(PRJ)$/inc$/sot$/factory.hxx \ $(PRJ)$/inc$/sot$/object.hxx \ $(PRJ)$/inc$/sot$/sotdata.hxx \ $(PRJ)$/inc$/sot$/sotref.hxx \ - $(PRJ)$/inc$/stg.hxx \ + $(PRJ)$/inc$/sot/stg.hxx \ $(PRJ)$/inc$/sot$/storage.hxx \ - $(PRJ)$/inc$/storinfo.hxx + $(PRJ)$/inc$/sot/storinfo.hxx DEFLIB1NAME =$(TARGET) DEF1DES =StarObjectsTools -- cgit From 9d6f8f1d8f2906da494fac07778428cc44bf0cb1 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Tue, 20 Apr 2010 15:55:51 +0200 Subject: CWS gnumake2: move all delivered headers in svx to inc/svx; remove unused or useless headers --- svtools/prj/target_res_productregistration.mk | 2 ++ svtools/prj/target_res_svt.mk | 2 ++ 2 files changed, 4 insertions(+) diff --git a/svtools/prj/target_res_productregistration.mk b/svtools/prj/target_res_productregistration.mk index c9c4c42e194f..af510d338c6e 100644 --- a/svtools/prj/target_res_productregistration.mk +++ b/svtools/prj/target_res_productregistration.mk @@ -27,6 +27,8 @@ $(eval $(call gb_AllLangResTarget_AllLangResTarget,productregistration)) +$(eval $(call gb_AllLangResTarget_set_reslocation,productregistration,svtools)) + $(eval $(call gb_AllLangResTarget_add_srs,productregistration,\ svt/productregistration \ )) diff --git a/svtools/prj/target_res_svt.mk b/svtools/prj/target_res_svt.mk index 8a4bdaa30e07..40f908c04793 100644 --- a/svtools/prj/target_res_svt.mk +++ b/svtools/prj/target_res_svt.mk @@ -27,6 +27,8 @@ $(eval $(call gb_AllLangResTarget_AllLangResTarget,svt)) +$(eval $(call gb_AllLangResTarget_set_reslocation,svt,svtools)) + $(eval $(call gb_AllLangResTarget_add_srs,svt,\ svt/res \ )) -- cgit From 11a84b8b106143d1de8bdaa663286892b8968f58 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Wed, 21 Apr 2010 14:09:27 +0200 Subject: CWS gnumake2: various fixes after merging with DEV300_m76 --- svl/prj/build.lst | 19 +-- svl/prj/d.lst | 21 ---- svl/prj/target_lib_svl.mk | 9 +- svl/prj/target_package_inc.mk | 161 +++++++++++++------------- svtools/prj/build.lst | 29 +---- svtools/prj/d.lst | 34 ------ svtools/prj/target_module_svtools.mk | 6 +- svtools/prj/target_package_inc.mk | 139 +++++++++++----------- svtools/prj/target_res_productregistration.mk | 2 + svtools/prj/target_res_svt.mk | 38 +++--- toolkit/prj/build.lst | 16 +-- toolkit/prj/d.lst | 62 ---------- tools/prj/build.lst | 33 +----- tools/prj/d.lst | 123 -------------------- tools/prj/target_lib_tl.mk | 39 ++++--- tools/prj/target_package_inc.mk | 1 + 16 files changed, 214 insertions(+), 518 deletions(-) diff --git a/svl/prj/build.lst b/svl/prj/build.lst index f2d4bf324d01..dc1b23e2971a 100644 --- a/svl/prj/build.lst +++ b/svl/prj/build.lst @@ -1,22 +1,5 @@ sl svl : l10n rsc offuh ucbhelper unotools cppu cppuhelper comphelper sal sot NULL sl svl usr1 - all svl_mkout NULL -sl svl\inc nmake - all svl_inc NULL -sl svl\unx\source\svdde nmake - u svl_usdde svl_inc NULL -sl svl\unx\source\svdde nmake - p svl_psdde svl_inc NULL -sl svl\source\config nmake - all svl_conf svl_inc NULL -sl svl\source\filepicker nmake - all svl_filepick svl_inc NULL -sl svl\source\filerec nmake - all svl_file svl_inc NULL -sl svl\source\items nmake - all svl__item svl_inc NULL -sl svl\source\memtools nmake - all svl_mem svl_inc NULL -sl svl\source\misc nmake - all svl__misc svl_inc NULL -sl svl\source\notify nmake - all svl_not svl_inc NULL -sl svl\source\numbers nmake - all svl_num svl_inc NULL -sl svl\source\svdde nmake - all svl__dde svl_inc NULL -sl svl\source\svsql nmake - all svl_sql svl_inc NULL -sl svl\source\undo nmake - all svl_undo svl_inc NULL -sl svl\source\uno nmake - all svl_uno svl_inc NULL -sl svl\util nmake - all svl_util svl_usdde.u svl_psdde.p svl_conf svl_filepick svl_file svl__item svl_mem svl__misc svl_not svl_num svl__dde svl_sql svl_undo svl_uno NULL -sl svl\source\fsstor nmake - all svl_fsstor svl_inc NULL -sl svl\source\passwordcontainer nmake - all svl_passcont svl_inc NULL +sl svl\prj nmake - all svl_prj NULL diff --git a/svl/prj/d.lst b/svl/prj/d.lst index a5c2564e81cd..8b137891791f 100644 --- a/svl/prj/d.lst +++ b/svl/prj/d.lst @@ -1,22 +1 @@ -mkdir: %COMMON_DEST%\bin%_EXT%\hid -mkdir: %COMMON_DEST%\res%_EXT% -mkdir: %_DEST%\inc%_EXT%\svl - -..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid -..\%__SRC%\lib\isvl.lib %_DEST%\lib%_EXT%\isvl.lib -..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\* -..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\* -..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\* -..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\* - -..\inc\svl\*.hrc %_DEST%\inc%_EXT%\svl\*.hrc -..\inc\svl\*.hxx %_DEST%\inc%_EXT%\svl\*.hxx -..\inc\svl\*.h %_DEST%\inc%_EXT%\svl\*.h -..\inc\*.hrc %_DEST%\inc%_EXT%\svl\*.hrc -..\inc\*.hxx %_DEST%\inc%_EXT%\svl\*.hxx -..\inc\*.h %_DEST%\inc%_EXT%\svl\*.h - -dos: sh -c "if test %OS% = MACOSX; then macosx-create-bundle %_DEST%\bin%_EXT%\bmp=%__PRJROOT%\%__SRC%\bin%_EXT%; fi" - -*.xml %_DEST%\xml%_EXT%\*.xml diff --git a/svl/prj/target_lib_svl.mk b/svl/prj/target_lib_svl.mk index 5aae5d4f5693..9791ccf84e47 100644 --- a/svl/prj/target_lib_svl.mk +++ b/svl/prj/target_lib_svl.mk @@ -46,20 +46,20 @@ $(eval $(call gb_Library_set_defs,svl,\ )) $(eval $(call gb_Library_add_linked_libs,svl,\ + basegfx \ comphelper \ cppu \ + cppuhelper \ i18nisolang1 \ i18nutil \ + jvmfwk \ sal \ sot \ + stl \ tl \ ucbhelper \ utl \ vos3 \ - basegfx \ - cppuhelper \ - jvmfwk \ - stl \ )) $(eval $(call gb_Library_add_linked_system_libs,svl,\ @@ -77,6 +77,7 @@ $(eval $(call gb_Library_add_exception_objects,svl,\ svl/source/config/ctloptions \ svl/source/config/itemholder2 \ svl/source/config/languageoptions \ + svl/source/config/srchcfg \ svl/source/filepicker/pickerhelper \ svl/source/filepicker/pickerhistory \ svl/source/filerec/filerec \ diff --git a/svl/prj/target_package_inc.mk b/svl/prj/target_package_inc.mk index bab50a4af197..e14d4d24cade 100644 --- a/svl/prj/target_package_inc.mk +++ b/svl/prj/target_package_inc.mk @@ -26,101 +26,106 @@ #************************************************************************* $(eval $(call gb_Package_Package,svl_inc,$(SRCDIR)/svl/inc)) + +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/aeitem.hxx,svl/aeitem.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/brdcst.hxx,svl/brdcst.hxx)) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/cancel.hxx,svl/cancel.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/cenumitm.hxx,svl/cenumitm.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/cintitem.hxx,svl/cintitem.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/cjkoptions.hxx,svl/cjkoptions.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/cnclhint.hxx,svl/cnclhint.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/cntwall.hxx,svl/cntwall.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/ctloptions.hxx,svl/ctloptions.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/ctypeitm.hxx,svl/ctypeitm.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/custritm.hxx,svl/custritm.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/dateitem.hxx,svl/dateitem.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/documentlockfile.hxx,svl/documentlockfile.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/eitem.hxx,svl/eitem.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/filerec.hxx,svl/filerec.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/flagitem.hxx,svl/flagitem.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/globalnameitem.hxx,svl/globalnameitem.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/hint.hxx,svl/hint.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/httpcook.hxx,svl/httpcook.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/ilstitem.hxx,svl/ilstitem.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/imageitm.hxx,svl/imageitm.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/inethist.hxx,svl/inethist.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/inettype.hxx,svl/inettype.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/intitem.hxx,svl/intitem.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/isethint.hxx,svl/isethint.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/itemiter.hxx,svl/itemiter.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/itempool.hxx,svl/itempool.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/itemprop.hxx,svl/itemprop.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/itemset.hxx,svl/itemset.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/languageoptions.hxx,svl/languageoptions.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/lckbitem.hxx,svl/lckbitem.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/lockfilecommon.hxx,svl/lockfilecommon.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/lstner.hxx,svl/lstner.hxx)) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/macitem.hxx,svl/macitem.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/metitem.hxx,svl/metitem.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/nfkeytab.hxx,svl/nfkeytab.hxx)) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/nfversi.hxx,svl/nfversi.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/nranges.hxx,svl/nranges.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/ondemand.hxx,svl/ondemand.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/ownlist.hxx,svl/ownlist.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/poolitem.hxx,svl/poolitem.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/ptitem.hxx,svl/ptitem.hxx)) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/rectitem.hxx,svl/rectitem.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/itemset.hxx,svl/itemset.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/solar.hrc,svl/solar.hrc)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/languageoptions.hxx,svl/languageoptions.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/hint.hxx,svl/hint.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/slstitm.hxx,svl/slstitm.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/restrictedpaths.hxx,svl/restrictedpaths.hxx)) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/rngitem.hxx,svl/rngitem.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/itempool.hxx,svl/itempool.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/custritm.hxx,svl/custritm.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/poolitem.hxx,svl/poolitem.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/zforlist.hxx,svl/zforlist.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/ondemand.hxx,svl/ondemand.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/sfontitm.hxx,svl/sfontitm.hxx)) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/sharecontrolfile.hxx,svl/sharecontrolfile.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/restrictedpaths.hxx,svl/restrictedpaths.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/eitem.hxx,svl/eitem.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/visitem.hxx,svl/visitem.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/lockfilecommon.hxx,svl/lockfilecommon.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/intitem.hxx,svl/intitem.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/svldllapi.h,svl/svldllapi.h)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/brdcst.hxx,svl/brdcst.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/szitem.hxx,svl/szitem.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/ownlist.hxx,svl/ownlist.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/itemiter.hxx,svl/itemiter.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/cnclhint.hxx,svl/cnclhint.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/cntwall.hxx,svl/cntwall.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/cjkoptions.hxx,svl/cjkoptions.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/svstdarr.hxx,svl/svstdarr.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/imageitm.hxx,svl/imageitm.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/httpcook.hxx,svl/httpcook.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/filerec.hxx,svl/filerec.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/svtools.hrc,svl/svtools.hrc)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/inethist.hxx,svl/inethist.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/cenumitm.hxx,svl/cenumitm.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/slstitm.hxx,svl/slstitm.hxx)) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/smplhint.hxx,svl/smplhint.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/ilstitem.hxx,svl/ilstitem.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/solar.hrc,svl/solar.hrc)) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/stritem.hxx,svl/stritem.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/cintitem.hxx,svl/cintitem.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/ctloptions.hxx,svl/ctloptions.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/ptitem.hxx,svl/ptitem.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/nranges.hxx,svl/nranges.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/zformat.hxx,svl/zformat.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/lstner.hxx,svl/lstner.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/urlfilter.hxx,svl/urlfilter.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/metitem.hxx,svl/metitem.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/undo.hxx,svl/undo.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/inettype.hxx,svl/inettype.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/style.hrc,svl/style.hrc)) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/style.hxx,svl/style.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/isethint.hxx,svl/isethint.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/itemprop.hxx,svl/itemprop.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/flagitem.hxx,svl/flagitem.hxx)) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/svarray.hxx,svl/svarray.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/aeitem.hxx,svl/aeitem.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/svldata.hxx,svl/svldata.hxx)) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/svdde.hxx,svl/svdde.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/style.hrc,svl/style.hrc)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/sfontitm.hxx,svl/sfontitm.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/ctypeitm.hxx,svl/ctypeitm.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/globalnameitem.hxx,svl/globalnameitem.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/dateitem.hxx,svl/dateitem.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/lckbitem.hxx,svl/lckbitem.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/nfkeytab.hxx,svl/nfkeytab.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/documentlockfile.hxx,svl/documentlockfile.hxx)) - +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/svldata.hxx,svl/svldata.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/svldllapi.h,svl/svldllapi.h)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/svstdarr.hxx,svl/svstdarr.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/svtools.hrc,svl/svtools.hrc)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/szitem.hxx,svl/szitem.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/undo.hxx,svl/undo.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/urlfilter.hxx,svl/urlfilter.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/visitem.hxx,svl/visitem.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/zforlist.hxx,svl/zforlist.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/zformat.hxx,svl/zformat.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/PasswordHelper.hxx,svl/PasswordHelper.hxx)) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/adrparse.hxx,svl/adrparse.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/cntwids.hrc,svl/cntwids.hrc)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/xmlement.hxx,svl/xmlement.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/urihelper.hxx,svl/urihelper.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/broadcast.hxx,svl/broadcast.hxx)) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/cntnrsrt.hxx,svl/cntnrsrt.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/listener.hxx,svl/listener.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/poolcach.hxx,svl/poolcach.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/PasswordHelper.hxx,svl/PasswordHelper.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/pickerhistoryaccess.hxx,svl/pickerhistoryaccess.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/memberid.hrc,svl/memberid.hrc)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/filenotation.hxx,svl/filenotation.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/strmadpt.hxx,svl/strmadpt.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/outstrm.hxx,svl/outstrm.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/stylepool.hxx,svl/stylepool.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/numuno.hxx,svl/numuno.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/inetstrm.hxx,svl/inetstrm.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/cntwids.hrc,svl/cntwids.hrc)) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/converter.hxx,svl/converter.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/urlbmk.hxx,svl/urlbmk.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/broadcast.hxx,svl/broadcast.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/listeneriter.hxx,svl/listeneriter.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/inetmsg.hxx,svl/inetmsg.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/inetdef.hxx,svl/inetdef.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/filenotation.hxx,svl/filenotation.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/folderrestriction.hxx,svl/folderrestriction.hxx)) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/fstathelper.hxx,svl/fstathelper.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/inetdef.hxx,svl/inetdef.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/inetmsg.hxx,svl/inetmsg.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/inetstrm.hxx,svl/inetstrm.hxx)) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/instrm.hxx,svl/instrm.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/folderrestriction.hxx,svl/folderrestriction.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/listener.hxx,svl/listener.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/listeneriter.hxx,svl/listeneriter.hxx)) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/lngmisc.hxx,svl/lngmisc.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/pickerhistory.hxx,svl/pickerhistory.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/memberid.hrc,svl/memberid.hrc)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/nfsymbol.hxx,svl/nfsymbol.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/numuno.hxx,svl/numuno.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/outstrm.hxx,svl/outstrm.hxx)) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/pickerhelper.hxx,svl/pickerhelper.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/pickerhistory.hxx,svl/pickerhistory.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/pickerhistoryaccess.hxx,svl/pickerhistoryaccess.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/poolcach.hxx,svl/poolcach.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/strmadpt.hxx,svl/strmadpt.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/stylepool.hxx,svl/stylepool.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/urihelper.hxx,svl/urihelper.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/urlbmk.hxx,svl/urlbmk.hxx)) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/whiter.hxx,svl/whiter.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/nfsymbol.hxx,svl/nfsymbol.hxx)) - +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/xmlement.hxx,svl/xmlement.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/asiancfg.hxx,svl/asiancfg.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/broadcast.hxx,svl/broadcast.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/mailenum.hxx,svl/mailenum.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/srchcfg.hxx,svl/srchcfg.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/srchdefs.hxx,svl/srchdefs.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/srchitem.hxx,svl/srchitem.hxx)) diff --git a/svtools/prj/build.lst b/svtools/prj/build.lst index 4b2cd9f9b26b..17542856e75c 100644 --- a/svtools/prj/build.lst +++ b/svtools/prj/build.lst @@ -1,29 +1,4 @@ st svtools : l10n svl offuh toolkit ucbhelper unotools JPEG:jpeg cppu cppuhelper comphelper sal sot jvmfwk NULL st svtools usr1 - all st_mkout NULL -st svtools\inc nmake - all st_inc NULL -st svtools\bmpmaker nmake - all st_bmp st_inc NULL -st svtools\source\brwbox nmake - all st__brw st_bmp st_inc NULL -st svtools\source\config nmake - all st_conf st_inc NULL -st svtools\source\contnr nmake - all st__ctr st_inc NULL -st svtools\source\control nmake - all st_ctl st_inc NULL -st svtools\source\dialogs nmake - all st_dial st_inc NULL -st svtools\source\edit nmake - all st_edit st_inc NULL -st svtools\source\filter.vcl\filter nmake - all st_vfilt st_inc NULL -st svtools\source\filter.vcl\wmf nmake - all st_vwmf st_inc NULL -st svtools\source\filter.vcl\igif nmake - all st_vigif st_inc NULL -st svtools\source\filter.vcl\jpeg nmake - all st_vjpeg st_inc NULL -st svtools\source\filter.vcl\ixbm nmake - all st_vixbm st_inc NULL -st svtools\source\filter.vcl\ixpm nmake - all st_vixpm st_inc NULL -st svtools\source\graphic nmake - all st_svtgraphic st_inc NULL -st svtools\source\java nmake - all st_svtjava st_inc NULL -st svtools\source\misc nmake - all st__misc st_bmp st_inc NULL -st svtools\source\plugapp nmake - all st_papp st_inc NULL -st svtools\source\svhtml nmake - all st_html st_inc NULL -st svtools\source\svrtf nmake - all st_rtf st_inc NULL -st svtools\source\table nmake - all st_table st_inc NULL -st svtools\source\uno nmake - all st_uno st_inc NULL -st svtools\source\urlobj nmake - all st__url st_inc NULL -st svtools\util nmake - all st_util st_svtgraphic st__brw st__ctr st_conf st_ctl st_dial st_edit st__misc st__url st_html st_papp st_rtf st_table st_uno st_vfilt st_vigif st_vixbm st_vixpm st_vjpeg st_vwmf st_svtjava NULL -st svtools\source\hatchwindow nmake - all st_hatchwin st_inc NULL -st svtools\source\productregistration nmake - all st_prodreg st_util st_inc NULL -st svtools\workben\unodialog nmake - all st_workben_udlg st_util NULL +st svtools\prj nmake - all st_prj NULL + diff --git a/svtools/prj/d.lst b/svtools/prj/d.lst index 0a3ccd8a9819..8b137891791f 100644 --- a/svtools/prj/d.lst +++ b/svtools/prj/d.lst @@ -1,35 +1 @@ -mkdir: %COMMON_DEST%\bin%_EXT%\hid -mkdir: %COMMON_DEST%\res%_EXT% -mkdir: %_DEST%\inc%_EXT%\svtools - -..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid -..\%__SRC%\srs\ehdl.srs %_DEST%\res%_EXT%\svtools.srs -..\%COMMON_OUTDIR%\srs\ehdl_srs.hid %COMMON_DEST%\res%_EXT%\svtools_srs.hid -..\%__SRC%\lib\svtool.lib %_DEST%\lib%_EXT%\svtool.lib -..\%__SRC%\slb\svt.lib %_DEST%\lib%_EXT%\xsvtool.lib -..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\* -..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\* -..\%__SRC%\bin\bmp.* %_DEST%\bin%_EXT%\bmp.* -..\%__SRC%\bin\bmpsum.* %_DEST%\bin%_EXT%\bmpsum.* -..\%__SRC%\bin\bmpgui.* %_DEST%\bin%_EXT%\bmpgui.* -..\%__SRC%\bin\g2g.* %_DEST%\bin%_EXT%\g2g.* -..\%__SRC%\bin\bmp %_DEST%\bin%_EXT%\bmp -..\%__SRC%\bin\bmpsum %_DEST%\bin%_EXT%\bmpsum -..\%__SRC%\bin\bmpgui %_DEST%\bin%_EXT%\bmpgui -..\%__SRC%\bin\g2g %_DEST%\bin%_EXT%\g2g -..\%__SRC%\res\bmp.* %_DEST%\bin%_EXT%\bmp.* -..\%__SRC%\res\bmpgui.* %_DEST%\bin%_EXT%\bmpgui.* -..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\* -..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\* - -..\inc\svtools\*.hxx %_DEST%\inc%_EXT%\svtools\*.hxx -..\inc\svtools\*.h %_DEST%\inc%_EXT%\svtools\*.h -..\inc\svtools\*.hrc %_DEST%\inc%_EXT%\svtools\*.hrc -..\inc\*.hxx %_DEST%\inc%_EXT%\svtools\*.hxx -..\inc\*.h %_DEST%\inc%_EXT%\svtools\*.h -..\inc\*.hrc %_DEST%\inc%_EXT%\svtools\*.hrc - -dos: sh -c "if test %OS% = MACOSX; then macosx-create-bundle %_DEST%\bin%_EXT%\bmp=%__PRJROOT%\%__SRC%\bin%_EXT%; fi" - -*.xml %_DEST%\xml%_EXT%\*.xml diff --git a/svtools/prj/target_module_svtools.mk b/svtools/prj/target_module_svtools.mk index 0d474b4d794f..88e6228b83e4 100644 --- a/svtools/prj/target_module_svtools.mk +++ b/svtools/prj/target_module_svtools.mk @@ -26,8 +26,8 @@ #************************************************************************* $(eval $(call gb_Module_Module,svtools,\ - $(call gb_AllLangResTarget_get_target,svt) \ $(call gb_AllLangResTarget_get_target,productregistration) \ + $(call gb_AllLangResTarget_get_target,svt) \ $(call gb_Executable_get_target,bmp) \ $(call gb_Executable_get_target,bmpsum) \ $(call gb_Executable_get_target,g2g) \ @@ -45,9 +45,9 @@ $(eval $(call gb_Module_read_includes,svtools,\ lib_productregistration \ lib_svt \ package_inc \ -)) - #res_svt \ res_productregistration \ + res_svt \ +)) #todo: javapatchres #todo: jpeg on mac in svtools/util/makefile.mk diff --git a/svtools/prj/target_package_inc.mk b/svtools/prj/target_package_inc.mk index 4b7fd56be3fa..f47251f31590 100644 --- a/svtools/prj/target_package_inc.mk +++ b/svtools/prj/target_package_inc.mk @@ -26,119 +26,109 @@ #************************************************************************* $(eval $(call gb_Package_Package,svtools_inc,$(SRCDIR)/svtools/inc)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/AccessibleBrowseBoxObjType.hxx,svtools/AccessibleBrowseBoxObjType.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/DocumentInfoPreview.hxx,svtools/DocumentInfoPreview.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/FilterConfigItem.hxx,svtools/FilterConfigItem.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/QueryFolderName.hxx,svtools/QueryFolderName.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/acceleratorexecute.hxx,svtools/acceleratorexecute.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibilityoptions.hxx,svtools/accessibilityoptions.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessiblefactory.hxx,svtools/accessiblefactory.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibletable.hxx,svtools/accessibletable.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibletableprovider.hxx,svtools/accessibletableprovider.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/addresstemplate.hxx,svtools/addresstemplate.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/apearcfg.hxx,svtools/apearcfg.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/asynclink.hxx,svtools/asynclink.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/brwbox.hxx,svtools/brwbox.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/brwhead.hxx,svtools/brwhead.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/calendar.hxx,svtools/calendar.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/chartprettypainter.hxx,svtools/chartprettypainter.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/cliplistener.hxx,svtools/cliplistener.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/colctrl.hxx,svtools/colctrl.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/collatorres.hxx,svtools/collatorres.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/colorcfg.hxx,svtools/colorcfg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/colrdlg.hxx,svtools/colrdlg.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/contextmenuhelper.hxx,svtools/contextmenuhelper.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/controldims.hrc,svtools/controldims.hrc)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ctrlbox.hxx,svtools/ctrlbox.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ctrltool.hxx,svtools/ctrltool.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/dialogclosedlistener.hxx,svtools/dialogclosedlistener.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/dialogcontrolling.hxx,svtools/dialogcontrolling.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/expander.hxx,svtools/expander.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/extcolorcfg.hxx,svtools/extcolorcfg.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filectrl.hxx,svtools/filectrl.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filedlg.hxx,svtools/filedlg.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filedlg2.hrc,svtools/filedlg2.hrc)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fileview.hxx,svtools/fileview.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fltdefs.hxx,svtools/fltdefs.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fontsubstconfig.hxx,svtools/fontsubstconfig.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/framestatuslistener.hxx,svtools/framestatuslistener.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/helpagentwindow.hxx,svtools/helpagentwindow.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/htmlkywd.hxx,svtools/htmlkywd.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/htmltokn.h,svtools/htmltokn.h)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imagemgr.hrc,svtools/imagemgr.hrc)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imagemgr.hxx,svtools/imagemgr.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imageresourceaccess.hxx,svtools/imageresourceaccess.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imgdef.hxx,svtools/imgdef.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/indexentryres.hxx,svtools/indexentryres.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/inetimg.hxx,svtools/inetimg.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/itemdel.hxx,svtools/itemdel.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ivctrl.hxx,svtools/ivctrl.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/localresaccess.hxx,svtools/localresaccess.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/prgsbar.hxx,svtools/prgsbar.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/roadmap.hxx,svtools/roadmap.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/rtfkeywd.hxx,svtools/rtfkeywd.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/rtfout.hxx,svtools/rtfout.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/rtftoken.h,svtools/rtftoken.h)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ruler.hxx,svtools/ruler.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/scriptedtext.hxx,svtools/scriptedtext.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/scrwin.hxx,svtools/scrwin.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/sfxecode.hxx,svtools/sfxecode.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/soerr.hxx,svtools/soerr.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/sores.hxx,svtools/sores.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/statusbarcontroller.hxx,svtools/statusbarcontroller.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/stdmenu.hxx,svtools/stdmenu.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/sychconv.hxx,svtools/sychconv.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/tabbar.hxx,svtools/tabbar.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/taskbar.hxx,svtools/taskbar.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/templatefoldercache.hxx,svtools/templatefoldercache.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/templdlg.hxx,svtools/templdlg.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/testtool.hxx,svtools/testtool.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/tooltiplbox.hxx,svtools/tooltiplbox.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/txtattr.hxx,svtools/txtattr.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/txtcmp.hxx,svtools/txtcmp.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/unoevent.hxx,svtools/unoevent.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/unoimap.hxx,svtools/unoimap.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wallitem.hxx,svtools/wallitem.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/AccessibleBrowseBoxObjType.hxx,svtools/AccessibleBrowseBoxObjType.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/FilterConfigItem.hxx,svtools/FilterConfigItem.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibilityoptions.hxx,svtools/accessibilityoptions.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessiblefactory.hxx,svtools/accessiblefactory.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibletable.hxx,svtools/accessibletable.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibletableprovider.hxx,svtools/accessibletableprovider.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/brwbox.hxx,svtools/brwbox.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/brwhead.hxx,svtools/brwhead.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/chartprettypainter.hxx,svtools/chartprettypainter.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/colctrl.hxx,svtools/colctrl.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/colorcfg.hxx,svtools/colorcfg.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/colrdlg.hxx,svtools/colrdlg.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/editbrowsebox.hxx,svtools/editbrowsebox.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/editimplementation.hxx,svtools/editimplementation.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/editsyntaxhighlighter.hxx,svtools/editsyntaxhighlighter.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ehdl.hxx,svtools/ehdl.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/embedhlp.hxx,svtools/embedhlp.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/embedtransfer.hxx,svtools/embedtransfer.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/expander.hxx,svtools/expander.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/extcolorcfg.hxx,svtools/extcolorcfg.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/extensionlistbox.hxx,svtools/extensionlistbox.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filectrl.hxx,svtools/filectrl.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filedlg.hxx,svtools/filedlg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filedlg2.hrc,svtools/filedlg2.hrc)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fileurlbox.hxx,svtools/fileurlbox.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fileview.hxx,svtools/fileview.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filter.hxx,svtools/filter.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fixedhyper.hxx,svtools/fixedhyper.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fltcall.hxx,svtools/fltcall.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fltdefs.hxx,svtools/fltdefs.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fmtfield.hxx,svtools/fmtfield.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fontsubstconfig.hxx,svtools/fontsubstconfig.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/framestatuslistener.hxx,svtools/framestatuslistener.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/generictoolboxcontroller.hxx,svtools/generictoolboxcontroller.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/genericunodialog.hxx,svtools/genericunodialog.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/grfmgr.hxx,svtools/grfmgr.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/headbar.hxx,svtools/headbar.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/helpagentwindow.hxx,svtools/helpagentwindow.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/helpid.hrc,svtools/helpid.hrc)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/helpopt.hxx,svtools/helpopt.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/htmlcfg.hxx,svtools/htmlcfg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/htmlkywd.hxx,svtools/htmlkywd.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/htmlout.hxx,svtools/htmlout.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/htmltokn.h,svtools/htmltokn.h)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/hyperlabel.hxx,svtools/hyperlabel.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imagemgr.hrc,svtools/imagemgr.hrc)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imagemgr.hxx,svtools/imagemgr.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imageresourceaccess.hxx,svtools/imageresourceaccess.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imap.hxx,svtools/imap.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imapcirc.hxx,svtools/imapcirc.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imapobj.hxx,svtools/imapobj.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imappoly.hxx,svtools/imappoly.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imaprect.hxx,svtools/imaprect.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imgdef.hxx,svtools/imgdef.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/indexentryres.hxx,svtools/indexentryres.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/inetimg.hxx,svtools/inetimg.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/inettbc.hxx,svtools/inettbc.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/insdlg.hxx,svtools/insdlg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/itemdel.hxx,svtools/itemdel.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ivctrl.hxx,svtools/ivctrl.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/javacontext.hxx,svtools/javacontext.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/javainteractionhandler.hxx,svtools/javainteractionhandler.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/langtab.hxx,svtools/langtab.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/localresaccess.hxx,svtools/localresaccess.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/logindlg.hxx,svtools/logindlg.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/menuoptions.hxx,svtools/menuoptions.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/miscopt.hxx,svtools/miscopt.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/optionsdrawinglayer.hxx,svtools/optionsdrawinglayer.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/parhtml.hxx,svtools/parhtml.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/parrtf.hxx,svtools/parrtf.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/prgsbar.hxx,svtools/prgsbar.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/printdlg.hxx,svtools/printdlg.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/printoptions.hxx,svtools/printoptions.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/prnsetup.hxx,svtools/prnsetup.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/roadmap.hxx,svtools/roadmap.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/roadmapwizard.hxx,svtools/roadmapwizard.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/rtfkeywd.hxx,svtools/rtfkeywd.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/rtfout.hxx,svtools/rtfout.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/rtftoken.h,svtools/rtftoken.h)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ruler.hxx,svtools/ruler.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/scriptedtext.hxx,svtools/scriptedtext.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/scrwin.hxx,svtools/scrwin.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/sfxecode.hxx,svtools/sfxecode.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/soerr.hxx,svtools/soerr.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/sores.hxx,svtools/sores.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/statusbarcontroller.hxx,svtools/statusbarcontroller.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/stdctrl.hxx,svtools/stdctrl.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/stdmenu.hxx,svtools/stdmenu.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/stringtransfer.hxx,svtools/stringtransfer.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svicnvw.hxx,svtools/svicnvw.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svlbitm.hxx,svtools/svlbitm.hxx)) @@ -150,28 +140,41 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtabbx.hxx,svtools/sv $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtdata.hxx,svtools/svtdata.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtdllapi.h,svtools/svtdllapi.h)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtreebx.hxx,svtools/svtreebx.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svxbox.hxx,svtools/svxbox.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/sychconv.hxx,svtools/sychconv.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/syntaxhighlight.hxx,svtools/syntaxhighlight.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/tabbar.hxx,svtools/tabbar.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/abstracttablecontrol.hxx,svtools/table/abstracttablecontrol.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/defaultinputhandler.hxx,svtools/table/defaultinputhandler.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/gridtablerenderer.hxx,svtools/table/gridtablerenderer.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tablecontrol.hxx,svtools/table/tablecontrol.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tabledatawindow.hxx,svtools/table/tabledatawindow.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tableinputhandler.hxx,svtools/table/tableinputhandler.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tablemodel.hxx,svtools/table/tablemodel.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tablerenderer.hxx,svtools/table/tablerenderer.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tabletypes.hxx,svtools/table/tabletypes.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/taskbar.hxx,svtools/taskbar.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/templatefoldercache.hxx,svtools/templatefoldercache.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/templdlg.hxx,svtools/templdlg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/testtool.hxx,svtools/testtool.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/textdata.hxx,svtools/textdata.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/texteng.hxx,svtools/texteng.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/textview.hxx,svtools/textview.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/textwindowpeer.hxx,svtools/textwindowpeer.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolboxcontroller.hxx,svtools/toolboxcontroller.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/tooltiplbox.hxx,svtools/tooltiplbox.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/transfer.hxx,svtools/transfer.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/treelist.hxx,svtools/treelist.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ttprops.hxx,svtools/ttprops.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/txtattr.hxx,svtools/txtattr.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/txtcmp.hxx,svtools/txtcmp.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/unitconv.hxx,svtools/unitconv.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/unoevent.hxx,svtools/unoevent.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/unoimap.hxx,svtools/unoimap.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/urlcontrol.hxx,svtools/urlcontrol.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/valueset.hxx,svtools/valueset.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wallitem.hxx,svtools/wallitem.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wizardmachine.hxx,svtools/wizardmachine.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wizdlg.hxx,svtools/wizdlg.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wmf.hxx,svtools/wmf.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/xtextedt.hxx,svtools/xtextedt.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/abstracttablecontrol.hxx,svtools/table/abstracttablecontrol.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/defaultinputhandler.hxx,svtools/table/defaultinputhandler.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/gridtablerenderer.hxx,svtools/table/gridtablerenderer.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tablecontrol.hxx,svtools/table/tablecontrol.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tabledatawindow.hxx,svtools/table/tabledatawindow.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tableinputhandler.hxx,svtools/table/tableinputhandler.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tablemodel.hxx,svtools/table/tablemodel.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tablerenderer.hxx,svtools/table/tablerenderer.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tabletypes.hxx,svtools/table/tabletypes.hxx)) - diff --git a/svtools/prj/target_res_productregistration.mk b/svtools/prj/target_res_productregistration.mk index c9c4c42e194f..af510d338c6e 100644 --- a/svtools/prj/target_res_productregistration.mk +++ b/svtools/prj/target_res_productregistration.mk @@ -27,6 +27,8 @@ $(eval $(call gb_AllLangResTarget_AllLangResTarget,productregistration)) +$(eval $(call gb_AllLangResTarget_set_reslocation,productregistration,svtools)) + $(eval $(call gb_AllLangResTarget_add_srs,productregistration,\ svt/productregistration \ )) diff --git a/svtools/prj/target_res_svt.mk b/svtools/prj/target_res_svt.mk index 8a4bdaa30e07..1e3e21b7ca6b 100644 --- a/svtools/prj/target_res_svt.mk +++ b/svtools/prj/target_res_svt.mk @@ -27,6 +27,8 @@ $(eval $(call gb_AllLangResTarget_AllLangResTarget,svt)) +$(eval $(call gb_AllLangResTarget_set_reslocation,svt,svtools)) + $(eval $(call gb_AllLangResTarget_add_srs,svt,\ svt/res \ )) @@ -43,35 +45,35 @@ $(eval $(call gb_SrsTarget_set_include,svt/res,\ )) $(eval $(call gb_SrsTarget_add_files,svt/res,\ - svtools/source/java/javaerror.src \ - svtools/source/misc/helpagent.src \ - svtools/source/misc/langtab.src \ - svtools/source/misc/ehdl.src \ - svtools/source/misc/undo.src \ - svtools/source/misc/imagemgr.src \ - svtools/source/plugapp/testtool.src \ - svtools/source/control/filectrl.src \ + svtools/source/brwbox/editbrowsebox.src \ + svtools/source/contnr/fileview.src \ + svtools/source/contnr/svcontnr.src \ + svtools/source/contnr/templwin.src \ svtools/source/control/calendar.src \ svtools/source/control/ctrlbox.src \ svtools/source/control/ctrltool.src \ - svtools/source/dialogs/so3res.src \ - svtools/source/dialogs/prnsetup.src \ - svtools/source/dialogs/colrdlg.src \ + svtools/source/control/filectrl.src \ svtools/source/dialogs/addresstemplate.src \ + svtools/source/dialogs/colrdlg.src \ svtools/source/dialogs/filedlg2.src \ - svtools/source/dialogs/printdlg.src \ svtools/source/dialogs/formats.src \ svtools/source/dialogs/logindlg.src \ + svtools/source/dialogs/printdlg.src \ + svtools/source/dialogs/prnsetup.src \ + svtools/source/dialogs/so3res.src \ svtools/source/dialogs/wizardmachine.src \ - svtools/source/contnr/templwin.src \ - svtools/source/contnr/fileview.src \ - svtools/source/contnr/svcontnr.src \ - svtools/source/uno/unoifac2.src \ - svtools/source/brwbox/editbrowsebox.src \ - svtools/source/filter.vcl/filter/dlgexpor.src \ svtools/source/filter.vcl/filter/dlgejpg.src \ svtools/source/filter.vcl/filter/dlgepng.src \ + svtools/source/filter.vcl/filter/dlgexpor.src \ svtools/source/filter.vcl/filter/strings.src \ + svtools/source/java/javaerror.src \ + svtools/source/misc/ehdl.src \ + svtools/source/misc/helpagent.src \ + svtools/source/misc/imagemgr.src \ + svtools/source/misc/langtab.src \ + svtools/source/misc/undo.src \ + svtools/source/plugapp/testtool.src \ + svtools/source/uno/unoifac2.src \ )) diff --git a/toolkit/prj/build.lst b/toolkit/prj/build.lst index 304d0e7c978f..b9403f4fd164 100644 --- a/toolkit/prj/build.lst +++ b/toolkit/prj/build.lst @@ -1,13 +1,3 @@ -ti toolkit : vcl NULL -ti toolkit usr1 - all ti_mkout NULL -ti toolkit\prj get - all ti_prj NULL -ti toolkit\inc nmake - all ti_inc NULL -ti toolkit\uiconfig\layout nmake - all ti_uiconfig_layout NULL -ti toolkit\source\helper nmake - all ti_helper ti_inc NULL -ti toolkit\source\awt nmake - all ti_awt ti_inc NULL -ti toolkit\source\controls nmake - all ti_controls ti_inc NULL -ti toolkit\source\controls\tree nmake - all ti_tree NULL -ti toolkit\source\controls\grid nmake - all ti_grid NULL -ti toolkit\source\layout\core nmake - all ti_layout_core NULL -ti toolkit\source\layout\vcl nmake - all ti_layout_vcl NULL -ti toolkit\util nmake - all ti_util ti_awt ti_controls ti_layout_core ti_helper ti_tree ti_grid ti_layout_vcl NULL +ti toolkit : vcl NULL +ti toolkit usr1 - all ti_mkout NULL +ti toolkit\prj nmake - all ti_prj NULL diff --git a/toolkit/prj/d.lst b/toolkit/prj/d.lst index 0c62a083b330..8b137891791f 100644 --- a/toolkit/prj/d.lst +++ b/toolkit/prj/d.lst @@ -1,63 +1 @@ -mkdir: %COMMON_DEST%\bin%_EXT%\hid -mkdir: %_DEST%\inc%_EXT%\toolkit -mkdir: %_DEST%\inc%_EXT%\toolkit\helper -mkdir: %_DEST%\inc%_EXT%\toolkit\awt -mkdir: %_DEST%\inc%_EXT%\toolkit\controls -..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid -..\%__SRC%\lib\itk.lib %_DEST%\lib%_EXT%\itk.lib -..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% -..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl -..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a -..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib -..\%__SRC%\bin\tk*.res %_DEST%\bin%_EXT%\tk*res -..\%__SRC%\bin\tk?????.sym %_DEST%\bin%_EXT%\tk?????.sym -..\%__SRC%\bin\tk?????.dll %_DEST%\bin%_EXT%\tk?????.dll -..\%__SRC%\misc\tk?????.map %_DEST%\bin%_EXT%\tk?????.map - -..\util\toolkit.xml %_DEST%\xml%_EXT%\toolkit.xml - -..\inc\toolkit\awt\vclxaccessiblecomponent.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxaccessiblecomponent.hxx -..\inc\toolkit\awt\vclxcontainer.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxcontainer.hxx -..\inc\toolkit\awt\vclxdevice.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxdevice.hxx -..\inc\toolkit\awt\vclxfont.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxfont.hxx -..\inc\toolkit\awt\vclxtopwindow.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxtopwindow.hxx -..\inc\toolkit\awt\vclxtoolkit.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxtoolkit.hxx -..\inc\toolkit\awt\vclxwindow.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxwindow.hxx -..\source\awt\vclxdialog.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxdialog.hxx -..\inc\toolkit\awt\vclxwindows.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxwindows.hxx -..\inc\toolkit\awt\vclxmenu.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxmenu.hxx - -..\inc\toolkit\controls\unocontrol.hxx %_DEST%\inc%_EXT%\toolkit\controls\unocontrol.hxx -..\inc\toolkit\controls\unocontrols.hxx %_DEST%\inc%_EXT%\toolkit\controls\unocontrols.hxx -..\inc\toolkit\controls\unocontrolmodel.hxx %_DEST%\inc%_EXT%\toolkit\controls\unocontrolmodel.hxx -..\inc\toolkit\controls\unocontrolbase.hxx %_DEST%\inc%_EXT%\toolkit\controls\unocontrolbase.hxx -..\inc\toolkit\helper\servicenames.hxx %_DEST%\inc%_EXT%\toolkit\helper\servicenames.hxx - -..\inc\toolkit\helper\emptyfontdescriptor.hxx %_DEST%\inc%_EXT%\toolkit\helper\emptyfontdescriptor.hxx -..\inc\toolkit\helper\vclunohelper.hxx %_DEST%\inc%_EXT%\toolkit\helper\vclunohelper.hxx -..\inc\toolkit\helper\convert.hxx %_DEST%\inc%_EXT%\toolkit\helper\convert.hxx -..\inc\toolkit\helper\property.hxx %_DEST%\inc%_EXT%\toolkit\helper\property.hxx -..\inc\toolkit\helper\macros.hxx %_DEST%\inc%_EXT%\toolkit\helper\macros.hxx -..\inc\toolkit\helper\mutexhelper.hxx %_DEST%\inc%_EXT%\toolkit\helper\mutexhelper.hxx -..\inc\toolkit\helper\mutexandbroadcasthelper.hxx %_DEST%\inc%_EXT%\toolkit\helper\mutexandbroadcasthelper.hxx -..\inc\toolkit\helper\listenermultiplexer.hxx %_DEST%\inc%_EXT%\toolkit\helper\listenermultiplexer.hxx -..\inc\toolkit\helper\unowrapper.hxx %_DEST%\inc%_EXT%\toolkit\helper\unowrapper.hxx -..\inc\toolkit\helper\externallock.hxx %_DEST%\inc%_EXT%\toolkit\helper\externallock.hxx -..\inc\toolkit\helper\formpdfexport.hxx %_DEST%\inc%_EXT%\toolkit\helper/formpdfexport.hxx -..\inc\toolkit\helper\accessiblefactory.hxx %_DEST%\inc%_EXT%\toolkit\helper\accessiblefactory.hxx -..\inc\toolkit\helper\fixedhyperbase.hxx %_DEST%\inc%_EXT%\toolkit\helper\fixedhyperbase.hxx - -..\inc\toolkit\helper\vclunohelper.hxx %_DEST%\inc%_EXT%\toolkit\unohlp.hxx -..\inc\toolkit\dllapi.h %_DEST%\inc%_EXT%\toolkit\dllapi.h - -mkdir: %_DEST%\inc%_EXT%\layout -..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib - -..\inc\layout\*.hxx %_DEST%\inc%_EXT%\layout\*.hxx -mkdir: %_DEST%\inc%_EXT%\layout\core -..\source\layout\core\*.hxx %_DEST%\inc%_EXT%\layout\core\*.hxx -mkdir: %_DEST%\inc%_EXT%\layout\vcl -..\source\layout\vcl\*.hxx %_DEST%\inc%_EXT%\layout\vcl\*.hxx - -..\%__SRC%\bin\*-layout.zip %_DEST%\pck%_EXT%\*.* diff --git a/tools/prj/build.lst b/tools/prj/build.lst index 659ecfe66cab..3194cbb4e87c 100644 --- a/tools/prj/build.lst +++ b/tools/prj/build.lst @@ -1,30 +1,3 @@ -tl tools : cppu external offuh vos ZLIB:zlib EXPAT:expat basegfx comphelper i18npool NULL -tl tools usr1 - all tl_mkout NULL -tl tools\bootstrp\isdll get - all tl_bsisdll NULL -tl tools\bootstrp\addexes get - all tl_bsexes NULL -tl tools\inc nmake - all tl_inc NULL -tl tools\prj get - all tl_prj NULL -tl tools\prj usr7 - all tl_deliver NULL -tl tools\prj usr42 - all tl_zn NULL -tl tools\workben get - all tl_wben NULL -tl tools\source\testtoolloader nmake - all tl_ttloader tl_inc NULL -tl tools\source\generic nmake - all tl_gen tl_fsys tl_inc NULL -tl tools\source\memtools nmake - all tl_mem tl_fsys tl_inc NULL -tl tools\source\debug nmake - all tl_deb tl_fsys tl_inc NULL -tl tools\source\datetime nmake - all tl_dat tl_fsys tl_inc NULL -tl tools\source\stream nmake - all tl_str tl_fsys tl_inc NULL -tl tools\source\rc nmake - all tl_rc tl_fsys tl_inc NULL -tl tools\source\ref nmake - all tl_ref tl_fsys tl_inc NULL -tl tools\source\fsys nmake - all tl_fsys tl_inc NULL -tl tools\source\zcodec nmake - all tl_zco tl_fsys tl_inc NULL -tl tools\source\communi nmake - all tl_com tl_fsys tl_inc NULL -tl tools\source\inet nmake - all tl_inet tl_fsys tl_inc NULL -tl tools\source\string nmake - all tl_string tl_fsys tl_inc NULL -tl tools\source\misc nmake - all tl_misc tl_inc NULL -tl tools\win\source\dll nmake - w tl_dllw tl_inc NULL -tl tools\os2\source\dll nmake - p tl_dllp tl_inc NULL -tl tools\unx\source\dll nmake - u tl_dllu tl_inc NULL -tl tools\util nmake - all tl_utl tl_com tl_dat tl_deb tl_dllu.u tl_dllp.p tl_dllw.w tl_fsys tl_gen tl_inet tl_mem tl_rc tl_ref tl_str tl_string tl_misc tl_zco tl_ttloader NULL -tl tools\bootstrp nmake - all tl_bstrp tl_utl tl_inc NULL -tl tools\bootstrp\addexes2 nmake - all tl_bsexes2 tl_bstrp tl_inc NULL - +tl tools : cppu external offuh vos ZLIB:zlib EXPAT:expat basegfx comphelper i18npool NULL +tl tools usr1 - all tl_mkout NULL +tl tools\prj nmake - all tl_prj NULL diff --git a/tools/prj/d.lst b/tools/prj/d.lst index 76cb0107453c..8b137891791f 100644 --- a/tools/prj/d.lst +++ b/tools/prj/d.lst @@ -1,124 +1 @@ -mkdir: %_DEST%\inc%_EXT%\bootstrp -..\%__SRC%\misc\_ooo_st_btstrp.pdb %_DEST%\lib%_EXT%\_ooo_st_btstrp.pdb -..\%__SRC%\bin\mkunroll* %_DEST%\bin%_EXT% -..\%__SRC%\bin\tl?????.dll %_DEST%\bin%_EXT%\tl?????.dll -..\%__SRC%\bin\tl?????.sym %_DEST%\bin%_EXT%\tl?????.sym -..\%__SRC%\lib\atools.lib %_DEST%\lib%_EXT%\atools.lib -..\%__SRC%\lib\btstrp.lib %_DEST%\lib%_EXT%\btstrp.lib -..\%__SRC%\lib\bootstrp2.lib %_DEST%\lib%_EXT%\bootstrp2.lib -..\%__SRC%\lib\itools.lib %_DEST%\lib%_EXT%\itools.lib -..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%\lib*.a -..\%__SRC%\lib\lib*.sl %_DEST%\lib%_EXT%\lib*.sl -..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so -..\%__SRC%\lib\lib*.so.* %_DEST%\lib%_EXT%\lib*.so.* -..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%\lib*.dylib -..\%__SRC%\lib\stdstrm.lib %_DEST%\lib%_EXT%\stdstrm.lib -..\%__SRC%\misc\tl?????.map %_DEST%\bin%_EXT%\tl?????.map -..\%__SRC%\slb\btstrpsh.lib %_DEST%\lib%_EXT%\btstrpsh.lib - -..\inc\bootstrp\command.hxx %_DEST%\inc%_EXT%\bootstrp\command.hxx -..\inc\bootstrp\inimgr.hxx %_DEST%\inc%_EXT%\bootstrp\inimgr.hxx -..\inc\bootstrp\listmacr.hxx %_DEST%\inc%_EXT%\bootstrp\listmacr.hxx -..\inc\bootstrp\mkcreate.hxx %_DEST%\inc%_EXT%\bootstrp\mkcreate.hxx -..\inc\bootstrp\prj.hxx %_DEST%\inc%_EXT%\bootstrp\prj.hxx -..\inc\bootstrp\sstring.hxx %_DEST%\inc%_EXT%\bootstrp\sstring.hxx - -..\inc\tools\toolsdllapi.h %_DEST%\inc%_EXT%\tools\toolsdllapi.h -..\inc\tools\weakbase.hxx %_DEST%\inc%_EXT%\tools\weakbase.hxx -..\inc\tools\weakbase.h %_DEST%\inc%_EXT%\tools\weakbase.h - -..\inc\tools\postwin.h %_DEST%\inc%_EXT%\tools\postwin.h -..\inc\tools\prewin.h %_DEST%\inc%_EXT%\tools\prewin.h - -..\inc\tools\postx.h %_DEST%\inc%_EXT%\tools\postx.h -..\inc\tools\prex.h %_DEST%\inc%_EXT%\tools\prex.h - -..\inc\tools\solarmutex.hxx %_DEST%\inc%_EXT%\tools\solarmutex.hxx -..\inc\tools\wintypes.hxx %_DEST%\inc%_EXT%\tools\wintypes.hxx -..\inc\tools\mapunit.hxx %_DEST%\inc%_EXT%\tools\mapunit.hxx -..\inc\tools\fldunit.hxx %_DEST%\inc%_EXT%\tools\fldunit.hxx -..\inc\tools\fontenum.hxx %_DEST%\inc%_EXT%\tools\fontenum.hxx -..\inc\tools\agapi.hxx %_DEST%\inc%_EXT%\tools\agapi.hxx -..\inc\tools\agitem.hxx %_DEST%\inc%_EXT%\tools\agitem.hxx -..\inc\tools\appendunixshellword.hxx %_DEST%\inc%_EXT%\tools\appendunixshellword.hxx -..\inc\tools\bigint.hxx %_DEST%\inc%_EXT%\tools\bigint.hxx -..\inc\tools\cachestr.hxx %_DEST%\inc%_EXT%\tools\cachestr.hxx -..\inc\tools\chapi.hxx %_DEST%\inc%_EXT%\tools\chapi.hxx -..\inc\tools\color.hxx %_DEST%\inc%_EXT%\tools\color.hxx -..\inc\tools\contnr.hxx %_DEST%\inc%_EXT%\tools\contnr.hxx -..\inc\tools\date.hxx %_DEST%\inc%_EXT%\tools\date.hxx -..\inc\tools\datetime.hxx %_DEST%\inc%_EXT%\tools\datetime.hxx -..\inc\tools\debug.hxx %_DEST%\inc%_EXT%\tools\debug.hxx -..\inc\tools\diagnose_ex.h %_DEST%\inc%_EXT%\tools\diagnose_ex.h -..\inc\tools\download.hxx %_DEST%\inc%_EXT%\tools\download.hxx -..\inc\tools\dynary.hxx %_DEST%\inc%_EXT%\tools\dynary.hxx -..\inc\tools\errcode.hxx %_DEST%\inc%_EXT%\tools\errcode.hxx -..\inc\tools\errinf.hxx %_DEST%\inc%_EXT%\tools\errinf.hxx -..\inc\tools\extendapplicationenvironment.hxx %_DEST%\inc%_EXT%\tools\extendapplicationenvironment.hxx -..\inc\tools\fract.hxx %_DEST%\inc%_EXT%\tools\fract.hxx -..\inc\tools\fsys.hxx %_DEST%\inc%_EXT%\tools\fsys.hxx -..\inc\tools\eacopier.hxx %_DEST%\inc%_EXT%\tools\eacopier.hxx -..\inc\tools\gen.hxx %_DEST%\inc%_EXT%\tools\gen.hxx -..\inc\tools\globname.hxx %_DEST%\inc%_EXT%\tools\globname.hxx -..\inc\tools\inetdef.hxx %_DEST%\inc%_EXT%\tools\inetdef.hxx -..\inc\tools\inetmime.hxx %_DEST%\inc%_EXT%\tools\inetmime.hxx -..\inc\tools\inetmsg.hxx %_DEST%\inc%_EXT%\tools\inetmsg.hxx -..\inc\tools\inetstrm.hxx %_DEST%\inc%_EXT%\tools\inetstrm.hxx -..\inc\tools\link.hxx %_DEST%\inc%_EXT%\tools\link.hxx -..\inc\tools\list.hxx %_DEST%\inc%_EXT%\tools\list.hxx -..\inc\tools\mempool.hxx %_DEST%\inc%_EXT%\tools\mempool.hxx -..\inc\tools\multisel.hxx %_DEST%\inc%_EXT%\tools\multisel.hxx -..\inc\tools\ownlist.hxx %_DEST%\inc%_EXT%\tools\ownlist.hxx -..\inc\tools\postsys.h %_DEST%\inc%_EXT%\tools\postsys.h -..\inc\tools\presys.h %_DEST%\inc%_EXT%\tools\presys.h -..\inc\tools\pstm.hxx %_DEST%\inc%_EXT%\tools\pstm.hxx -..\inc\tools\queue.hxx %_DEST%\inc%_EXT%\tools\queue.hxx -..\inc\tools\rc.h %_DEST%\inc%_EXT%\tools\rc.h -..\inc\tools\rc.hxx %_DEST%\inc%_EXT%\tools\rc.hxx -..\inc\tools\rcid.h %_DEST%\inc%_EXT%\tools\rcid.h -..\inc\tools\ref.hxx %_DEST%\inc%_EXT%\tools\ref.hxx -..\inc\tools\resid.hxx %_DEST%\inc%_EXT%\tools\resid.hxx -..\inc\tools\resmgr.hxx %_DEST%\inc%_EXT%\tools\resmgr.hxx -..\inc\tools\StringListResource.hxx %_DEST%\inc%_EXT%\tools\StringListResource.hxx -..\inc\tools\isofallback.hxx %_DEST%\inc%_EXT%\tools\isofallback.hxx -..\inc\tools\rtti.hxx %_DEST%\inc%_EXT%\tools\rtti.hxx -..\inc\tools\shl.hxx %_DEST%\inc%_EXT%\tools\shl.hxx -..\inc\tools\simplerm.hxx %_DEST%\inc%_EXT%\tools\simplerm.hxx -..\inc\tools\solar.h %_DEST%\inc%_EXT%\tools\solar.h -..\inc\tools\stack.hxx %_DEST%\inc%_EXT%\tools\stack.hxx -..\inc\tools\stream.hxx %_DEST%\inc%_EXT%\tools\stream.hxx -..\inc\tools\string.hxx %_DEST%\inc%_EXT%\tools\string.hxx -..\inc\tools\svwin.h %_DEST%\inc%_EXT%\tools\svwin.h -..\inc\tools\table.hxx %_DEST%\inc%_EXT%\tools\table.hxx -..\inc\tools\tenccvt.hxx %_DEST%\inc%_EXT%\tools\tenccvt.hxx -..\inc\tools\time.hxx %_DEST%\inc%_EXT%\tools\time.hxx -..\inc\tools\tools.h %_DEST%\inc%_EXT%\tools\tools.h -..\inc\tools\unqid.hxx %_DEST%\inc%_EXT%\tools\unqid.hxx -..\inc\tools\unqidx.hxx %_DEST%\inc%_EXT%\tools\unqidx.hxx -..\inc\tools\urlkeys.hxx %_DEST%\inc%_EXT%\tools\urlkeys.hxx -..\inc\tools\urlobj.hxx %_DEST%\inc%_EXT%\tools\urlobj.hxx -..\inc\tools\vcompat.hxx %_DEST%\inc%_EXT%\tools\vcompat.hxx -..\inc\tools\wldcrd.hxx %_DEST%\inc%_EXT%\tools\wldcrd.hxx -..\inc\tools\zcodec.hxx %_DEST%\inc%_EXT%\tools\zcodec.hxx -..\inc\tools\tempfile.hxx %_DEST%\inc%_EXT%\tools\tempfile.hxx -..\inc\tools\geninfo.hxx %_DEST%\inc%_EXT%\tools\geninfo.hxx -..\inc\tools\iparser.hxx %_DEST%\inc%_EXT%\tools\iparser.hxx -..\inc\tools\config.hxx %_DEST%\inc%_EXT%\tools\config.hxx -..\inc\tools\resary.hxx %_DEST%\inc%_EXT%\tools\resary.hxx -..\inc\tools\poly.hxx %_DEST%\inc%_EXT%\tools\poly.hxx -..\inc\tools\line.hxx %_DEST%\inc%_EXT%\tools\line.hxx -..\inc\tools\vector2d.hxx %_DEST%\inc%_EXT%\tools\vector2d.hxx -..\inc\tools\testtoolloader.hxx %_DEST%\inc%_EXT%\tools\testtoolloader.hxx -..\inc\tools\svborder.hxx %_DEST%\inc%_EXT%\tools\svborder.hxx -..\inc\tools\getprocessworkingdir.hxx %_DEST%\inc%_EXT%\tools\getprocessworkingdir.hxx -..\inc\tools\b3dtrans.hxx %_DEST%\inc%_EXT%\tools\b3dtrans.hxx - -..\%__SRC%\bin\rscdep.exe %_DEST%\bin%_EXT%\rscdep.exe -..\%__SRC%\bin\rscdep %_DEST%\bin%_EXT%\rscdep -..\%__SRC%\bin\so_checksum.exe %_DEST%\bin%_EXT%\so_checksum.exe -..\%__SRC%\bin\so_checksum %_DEST%\bin%_EXT%\so_checksum - -..\inc\tools\pathutils.hxx %_DEST%\inc%_EXT%\tools\pathutils.hxx -..\%__SRC%\obj\pathutils.obj %_DEST%\lib%_EXT%\pathutils-obj.obj -..\%__SRC%\slo\pathutils.obj %_DEST%\lib%_EXT%\pathutils-slo.obj diff --git a/tools/prj/target_lib_tl.mk b/tools/prj/target_lib_tl.mk index 3379a194e024..704ddbb16be1 100644 --- a/tools/prj/target_lib_tl.mk +++ b/tools/prj/target_lib_tl.mk @@ -61,14 +61,27 @@ $(eval $(call gb_Library_add_linked_libs,tl,\ $(eval $(call gb_Library_add_exception_objects,tl,\ + tools/source/communi/geninfo \ tools/source/communi/parser \ + tools/source/datetime/datetime \ tools/source/datetime/tdate \ tools/source/datetime/ttime \ + tools/source/debug/debug \ tools/source/debug/stcktree \ + tools/source/fsys/comdep \ + tools/source/fsys/dirent \ + tools/source/fsys/filecopy \ + tools/source/fsys/fstat \ tools/source/fsys/tdir \ tools/source/fsys/tempfile \ tools/source/fsys/urlobj \ tools/source/fsys/wldcrd \ + tools/source/generic/b3dtrans \ + tools/source/generic/bigint \ + tools/source/generic/color \ + tools/source/generic/config \ + tools/source/generic/fract \ + tools/source/generic/gen \ tools/source/generic/line \ tools/source/generic/link \ tools/source/generic/poly \ @@ -78,44 +91,32 @@ $(eval $(call gb_Library_add_exception_objects,tl,\ tools/source/inet/inetmime \ tools/source/inet/inetmsg \ tools/source/inet/inetstrm \ + tools/source/memtools/contnr \ tools/source/memtools/mempool \ tools/source/memtools/multisel \ tools/source/memtools/table \ tools/source/memtools/unqidx \ + tools/source/misc/appendunixshellword \ + tools/source/misc/extendapplicationenvironment \ + tools/source/misc/getprocessworkingdir \ tools/source/misc/solarmutex \ tools/source/rc/isofallback \ tools/source/rc/rc \ tools/source/rc/resary \ tools/source/rc/resmgr \ + tools/source/ref/errinf \ tools/source/ref/globname \ tools/source/ref/pstm \ tools/source/ref/ref \ + tools/source/stream/cachestr \ tools/source/stream/stream \ tools/source/stream/strmsys \ tools/source/stream/vcompat \ + tools/source/string/debugprint \ tools/source/string/tenccvt \ tools/source/string/tstring \ tools/source/string/tustring \ tools/source/testtoolloader/testtoolloader \ - tools/source/communi/geninfo \ - tools/source/datetime/datetime \ - tools/source/debug/debug \ - tools/source/fsys/comdep \ - tools/source/fsys/dirent \ - tools/source/fsys/filecopy \ - tools/source/fsys/fstat \ - tools/source/generic/bigint \ - tools/source/generic/color \ - tools/source/generic/config \ - tools/source/generic/fract \ - tools/source/generic/gen \ - tools/source/memtools/contnr \ - tools/source/misc/appendunixshellword \ - tools/source/misc/extendapplicationenvironment \ - tools/source/misc/getprocessworkingdir \ - tools/source/ref/errinf \ - tools/source/stream/cachestr \ - tools/source/string/debugprint \ tools/source/zcodec/zcodec \ )) diff --git a/tools/prj/target_package_inc.mk b/tools/prj/target_package_inc.mk index 92bb02034e7d..14e70973b276 100644 --- a/tools/prj/target_package_inc.mk +++ b/tools/prj/target_package_inc.mk @@ -118,3 +118,4 @@ $(eval $(call gb_Package_add_file,tools_inc,inc/tools/weakbase.hxx,tools/weakbas $(eval $(call gb_Package_add_file,tools_inc,inc/tools/wintypes.hxx,tools/wintypes.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/wldcrd.hxx,tools/wldcrd.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/zcodec.hxx,tools/zcodec.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/b3dtrans.hxx,tools/b3dtrans.hxx)) -- cgit From f4f1d545e7523f3a900e466402aa65a468cbaeca Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Wed, 21 Apr 2010 14:55:42 +0200 Subject: CWS gnumake2: not using implicit rules --- svl/prj/makefile.mk | 2 +- svtools/prj/makefile.mk | 2 +- toolkit/prj/makefile.mk | 2 +- tools/prj/makefile.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/svl/prj/makefile.mk b/svl/prj/makefile.mk index a5f9aa9d8248..2a0b99e72fd5 100644 --- a/svl/prj/makefile.mk +++ b/svl/prj/makefile.mk @@ -1,2 +1,2 @@ all: - cd .. && make -sj9 + cd .. && make -srj9 diff --git a/svtools/prj/makefile.mk b/svtools/prj/makefile.mk index a5f9aa9d8248..2a0b99e72fd5 100644 --- a/svtools/prj/makefile.mk +++ b/svtools/prj/makefile.mk @@ -1,2 +1,2 @@ all: - cd .. && make -sj9 + cd .. && make -srj9 diff --git a/toolkit/prj/makefile.mk b/toolkit/prj/makefile.mk index a5f9aa9d8248..2a0b99e72fd5 100644 --- a/toolkit/prj/makefile.mk +++ b/toolkit/prj/makefile.mk @@ -1,2 +1,2 @@ all: - cd .. && make -sj9 + cd .. && make -srj9 diff --git a/tools/prj/makefile.mk b/tools/prj/makefile.mk index a5f9aa9d8248..2a0b99e72fd5 100644 --- a/tools/prj/makefile.mk +++ b/tools/prj/makefile.mk @@ -1,2 +1,2 @@ all: - cd .. && make -sj9 + cd .. && make -srj9 -- cgit From cce865a6d0d7d58f37da3c607faa9f8010d61c48 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Wed, 21 Apr 2010 18:07:43 +0200 Subject: CWS gnumake2: small fixes in makefiles --- svl/prj/target_package_inc.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/svl/prj/target_package_inc.mk b/svl/prj/target_package_inc.mk index e14d4d24cade..e2814e6eddab 100644 --- a/svl/prj/target_package_inc.mk +++ b/svl/prj/target_package_inc.mk @@ -29,11 +29,9 @@ $(eval $(call gb_Package_Package,svl_inc,$(SRCDIR)/svl/inc)) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/aeitem.hxx,svl/aeitem.hxx)) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/brdcst.hxx,svl/brdcst.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/cancel.hxx,svl/cancel.hxx)) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/cenumitm.hxx,svl/cenumitm.hxx)) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/cintitem.hxx,svl/cintitem.hxx)) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/cjkoptions.hxx,svl/cjkoptions.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/cnclhint.hxx,svl/cnclhint.hxx)) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/cntwall.hxx,svl/cntwall.hxx)) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/ctloptions.hxx,svl/ctloptions.hxx)) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/ctypeitm.hxx,svl/ctypeitm.hxx)) -- cgit From e37041ee819fc4e3b0734faee187fdfb972dad37 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 21 Apr 2010 18:15:18 +0200 Subject: gnumake2: value of $GUI is uppercase UNX --- tools/prj/target_lib_tl.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/prj/target_lib_tl.mk b/tools/prj/target_lib_tl.mk index 704ddbb16be1..ba984dc9f501 100644 --- a/tools/prj/target_lib_tl.mk +++ b/tools/prj/target_lib_tl.mk @@ -120,7 +120,7 @@ $(eval $(call gb_Library_add_exception_objects,tl,\ tools/source/zcodec/zcodec \ )) -ifeq ($(GUI),unx) +ifeq ($(GUI),UNX) $(eval $(call gb_Library_add_exception_objects,tl,\ tools/unx/source/dll/toolsdll \ )) -- cgit From 9787713cac2f60f1567758701c74d059c6b17f15 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 23 Apr 2010 18:06:44 +0200 Subject: gnumake2: rscdb.cxx: fix format string --- rsc/source/parser/rscdb.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx index d003b9a1f321..70364f5acbeb 100644 --- a/rsc/source/parser/rscdb.cxx +++ b/rsc/source/parser/rscdb.cxx @@ -125,7 +125,7 @@ static sal_uInt32 getLangIdAndShortenLocale( RscTypCont* pTypCont, else rLang = rtl::OString(); #if OSL_DEBUG_LEVEL > 1 - fprintf( stderr, " %s (0x%hx)", aL.getStr(), nRet ); + fprintf( stderr, " %s (0x%" SAL_PRIxUINT32 ")", aL.getStr(), nRet ); #endif return nRet; } -- cgit From bb7508a36c2d20efe1ad0566a8a0c4b14148355e Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 23 Apr 2010 18:12:03 +0200 Subject: gnumake2: svtools: always link against stl --- svtools/prj/target_exe_bmp.mk | 2 +- svtools/prj/target_exe_bmpsum.mk | 2 +- svtools/prj/target_exe_g2g.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/svtools/prj/target_exe_bmp.mk b/svtools/prj/target_exe_bmp.mk index b323f8039450..57b34292ff11 100644 --- a/svtools/prj/target_exe_bmp.mk +++ b/svtools/prj/target_exe_bmp.mk @@ -40,6 +40,7 @@ $(eval $(call gb_Executable_set_include,bmp,\ )) $(eval $(call gb_Executable_add_linked_libs,bmp,\ + stl \ vcl \ tl \ vos3 \ @@ -56,7 +57,6 @@ $(eval $(call gb_Executable_add_linked_libs,bmp,\ kernel32 \ msvcrt \ oldnames \ - stl \ user32 \ uwinapi \ )) diff --git a/svtools/prj/target_exe_bmpsum.mk b/svtools/prj/target_exe_bmpsum.mk index d06a25c09ec7..ec0f90f2b04b 100644 --- a/svtools/prj/target_exe_bmpsum.mk +++ b/svtools/prj/target_exe_bmpsum.mk @@ -37,6 +37,7 @@ $(eval $(call gb_Executable_set_include,bmpsum,\ )) $(eval $(call gb_Executable_add_linked_libs,bmpsum,\ + stl \ vcl \ tl \ vos3 \ @@ -52,7 +53,6 @@ $(eval $(call gb_Executable_add_linked_libs,bmpsum,\ kernel32 \ msvcrt \ oldnames \ - stl \ user32 \ uwinapi \ )) diff --git a/svtools/prj/target_exe_g2g.mk b/svtools/prj/target_exe_g2g.mk index b78821860a30..d7d75396562c 100644 --- a/svtools/prj/target_exe_g2g.mk +++ b/svtools/prj/target_exe_g2g.mk @@ -37,6 +37,7 @@ $(eval $(call gb_Executable_set_include,g2g,\ )) $(eval $(call gb_Executable_add_linked_libs,g2g,\ + stl \ vcl \ tl \ vos3 \ @@ -52,7 +53,6 @@ $(eval $(call gb_Executable_add_linked_libs,g2g,\ kernel32 \ msvcrt \ oldnames \ - stl \ user32 \ uwinapi \ )) -- cgit From 09c6bc8718f8cb1c59cb2b4fd9af2d63a264dcb5 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 23 Apr 2010 18:12:37 +0200 Subject: gnumake2: tools: always link zlib statically --- tools/prj/target_lib_tl.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/prj/target_lib_tl.mk b/tools/prj/target_lib_tl.mk index ba984dc9f501..82d29900fd62 100644 --- a/tools/prj/target_lib_tl.mk +++ b/tools/prj/target_lib_tl.mk @@ -145,6 +145,10 @@ $(eval $(call gb_Library_add_linked_static_libs,tl,\ zlib \ )) endif +else +$(eval $(call gb_Library_add_linked_static_libs,tl,\ + zlib \ +)) endif ifeq ($(OS),WNT) -- cgit From 8cdd55813c6bd7d8afb193f84ce332244dfa43e5 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Sat, 24 Apr 2010 00:07:48 +0200 Subject: CWS gnumake2: small error in makefil --- tools/prj/target_lib_tl.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/prj/target_lib_tl.mk b/tools/prj/target_lib_tl.mk index 82d29900fd62..65a48316d914 100644 --- a/tools/prj/target_lib_tl.mk +++ b/tools/prj/target_lib_tl.mk @@ -158,7 +158,7 @@ $(eval $(call gb_Library_set_include,tl,\ )) $(eval $(call gb_Library_add_exception_objects,tl,\ - tools/source/win/source/dll/toolsdll \ + tools/win/source/dll/toolsdll \ )) $(eval $(call gb_Library_add_linked_libs,tl,\ -- cgit From 1c4f220b470e3887ef3f04974b805c7641e593e2 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Tue, 27 Apr 2010 11:39:42 +0200 Subject: CWS gnumake2: refactoring --- svl/Makefile | 10 ++++++++-- svtools/Makefile | 10 ++++++++-- toolkit/Makefile | 10 ++++++++-- tools/Makefile | 10 ++++++++-- 4 files changed, 32 insertions(+), 8 deletions(-) diff --git a/svl/Makefile b/svl/Makefile index d020b04dba7c..9ab4b8ba83f4 100644 --- a/svl/Makefile +++ b/svl/Makefile @@ -25,6 +25,12 @@ # #************************************************************************* -include ../solenv/inc/gbuild.mk +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk -$(eval $(call gb_Module_make_global_targets,$(notdir $(shell pwd)))) + +gb_CURRENT_MODULE := $(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))) + +$(eval $(call gb_Module_make_global_targets,$(gb_CURRENT_MODULE))) + +# vim: set noet sw=4 ts=4: diff --git a/svtools/Makefile b/svtools/Makefile index d020b04dba7c..9ab4b8ba83f4 100644 --- a/svtools/Makefile +++ b/svtools/Makefile @@ -25,6 +25,12 @@ # #************************************************************************* -include ../solenv/inc/gbuild.mk +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk -$(eval $(call gb_Module_make_global_targets,$(notdir $(shell pwd)))) + +gb_CURRENT_MODULE := $(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))) + +$(eval $(call gb_Module_make_global_targets,$(gb_CURRENT_MODULE))) + +# vim: set noet sw=4 ts=4: diff --git a/toolkit/Makefile b/toolkit/Makefile index d020b04dba7c..9ab4b8ba83f4 100644 --- a/toolkit/Makefile +++ b/toolkit/Makefile @@ -25,6 +25,12 @@ # #************************************************************************* -include ../solenv/inc/gbuild.mk +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk -$(eval $(call gb_Module_make_global_targets,$(notdir $(shell pwd)))) + +gb_CURRENT_MODULE := $(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))) + +$(eval $(call gb_Module_make_global_targets,$(gb_CURRENT_MODULE))) + +# vim: set noet sw=4 ts=4: diff --git a/tools/Makefile b/tools/Makefile index d020b04dba7c..9ab4b8ba83f4 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -25,6 +25,12 @@ # #************************************************************************* -include ../solenv/inc/gbuild.mk +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk -$(eval $(call gb_Module_make_global_targets,$(notdir $(shell pwd)))) + +gb_CURRENT_MODULE := $(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))) + +$(eval $(call gb_Module_make_global_targets,$(gb_CURRENT_MODULE))) + +# vim: set noet sw=4 ts=4: -- cgit From ccecaf93b3d1c85a8c5a3b3be2adfeb5fed7dfc8 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 29 Apr 2010 17:09:55 +0200 Subject: gnumake2: tools: support for SYSTEM_ZLIB not LINUX specific --- tools/prj/target_lib_tl.mk | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/tools/prj/target_lib_tl.mk b/tools/prj/target_lib_tl.mk index 65a48316d914..30c64badc265 100644 --- a/tools/prj/target_lib_tl.mk +++ b/tools/prj/target_lib_tl.mk @@ -126,12 +126,6 @@ $(eval $(call gb_Library_add_exception_objects,tl,\ )) endif -ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,tl,\ - dl \ - m \ - pthread \ -)) ifeq ($(SYSTEM_ZLIB),YES) $(eval $(call gb_Library_set_cxxflags,tl,\ $$(CXXFLAGS) \ @@ -145,9 +139,12 @@ $(eval $(call gb_Library_add_linked_static_libs,tl,\ zlib \ )) endif -else -$(eval $(call gb_Library_add_linked_static_libs,tl,\ - zlib \ + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,tl,\ + dl \ + m \ + pthread \ )) endif -- cgit From 80f4107d6d5e6280756e051ffcdd374a9a84287c Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 30 Apr 2010 17:48:27 +0200 Subject: gnumake2: g2g on linux needs X11 (patch by ause) --- svtools/prj/target_exe_g2g.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/svtools/prj/target_exe_g2g.mk b/svtools/prj/target_exe_g2g.mk index d7d75396562c..4bba4dc2644f 100644 --- a/svtools/prj/target_exe_g2g.mk +++ b/svtools/prj/target_exe_g2g.mk @@ -61,6 +61,7 @@ ifeq ($(OS),LINUX) $(eval $(call gb_Executable_add_linked_libs,g2g,\ pthread \ dl \ + X11 \ )) endif # vim: set noet sw=4 ts=4: -- cgit From 14a60044715760a572b79e42615e6013b059c960 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 30 Apr 2010 19:44:13 +0200 Subject: gnumake2: toolkit: must compile with Objective-C++ with AQUA GUI --- toolkit/prj/target_lib_tk.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/toolkit/prj/target_lib_tk.mk b/toolkit/prj/target_lib_tk.mk index 3d70d3753dc1..d5bdb2fc4341 100644 --- a/toolkit/prj/target_lib_tk.mk +++ b/toolkit/prj/target_lib_tk.mk @@ -147,6 +147,11 @@ $(eval $(call gb_Library_add_exception_objects,tk,\ toolkit/source/layout/vcl/wrapper \ )) +ifeq ($(GUIBASE),aqua) +$(eval $(call gb_Library_set_cxxflags,tk,\ + $$(CXXFLAGS) $(gb_OBJCXXFLAGS))) +endif + ifeq ($(OS),LINUX) $(eval $(call gb_Library_add_linked_libs,tk,\ X11 \ -- cgit From 1384b809fa1f1155624f7f00040328aa96f0cf1e Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 30 Apr 2010 21:24:50 +0200 Subject: CWS gnumake2: tools cleanup --- tools/prj/build.lst | 1 - tools/prj/d.lst | 93 +----- tools/prj/target_module_tools.mk | 3 + tools/source/solar/makefile.mk | 63 ---- tools/source/solar/solar.c | 562 ---------------------------------- tools/util/makefile.mk | 13 - tools/win/inc/parser.hxx | 48 --- tools/win/inc/shellex.h | 115 ------- tools/win/inc/shutil.h | 215 ------------- tools/win/inc/winshell.hxx | 386 ----------------------- tools/win/source/fastfsys/makefile.mk | 71 ----- 11 files changed, 5 insertions(+), 1565 deletions(-) delete mode 100644 tools/source/solar/makefile.mk delete mode 100644 tools/source/solar/solar.c delete mode 100644 tools/win/inc/parser.hxx delete mode 100644 tools/win/inc/shellex.h delete mode 100644 tools/win/inc/shutil.h delete mode 100644 tools/win/inc/winshell.hxx delete mode 100644 tools/win/source/fastfsys/makefile.mk diff --git a/tools/prj/build.lst b/tools/prj/build.lst index 659ecfe66cab..6f07015178d2 100644 --- a/tools/prj/build.lst +++ b/tools/prj/build.lst @@ -1,7 +1,6 @@ tl tools : cppu external offuh vos ZLIB:zlib EXPAT:expat basegfx comphelper i18npool NULL tl tools usr1 - all tl_mkout NULL tl tools\bootstrp\isdll get - all tl_bsisdll NULL -tl tools\bootstrp\addexes get - all tl_bsexes NULL tl tools\inc nmake - all tl_inc NULL tl tools\prj get - all tl_prj NULL tl tools\prj usr7 - all tl_deliver NULL diff --git a/tools/prj/d.lst b/tools/prj/d.lst index 76cb0107453c..854a6179739a 100644 --- a/tools/prj/d.lst +++ b/tools/prj/d.lst @@ -1,6 +1,5 @@ mkdir: %_DEST%\inc%_EXT%\bootstrp -..\%__SRC%\misc\_ooo_st_btstrp.pdb %_DEST%\lib%_EXT%\_ooo_st_btstrp.pdb ..\%__SRC%\bin\mkunroll* %_DEST%\bin%_EXT% ..\%__SRC%\bin\tl?????.dll %_DEST%\bin%_EXT%\tl?????.dll ..\%__SRC%\bin\tl?????.sym %_DEST%\bin%_EXT%\tl?????.sym @@ -24,101 +23,13 @@ mkdir: %_DEST%\inc%_EXT%\bootstrp ..\inc\bootstrp\prj.hxx %_DEST%\inc%_EXT%\bootstrp\prj.hxx ..\inc\bootstrp\sstring.hxx %_DEST%\inc%_EXT%\bootstrp\sstring.hxx -..\inc\tools\toolsdllapi.h %_DEST%\inc%_EXT%\tools\toolsdllapi.h -..\inc\tools\weakbase.hxx %_DEST%\inc%_EXT%\tools\weakbase.hxx -..\inc\tools\weakbase.h %_DEST%\inc%_EXT%\tools\weakbase.h - -..\inc\tools\postwin.h %_DEST%\inc%_EXT%\tools\postwin.h -..\inc\tools\prewin.h %_DEST%\inc%_EXT%\tools\prewin.h - -..\inc\tools\postx.h %_DEST%\inc%_EXT%\tools\postx.h -..\inc\tools\prex.h %_DEST%\inc%_EXT%\tools\prex.h - -..\inc\tools\solarmutex.hxx %_DEST%\inc%_EXT%\tools\solarmutex.hxx -..\inc\tools\wintypes.hxx %_DEST%\inc%_EXT%\tools\wintypes.hxx -..\inc\tools\mapunit.hxx %_DEST%\inc%_EXT%\tools\mapunit.hxx -..\inc\tools\fldunit.hxx %_DEST%\inc%_EXT%\tools\fldunit.hxx -..\inc\tools\fontenum.hxx %_DEST%\inc%_EXT%\tools\fontenum.hxx -..\inc\tools\agapi.hxx %_DEST%\inc%_EXT%\tools\agapi.hxx -..\inc\tools\agitem.hxx %_DEST%\inc%_EXT%\tools\agitem.hxx -..\inc\tools\appendunixshellword.hxx %_DEST%\inc%_EXT%\tools\appendunixshellword.hxx -..\inc\tools\bigint.hxx %_DEST%\inc%_EXT%\tools\bigint.hxx -..\inc\tools\cachestr.hxx %_DEST%\inc%_EXT%\tools\cachestr.hxx -..\inc\tools\chapi.hxx %_DEST%\inc%_EXT%\tools\chapi.hxx -..\inc\tools\color.hxx %_DEST%\inc%_EXT%\tools\color.hxx -..\inc\tools\contnr.hxx %_DEST%\inc%_EXT%\tools\contnr.hxx -..\inc\tools\date.hxx %_DEST%\inc%_EXT%\tools\date.hxx -..\inc\tools\datetime.hxx %_DEST%\inc%_EXT%\tools\datetime.hxx -..\inc\tools\debug.hxx %_DEST%\inc%_EXT%\tools\debug.hxx -..\inc\tools\diagnose_ex.h %_DEST%\inc%_EXT%\tools\diagnose_ex.h -..\inc\tools\download.hxx %_DEST%\inc%_EXT%\tools\download.hxx -..\inc\tools\dynary.hxx %_DEST%\inc%_EXT%\tools\dynary.hxx -..\inc\tools\errcode.hxx %_DEST%\inc%_EXT%\tools\errcode.hxx -..\inc\tools\errinf.hxx %_DEST%\inc%_EXT%\tools\errinf.hxx -..\inc\tools\extendapplicationenvironment.hxx %_DEST%\inc%_EXT%\tools\extendapplicationenvironment.hxx -..\inc\tools\fract.hxx %_DEST%\inc%_EXT%\tools\fract.hxx -..\inc\tools\fsys.hxx %_DEST%\inc%_EXT%\tools\fsys.hxx -..\inc\tools\eacopier.hxx %_DEST%\inc%_EXT%\tools\eacopier.hxx -..\inc\tools\gen.hxx %_DEST%\inc%_EXT%\tools\gen.hxx -..\inc\tools\globname.hxx %_DEST%\inc%_EXT%\tools\globname.hxx -..\inc\tools\inetdef.hxx %_DEST%\inc%_EXT%\tools\inetdef.hxx -..\inc\tools\inetmime.hxx %_DEST%\inc%_EXT%\tools\inetmime.hxx -..\inc\tools\inetmsg.hxx %_DEST%\inc%_EXT%\tools\inetmsg.hxx -..\inc\tools\inetstrm.hxx %_DEST%\inc%_EXT%\tools\inetstrm.hxx -..\inc\tools\link.hxx %_DEST%\inc%_EXT%\tools\link.hxx -..\inc\tools\list.hxx %_DEST%\inc%_EXT%\tools\list.hxx -..\inc\tools\mempool.hxx %_DEST%\inc%_EXT%\tools\mempool.hxx -..\inc\tools\multisel.hxx %_DEST%\inc%_EXT%\tools\multisel.hxx -..\inc\tools\ownlist.hxx %_DEST%\inc%_EXT%\tools\ownlist.hxx -..\inc\tools\postsys.h %_DEST%\inc%_EXT%\tools\postsys.h -..\inc\tools\presys.h %_DEST%\inc%_EXT%\tools\presys.h -..\inc\tools\pstm.hxx %_DEST%\inc%_EXT%\tools\pstm.hxx -..\inc\tools\queue.hxx %_DEST%\inc%_EXT%\tools\queue.hxx -..\inc\tools\rc.h %_DEST%\inc%_EXT%\tools\rc.h -..\inc\tools\rc.hxx %_DEST%\inc%_EXT%\tools\rc.hxx -..\inc\tools\rcid.h %_DEST%\inc%_EXT%\tools\rcid.h -..\inc\tools\ref.hxx %_DEST%\inc%_EXT%\tools\ref.hxx -..\inc\tools\resid.hxx %_DEST%\inc%_EXT%\tools\resid.hxx -..\inc\tools\resmgr.hxx %_DEST%\inc%_EXT%\tools\resmgr.hxx -..\inc\tools\StringListResource.hxx %_DEST%\inc%_EXT%\tools\StringListResource.hxx -..\inc\tools\isofallback.hxx %_DEST%\inc%_EXT%\tools\isofallback.hxx -..\inc\tools\rtti.hxx %_DEST%\inc%_EXT%\tools\rtti.hxx -..\inc\tools\shl.hxx %_DEST%\inc%_EXT%\tools\shl.hxx -..\inc\tools\simplerm.hxx %_DEST%\inc%_EXT%\tools\simplerm.hxx -..\inc\tools\solar.h %_DEST%\inc%_EXT%\tools\solar.h -..\inc\tools\stack.hxx %_DEST%\inc%_EXT%\tools\stack.hxx -..\inc\tools\stream.hxx %_DEST%\inc%_EXT%\tools\stream.hxx -..\inc\tools\string.hxx %_DEST%\inc%_EXT%\tools\string.hxx -..\inc\tools\svwin.h %_DEST%\inc%_EXT%\tools\svwin.h -..\inc\tools\table.hxx %_DEST%\inc%_EXT%\tools\table.hxx -..\inc\tools\tenccvt.hxx %_DEST%\inc%_EXT%\tools\tenccvt.hxx -..\inc\tools\time.hxx %_DEST%\inc%_EXT%\tools\time.hxx -..\inc\tools\tools.h %_DEST%\inc%_EXT%\tools\tools.h -..\inc\tools\unqid.hxx %_DEST%\inc%_EXT%\tools\unqid.hxx -..\inc\tools\unqidx.hxx %_DEST%\inc%_EXT%\tools\unqidx.hxx -..\inc\tools\urlkeys.hxx %_DEST%\inc%_EXT%\tools\urlkeys.hxx -..\inc\tools\urlobj.hxx %_DEST%\inc%_EXT%\tools\urlobj.hxx -..\inc\tools\vcompat.hxx %_DEST%\inc%_EXT%\tools\vcompat.hxx -..\inc\tools\wldcrd.hxx %_DEST%\inc%_EXT%\tools\wldcrd.hxx -..\inc\tools\zcodec.hxx %_DEST%\inc%_EXT%\tools\zcodec.hxx -..\inc\tools\tempfile.hxx %_DEST%\inc%_EXT%\tools\tempfile.hxx -..\inc\tools\geninfo.hxx %_DEST%\inc%_EXT%\tools\geninfo.hxx -..\inc\tools\iparser.hxx %_DEST%\inc%_EXT%\tools\iparser.hxx -..\inc\tools\config.hxx %_DEST%\inc%_EXT%\tools\config.hxx -..\inc\tools\resary.hxx %_DEST%\inc%_EXT%\tools\resary.hxx -..\inc\tools\poly.hxx %_DEST%\inc%_EXT%\tools\poly.hxx -..\inc\tools\line.hxx %_DEST%\inc%_EXT%\tools\line.hxx -..\inc\tools\vector2d.hxx %_DEST%\inc%_EXT%\tools\vector2d.hxx -..\inc\tools\testtoolloader.hxx %_DEST%\inc%_EXT%\tools\testtoolloader.hxx -..\inc\tools\svborder.hxx %_DEST%\inc%_EXT%\tools\svborder.hxx -..\inc\tools\getprocessworkingdir.hxx %_DEST%\inc%_EXT%\tools\getprocessworkingdir.hxx -..\inc\tools\b3dtrans.hxx %_DEST%\inc%_EXT%\tools\b3dtrans.hxx +..\inc\tools\*.h %_DEST%\inc%_EXT%\tools\*.h +..\inc\tools\*.hxx %_DEST%\inc%_EXT%\tools\*.hxx ..\%__SRC%\bin\rscdep.exe %_DEST%\bin%_EXT%\rscdep.exe ..\%__SRC%\bin\rscdep %_DEST%\bin%_EXT%\rscdep ..\%__SRC%\bin\so_checksum.exe %_DEST%\bin%_EXT%\so_checksum.exe ..\%__SRC%\bin\so_checksum %_DEST%\bin%_EXT%\so_checksum -..\inc\tools\pathutils.hxx %_DEST%\inc%_EXT%\tools\pathutils.hxx ..\%__SRC%\obj\pathutils.obj %_DEST%\lib%_EXT%\pathutils-obj.obj ..\%__SRC%\slo\pathutils.obj %_DEST%\lib%_EXT%\pathutils-slo.obj diff --git a/tools/prj/target_module_tools.mk b/tools/prj/target_module_tools.mk index b566c1d65b86..70d14b03dc45 100644 --- a/tools/prj/target_module_tools.mk +++ b/tools/prj/target_module_tools.mk @@ -54,3 +54,6 @@ $(eval $(call gb_Module_read_includes,tools,\ #COPY tools/unxlngx6.pro/lib/stdstrm.lib unxlngx6.pro/lib/stdstrm.lib #COPY tools/unxlngx6.pro/obj/pathutils.obj unxlngx6.pro/lib/pathutils-obj.obj #COPY tools/unxlngx6.pro/slo/pathutils.obj unxlngx6.pro/lib/pathutils-slo.obj + +#todo: link tools dynamically everywhere +#todo: ALWAYSDBGFLAG etc. diff --git a/tools/source/solar/makefile.mk b/tools/source/solar/makefile.mk deleted file mode 100644 index 6f5dd85c608b..000000000000 --- a/tools/source/solar/makefile.mk +++ /dev/null @@ -1,63 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=tools -TARGET=mksvconf -TARGETTYPE=CUI - -LIBSALCPPRT=$(0) - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -CFILES= solar.c - -OBJFILES= $(OBJ)$/solar.obj - -APP1TARGET= $(TARGET) -APP1OBJS= $(OBJFILES) -APP1STDLIBS= -APP1DEPN= -APP1DEF= - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -.IF "$(L10N-framework)"=="" -ALLTAR : $(INCCOM)$/svconf.h -.ENDIF # "$(L10N-framework)"=="" - -$(INCCOM)$/svconf.h : $(BIN)$/$(TARGET) - $(BIN)$/$(TARGET) $@ - diff --git a/tools/source/solar/solar.c b/tools/source/solar/solar.c deleted file mode 100644 index 608f0baf5129..000000000000 --- a/tools/source/solar/solar.c +++ /dev/null @@ -1,562 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -/* POSIX defines that a program is undefined after a SIG_SEGV. The - * code stopped working on Linux Kernel 2.6 so I have moved this back to - * use FORK. - * If at a later time the signals work correctly with the Linux Kernel 2.6 - * then this change may be reverted although not strictly posix safe. */ -#define USE_FORK_TO_CHECK 1 - -#include -#include -#include -#include - -#include -#include - -#define I_STDARG -#ifdef I_STDARG -#include -#else -#include -#endif - -#define NO_USE_FORK_TO_CHECK -#ifdef USE_FORK_TO_CHECK -#include -#else -#include -#include -#endif - -#define printTypeSize(Type,Name) printf( "sizeof(%s)\t= %d\n", Name, sizeof (Type) ) - -#define isSignedType(Type) (((Type)-1) < 0) -#define printTypeSign(Type,Name) printf( "%s\t= %s %s\n", Name, ( isSignedType(Type) ? "signed" : "unsigned" ), Name ) - - -/************************************************************************* -|* -|* IsBigEndian() -|* -|* Beschreibung True, wenn CPU BigEndian ist -|* -|* Ersterstellung EG 26.06.96 -|* Letzte Aenderung -|* -*************************************************************************/ -int IsBigEndian() -{ - long l = 1; - return ! *(char*)&l; -} - -/************************************************************************* -|* -|* IsStackGrowingDown() -|* -|* Beschreibung True, wenn der Stack nach unten waechst -|* -|* Ersterstellung EG 26.06.96 -|* Letzte Aenderung -|* -*************************************************************************/ -int IsStackGrowingDown_2( int * pI ) -{ - int i = 1; - return ((unsigned long)&i) < (unsigned long)pI; -} - -int IsStackGrowingDown() -{ - int i = 1; - return IsStackGrowingDown_2(&i); -} - -/************************************************************************* -|* -|* GetStackAlignment() -|* -|* Beschreibung Alignment von char Parametern, die (hoffentlich) -|* ueber den Stack uebergeben werden -|* -|* Ersterstellung EG 26.06.96 -|* Letzte Aenderung -|* -*************************************************************************/ -int GetStackAlignment_3( char*p, long l, int i, short s, char b, char c, ... ) -{ - if ( IsStackGrowingDown() ) - return &c - &b; - else - return &b - &c; -} - -int GetStackAlignment_2( char*p, long l, int i, short s, char b, char c ) -{ - if ( IsStackGrowingDown() ) - return &c - &b; - else - return &b - &c; -} - -int GetStackAlignment() -{ - int nStackAlignment = GetStackAlignment_3(0,1,2,3,4,5); - if ( nStackAlignment != GetStackAlignment_2(0,1,2,3,4,5) ) - printf( "Pascal calling convention\n" ); - return nStackAlignment; -} - - -/************************************************************************* -|* -|* Typdeclarations for memory access test functions -|* -*************************************************************************/ -typedef enum { t_char, t_short, t_int, t_long, t_double } Type; -typedef int (*TestFunc)( Type, void* ); - - -/************************************************************************* -|* -|* PrintArgs() -|* -|* Beschreibung Testfunktion fuer variable Parameter -|* -|* Ersterstellung EG 26.06.96 -|* Letzte Aenderung -|* -*************************************************************************/ -#ifdef I_STDARG -void PrintArgs( int p, ... ) -#else -void PrintArgs( p, va_alist ) -int p; -va_dcl -#endif -{ - int value; - va_list ap; - -#ifdef I_STDARG - va_start( ap, p ); -#else - va_start( ap ); -#endif - - printf( "value = %d", p ); - - while ( ( value = va_arg(ap, int) ) != 0 ) - printf( " %d", value ); - - printf( "\n" ); - va_end(ap); -} - -#ifndef USE_FORK_TO_CHECK -/************************************************************************* -|* -|* SignalHdl() -|* -|* Beschreibung faengt SIGBUS und SIGSEGV in check() ab -|* -|* Ersterstellung EG 26.06.96 -|* Letzte Aenderung -|* -*************************************************************************/ -static jmp_buf check_env; -static int bSignal; -void SignalHdl( int sig ) -{ - bSignal = 1; - - fprintf( stderr, "Signal %d caught\n", sig ); - signal( SIGSEGV, SIG_DFL ); - signal( SIGBUS, SIG_DFL ); - siglongjmp( check_env, sig ); -} -#endif - -/************************************************************************* -|* -|* check() -|* -|* Beschreibung Testet MemoryZugriff (read/write) -|* -|* Ersterstellung EG 26.06.96 -|* Letzte Aenderung -|* -*************************************************************************/ -int check( TestFunc func, Type eT, void* p ) -{ -#ifdef USE_FORK_TO_CHECK - pid_t nChild = fork(); - if ( nChild ) - { - int exitVal; - wait( &exitVal ); - if ( exitVal & 0xff ) - return -1; - else - return exitVal >> 8; - } - else - { - exit( func( eT, p ) ); - } -#else - int result; - - bSignal = 0; - - if ( !sigsetjmp( check_env, 1 ) ) - { - signal( SIGSEGV, SignalHdl ); - signal( SIGBUS, SignalHdl ); - result = func( eT, p ); - signal( SIGSEGV, SIG_DFL ); - signal( SIGBUS, SIG_DFL ); - } - - if ( bSignal ) - return -1; - else - return 0; -#endif -} - -/************************************************************************* -|* -|* GetAtAddress() -|* -|* Beschreibung memory read access -|* -|* Ersterstellung EG 26.06.96 -|* Letzte Aenderung -|* -*************************************************************************/ -int GetAtAddress( Type eT, void* p ) -{ - switch ( eT ) - { - case t_char: return *((char*)p); - case t_short: return *((short*)p); - case t_int: return *((int*)p); - case t_long: return *((long*)p); - case t_double: return *((double*)p); - } - abort(); -} - -/************************************************************************* -|* -|* SetAtAddress() -|* -|* Beschreibung memory write access -|* -|* Ersterstellung EG 26.06.96 -|* Letzte Aenderung -|* -*************************************************************************/ -int SetAtAddress( Type eT, void* p ) -{ - switch ( eT ) - { - case t_char: return *((char*)p) = 0; - case t_short: return *((short*)p) = 0; - case t_int: return *((int*)p) = 0; - case t_long: return *((long*)p) = 0; - case t_double: return *((double*)p)= 0; - } - abort(); -} - -char* TypeName( Type eT ) -{ - switch ( eT ) - { - case t_char: return "char"; - case t_short: return "short"; - case t_int: return "int"; - case t_long: return "long"; - case t_double: return "double"; - } - abort(); -} - -/************************************************************************* -|* -|* Check(Get|Set)Access() -|* -|* Beschreibung Testet MemoryZugriff (read/write) -|* Zugriffsverletzungen werden abgefangen -|* -|* Ersterstellung EG 26.06.96 -|* Letzte Aenderung -|* -*************************************************************************/ -int CheckGetAccess( Type eT, void* p ) -{ - int b; - b = -1 != check( (TestFunc)GetAtAddress, eT, p ); -#if OSL_DEBUG_LEVEL > 1 - fprintf( stderr, - "%s read %s at %p\n", - (b? "can" : "can not" ), TypeName(eT), p ); -#endif - return b; -} -int CheckSetAccess( Type eT, void* p ) -{ - int b; - - b = -1 != check( (TestFunc)SetAtAddress, eT, p ); -#if OSL_DEBUG_LEVEL > 1 - fprintf( stderr, - "%s write %s at %p\n", - (b? "can" : "can not" ), TypeName(eT), p ); -#endif - return b; -} - -/************************************************************************* -|* -|* GetAlignment() -|* -|* Beschreibung Bestimmt das Alignment verschiedener Typen -|* -|* Ersterstellung EG 26.06.96 -|* Letzte Aenderung -|* -*************************************************************************/ -int GetAlignment( Type eT ) -{ - char a[ 16*8 ]; - long p = (long)(void*)a; - int i; - - /* clear a[...] to set legal value for double access */ - for ( i = 0; i < 16*8; i++ ) - a[i] = 0; - - p = ( p + 0xF ) & ~0xF; - for ( i = 1; i < 16; i++ ) - if ( CheckGetAccess( eT, (void*)(p+i) ) ) - return i; - return 0; -} - -/************************************************************************* -|* -|* struct Description -|* -|* Beschreibung Beschreibt die Parameter der Architektur -|* -|* Ersterstellung EG 26.06.96 -|* Letzte Aenderung -|* -*************************************************************************/ -struct Description -{ - int bBigEndian; - int bStackGrowsDown; - int nStackAlignment; - int nAlignment[3]; /* 2,4,8 */ -}; - -/************************************************************************* -|* -|* Description_Ctor() -|* -|* Beschreibung Bestimmt die Parameter der Architektur -|* -|* Ersterstellung EG 26.06.96 -|* Letzte Aenderung -|* -*************************************************************************/ -void Description_Ctor( struct Description* pThis ) -{ - pThis->bBigEndian = IsBigEndian(); - pThis->bStackGrowsDown = IsStackGrowingDown(); - pThis->nStackAlignment = GetStackAlignment(); - - if ( sizeof(short) != 2 ) - abort(); - pThis->nAlignment[0] = GetAlignment( t_short ); - if ( sizeof(int) != 4 ) - abort(); - pThis->nAlignment[1] = GetAlignment( t_int ); - - if ( sizeof(long) == 8 ) - pThis->nAlignment[2] = GetAlignment( t_long ); - else if ( sizeof(double) == 8 ) - pThis->nAlignment[2] = GetAlignment( t_double ); - else - abort(); -} - -/************************************************************************* -|* -|* Description_Print() -|* -|* Beschreibung Schreibt die Parameter der Architektur als Header -|* -|* Ersterstellung EG 26.06.96 -|* Letzte Aenderung -|* -*************************************************************************/ -void Description_Print( struct Description* pThis, char* name ) -{ - int i; - FILE* f = fopen( name, "w" ); - if( ! f ) { - fprintf( stderr, "Unable to open file %s: %s\n", name, strerror( errno ) ); - exit( 99 ); - } - fprintf( f, "#define __%s\n", - pThis->bBigEndian ? "BIGENDIAN" : "LITTLEENDIAN" ); - for ( i = 0; i < 3; i++ ) - fprintf( f, "#define __ALIGNMENT%d\t%d\n", - 1 << (i+1), pThis->nAlignment[i] ); - fprintf( f, "/* Stack alignment is not used... */\n" ); - fprintf( f, "#define __STACKALIGNMENT\t%d\n", pThis->nStackAlignment ); - fprintf( f, "#define __STACKDIRECTION\t%d\n", - pThis->bStackGrowsDown ? -1 : 1 ); - fprintf( f, "#define __SIZEOFCHAR\t%d\n", sizeof( char ) ); - fprintf( f, "#define __SIZEOFSHORT\t%d\n", sizeof( short ) ); - fprintf( f, "#define __SIZEOFINT\t%d\n", sizeof( int ) ); - fprintf( f, "#define __SIZEOFLONG\t%d\n", sizeof( long ) ); - fprintf( f, "#define __SIZEOFPOINTER\t%d\n", sizeof( void* ) ); - fprintf( f, "#define __SIZEOFDOUBLE\t%d\n", sizeof( double ) ); - fprintf( f, "#define __IEEEDOUBLE\n" ); - fclose( f ); -} - -/************************************************************************* -|* -|* InfoMemoryAccess() -|* -|* Beschreibung Informeller Bytezugriffstest -|* -|* Ersterstellung EG 26.06.96 -|* Letzte Aenderung -|* -*************************************************************************/ -void InfoMemoryAccess( char* p ) -{ - if ( CheckGetAccess( t_char, p ) ) - printf( "can read address %p\n", p ); - else - printf( "can not read address %p\n", p ); - - if ( CheckSetAccess( t_char, p ) ) - printf( "can write address %p\n", p ); - else - printf( "can not write address %p\n", p ); -} - -/************************************************************************* -|* -|* InfoMemoryTypeAccess() -|* -|* Beschreibung Informeller Zugriffstest verschiedener Typen -|* -|* Ersterstellung EG 15.08.96 -|* Letzte Aenderung -|* -*************************************************************************/ -void InfoMemoryTypeAccess( Type eT ) -{ - char a[64]; - int i; - - /* clear a[...] to set legal value for double access */ - for ( i = 0; i < 64; i++ ) - a[i] = 0; - - for ( i = 56; i >= 7; i >>= 1 ) - { - printf( "Zugriff %s auf %i-Aligned Adresse : ", TypeName( eT ), i / 7 ); - printf( ( CheckGetAccess( eT, (long*)&a[i] ) ? "OK\n" : "ERROR\n" ) ); - } -} -/************************************************************************ - * - * Use C code to determine the characteristics of the building platform. - * - ************************************************************************/ -int main( int argc, char* argv[] ) -{ - printTypeSign( char, "char" ); - printTypeSign( short, "short" ); - printTypeSign( int, "int" ); - printTypeSign( long, "long" ); - - printTypeSize( char, "char" ); - printTypeSize( short, "short" ); - printTypeSize( int, "int" ); - printTypeSize( long, "long" ); - printTypeSize( float, "float" ); - printTypeSize( double, "double" ); - printTypeSize( void *, "void *" ); - - if ( IsBigEndian() ) - printf( "BIGENDIAN (Sparc, MC680x0, RS6000, IP22, IP32, g3)\n" ); - else - printf( "LITTLEENDIAN (Intel, VAX, PowerPC)\n" ); - - if( IsStackGrowingDown() ) - printf( "Stack waechst nach unten\n" ); - else - printf( "Stack waechst nach oben\n" ); - - printf( "STACKALIGNMENT : %d\n", GetStackAlignment() ); - - /* PrintArgs( 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 ); */ - - if ( argc > 1 ) - { - struct Description description; - Description_Ctor( &description ); - Description_Print( &description, argv[1] ); - } - { - char* p = NULL; - InfoMemoryAccess( p ); - p = (char*)&p; - InfoMemoryAccess( p ); - InfoMemoryTypeAccess( t_short ); - InfoMemoryTypeAccess( t_int ); - InfoMemoryTypeAccess( t_long ); - InfoMemoryTypeAccess( t_double ); - } - - exit( 0 ); -} diff --git a/tools/util/makefile.mk b/tools/util/makefile.mk index 1574addcf59c..568baaacd8f1 100644 --- a/tools/util/makefile.mk +++ b/tools/util/makefile.mk @@ -87,19 +87,6 @@ SHL1STDLIBS += $(ZLIB3RDLIB) \ LIB1FILES+= $(SLB)$/dll.lib - -.IF "$(BIG_TOOLS)"!="" -.IF "$(GUI)"=="WNT" -#SOLARLIBDIR=$(SOLARVER)\$((INPATH)\lib -#SOLARLIBDIR=..\$(INPATH)\lib -# bei lokalen osl rtl oder vos das SOLARLIBDIR bitte patchen ! -LIB1FILES+= $(SOLARLIBDIR)\xosl.lib \ - $(SOLARLIBDIR)\xrtl.lib \ - $(SOLARLIBDIR)\xvos.lib -SHL1STDLIBS+= $(WSOCK32LIB) -.ENDIF -.ENDIF # "$(BIG_TOOLS)"!="" - # --- TOOLS.DLL --- SHL1TARGET= tl$(DLLPOSTFIX) diff --git a/tools/win/inc/parser.hxx b/tools/win/inc/parser.hxx deleted file mode 100644 index 08b0d7968d54..000000000000 --- a/tools/win/inc/parser.hxx +++ /dev/null @@ -1,48 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _PARSER_HXX -#define _PARSER_HXX - -#if defined WNT - -#include -#include - -void * NewBinaryFromString( const String & rBinStr ); -String CreateStringFromData( const void *pData, ULONG nBytes ); - -String CreateStringFromItemIDList( const CItemIDList & rIDList ); - -String GetURLFromHostNotation( const String & rPath ); -String GetHostNotationFromURL( const String & rURL ); - -CItemIDList MakeIDToken( const String &rToken ); -CItemIDList ParseSpecialURL( const String & rURL ); - -#endif - -#endif // _PARSER_HXX diff --git a/tools/win/inc/shellex.h b/tools/win/inc/shellex.h deleted file mode 100644 index f81502a3382b..000000000000 --- a/tools/win/inc/shellex.h +++ /dev/null @@ -1,115 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SHELLEX_H_ -#define _SHELLEX_H_ - -#ifndef _SHLOBJ_H_ -#include -#endif - -#ifdef __cplusplus -extern "C" { -#define WINSHELLCALL inline -#else -#define WINSHELLCALL static -#endif - -#define SHChangeNotifyRegister_PROC_STR MAKEINTRESOURCE(2) -#define SHChangeNotifyDeregister_PROC_STR MAKEINTRESOURCE(4) - -#define SHCNF_ACCEPT_INTERRUPTS 0x0001 -#define SHCNF_ACCEPT_NON_INTERRUPTS 0x0002 -#define SHCNF_NO_PROXY 0x8000 - -#define SHCNF_ACCEPT_ALL (SHCNF_ACCEPT_INTERRUPTS | SHCNF_ACCEPT_NON_INTERRUPTS) - -typedef struct tagNOTIFYREGISTER { - LPCITEMIDLIST pidlPath; - BOOL bWatchSubtree; -} NOTIFYREGISTER; - -typedef NOTIFYREGISTER *LPNOTIFYREGISTER; -typedef NOTIFYREGISTER const *LPCNOTIFYREGISTER; - -typedef HANDLE (WINAPI *SHChangeNotifyRegister_PROC)( - HWND hWnd, - DWORD dwFlags, - LONG wEventMask, - UINT uMsg, - ULONG cItems, - LPCNOTIFYREGISTER lpItems); - - -WINSHELLCALL HANDLE WINAPI SHChangeNotifyRegister( - HWND hWnd, - DWORD dwFlags, - LONG wEventMask, - UINT uMsg, - ULONG cItems, - LPCNOTIFYREGISTER lpItems) - -{ - HMODULE hModule = GetModuleHandle( "SHELL32" ); - HANDLE hNotify = NULL; - - if ( hModule ) - { - SHChangeNotifyRegister_PROC lpfnSHChangeNotifyRegister = (SHChangeNotifyRegister_PROC)GetProcAddress( hModule, SHChangeNotifyRegister_PROC_STR ); - if ( lpfnSHChangeNotifyRegister ) - hNotify = lpfnSHChangeNotifyRegister( hWnd, dwFlags, wEventMask, uMsg, cItems, lpItems ); - } - - return hNotify; -} - - - -typedef BOOL (WINAPI *SHChangeNotifyDeregister_PROC)( - HANDLE hNotify); - -WINSHELLCALL BOOL WINAPI SHChangeNotifyDeregister( HANDLE hNotify ) -{ - HMODULE hModule = GetModuleHandle( "SHELL32" ); - BOOL fSuccess = FALSE; - - if ( hModule ) - { - SHChangeNotifyDeregister_PROC lpfnSHChangeNotifyDeregister = (SHChangeNotifyDeregister_PROC)GetProcAddress( hModule, SHChangeNotifyDeregister_PROC_STR ); - if ( lpfnSHChangeNotifyDeregister ) - fSuccess = lpfnSHChangeNotifyDeregister( hNotify ); - } - - return fSuccess; -} - - -#ifdef __cplusplus -} -#endif - -#endif - diff --git a/tools/win/inc/shutil.h b/tools/win/inc/shutil.h deleted file mode 100644 index 1daae442292d..000000000000 --- a/tools/win/inc/shutil.h +++ /dev/null @@ -1,215 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SHUTIL_H_ -#define _SHUTIL_H_ - -#if defined WNT - -#ifndef _SHOBJ_H -#include -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -#define PROTOCOL_FILE "file:" -#define MAX_URL (MAX_PATH + sizeof(PROTOCOL_FILE)) - -#define SHUTIL_TO_DELIVER - -//-------------------------------------------------------------------------- - -void * WINAPI WIN_SHAlloc( ULONG cb ); -void * WINAPI WIN_SHRealloc( void *pv, ULONG cb ); -void WINAPI WIN_SHFree( void *pv ); - -//-------------------------------------------------------------------------- - -ULONG WINAPI WIN_SHGetIDListSize( LPCITEMIDLIST pidl ); -BOOL WINAPI WIN_SHCloneIDList( LPCITEMIDLIST pidl, LPITEMIDLIST *ppidl ); -BOOL WINAPI WIN_SHAppendIDList( LPCITEMIDLIST pidl, LPITEMIDLIST *ppidl ); -LONG WINAPI WIN_SHCompareIDList( LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2 ); - -LONG WINAPI WIN_SHGetIDListTokenCount( LPCITEMIDLIST pidl ); -BOOL WINAPI WIN_SHGetIDListToken( LPCITEMIDLIST pidl, ULONG nToken, LPITEMIDLIST *ppidl ); - -BOOL WINAPI WIN_SHSplitIDList( - LPCITEMIDLIST pidl, - LPITEMIDLIST * pidlFolder, - LPITEMIDLIST * pidlItem - ); - -BOOL WINAPI WIN_SHSplitIDListEx( - LPCITEMIDLIST pidl, - LPITEMIDLIST * pidlParent, - LPITEMIDLIST * pidlChild, - ULONG nLevel - ); - -//-------------------------------------------------------------------------- - -#define WIN_SHGetSpecialFolderLocation( nFolder, ppidl ) \ - ((BOOL)(NOERROR == SHGetSpecialFolderLocation( GetFocus(), nFolder, ppidl ))) - -#define WIN_SHGetPathFromIDList( pidl, pszPath ) \ - SHGetPathFromIDList( pidl, pszPath ) - -// #define SHGP_CLSID 0x00000001 - -// BOOL WINAPI WIN_SHGetPathFromIDListEx( LPCITEMIDLIST pidl, LPSTR pszBuffer, UINT uFlags ); - -BOOL WINAPI WIN_SHGetIDListFromPath( LPCSTR pszPath, LPITEMIDLIST *ppidl ); - -BOOL WINAPI WIN_SHGetPathFromURL( LPCSTR pszURL, LPSTR pszPath ); -BOOL WINAPI WIN_SHGetURLFromPath( LPCSTR pszPath, LPSTR pszURL ); - -BOOL WINAPI WIN_SHGetFolderFromIDList( LPCITEMIDLIST pidl, LPSHELLFOLDER *ppshf ); -BOOL WINAPI WIN_SHGetSpecialFolder( int nFolder, LPSHELLFOLDER *ppshf ); -BOOL WINAPI WIN_SHGetFolderFromPath( LPCSTR pszPath, LPSHELLFOLDER *ppshf ); - -BOOL WINAPI WIN_SHGetSpecialFolderPath( int nFolder, LPSTR pszPath ); - -HRESULT WINAPI WIN_SHGetDataFromIDList( - LPSHELLFOLDER psf, - LPCITEMIDLIST pidl, - int nFormat, - PVOID pv, - int cb - ); - - -//-------------------------------------------------------------------------- - -#define SHIC_PIDL 0x00000001 -#define SHIC_NO_UI 0x00000002 - -#define CMDSTR_OPENA "open" -#define CMDSTR_EXPLOREA "explore" -#define CMDSTR_FINDA "find" - -#define CMDSTR_OPENW L"open" -#define CMDSTR_EXPLOREW L"explore" -#define CMDSTR_FINDW L"find" - -#ifdef UNICODE -#define CMDSTR_OPEN CMDSTR_OPENW -#define CMDSTR_EXPLORE CMDSTR_EXPLOREW -#define CMDSTR_FIND CMDSTR_FINDW -#else -#define CMDSTR_OPEN CMDSTR_OPENA -#define CMDSTR_EXPLORE CMDSTR_EXPLOREA -#define CMDSTR_FIND CMDSTR_FINDA -#endif - -#define CMDSTR_DEFAULT MAKEINTRESOURCE(0x00) - -#define CMDSTR_LINK MAKEINTRESOURCE(0x10) -#define CMDSTR_DELETE MAKEINTRESOURCE(0x11) -#define CMDSTR_RENAME MAKEINTRESOURCE(0x12) -#define CMDSTR_PROPERTIES MAKEINTRESOURCE(0x13) -#define CMDSTR_CUT MAKEINTRESOURCE(0x18) -#define CMDSTR_COPY MAKEINTRESOURCE(0x19) - -BOOL WINAPI WIN_SHInvokeCommand( - HWND hwndOwner, - DWORD dwFlags, - LPCTSTR lpPath, - LPCSTR lpVerb, - LPCSTR lpParameters, - LPCSTR lpDirectory, - int nShow - ); - -//-------------------------------------------------------------------------- - -BOOL WINAPI WIN_SHStrRetToMultiByte( - LPCITEMIDLIST pidl, - const STRRET * pStr, - LPSTR lpMultiByte, - int cchMultiByte - ); - -DWORD WIN_SHBuildCRC( LPVOID pBytes, ULONG nBytes ); - -DWORD WINAPI WIN_GetShellVersion(VOID); - -HIMAGELIST WINAPI WIN_SHGetSystemImageList( UINT uFlags ); - -//-------------------------------------------------------------------------- - -/* - -ULONG WINAPI WIN_CreateStringFromBinary ( - LPCVOID pv, - ULONG cbSize, - LPSTR pszString, - ULONG cbStringSize - ); - -ULONG WINAPI WIN_CreateBinaryFromString( - LPCSTR pszStr, - LPVOID pBuffer, - ULONG cbSize - ); -*/ - -//-------------------------------------------------------------------------- - -DWORD WINAPI WIN_SHSetValue( - HKEY hKey, - LPCTSTR pszSubKey, - LPCTSTR pszValue, - DWORD dwType, - LPCVOID pvData, - DWORD cbData - ); - -DWORD WINAPI WIN_SHGetValue( - HKEY hKey, - LPCTSTR pszSubKey, - LPCTSTR pszValue, - LPDWORD pdwType, - LPVOID pvData, - LPDWORD pcbData - ); - -DWORD WINAPI WIN_SHDeleteValue( - HKEY hKey, - LPCTSTR pszSubKey, - LPCTSTR pszValue - ); - -#ifdef __cplusplus -} -#endif - -#endif - -#endif // _SHUTIL_H_ - diff --git a/tools/win/inc/winshell.hxx b/tools/win/inc/winshell.hxx deleted file mode 100644 index a8be1e7d1344..000000000000 --- a/tools/win/inc/winshell.hxx +++ /dev/null @@ -1,386 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _WINSHELL_HXX -#define _WINSHELL_HXX - -#if defined WNT - -#include -#include "shutil.h" -#include - -#include - -//---------------------------------------------------------------------------- -// CItemIDList -//---------------------------------------------------------------------------- - -class CItemIDList -{ -public: - CItemIDList(); - CItemIDList( const CItemIDList & ); - CItemIDList( LPCITEMIDLIST ); - CItemIDList( const String & ); - CItemIDList( int nFolder ); - ~CItemIDList(); - - CItemIDList & operator = ( const CItemIDList & ); - CItemIDList & operator += ( const CItemIDList & ); - CItemIDList operator + ( const CItemIDList & ) const; - - int operator == ( const CItemIDList & ) const; - int operator != ( const CItemIDList & rIDList ) const - { return ! operator == ( rIDList ); }; - - operator LPCITEMIDLIST() const - { return m_pidl; }; - - int GetTokenCount() const; - CItemIDList GetToken( int nIndex ) const; - CItemIDList GetParent( int nLevelFromBottom = 1) const; - CItemIDList GetChild( int nLevelFromBottom = 1 ) const; - void Split( CItemIDList & rParent, CItemIDList & rChild, int nLevelFromBottom = 1 ) const; - - CItemIDList operator []( int nIndex ) const - { return GetToken( nIndex ); }; - - String GetFilePath() const; - - BOOL IsValid() const - { return m_pidl != NULL && m_pidl->mkid.cb != sizeof(USHORT); } - - int GetRootID() const - { return m_nFolder; } - -protected: - ITEMIDLIST *m_pidl; - int m_nFolder; -}; - - -inline CItemIDList CItemIDList::operator + ( const CItemIDList & rIDList ) const -{ - CItemIDList aCopy( *this ); - aCopy += rIDList; - return aCopy; -} - -//---------------------------------------------------------------------------- -// Types for CShellFolder -//---------------------------------------------------------------------------- - -// Notification Events fuer CShellFolder - -enum NotificationEvent -{ - NotificationEvent_Error, - NotificationEvent_Signaled, - NotificationEvent_Canceled -}; - -// Volume information - -typedef struct _WIN32_VOLUME_DATA -{ - TCHAR cDeviceName[MAX_PATH]; - TCHAR cVolumeName[MAX_PATH]; - TCHAR cFileSystemName[MAX_PATH]; - DWORD dwSerialNumber; - DWORD dwFileSystemFlags; - DWORD nMaxComponentLength; -} WIN32_VOLUME_DATA; - -// Bekannte Class-IDs fuer wichtige Ordner - -// {871C5380-42A0-1069-A2EA-08002B30309D} Internet Explorer 4.0 -static const GUID CLSID_IE4 = -{ 0x871C5380, 0x42A0, 0x1069, { 0xA2, 0xEA, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D } }; - -// {208D2C60-3AEA-1069-A2D7-08002B30309D} Netzwerkumgebung -static const GUID CLSID_Network = -{ 0x208D2C60, 0x3AEA, 0x1069, { 0xA2, 0xD7, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D } }; - -// {645FF040-5081-101B-9F08-00AA002F954E} Papierkorb -static const GUID CLSID_RecycleBin = -{ 0x645FF040, 0x5081, 0x101B, { 0x9F, 0x08, 0x00, 0xAA, 0x00, 0x2F, 0x95, 0x4E } }; - -// {20D04FE0-3AEA-1069-A2D8-08002B30309D} Arbeitsplatz -static const GUID CLSID_MyComputer = -{ 0x20D04FE0, 0x3AEA, 0x1069, { 0xA2, 0xD8, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D } }; - -// {D6277990-4C6A-11CF-8D87-00AA0060F5BF} Geplante Vorgänge -static const GUID CLSID_Tasks = -{ 0xD6277990, 0x4C6A, 0x11CF, { 0x8D, 0x87, 0x00, 0xAA, 0x00, 0x60, 0xF5, 0xBF } }; - -// Fehlt im Header - -#define SHGDN_INCLUDE_NONFILESYS 0x2000 - -#define CSIDL_UNKNOWN -1 -#define CSIDL_ROOT -2 -#define CSIDL_SYSTEM -3 - -// Suchmaske fuer IEnumIDList - -#define SHCONTF_ALL (SHCONTF_FOLDERS | SHCONTF_NONFOLDERS | SHCONTF_INCLUDEHIDDEN) - -// SHITEM Prefix Kinds - -#define SHGII_CONTAINER_MASK 0x70 - -#define SHGII_COMPUTER 0x20 - -#define SHGII_COMPUTER_REMOVABLE 0x22 -#define SHGII_COMPUTER_FIXED 0x23 -#define SHGII_COMPUTER_REMOTE 0x24 -#define SHGII_COMPUTER_CDROM 0x25 -#define SHGII_COMPUTER_RAMDISK 0x26 -#define SHGII_COMPUTER_FLOPPY525 0x28 -#define SHGII_COMPUTER_FLOPPY35 0x29 -#define SHGII_COMPUTER_NETWORK 0x2A -#define SHGII_COMPUTER_REGITEM 0x2E - -#define SHGII_ROOT 0x10 -#define SHGII_ROOT_REGITEM 0x1F - -#define SHGII_NETWORK 0x40 -#define SHGII_NETWORK_TREE 0x47 -#define SHGII_NETWORK_SERVER 0x42 -#define SHGII_NETWORK_DIRECTORY 0x43 -#define SHGII_NETWORK_PRINTER 0x41 - -#define SHGII_FILESYSTEM 0x30 -#define SHGII_FILESYSTEM_FILE 0x31 -#define SHGII_FILESYSTEM_DIRECTORY 0x32 - -#define SHGII_ANCESTOR 0x80 - -#define SHITEMCONTAINER( pidl ) ((pidl)->mkid.abID[0] & SHGII_CONTAINER_MASK) -#define SHITEMKIND( pidl ) ((pidl)->mkid.abID[0] & 0x7F) - -//---------------------------------------------------------------------------- -// CShellFolderData -//---------------------------------------------------------------------------- - -class CShellFolderData -{ -protected: - CShellFolderData(); - virtual ~CShellFolderData(); - - IShellFolder *m_pShellFolder; - IEnumIDList *m_pEnumIDList; - IShellIcon *m_pShellIcon; - BOOL m_bIsOpen; - HANDLE m_hCancelEvent; - DWORD m_dwContentFlags; -}; - -//---------------------------------------------------------------------------- -// CShellFolder -//---------------------------------------------------------------------------- - -// Ganz "normaler" Ordner basierend auf dem IShellFolder Interface - -class CShellFolder : public CShellFolderData -{ -public: - CShellFolder( const CItemIDList & ); - CShellFolder( const CShellFolder & ); - CShellFolder( IShellFolder * ); - - // Retrieval of Item IDs - - virtual BOOL Reset(); - - BOOL GetNextValidID( CItemIDList & ); - - virtual BOOL GetNextID( CItemIDList & ); - virtual BOOL ValidateID( const CItemIDList & ); - - // Getting information about Items - - virtual BOOL GetAttributesOf( const CItemIDList &, LPDWORD pdwInOut ); - virtual BOOL GetNameOf( const CItemIDList &, String & ); - - virtual BOOL GetFileInfo( const CItemIDList &, WIN32_FIND_DATA * ); - virtual BOOL GetVolumeInfo( const CItemIDList & rIDList, WIN32_VOLUME_DATA * ); - - // Modifying the folder contents - - virtual BOOL SetNameOf( const CItemIDList &, const String &, CItemIDList & ); - virtual BOOL DeleteItem( const CItemIDList & ); - - // Comparison of IDs - - virtual int CompareIDs( const CItemIDList &, const CItemIDList & ); - - // UI Components - - virtual IContextMenu *GetContextMenu( int nItems, const CItemIDList * ); - virtual String GetIconLocation( const CItemIDList & ); - - // Notifications - - virtual NotificationEvent WaitForChanges(); - virtual void CancelWaitNotifications(); - -protected: - CShellFolder() : CShellFolderData() {}; - - void Initialize( IShellFolder *pShellFolder ); - void Initialize( LPCITEMIDLIST ); -}; - -//---------------------------------------------------------------------------- -// CFileSystemFolder -//---------------------------------------------------------------------------- - -// Reiner !!! Filesystem-Ordner. Benutzt optimierten Notification Mechanismus - -class CFileSystemFolder : public CShellFolder -{ -public: - CFileSystemFolder( LPCSTR pszPath ); - - virtual NotificationEvent WaitForChanges(); - -protected: - CFileSystemFolder() : CShellFolder() {}; - - void Initialize( LPCTSTR pszPath ); - - TCHAR m_szPath[MAX_PATH]; -}; - -//---------------------------------------------------------------------------- -// CSpecialFolder -//---------------------------------------------------------------------------- - -// Wie SHellFolder, aber andere Konstruktion ueber definierte Junktion-Points - -class CSpecialFolder : public CShellFolder -{ -public: - CSpecialFolder( int nFolder ); - -protected: - CSpecialFolder() : CShellFolder() {}; - - void Initialize( int nFolder ); - - int m_nFolder; -}; - -//---------------------------------------------------------------------------- -// CMyComputerFolder -//---------------------------------------------------------------------------- - -// Der MS-Windows "Arbeitsplatz" - -class CMyComputerFolder : public CSpecialFolder -{ -public: - CMyComputerFolder() : CSpecialFolder( CSIDL_DRIVES ) {}; -}; - -//---------------------------------------------------------------------------- -// CVolumesFolder -//---------------------------------------------------------------------------- - -// Wie CMyComputersFolder, enthält aber nur die Laufwerke - -class CVolumesFolder : public CMyComputerFolder -{ -public: - CVolumesFolder() : CMyComputerFolder() {}; - - virtual BOOL ValidateID( const CItemIDList & ); - virtual NotificationEvent WaitForChanges(); -}; - -//---------------------------------------------------------------------------- -// CWorkplaceFolder -//---------------------------------------------------------------------------- - -// Wie CMyComputersFolder, enthält aber keine!!! Laufwerke - -class CWorkplaceFolder : public CMyComputerFolder -{ - CWorkplaceFolder() : CMyComputerFolder() {}; - - virtual BOOL ValidateID( const CItemIDList & ); - virtual NotificationEvent WaitForChanges(); -}; - -//---------------------------------------------------------------------------- -// CDesktopFolder -//---------------------------------------------------------------------------- - -// Der MS-Windows Desktop - -class CDesktopFolder : public CSpecialFolder -{ -public: - CDesktopFolder() : CSpecialFolder( CSIDL_DESKTOP ) {}; -}; - -//---------------------------------------------------------------------------- -// CDesktopAncestorsFolder -//---------------------------------------------------------------------------- - -// Wie CDesktopFolder, enthält aber nur Arbeitsplatz und Netzwerk - -class CDesktopAncestorsFolder : public CDesktopFolder -{ -public: - CDesktopAncestorsFolder() : CDesktopFolder() {}; - - virtual BOOL ValidateID( const CItemIDList & ); - virtual NotificationEvent WaitForChanges(); -}; - -//---------------------------------------------------------------------------- -// CDesktopContentsFolder -//---------------------------------------------------------------------------- - -// Wie CDesktopFolder, aber ohne!!! Arbeitsplatz und Netzwerk - -class CDesktopContentsFolder : public CDesktopFolder -{ -public: - CDesktopContentsFolder() : CDesktopFolder() {}; - - virtual BOOL ValidateID( const CItemIDList & ); - virtual NotificationEvent WaitForChanges(); -}; - -#endif - -#endif // _WINSHELL_HXX diff --git a/tools/win/source/fastfsys/makefile.mk b/tools/win/source/fastfsys/makefile.mk deleted file mode 100644 index 12df85d6a2f3..000000000000 --- a/tools/win/source/fastfsys/makefile.mk +++ /dev/null @@ -1,71 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..\..\.. - -PRJNAME=TOOLS -TARGET=fastfsys - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- WNT ---------------------------------------------------------- - -.IF "$(GUI)" == "WNT" - -# --- Files -------------------------------------------------------- - - -OBJFILES= $(OBJ)$/shutil.obj \ - $(OBJ)$/shidl.obj \ - $(OBJ)$/shmalloc.obj \ - $(OBJ)$/fffolder.obj \ - $(OBJ)$/ffmenu.obj \ - $(OBJ)$/ffitem.obj \ - $(OBJ)$/fflink.obj \ - $(OBJ)$/ffparser.obj \ - $(OBJ)$/wincidl.obj \ - $(OBJ)$/wincshf.obj - - -SLOFILES= $(SLO)$/shutil.obj \ - $(SLO)$/shidl.obj \ - $(SLO)$/shmalloc.obj \ - $(SLO)$/fffolder.obj \ - $(SLO)$/ffmenu.obj \ - $(SLO)$/ffitem.obj \ - $(SLO)$/fflink.obj \ - $(SLO)$/ffparser.obj \ - $(SLO)$/wincidl.obj \ - $(SLO)$/wincshf.obj - -# --- Targets ------------------------------------------------------ - -.ENDIF - -.INCLUDE : target.mk -- cgit From 3eda2cfb75c8bc483d8377a1fac24974b1864440 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Thu, 6 May 2010 15:13:08 +0200 Subject: CWS gnumake2: don't create static libs in tools --- tools/bootstrp/addexes2/makefile.mk | 2 +- tools/bootstrp/command.cxx | 690 ----------------- tools/bootstrp/makefile.mk | 18 +- tools/bootstrp/prj.cxx | 1438 +---------------------------------- tools/bootstrp/sstring.cxx | 317 -------- tools/inc/bootstrp/command.hxx | 165 ---- tools/inc/bootstrp/listmacr.hxx | 60 -- tools/inc/bootstrp/mkcreate.hxx | 4 +- tools/inc/bootstrp/prj.hxx | 273 ------- tools/inc/bootstrp/sstring.hxx | 105 --- tools/prj/d.lst | 17 +- tools/util/makefile.mk | 39 +- 12 files changed, 31 insertions(+), 3097 deletions(-) delete mode 100644 tools/bootstrp/command.cxx delete mode 100644 tools/bootstrp/sstring.cxx delete mode 100644 tools/inc/bootstrp/command.hxx delete mode 100644 tools/inc/bootstrp/listmacr.hxx delete mode 100644 tools/inc/bootstrp/sstring.hxx diff --git a/tools/bootstrp/addexes2/makefile.mk b/tools/bootstrp/addexes2/makefile.mk index 492d6f3105ed..7e4d3d0da7fa 100644 --- a/tools/bootstrp/addexes2/makefile.mk +++ b/tools/bootstrp/addexes2/makefile.mk @@ -47,7 +47,7 @@ APP1STDLIBS+=-lpthread APP1STDLIBS+=-lpthread .ENDIF APP1LIBS= $(LB)$/btstrp.lib $(LB)$/bootstrp2.lib -APP1DEPN= $(LB)$/atools.lib $(LB)$/btstrp.lib $(LB)$/bootstrp2.lib +APP1DEPN= $(LB)$/btstrp.lib $(LB)$/bootstrp2.lib DEPOBJFILES = $(APP1OBJS) diff --git a/tools/bootstrp/command.cxx b/tools/bootstrp/command.cxx deleted file mode 100644 index 605965339b0e..000000000000 --- a/tools/bootstrp/command.cxx +++ /dev/null @@ -1,690 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_tools.hxx" - -#ifdef SCO -#define _IOSTREAM_H -#endif - -#ifdef PRECOMPILED -#include "first.hxx" -#endif - -#include -#include -#include "bootstrp/command.hxx" -#include -#include "bootstrp/appdef.hxx" - -#ifdef _MSC_VER -#pragma warning (push,1) -#endif - -#include -#include -#include -#include -#include -#include - -#ifdef _MSC_VER -#pragma warning (pop) -#endif - -//#define MH_TEST2 1 // fuers direkte Testen - -#if defined(WNT) || defined(OS2) -#ifdef _MSC_VER -#pragma warning (push,1) -#endif -#include // for _SPAWN -#ifdef _MSC_VER -#pragma warning (pop) -#endif -#endif -#ifdef UNX -#include -#include -#if ( defined NETBSD ) || defined (FREEBSD) || defined (AIX) \ - || defined (HPUX) || defined (MACOSX) -#include -#else -#include -#endif -#define P_WAIT 1 // erstmal einen dummz -#endif - -#if defined WNT -#include -#endif - -#if defined(WNT) || defined(OS2) -#define cPathSeperator ';' -#endif -#ifdef UNX -#define cPathSeperator ':' -#endif - -/*****************************************************************************/ -CommandLine::CommandLine(BOOL bWrite) -/*****************************************************************************/ - : bTmpWrite(bWrite) -{ - CommandBuffer = new char [1]; - if (CommandBuffer == NULL) { - //cout << "Error: nospace" << endl; - exit(0); - } - CommandBuffer[0] = '\0'; - nArgc = 0; - ppArgv = new char * [1]; - ppArgv[0] = NULL; - - ComShell = new char [128]; - char* pTemp = getenv("COMMAND_SHELL"); - if(!pTemp) - strcpy(ComShell,COMMAND_SHELL); - else - strcpy(ComShell,pTemp); - - strcpy(&ComShell[strlen(ComShell)]," -C "); -} - -/*****************************************************************************/ -CommandLine::CommandLine(const char *CommandString, BOOL bWrite) -/*****************************************************************************/ - : bTmpWrite(bWrite) -{ - CommandBuffer = new char [1]; - if (CommandBuffer == NULL) { - //cout << "Error: nospace" << endl; - exit(0); - } - nArgc = 0; - ppArgv = new char * [1]; - ppArgv[0] = NULL; - - ComShell = new char [128]; - char* pTemp = getenv("COMMAND_SHELL"); - if(!pTemp) - strcpy(ComShell,COMMAND_SHELL); - else - strcpy(ComShell,pTemp); - - strcpy(&ComShell[strlen(ComShell)]," -C "); - - BuildCommand(CommandString); -} - -/*****************************************************************************/ -CommandLine::CommandLine(const CommandLine& CCommandLine, BOOL bWrite) -/*****************************************************************************/ - : bTmpWrite(bWrite) -{ - CommandBuffer = new char [1]; - if (CommandBuffer == NULL) { - //cout << "Error: nospace" << endl; - exit(0); - } - nArgc = 0; - ppArgv = new char * [1]; - ppArgv[0] = NULL; - - ComShell = new char [128]; - char* pTemp = getenv("COMMAND_SHELL"); - if(!pTemp) - strcpy(ComShell,COMMAND_SHELL); - else - strcpy(ComShell,pTemp); - - strcpy(&ComShell[strlen(ComShell)]," -C "); - - BuildCommand(CCommandLine.CommandBuffer); -} - -/*****************************************************************************/ -CommandLine::~CommandLine() -/*****************************************************************************/ -{ - delete [] CommandBuffer; - delete [] ComShell; - //for (int i = 0; ppArgv[i] != '\0'; i++) { - for (int i = 0; ppArgv[i] != 0; i++) { - delete [] ppArgv[i]; - } - delete [] ppArgv; - -} - -/*****************************************************************************/ -CommandLine& CommandLine::operator=(const CommandLine& CCommandLine) -/*****************************************************************************/ -{ - strcpy (CommandBuffer, CCommandLine.CommandBuffer); - for (int i = 0; i != nArgc; i++) { - delete [] ppArgv[i]; - } - delete [] ppArgv; - ppArgv = new char * [1]; - ppArgv[0] = NULL; - BuildCommand(CommandBuffer); - return *this; -} - -/*****************************************************************************/ -CommandLine& CommandLine::operator=(const char *CommandString) -/*****************************************************************************/ -{ - strcpy (CommandBuffer, CommandString); - for (int i = 0; i != nArgc; i++) { - delete [] ppArgv[i]; - } - delete [] ppArgv; - ppArgv = new char * [1]; - ppArgv[0] = NULL; - BuildCommand(CommandBuffer); - - return *this; -} - -/*****************************************************************************/ -void CommandLine::Print() -/*****************************************************************************/ -{ - //cout << "******* start print *******" << endl; - //cout << "nArgc = " << nArgc << endl; - //cout << "CommandBuffer = " << CommandBuffer << endl; - for (int i = 0; ppArgv[i] != NULL; i++) { - //cout << "ppArgv[" << i << "] = " << ppArgv[i] << endl; - } - //cout << "******** end print ********" << endl; -} - -/*****************************************************************************/ -void CommandLine::BuildCommand(const char *CommandString) -/*****************************************************************************/ -{ - int index = 0, pos=0; - char buffer[1024]; - char WorkString[1024]; - - strcpy(WorkString,CommandString); - - //falls LogWindow -> in tmpfile schreiben - if(bTmpWrite) - { - strcpy(&WorkString[strlen(WorkString)]," >&"); - strcpy(&WorkString[strlen(WorkString)],getenv("TMP")); - strcpy(&WorkString[strlen(WorkString)],TMPNAME); - } - - // delete old memory and get some new memory for CommandBuffer - - delete [] CommandBuffer; - CommandBuffer = new char [strlen(ComShell)+strlen(WorkString)+1]; - if (CommandBuffer == NULL) { - //cout << "Error: nospace" << endl; - exit(0); - } - strcpy (CommandBuffer, ComShell); - strcpy (&CommandBuffer[strlen(ComShell)], WorkString); - - CommandString = CommandBuffer; - - // get the number of tokens - Strtokens(CommandString); - - // delete the space for the old CommandLine - - for (int i = 0; ppArgv[i] != 0; i++) { - delete [] ppArgv[i]; - } - delete [] ppArgv; - - /* get space for the new command line */ - - ppArgv = (char **) new char * [nArgc+1]; - if (ppArgv == NULL) { - //cout << "Error: no space" << endl; - exit(0); - } - - // flush the white space - - while ( isspace(*CommandString) ) - CommandString++; - - index = 0; - - // start the loop to build all the individual tokens - - while (*CommandString != '\0') { - - pos = 0; - - // copy the token until white space is found - - while ( !isspace(*CommandString) && *CommandString != '\0') { - - buffer[pos++] = *CommandString++; - - } - - buffer[pos] = '\0'; - - // get space for the individual tokens - - ppArgv[index] = (char *) new char [strlen(buffer)+1]; - if (ppArgv[index] == NULL) { - //cout << "Error: nospace" << endl; - exit(0); - } - - // copy the token - - strcpy (ppArgv[index++], buffer); - - // flush while space - - while ( isspace(*CommandString) ) - CommandString++; - - } - - // finish by setting the las pointer to NULL - ppArgv[nArgc]= NULL; - -} - -/*****************************************************************************/ -void CommandLine::Strtokens(const char *CommandString) -/*****************************************************************************/ -{ - int count = 0; - const char *temp; - - temp = CommandString; - - /* bypass white space */ - - while (isspace(*temp)) temp++; - - for (count=0; *temp != '\0'; count++) { - - /* continue until white space of string terminator is found */ - - while ((!isspace(*temp)) && (*temp != '\0')) temp++; - - /* bypass white space */ - - while (isspace(*temp)) temp++; - - } - nArgc = count; -} - -/*****************************************************************************/ -CCommand::CCommand( ByteString &rString ) -/*****************************************************************************/ -{ - rString.SearchAndReplace( '\t', ' ' ); - aCommand = rString.GetToken( 0, ' ' ); - aCommandLine = Search(); -#ifndef UNX - aCommandLine += " /c "; -#else - aCommandLine += " -c "; -#endif - - ByteString sCmd( rString.GetToken( 0, ' ' )); - ByteString sParam( rString.Copy( sCmd.Len())); - - aCommandLine += Search( thePath, sCmd ); - aCommandLine += sParam; - - ImplInit(); -} - -/*****************************************************************************/ -CCommand::CCommand( const char *pChar ) -/*****************************************************************************/ -{ - ByteString aString = pChar; - aString.SearchAndReplace( '\t', ' ' ); - aCommand = aString.GetToken( 0, ' ' ); - - aCommandLine = Search(); -#ifndef UNX - aCommandLine += " /c "; -#else - aCommandLine += " -c "; -#endif - ByteString rString( pChar ); - - ByteString sCmd( rString.GetToken( 0, ' ' )); - ByteString sParam( rString.Copy( sCmd.Len())); - - aCommandLine += Search( thePath, sCmd ); - aCommandLine += sParam; - - ImplInit(); -} - -/*****************************************************************************/ -void CCommand::ImplInit() -/*****************************************************************************/ -{ - char pTmpStr[255]; - size_t *pPtr; - char *pChar; - int nVoid = sizeof( size_t * ); - nArgc = aCommandLine.GetTokenCount(' '); - ULONG nLen = aCommandLine.Len(); - - ppArgv = (char **) new char[ (ULONG)(nLen + nVoid * (nArgc +2) + nArgc ) ]; - pChar = (char *) ppArgv + ( (1+nArgc) * nVoid ); - pPtr = (size_t *) ppArgv; - for ( xub_StrLen i=0; i #include -#include "bootstrp/sstring.hxx" +//#include "bootstrp/sstring.hxx" #include #include @@ -37,6 +37,8 @@ #include "bootstrp/prj.hxx" #include "bootstrp/inimgr.hxx" +DECLARE_LIST( UniStringList, UniString* ) + //#define TEST 1 #if defined(WNT) || defined(OS2) @@ -47,7 +49,7 @@ #define PATH_DELIMETER '/' #endif -Link Star::aDBNotFoundHdl; +//Link Star::aDBNotFoundHdl; // // class SimpleConfig @@ -166,1435 +168,3 @@ ByteString SimpleConfig::GetCleanedNextLine( BOOL bReadComments ) return aTmpStr; } - - -// -// class CommandData -// - -/*****************************************************************************/ -CommandData::CommandData() -/*****************************************************************************/ -{ - nOSType = 0; - nCommand = 0; - pDepList = 0; -} - -/*****************************************************************************/ -CommandData::~CommandData() -/*****************************************************************************/ -{ - if ( pDepList ) - { - ByteString *pString = pDepList->First(); - while ( pString ) - { - delete pString; - pString = pDepList->Next(); - } - delete pDepList; - - pDepList = NULL; - } -} - -/*****************************************************************************/ -ByteString CommandData::GetOSTypeString() -/*****************************************************************************/ -{ - ByteString aRetStr; - - switch (nOSType) - { - case OS_WIN16 | OS_WIN32 | OS_OS2 | OS_UNX : - aRetStr = "all"; - break; - case OS_WIN32 | OS_WIN16 : - aRetStr = "w"; - break; - case OS_OS2 : - aRetStr = "p"; - break; - case OS_UNX : - aRetStr = "u"; - break; - case OS_WIN16 : - aRetStr = "d"; - break; - case OS_WIN32 : - aRetStr = "n"; - break; - default : - aRetStr = "none"; - } - - return aRetStr; -} - -/*****************************************************************************/ -ByteString CommandData::GetCommandTypeString() -/*****************************************************************************/ -{ - ByteString aRetStr; - - switch (nCommand) - { - case COMMAND_NMAKE : - aRetStr = "nmake"; - break; - case COMMAND_GET : - aRetStr = "get"; - break; - default : - aRetStr = "usr"; - aRetStr += ByteString::CreateFromInt64( nCommand + 1 - COMMAND_USER_START ); - - } - - return aRetStr; -} - -/*****************************************************************************/ -CommandData* Prj::GetDirectoryList ( USHORT, USHORT ) -/*****************************************************************************/ -{ - return (CommandData *)NULL; -} - -/*****************************************************************************/ -CommandData* Prj::GetDirectoryData( ByteString aLogFileName ) -/*****************************************************************************/ -{ - CommandData *pData = NULL; - ULONG nObjCount = Count(); - for ( ULONG i=0; iGetLogFile() == aLogFileName ) - return pData; - } - return NULL; -} - -// -// class Prj -// - -/*****************************************************************************/ -Prj::Prj() : - bVisited( FALSE ), - pPrjInitialDepList(0), - pPrjDepList(0), - bHardDependencies( FALSE ), - bSorted( FALSE ) -/*****************************************************************************/ -{ -} - -/*****************************************************************************/ -Prj::Prj( ByteString aName ) : - bVisited( FALSE ), - aProjectName( aName ), - pPrjInitialDepList(0), - pPrjDepList(0), - bHardDependencies( FALSE ), - bSorted( FALSE ) -/*****************************************************************************/ -{ -} - -/*****************************************************************************/ -Prj::~Prj() -/*****************************************************************************/ -{ - if ( pPrjDepList ) - { - ByteString *pString = pPrjDepList->First(); - while ( pString ) - { - delete pString; - pString = pPrjDepList->Next(); - } - delete pPrjDepList; - - pPrjDepList = NULL; - } - - if ( pPrjInitialDepList ) - { - ByteString *pString = pPrjInitialDepList->First(); - while ( pString ) - { - delete pString; - pString = pPrjInitialDepList->Next(); - } - delete pPrjInitialDepList; - - pPrjInitialDepList = NULL; - } -} - -/*****************************************************************************/ -void Prj::AddDependencies( ByteString aStr ) -/*****************************************************************************/ -{ - - // needs dirty flag - not expanded - if ( !pPrjDepList ) - pPrjDepList = new SByteStringList; - - pPrjDepList->PutString( new ByteString(aStr) ); - - if ( !pPrjInitialDepList ) - pPrjInitialDepList = new SByteStringList; - - pPrjInitialDepList->PutString( new ByteString(aStr) ); -} - -/*****************************************************************************/ -SByteStringList* Prj::GetDependencies( BOOL bExpanded ) -/*****************************************************************************/ -{ - if ( bExpanded ) - return pPrjDepList; - else - return pPrjInitialDepList; -} - - - -/*****************************************************************************/ -BOOL Prj::InsertDirectory ( ByteString aDirName, USHORT aWhat, - USHORT aWhatOS, ByteString aLogFileName, - const ByteString &rClientRestriction ) -/*****************************************************************************/ -{ - CommandData* pData = new CommandData(); - - pData->SetPath( aDirName ); - pData->SetCommandType( aWhat ); - pData->SetOSType( aWhatOS ); - pData->SetLogFile( aLogFileName ); - pData->SetClientRestriction( rClientRestriction ); - - Insert( pData ); - - return FALSE; -} - -/*****************************************************************************/ -// -// removes directory and existing dependencies on it -// -CommandData* Prj::RemoveDirectory ( ByteString aLogFileName ) -/*****************************************************************************/ -{ - ULONG nCountMember = Count(); - CommandData* pData; - CommandData* pDataFound = NULL; - SByteStringList* pDataDeps; - - for ( USHORT i = 0; i < nCountMember; i++ ) - { - pData = GetObject( i ); - if ( pData->GetLogFile() == aLogFileName ) - pDataFound = pData; - else - { - pDataDeps = pData->GetDependencies(); - if ( pDataDeps ) - { - ByteString* pString; - ULONG nDataDepsCount = pDataDeps->Count(); - for ( ULONG j = nDataDepsCount; j > 0; j-- ) - { - pString = pDataDeps->GetObject( j - 1 ); - if ( pString->GetToken( 0, '.') == aLogFileName ) - pDataDeps->Remove( pString ); - } - } - } - } - - Remove( pDataFound ); - - return pDataFound; -} - -// -// class Star -// - -/*****************************************************************************/ -Star::Star() -/*****************************************************************************/ -{ - // this ctor is only used by StarWriter -} - -/*****************************************************************************/ -Star::Star(String aFileName, USHORT nMode ) -/*****************************************************************************/ - : nStarMode( nMode ) -{ - Read( aFileName ); -} - -/*****************************************************************************/ -Star::Star( SolarFileList *pSolarFiles ) -/*****************************************************************************/ - : nStarMode( STAR_MODE_MULTIPLE_PARSE ) -{ - // this ctor is used by StarBuilder to get the information for the whole workspace - Read( pSolarFiles ); -} - -/*****************************************************************************/ -Star::Star( GenericInformationList *pStandLst, ByteString &rVersion, - BOOL bLocal, const char *pSourceRoot ) -/*****************************************************************************/ -{ - ByteString sPath( rVersion ); - String sSrcRoot; - if ( pSourceRoot ) - sSrcRoot = String::CreateFromAscii( pSourceRoot ); - -#ifdef UNX - sPath += "/settings/UNXSOLARLIST"; -#else - sPath += "/settings/SOLARLIST"; -#endif - GenericInformation *pInfo = pStandLst->GetInfo( sPath, TRUE ); - - if( pInfo && pInfo->GetValue().Len()) { - ByteString sFile( pInfo->GetValue()); - if ( bLocal ) { - IniManager aIniManager; - aIniManager.ToLocal( sFile ); - } - String sFileName( sFile, RTL_TEXTENCODING_ASCII_US ); - nStarMode = STAR_MODE_SINGLE_PARSE; - Read( sFileName ); - } - else { - SolarFileList *pFileList = new SolarFileList(); - - sPath = rVersion; - sPath += "/drives"; - - GenericInformation *pInfo2 = pStandLst->GetInfo( sPath, TRUE ); - if ( pInfo2 && pInfo2->GetSubList()) { - GenericInformationList *pDrives = pInfo2->GetSubList(); - for ( ULONG i = 0; i < pDrives->Count(); i++ ) { - GenericInformation *pDrive = pDrives->GetObject( i ); - if ( pDrive ) { - DirEntry aEntry; - BOOL bOk = FALSE; - if ( sSrcRoot.Len()) { - aEntry = DirEntry( sSrcRoot ); - bOk = TRUE; - } - else { -#ifdef UNX - sPath = "UnixVolume"; - GenericInformation *pUnixVolume = pDrive->GetSubInfo( sPath ); - if ( pUnixVolume ) { - String sRoot( pUnixVolume->GetValue(), RTL_TEXTENCODING_ASCII_US ); - aEntry = DirEntry( sRoot ); - bOk = TRUE; - } -#else - bOk = TRUE; - String sRoot( *pDrive, RTL_TEXTENCODING_ASCII_US ); - sRoot += String::CreateFromAscii( "\\" ); - aEntry = DirEntry( sRoot ); -#endif - } - if ( bOk ) { - sPath = "projects"; - GenericInformation *pProjectsKey = pDrive->GetSubInfo( sPath, TRUE ); - if ( pProjectsKey ) { - if ( !sSrcRoot.Len()) { - sPath = rVersion; - sPath += "/settings/PATH"; - GenericInformation *pPath = pStandLst->GetInfo( sPath, TRUE ); - if( pPath ) { - ByteString sAddPath( pPath->GetValue()); -#ifdef UNX - sAddPath.SearchAndReplaceAll( "\\", "/" ); -#else - sAddPath.SearchAndReplaceAll( "/", "\\" ); -#endif - String ssAddPath( sAddPath, RTL_TEXTENCODING_ASCII_US ); - aEntry += DirEntry( ssAddPath ); - } - } - GenericInformationList *pProjects = pProjectsKey->GetSubList(); - if ( pProjects ) { - String sPrjDir( String::CreateFromAscii( "prj" )); - String sSolarFile( String::CreateFromAscii( "build.lst" )); - - for ( ULONG j = 0; j < pProjects->Count(); j++ ) { - ByteString sProject( *pProjects->GetObject( j )); - String ssProject( sProject, RTL_TEXTENCODING_ASCII_US ); - - DirEntry aPrjEntry( aEntry ); - - aPrjEntry += DirEntry( ssProject ); - aPrjEntry += DirEntry( sPrjDir ); - aPrjEntry += DirEntry( sSolarFile ); - - pFileList->Insert( new String( aPrjEntry.GetFull()), LIST_APPEND ); - - ByteString sFile( aPrjEntry.GetFull(), RTL_TEXTENCODING_ASCII_US ); - } - } - } - } - } - } - } - Read( pFileList ); - } -} - -/*****************************************************************************/ -Star::~Star() -/*****************************************************************************/ -{ -} - -/*****************************************************************************/ -BOOL Star::NeedsUpdate() -/*****************************************************************************/ -{ - aMutex.acquire(); - for ( ULONG i = 0; i < aLoadedFilesList.Count(); i++ ) - if ( aLoadedFilesList.GetObject( i )->NeedsUpdate()) { - aMutex.release(); - return TRUE; - } - - aMutex.release(); - return FALSE; -} - -/*****************************************************************************/ -void Star::Read( String &rFileName ) -/*****************************************************************************/ -{ - ByteString aString; - aFileList.Insert( new String( rFileName )); - - DirEntry aEntry( rFileName ); - aEntry.ToAbs(); - aEntry = aEntry.GetPath().GetPath().GetPath(); - sSourceRoot = aEntry.GetFull(); - - while( aFileList.Count()) { - StarFile *pFile = new StarFile( *aFileList.GetObject(( ULONG ) 0 )); - if ( pFile->Exists()) { - SimpleConfig aSolarConfig( *aFileList.GetObject(( ULONG ) 0 )); - while (( aString = aSolarConfig.GetNext()) != "" ) - InsertToken (( char * ) aString.GetBuffer()); - } - aMutex.acquire(); - aLoadedFilesList.Insert( pFile, LIST_APPEND ); - aMutex.release(); - aFileList.Remove(( ULONG ) 0 ); - } - // resolve all dependencies recursive - Expand_Impl(); -} - -/*****************************************************************************/ -void Star::Read( SolarFileList *pSolarFiles ) -/*****************************************************************************/ -{ - while( pSolarFiles->Count()) { - ByteString aString; - - StarFile *pFile = new StarFile( *pSolarFiles->GetObject(( ULONG ) 0 )); - if ( pFile->Exists()) { - SimpleConfig aSolarConfig( *pSolarFiles->GetObject(( ULONG ) 0 )); - while (( aString = aSolarConfig.GetNext()) != "" ) - InsertToken (( char * ) aString.GetBuffer()); - } - - aMutex.acquire(); - aLoadedFilesList.Insert( pFile, LIST_APPEND ); - aMutex.release(); - delete pSolarFiles->Remove(( ULONG ) 0 ); - } - delete pSolarFiles; - - Expand_Impl(); -} - -/*****************************************************************************/ -String Star::CreateFileName( String sProject ) -/*****************************************************************************/ -{ - // this method is used to find solarlist parts of nabours (other projects) - String sPrjDir( String::CreateFromAscii( "prj" )); - String sSolarFile( String::CreateFromAscii( "build.lst" )); - - DirEntry aEntry( sSourceRoot ); - aEntry += DirEntry( sProject ); - aEntry += DirEntry( sPrjDir ); - aEntry += DirEntry( sSolarFile ); - - if ( !aEntry.Exists() && aDBNotFoundHdl.IsSet()) - aDBNotFoundHdl.Call( &sProject ); - - return aEntry.GetFull(); -} - -/*****************************************************************************/ -void Star::InsertSolarList( String sProject ) -/*****************************************************************************/ -{ - // inserts a new solarlist part of another project - String sFileName( CreateFileName( sProject )); - - for ( ULONG i = 0; i < aFileList.Count(); i++ ) { - if (( *aFileList.GetObject( i )) == sFileName ) - return; - } - - ByteString ssProject( sProject, RTL_TEXTENCODING_ASCII_US ); - if ( HasProject( ssProject )) - return; - - aFileList.Insert( new String( sFileName ), LIST_APPEND ); -} - -/*****************************************************************************/ -void Star::ExpandPrj_Impl( Prj *pPrj, Prj *pDepPrj ) -/*****************************************************************************/ -{ - if ( pDepPrj->bVisited ) - return; - - pDepPrj->bVisited = TRUE; - - SByteStringList* pPrjLst = pPrj->GetDependencies(); - SByteStringList* pDepLst = NULL; - ByteString* pDepend; - ByteString* pPutStr; - Prj *pNextPrj = NULL; - ULONG i, nRetPos; - - if ( pPrjLst ) { - pDepLst = pDepPrj->GetDependencies(); - if ( pDepLst ) { - for ( i = 0; i < pDepLst->Count(); i++ ) { - pDepend = pDepLst->GetObject( i ); - pPutStr = new ByteString( *pDepend ); - nRetPos = pPrjLst->PutString( pPutStr ); - if( nRetPos == NOT_THERE ) - delete pPutStr; - pNextPrj = GetPrj( *pDepend ); - if ( pNextPrj ) { - ExpandPrj_Impl( pPrj, pNextPrj ); - } - } - } - } -} - -/*****************************************************************************/ -void Star::Expand_Impl() -/*****************************************************************************/ -{ - for ( ULONG i = 0; i < Count(); i++ ) { - for ( ULONG j = 0; j < Count(); j++ ) - GetObject( j )->bVisited = FALSE; - - Prj* pPrj = GetObject( i ); - ExpandPrj_Impl( pPrj, pPrj ); - } -} - -/*****************************************************************************/ -void Star::InsertToken ( char *yytext ) -/*****************************************************************************/ -{ - static int i = 0; - static ByteString aDirName, aWhat, aWhatOS, - sClientRestriction, aLogFileName, aProjectName, aPrefix, aCommandPara; - static BOOL bPrjDep = FALSE; - static BOOL bHardDep = FALSE; - static USHORT nCommandType, nOSType; - CommandData* pCmdData; - static SByteStringList *pStaticDepList; - Prj* pPrj; - - switch (i) - { - case 0: - aPrefix = yytext; - pStaticDepList = 0; - break; - case 1: - aDirName = yytext; - break; - case 2: - if ( !strcmp( yytext, ":" )) - { - bPrjDep = TRUE; - bHardDep = FALSE; - i = 9; - } - else if ( !strcmp( yytext, "::" )) - { - bPrjDep = TRUE; - bHardDep = TRUE; - i = 9; - } - else - { - bPrjDep = FALSE; - bHardDep = FALSE; - - aWhat = yytext; - if ( aWhat == "nmake" ) - nCommandType = COMMAND_NMAKE; - else if ( aWhat == "get" ) - nCommandType = COMMAND_GET; - else { - ULONG nOffset = aWhat.Copy( 3 ).ToInt32(); - nCommandType = sal::static_int_cast< USHORT >( - COMMAND_USER_START + nOffset - 1); - } - } - break; - case 3: - if ( !bPrjDep ) - { - aWhat = yytext; - if ( aWhat == "-" ) - { - aCommandPara = ByteString(); - } - else - aCommandPara = aWhat; - } - break; - case 4: - if ( !bPrjDep ) - { - aWhatOS = yytext; - if ( aWhatOS.GetTokenCount( ',' ) > 1 ) { - sClientRestriction = aWhatOS.Copy( aWhatOS.GetToken( 0, ',' ).Len() + 1 ); - aWhatOS = aWhatOS.GetToken( 0, ',' ); - } - if ( aWhatOS == "all" ) - nOSType = ( OS_WIN16 | OS_WIN32 | OS_OS2 | OS_UNX ); - else if ( aWhatOS == "w" ) - nOSType = ( OS_WIN16 | OS_WIN32 ); - else if ( aWhatOS == "p" ) - nOSType = OS_OS2; - else if ( aWhatOS == "u" ) - nOSType = OS_UNX; - else if ( aWhatOS == "d" ) - nOSType = OS_WIN16; - else if ( aWhatOS == "n" ) - nOSType = OS_WIN32; - else - nOSType = OS_NONE; - } - break; - case 5: - if ( !bPrjDep ) - { - aLogFileName = yytext; - } - break; - default: - if ( !bPrjDep ) - { - ByteString aItem = yytext; - if ( aItem == "NULL" ) - { - // Liste zu Ende - i = -1; - } - else - { - // ggfs. Dependency liste anlegen und ergaenzen - if ( !pStaticDepList ) - pStaticDepList = new SByteStringList; - pStaticDepList->PutString( new ByteString( aItem )); - } - } - else - { - ByteString aItem = yytext; - if ( aItem == "NULL" ) - { - // Liste zu Ende - i = -1; - bPrjDep= FALSE; - } - else - { - aProjectName = aDirName.GetToken ( 0, '\\'); - if ( HasProject( aProjectName )) - { - pPrj = GetPrj( aProjectName ); - // Projekt exist. schon, neue Eintraege anhaengen - } - else - { - // neues Project anlegen - pPrj = new Prj ( aProjectName ); - pPrj->SetPreFix( aPrefix ); - Insert(pPrj,LIST_APPEND); - } - pPrj->AddDependencies( aItem ); - pPrj->HasHardDependencies( bHardDep ); - - if ( nStarMode == STAR_MODE_RECURSIVE_PARSE ) { - String sItem( aItem, RTL_TEXTENCODING_ASCII_US ); - InsertSolarList( sItem ); - } - } - } - break; - } - /* Wenn dieses Project noch nicht vertreten ist, in die Liste - der Solar-Projekte einfuegen */ - if ( i == -1 ) - { - aProjectName = aDirName.GetToken ( 0, '\\'); - if ( HasProject( aProjectName )) - { - pPrj = GetPrj( aProjectName ); - // Projekt exist. schon, neue Eintraege anhaengen - } - else - { - // neues Project anlegen - pPrj = new Prj ( aProjectName ); - pPrj->SetPreFix( aPrefix ); - Insert(pPrj,LIST_APPEND); - } - - pCmdData = new CommandData; - pCmdData->SetPath( aDirName ); - pCmdData->SetCommandType( nCommandType ); - pCmdData->SetCommandPara( aCommandPara ); - pCmdData->SetOSType( nOSType ); - pCmdData->SetLogFile( aLogFileName ); - pCmdData->SetClientRestriction( sClientRestriction ); - if ( pStaticDepList ) - pCmdData->SetDependencies( pStaticDepList ); - - pStaticDepList = 0; - pPrj->Insert ( pCmdData, LIST_APPEND ); - aDirName =""; - aWhat =""; - aWhatOS = ""; - sClientRestriction = ""; - aLogFileName = ""; - nCommandType = 0; - nOSType = 0; - } - i++; - - // und wer raeumt die depLst wieder ab ? -} - -/*****************************************************************************/ -BOOL Star::HasProject ( ByteString aProjectName ) -/*****************************************************************************/ -{ - Prj *pPrj; - int nCountMember; - - nCountMember = Count(); - - for ( int i=0; iGetProjectName().EqualsIgnoreCaseAscii(aProjectName) ) - return TRUE; - } - return FALSE; -} - -/*****************************************************************************/ -Prj* Star::GetPrj ( ByteString aProjectName ) -/*****************************************************************************/ -{ - Prj* pPrj; - int nCountMember = Count(); - for ( int i=0;iGetProjectName().EqualsIgnoreCaseAscii(aProjectName) ) - return pPrj; - } -// return (Prj*)NULL; - return 0L ; -} - -/*****************************************************************************/ -ByteString Star::GetPrjName( DirEntry &aPath ) -/*****************************************************************************/ -{ - ByteString aRetPrj, aDirName; - ByteString aFullPathName = ByteString( aPath.GetFull(), gsl_getSystemTextEncoding()); - - xub_StrLen nToken = aFullPathName.GetTokenCount(PATH_DELIMETER); - for ( xub_StrLen i=0; i< nToken; i++ ) - { - aDirName = aFullPathName.GetToken( i, PATH_DELIMETER ); - if ( HasProject( aDirName )) - { - aRetPrj = aDirName; - break; - } - } - - return aRetPrj; -} - - -// -// class StarWriter -// - -/*****************************************************************************/ -StarWriter::StarWriter( String aFileName, BOOL bReadComments, USHORT nMode ) -/*****************************************************************************/ -{ - Read ( aFileName, bReadComments, nMode ); -} - -/*****************************************************************************/ -StarWriter::StarWriter( SolarFileList *pSolarFiles, BOOL bReadComments ) -/*****************************************************************************/ -{ - Read( pSolarFiles, bReadComments ); -} - -/*****************************************************************************/ -StarWriter::StarWriter( GenericInformationList *pStandLst, ByteString &rVersion, - BOOL bLocal, const char *pSourceRoot ) -/*****************************************************************************/ -{ - ByteString sPath( rVersion ); - String sSrcRoot; - if ( pSourceRoot ) - sSrcRoot = String::CreateFromAscii( pSourceRoot ); - -#ifdef UNX - sPath += "/settings/UNXSOLARLIST"; -#else - sPath += "/settings/SOLARLIST"; -#endif - GenericInformation *pInfo = pStandLst->GetInfo( sPath, TRUE ); - - if( pInfo && pInfo->GetValue().Len()) { - ByteString sFile( pInfo->GetValue()); - if ( bLocal ) { - IniManager aIniManager; - aIniManager.ToLocal( sFile ); - } - String sFileName( sFile, RTL_TEXTENCODING_ASCII_US ); - nStarMode = STAR_MODE_SINGLE_PARSE; - Read( sFileName ); - } - else { - SolarFileList *pFileList = new SolarFileList(); - - sPath = rVersion; - sPath += "/drives"; - - GenericInformation *pInfo2 = pStandLst->GetInfo( sPath, TRUE ); - if ( pInfo2 && pInfo2->GetSubList()) { - GenericInformationList *pDrives = pInfo2->GetSubList(); - for ( ULONG i = 0; i < pDrives->Count(); i++ ) { - GenericInformation *pDrive = pDrives->GetObject( i ); - if ( pDrive ) { - DirEntry aEntry; - BOOL bOk = FALSE; - if ( sSrcRoot.Len()) { - aEntry = DirEntry( sSrcRoot ); - bOk = TRUE; - } - else { -#ifdef UNX - sPath = "UnixVolume"; - GenericInformation *pUnixVolume = pDrive->GetSubInfo( sPath ); - if ( pUnixVolume ) { - String sRoot( pUnixVolume->GetValue(), RTL_TEXTENCODING_ASCII_US ); - aEntry = DirEntry( sRoot ); - bOk = TRUE; - } -#else - bOk = TRUE; - String sRoot( *pDrive, RTL_TEXTENCODING_ASCII_US ); - sRoot += String::CreateFromAscii( "\\" ); - aEntry = DirEntry( sRoot ); -#endif - } - if ( bOk ) { - sPath = "projects"; - GenericInformation *pProjectsKey = pDrive->GetSubInfo( sPath, TRUE ); - if ( pProjectsKey ) { - if ( !sSrcRoot.Len()) { - sPath = rVersion; - sPath += "/settings/PATH"; - GenericInformation *pPath = pStandLst->GetInfo( sPath, TRUE ); - if( pPath ) { - ByteString sAddPath( pPath->GetValue()); -#ifdef UNX - sAddPath.SearchAndReplaceAll( "\\", "/" ); -#else - sAddPath.SearchAndReplaceAll( "/", "\\" ); -#endif - String ssAddPath( sAddPath, RTL_TEXTENCODING_ASCII_US ); - aEntry += DirEntry( ssAddPath ); - } - } - GenericInformationList *pProjects = pProjectsKey->GetSubList(); - if ( pProjects ) { - String sPrjDir( String::CreateFromAscii( "prj" )); - String sSolarFile( String::CreateFromAscii( "build.lst" )); - - for ( ULONG j = 0; j < pProjects->Count(); j++ ) { - ByteString sProject( *pProjects->GetObject( j )); - String ssProject( sProject, RTL_TEXTENCODING_ASCII_US ); - - DirEntry aPrjEntry( aEntry ); - - aPrjEntry += DirEntry( ssProject ); - aPrjEntry += DirEntry( sPrjDir ); - aPrjEntry += DirEntry( sSolarFile ); - - pFileList->Insert( new String( aPrjEntry.GetFull()), LIST_APPEND ); - - ByteString sFile( aPrjEntry.GetFull(), RTL_TEXTENCODING_ASCII_US ); - fprintf( stdout, "%s\n", sFile.GetBuffer()); - } - } - } - } - } - } - } - Read( pFileList ); - } -} - -/*****************************************************************************/ -void StarWriter::CleanUp() -/*****************************************************************************/ -{ - Expand_Impl(); -} - -/*****************************************************************************/ -USHORT StarWriter::Read( String aFileName, BOOL bReadComments, USHORT nMode ) -/*****************************************************************************/ -{ - nStarMode = nMode; - - ByteString aString; - aFileList.Insert( new String( aFileName )); - - DirEntry aEntry( aFileName ); - aEntry.ToAbs(); - aEntry = aEntry.GetPath().GetPath().GetPath(); - sSourceRoot = aEntry.GetFull(); - - while( aFileList.Count()) { - - StarFile *pFile = new StarFile( *aFileList.GetObject(( ULONG ) 0 )); - if ( pFile->Exists()) { - SimpleConfig aSolarConfig( *aFileList.GetObject(( ULONG ) 0 )); - while (( aString = aSolarConfig.GetCleanedNextLine( bReadComments )) != "" ) - InsertTokenLine ( aString ); - } - - aMutex.acquire(); - aLoadedFilesList.Insert( pFile, LIST_APPEND ); - aMutex.release(); - delete aFileList.Remove(( ULONG ) 0 ); - } - // resolve all dependencies recursive - Expand_Impl(); - - // Die gefundenen Abhaengigkeiten rekursiv aufloesen - Expand_Impl(); - return 0; -} - -/*****************************************************************************/ -USHORT StarWriter::Read( SolarFileList *pSolarFiles, BOOL bReadComments ) -/*****************************************************************************/ -{ - nStarMode = STAR_MODE_MULTIPLE_PARSE; - - // this ctor is used by StarBuilder to get the information for the whole workspace - while( pSolarFiles->Count()) { - ByteString aString; - - StarFile *pFile = new StarFile( *pSolarFiles->GetObject(( ULONG ) 0 )); - if ( pFile->Exists()) { - SimpleConfig aSolarConfig( *pSolarFiles->GetObject(( ULONG ) 0 )); - while (( aString = aSolarConfig.GetCleanedNextLine( bReadComments )) != "" ) - InsertTokenLine ( aString ); - } - - aMutex.acquire(); - aLoadedFilesList.Insert( pFile, LIST_APPEND ); - aMutex.release(); - delete pSolarFiles->Remove(( ULONG ) 0 ); - } - delete pSolarFiles; - - Expand_Impl(); - return 0; -} - -/*****************************************************************************/ -USHORT StarWriter::WritePrj( Prj *pPrj, SvFileStream& rStream ) -/*****************************************************************************/ -{ - ByteString aDataString; - ByteString aTab('\t'); - ByteString aSpace(' '); - ByteString aEmptyString(""); - SByteStringList* pCmdDepList; - - CommandData* pCmdData = NULL; - if ( pPrj->Count() > 0 ) - { - pCmdData = pPrj->First(); - SByteStringList* pPrjDepList = pPrj->GetDependencies( FALSE ); - if ( pPrjDepList != 0 ) - { - aDataString = pPrj->GetPreFix(); - aDataString += aTab; - aDataString += pPrj->GetProjectName(); - aDataString += aTab; - if ( pPrj->HasHardDependencies()) - aDataString+= ByteString("::"); - else - aDataString+= ByteString(":"); - aDataString += aTab; - for ( USHORT i = 0; i< pPrjDepList->Count(); i++ ) { - aDataString += *pPrjDepList->GetObject( i ); - aDataString += aSpace; - } - aDataString+= "NULL"; - - rStream.WriteLine( aDataString ); - - pCmdData = pPrj->Next(); - } - if ( pCmdData ) { - do - { - if (( aDataString = pCmdData->GetComment()) == aEmptyString ) - { - aDataString = pPrj->GetPreFix(); - aDataString += aTab; - - aDataString+= pCmdData->GetPath(); - aDataString += aTab; - USHORT nPathLen = pCmdData->GetPath().Len(); - if ( nPathLen < 40 ) - for ( int i = 0; i < 9 - pCmdData->GetPath().Len() / 4 ; i++ ) - aDataString += aTab; - else - for ( int i = 0; i < 12 - pCmdData->GetPath().Len() / 4 ; i++ ) - aDataString += aTab; - aDataString += pCmdData->GetCommandTypeString(); - aDataString += aTab; - if ( pCmdData->GetCommandType() == COMMAND_GET ) - aDataString += aTab; - if ( pCmdData->GetCommandPara() == aEmptyString ) - aDataString+= ByteString("-"); - else - aDataString+= pCmdData->GetCommandPara(); - aDataString += aTab; - aDataString+= pCmdData->GetOSTypeString(); - if ( pCmdData->GetClientRestriction().Len()) { - aDataString += ByteString( "," ); - aDataString += pCmdData->GetClientRestriction(); - } - aDataString += aTab; - aDataString += pCmdData->GetLogFile(); - aDataString += aSpace; - - pCmdDepList = pCmdData->GetDependencies(); - if ( pCmdDepList ) - for ( USHORT i = 0; i< pCmdDepList->Count(); i++ ) { - aDataString += *pCmdDepList->GetObject( i ); - aDataString += aSpace; - } - aDataString += "NULL"; - } - - rStream.WriteLine( aDataString ); - - pCmdData = pPrj->Next(); - } while ( pCmdData ); - } - } - return 0; -} - -/*****************************************************************************/ -USHORT StarWriter::Write( String aFileName ) -/*****************************************************************************/ -{ - SvFileStream aFileStream; - - aFileStream.Open( aFileName, STREAM_WRITE | STREAM_TRUNC); - - if ( Count() > 0 ) - { - Prj* pPrj = First(); - do - { - WritePrj( pPrj, aFileStream ); - pPrj = Next(); - } while ( pPrj ); - } - - aFileStream.Close(); - - return 0; -} - -/*****************************************************************************/ -USHORT StarWriter::WriteMultiple( String rSourceRoot ) -/*****************************************************************************/ -{ - if ( Count() > 0 ) - { - String sPrjDir( String::CreateFromAscii( "prj" )); - String sSolarFile( String::CreateFromAscii( "build.lst" )); - - Prj* pPrj = First(); - do - { - String sName( pPrj->GetProjectName(), RTL_TEXTENCODING_ASCII_US ); - - DirEntry aEntry( rSourceRoot ); - aEntry += DirEntry( sName ); - aEntry += DirEntry( sPrjDir ); - aEntry += DirEntry( sSolarFile ); - - SvFileStream aFileStream; - aFileStream.Open( aEntry.GetFull(), STREAM_WRITE | STREAM_TRUNC); - - WritePrj( pPrj, aFileStream ); - - aFileStream.Close(); - - pPrj = Next(); - } while ( pPrj ); - } - - return 0; -} - -/*****************************************************************************/ -void StarWriter::InsertTokenLine ( ByteString& rString ) -/*****************************************************************************/ -{ - int i = 0; - ByteString aWhat, aWhatOS, - sClientRestriction, aLogFileName, aProjectName, aPrefix, aCommandPara; - static ByteString aDirName; - BOOL bPrjDep = FALSE; - BOOL bHardDep = FALSE; - USHORT nCommandType = 0; - USHORT nOSType = 0; - CommandData* pCmdData; - SByteStringList *pDepList2 = NULL; - Prj* pPrj; - - ByteString aEmptyString; - ByteString aToken = rString.GetToken( 0, '\t' ); - ByteString aCommentString; - - const char* yytext = aToken.GetBuffer(); - - while ( !( aToken == aEmptyString ) ) - { - switch (i) - { - case 0: - if ( rString.Search( "#" ) == 0 ) - { - i = -1; - aCommentString = rString; - rString = aEmptyString; - if ( Count() == 0 ) - aDirName = "null_entry" ; //comments at begin of file - break; - } - aPrefix = yytext; - pDepList2 = NULL; - break; - case 1: - aDirName = yytext; - break; - case 2: - if ( !strcmp( yytext, ":" )) - { - bPrjDep = TRUE; - bHardDep = FALSE; - i = 9; - } - else if ( !strcmp( yytext, "::" )) - { - bPrjDep = TRUE; - bHardDep = TRUE; - i = 9; - } - else - { - bPrjDep = FALSE; - bHardDep = FALSE; - - aWhat = yytext; - if ( aWhat == "nmake" ) - nCommandType = COMMAND_NMAKE; - else if ( aWhat == "get" ) - nCommandType = COMMAND_GET; - else { - ULONG nOffset = aWhat.Copy( 3 ).ToInt32(); - nCommandType = sal::static_int_cast< USHORT >( - COMMAND_USER_START + nOffset - 1); - } - } - break; - case 3: - if ( !bPrjDep ) - { - aWhat = yytext; - if ( aWhat == "-" ) - { - aCommandPara = ByteString(); - } - else - aCommandPara = aWhat; - } - break; - case 4: - if ( !bPrjDep ) - { - aWhatOS = yytext; - if ( aWhatOS.GetTokenCount( ',' ) > 1 ) { - sClientRestriction = aWhatOS.Copy( aWhatOS.GetToken( 0, ',' ).Len() + 1 ); - aWhatOS = aWhatOS.GetToken( 0, ',' ); - } - aWhatOS = aWhatOS.GetToken( 0, ',' ); - if ( aWhatOS == "all" ) - nOSType = ( OS_WIN16 | OS_WIN32 | OS_OS2 | OS_UNX ); - else if ( aWhatOS == "w" ) - nOSType = ( OS_WIN16 | OS_WIN32 ); - else if ( aWhatOS == "p" ) - nOSType = OS_OS2; - else if ( aWhatOS == "u" ) - nOSType = OS_UNX; - else if ( aWhatOS == "d" ) - nOSType = OS_WIN16; - else if ( aWhatOS == "n" ) - nOSType = OS_WIN32; - else - nOSType = OS_NONE; - } - break; - case 5: - if ( !bPrjDep ) - { - aLogFileName = yytext; - } - break; - default: - if ( !bPrjDep ) - { - ByteString aItem = yytext; - if ( aItem == "NULL" ) - { - // Liste zu Ende - i = -1; - } - else - { - // ggfs. Dependency liste anlegen und ergaenzen - if ( !pDepList2 ) - pDepList2 = new SByteStringList; - pDepList2->PutString( new ByteString( aItem )); - } - } - else - { - ByteString aItem = yytext; - if ( aItem == "NULL" ) - { - // Liste zu Ende - i = -1; - bPrjDep= FALSE; - } - else - { - aProjectName = aDirName.GetToken ( 0, '\\'); - if ( HasProject( aProjectName )) - { - pPrj = GetPrj( aProjectName ); - // Projekt exist. schon, neue Eintraege anhaengen - } - else - { - // neues Project anlegen - pPrj = new Prj ( aProjectName ); - pPrj->SetPreFix( aPrefix ); - Insert(pPrj,LIST_APPEND); - } - pPrj->AddDependencies( aItem ); - pPrj->HasHardDependencies( bHardDep ); - - if ( nStarMode == STAR_MODE_RECURSIVE_PARSE ) { - String sItem( aItem, RTL_TEXTENCODING_ASCII_US ); - InsertSolarList( sItem ); - } - } - - } - break; - } - /* Wenn dieses Project noch nicht vertreten ist, in die Liste - der Solar-Projekte einfuegen */ - if ( i == -1 ) - { - aProjectName = aDirName.GetToken ( 0, '\\'); - if ( HasProject( aProjectName )) - { - pPrj = GetPrj( aProjectName ); - // Projekt exist. schon, neue Eintraege anhaengen - } - else - { - // neues Project anlegen - pPrj = new Prj ( aProjectName ); - pPrj->SetPreFix( aPrefix ); - Insert(pPrj,LIST_APPEND); - } - - pCmdData = new CommandData; - pCmdData->SetPath( aDirName ); - pCmdData->SetCommandType( nCommandType ); - pCmdData->SetCommandPara( aCommandPara ); - pCmdData->SetOSType( nOSType ); - pCmdData->SetLogFile( aLogFileName ); - pCmdData->SetComment( aCommentString ); - pCmdData->SetClientRestriction( sClientRestriction ); - if ( pDepList2 ) - pCmdData->SetDependencies( pDepList2 ); - - pPrj->Insert ( pCmdData, LIST_APPEND ); - - } - i++; - - rString.Erase(0, aToken.Len()+1); - aToken = rString.GetToken( 0, '\t' ); - yytext = aToken.GetBuffer(); - - } - // und wer raeumt die depLst wieder ab ? -} - -/*****************************************************************************/ -BOOL StarWriter::InsertProject ( Prj* ) -/*****************************************************************************/ -{ - return FALSE; -} - -/*****************************************************************************/ -Prj* StarWriter::RemoveProject ( ByteString aProjectName ) -/*****************************************************************************/ -{ - ULONG nCountMember = Count(); - Prj* pPrj; - Prj* pPrjFound = NULL; - SByteStringList* pPrjDeps; - - for ( USHORT i = 0; i < nCountMember; i++ ) - { - pPrj = GetObject( i ); - if ( pPrj->GetProjectName() == aProjectName ) - pPrjFound = pPrj; - else - { - pPrjDeps = pPrj->GetDependencies( FALSE ); - if ( pPrjDeps ) - { - ByteString* pString; - ULONG nPrjDepsCount = pPrjDeps->Count(); - for ( ULONG j = nPrjDepsCount; j > 0; j-- ) - { - pString = pPrjDeps->GetObject( j - 1 ); - if ( pString->GetToken( 0, '.') == aProjectName ) - pPrjDeps->Remove( pString ); - } - } - } - } - - Remove( pPrjFound ); - - return pPrjFound; -} - -// -// class StarFile -// - -/*****************************************************************************/ -StarFile::StarFile( const String &rFile ) -/*****************************************************************************/ - : aFileName( rFile ) -{ - DirEntry aEntry( aFileName ); - if ( aEntry.Exists()) { - bExists = TRUE; - FileStat aStat( aEntry ); - aDate = aStat.DateModified(); - aTime = aStat.TimeModified(); - } - else - bExists = FALSE; -} - -/*****************************************************************************/ -BOOL StarFile::NeedsUpdate() -/*****************************************************************************/ -{ - DirEntry aEntry( aFileName ); - if ( aEntry.Exists()) { - if ( !bExists ) { - bExists = TRUE; - return TRUE; - } - FileStat aStat( aEntry ); - if (( aStat.DateModified() > aDate ) || - (( aStat.DateModified() == aDate ) && ( aStat.TimeModified() > aTime ))) - return TRUE; - } - return FALSE; -} - diff --git a/tools/bootstrp/sstring.cxx b/tools/bootstrp/sstring.cxx deleted file mode 100644 index 8c83dedf72ec..000000000000 --- a/tools/bootstrp/sstring.cxx +++ /dev/null @@ -1,317 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_tools.hxx" - -#ifndef _TOOLS_STRINGLIST -# define _TOOLS_STRINGLIST -#endif - -#define ENABLE_BYTESTRING_STREAM_OPERATORS -#include -#include "bootstrp/sstring.hxx" - -SByteStringList::SByteStringList() -{ -} - -SByteStringList::~SByteStringList() -{ -} - -ULONG SByteStringList::IsString( ByteString* pStr ) -{ - ULONG nRet = NOT_THERE; - if ( (nRet = GetPrevString( pStr )) != 0 ) - { - ByteString* pString = GetObject( nRet ); - if ( *pString == *pStr ) - return nRet; - else - return NOT_THERE; - } - else - { - ByteString* pString = GetObject( 0 ); - if ( pString && (*pString == *pStr) ) - return 0; - else - return NOT_THERE; - } -} - -ULONG SByteStringList::GetPrevString( ByteString* pStr ) -{ - ULONG nRet = 0; - BOOL bFound = FALSE; - ULONG nCountMember = Count(); - ULONG nUpper = nCountMember; - ULONG nLower = 0; - ULONG nCurrent = nUpper / 2; - ULONG nRem = 0; - ByteString* pString; - - do - { - if ( (nCurrent == nLower) || (nCurrent == nUpper) ) - return nLower; - pString = GetObject( nCurrent ); - StringCompare nResult = pStr->CompareTo( *pString ); - if ( nResult == COMPARE_LESS ) - { - nUpper = nCurrent; - nCurrent = (nCurrent + nLower) /2; - } - else if ( nResult == COMPARE_GREATER ) - { - nLower = nCurrent; - nCurrent = (nUpper + nCurrent) /2; - } - else if ( nResult == COMPARE_EQUAL ) - return nCurrent; - if ( nRem == nCurrent ) - return nCurrent; - nRem = nCurrent; - } - while ( !bFound ); - return nRet; -} - -/************************************************************************** -* -* Sortiert einen ByteString in die Liste ein und gibt die Position, -* an der einsortiert wurde, zurueck -* -**************************************************************************/ - -ULONG SByteStringList::PutString( ByteString* pStr ) -{ - ULONG nPos = GetPrevString ( pStr ); - if ( Count() ) - { - { - ByteString* pString = GetObject( 0 ); - if ( pString->CompareTo( *pStr ) == COMPARE_GREATER ) - { - Insert( pStr, (ULONG)0 ); - return (ULONG)0; - } - } - ByteString* pString = GetObject( nPos ); - if ( *pStr != *pString ) - { - Insert( pStr, nPos+1 ); - return ( nPos +1 ); - } - } - else - { - Insert( pStr ); - return (ULONG)0; - } - - return NOT_THERE; -} - -ByteString* SByteStringList::RemoveString( const ByteString& rName ) -{ - ULONG i; - ByteString* pReturn; - - for( i = 0 ; i < Count(); i++ ) - { - if ( rName == *GetObject( i ) ) - { - pReturn = GetObject(i); - Remove(i); - return pReturn; - } - } - - return NULL; -} - -void SByteStringList::CleanUp() -{ - ByteString* pByteString = First(); - while (pByteString) { - delete pByteString; - pByteString = Next(); - } - Clear(); -} - -SByteStringList& SByteStringList::operator<< ( SvStream& rStream ) -{ - sal_uInt32 nListCount; - rStream >> nListCount; - for ( USHORT i = 0; i < nListCount; i++ ) { - ByteString* pByteString = new ByteString(); - rStream >> *pByteString; - Insert (pByteString, LIST_APPEND); - } - return *this; -} - -SByteStringList& SByteStringList::operator>> ( SvStream& rStream ) -{ - sal_uInt32 nListCount = Count(); - rStream << nListCount; - ByteString* pByteString = First(); - while (pByteString) { - rStream << *pByteString; - pByteString = Next(); - } - return *this; -} - - - - - - - -SUniStringList::SUniStringList() -{ -} - -SUniStringList::~SUniStringList() -{ -} - -ULONG SUniStringList::IsString( UniString* pStr ) -{ - ULONG nRet = NOT_THERE; - if ( (nRet = GetPrevString( pStr )) != 0 ) - { - UniString* pString = GetObject( nRet ); - if ( *pString == *pStr ) - return nRet; - else - return NOT_THERE; - } - else - { - UniString* pString = GetObject( 0 ); - if ( pString && (*pString == *pStr) ) - return 0; - else - return NOT_THERE; - } -} - -ULONG SUniStringList::GetPrevString( UniString* pStr ) -{ - ULONG nRet = 0; - BOOL bFound = FALSE; - ULONG nCountMember = Count(); - ULONG nUpper = nCountMember; - ULONG nLower = 0; - ULONG nCurrent = nUpper / 2; - ULONG nRem = 0; - UniString* pString; - - do - { - if ( (nCurrent == nLower) || (nCurrent == nUpper) ) - return nLower; - pString = GetObject( nCurrent ); - StringCompare nResult = pStr->CompareTo( *pString ); - if ( nResult == COMPARE_LESS ) - { - nUpper = nCurrent; - nCurrent = (nCurrent + nLower) /2; - } - else if ( nResult == COMPARE_GREATER ) - { - nLower = nCurrent; - nCurrent = (nUpper + nCurrent) /2; - } - else if ( nResult == COMPARE_EQUAL ) - return nCurrent; - if ( nRem == nCurrent ) - return nCurrent; - nRem = nCurrent; - } - while ( !bFound ); - return nRet; -} - -/************************************************************************** -* -* Sortiert einen UniString in die Liste ein und gibt die Position, -* an der einsortiert wurde, zurueck -* -**************************************************************************/ - -ULONG SUniStringList::PutString( UniString* pStr ) -{ - ULONG nPos = GetPrevString ( pStr ); - if ( Count() ) - { - { - UniString* pString = GetObject( 0 ); - if ( pString->CompareTo( *pStr ) == COMPARE_GREATER ) - { - Insert( pStr, (ULONG)0); - return (ULONG)0; - } - } - UniString* pString = GetObject( nPos ); - if ( *pStr != *pString ) - { - Insert( pStr, nPos+1 ); - return ( nPos +1 ); - } - } - else - { - Insert( pStr ); - return (ULONG)0; - } - - return NOT_THERE; -} - -UniString* SUniStringList::RemoveString( const UniString& rName ) -{ - ULONG i; - UniString* pReturn; - - for( i = 0 ; i < Count(); i++ ) - { - if ( rName == *GetObject( i ) ) - { - pReturn = GetObject(i); - Remove(i); - return pReturn; - } - } - - return NULL; -} diff --git a/tools/inc/bootstrp/command.hxx b/tools/inc/bootstrp/command.hxx deleted file mode 100644 index e0d8f1e39aeb..000000000000 --- a/tools/inc/bootstrp/command.hxx +++ /dev/null @@ -1,165 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef COMMAND_HXX -#define COMMAND_HXX - -#include - -#include -#define STRLEN 100 -#ifndef UNX -#define TMPNAME "\\command.tmp" -#else -#define TMPNAME "/tmp/command.tmp" -#endif - -/** Different types of spawnable programs -*/ -enum ExeType -{ - EXE, /// programm is a native executable - BAT, /// programm is a DOS-Batch - BTM /// programm is a 4DOS-Batch -}; - -#define COMMAND_NOTFOUND 0x0001 -#define COMMAND_TOOBIG 0x0002 -#define COMMAND_INVALID 0x0004 -#define COMMAND_NOEXEC 0x0008 -#define COMMAND_NOMEM 0x0010 -#define COMMAND_UNKNOWN 0x0020 - -#ifdef WNT -#define COMMAND_SHELL "4nt.exe" -#endif -#ifdef OS2 -#define COMMAND_SHELL "4os2.exe" -#endif -#ifdef UNX -#define COMMAND_SHELL "csh" -#endif - -class CommandLine; -class LogWindow; - -class CommandLine -{ -friend class ChildProcess; -private: - char *CommandBuffer; - char *ComShell; - char **ppArgv; - BOOL bTmpWrite; - -public: - CommandLine(BOOL bTmpWrite = FALSE); - CommandLine(const char *, BOOL bTmpWrite = FALSE); - CommandLine(const CommandLine&, BOOL bTmpWrite = FALSE); - virtual ~CommandLine(); - - int nArgc; - - CommandLine& operator=(const CommandLine&); - CommandLine& operator=(const char *); - void BuildCommand(const char *); - char** GetCommand(void) { return ppArgv; } - void Strtokens(const char *); - void Print(); -}; - -static ByteString thePath( "PATH" ); - -/** Declares and spawns a child process. - The spawned programm could be a native executable or a schell script. -*/ -class CCommand -{ -private: - ByteString aCommandLine; - ByteString aCommand; - char *pArgv; - char **ppArgv; - ULONG nArgc; - int nError; - -protected: - void ImplInit(); - void Initpp( ULONG nCount, ByteString &rStr ); - -public: - /** Creates the process specified without spawning it - @param rString specifies the programm or shell scrip - */ - CCommand( ByteString &rString ); - - /** Creates the process specified without spawning it - @param pChar specifies the programm or shell scrip - */ - CCommand( const char *pChar ); - - /** Try to find the given programm in specified path - @param sEnv specifies the current search path, defaulted by environment - @param sItem specifies the system shell - @return the Location (when programm was found) - */ - static ByteString Search( ByteString sEnv = thePath, - ByteString sItem = COMMAND_SHELL ); - - /** Spawns the Process - @return 0 when spawned without errors, otherwise a error code - */ - operator int(); - - ByteString GetCommandLine_() { return aCommandLine; } - ByteString GetCommand() { return aCommand; } - - char** GetCommandStr() { return ppArgv; } -}; - -#define COMMAND_EXECUTE_WINDOW 0x0000001 -#define COMMAND_EXECUTE_CONSOLE 0x0000002 -#define COMMAND_EXECUTE_HIDDEN 0x0000004 -#define COMMAND_EXECUTE_START 0x0000008 -#define COMMAND_EXECUTE_WAIT 0x0000010 -#define COMMAND_EXECUTE_REMOTE 0x1000000 - -typedef ULONG CommandBits; - -/** Allowes to spawn programms hidden, waiting etc. - @see CCommand -*/ -class CCommandd : public CCommand -{ - CommandBits nFlag; -public: - CCommandd( ByteString &rString, CommandBits nBits ); - CCommandd( const char *pChar, CommandBits nBits ); - operator int(); -}; - -#endif diff --git a/tools/inc/bootstrp/listmacr.hxx b/tools/inc/bootstrp/listmacr.hxx deleted file mode 100644 index 8c678ff32275..000000000000 --- a/tools/inc/bootstrp/listmacr.hxx +++ /dev/null @@ -1,60 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _LISTMACR_HXX -#define _LISTMACR_HXX - -#define DECL_DEST_LIST( TmpListType, ListType, PointerType ) \ -DECLARE_LIST(TmpListType, PointerType) \ -class ListType : public TmpListType \ -{ \ -public: \ - void ClearAndDelete() \ - { \ - while ( Count()) { \ - PointerType pTmp = GetObject(( ULONG ) 0 ); \ - delete pTmp; \ - Remove(( ULONG ) 0 ); \ - } \ - } \ - ~ListType() \ - { \ - ClearAndDelete(); \ - } \ -}; \ - -#endif - - - - - - - - - - diff --git a/tools/inc/bootstrp/mkcreate.hxx b/tools/inc/bootstrp/mkcreate.hxx index 991b5961a096..5510fb87f7b9 100644 --- a/tools/inc/bootstrp/mkcreate.hxx +++ b/tools/inc/bootstrp/mkcreate.hxx @@ -29,7 +29,9 @@ #define _MK_CREATE_HXX #include -#include "bootstrp/sstring.hxx" +//#include "bootstrp/sstring.hxx" + +DECLARE_LIST( UniStringList, UniString* ) #include #include "bootstrp/prj.hxx" diff --git a/tools/inc/bootstrp/prj.hxx b/tools/inc/bootstrp/prj.hxx index 2d7664b8b69f..4b1ff91feb7b 100644 --- a/tools/inc/bootstrp/prj.hxx +++ b/tools/inc/bootstrp/prj.hxx @@ -30,98 +30,6 @@ #include #include -#include "bootstrp/listmacr.hxx" -#include - -#define OS_NONE 0x0000 -#define OS_WIN16 0x0001 -#define OS_WIN32 0x0002 -#define OS_OS2 0x0004 -#define OS_UNX 0x0008 -#define OS_ALL ( OS_WIN16 | OS_WIN32 | OS_OS2 | OS_UNX ) - -#define COMMAND_PROJECTROOT 0x0000 -#define COMMAND_NMAKE 0x0001 -#define COMMAND_GET 0x0002 -#define COMMAND_USER_START 0x0003 -#define COMMAND_USER_END 0xFFFE -#define COMMAND_ALLDIRS 0xFFFF - -class SByteStringList; -class GenericInformationList; - -/* -// Pfade auf Konfigurationsdateien des Build-Servers - -#define REQUEST_DIR \\src\data4\source\b_server\server\newjob -*/ -/********************************************************************* -* -* Die Klasse CommandData haelte alle Informationen, die fuer die -* Abarbeitung eines Kommandos (nmake, get) noetig sind -* -*********************************************************************/ - -class CommandData -{ - ByteString aPrj; - ByteString aLogFileName; - ByteString aInpath; - ByteString aUpd; - ByteString aUpdMinor; - ByteString aProduct; - ByteString aCommand; - ByteString aPath; - ByteString aPrePath; - ByteString aPreFix; - ByteString aCommandPara; - ByteString aComment; - ByteString sClientRestriction; - SByteStringList *pDepList; - USHORT nOSType; - USHORT nCommand; - - ULONG nDepth; // Tiefe der Abhaenigkeit - -public: - CommandData(); - ~CommandData(); - ByteString GetProjectName(){return aPrj;} - void SetProjectName( ByteString aName ){aPrj = aName;} - ByteString GetLogFile(){return aLogFileName;} - void SetLogFile( ByteString aName ){aLogFileName = aName;} - ByteString GetInpath(){return aInpath;} - void SetInpath( ByteString aName ){aInpath = aName;} - ByteString GetUpd(){return aUpd;} - void SetUpd( ByteString aName ){aUpd = aName;} - ByteString GetUpdMinor(){return aUpdMinor;} - void SetUpdMinor( ByteString aName ){aUpdMinor = aName;} - ByteString GetProduct(){return aProduct;} - void SetProduct( ByteString aName ){aProduct = aName;} - ByteString GetCommand(){return aCommand;} - void SetCommand ( ByteString aName ){aCommand = aName;} - ByteString GetCommandPara(){return aCommandPara;} - void SetCommandPara ( ByteString aName ){aCommandPara = aName;} - ByteString GetComment(){return aComment;} - void SetComment ( ByteString aCommentString ){aComment = aCommentString;} - ByteString GetPath(){return aPath;} - void SetPath( ByteString aName ){aPath = aName;} - ByteString GetPrePath(){return aPrePath;} - void SetPrePath( ByteString aName ){aPrePath = aName;} - USHORT GetOSType(){return nOSType;} - ByteString GetOSTypeString(); - void SetOSType( USHORT nType ){nOSType = nType;} - USHORT GetCommandType(){return nCommand;} - ByteString GetCommandTypeString(); - void SetCommandType( USHORT nCommandType ){nCommand = nCommandType;} - SByteStringList* GetDependencies(){return pDepList;} - void SetDependencies( SByteStringList *pList ){pDepList = pList;} - ByteString GetClientRestriction() { return sClientRestriction; } - void SetClientRestriction( ByteString sRestriction ) { sClientRestriction = sRestriction; } - - void AddDepth(){nDepth++;} - ULONG GetDepth(){return nDepth;} -}; /********************************************************************* * @@ -147,185 +55,4 @@ public: ByteString GetCleanedNextLine( BOOL bReadComments = FALSE ); }; -#define ENV_GUI 0x00000000 -#define ENV_OS 0x00000001 -#define ENV_UPD 0x00000002 -#define ENV_UPDMIN 0x00000004 -#define ENV_INPATH 0x00000008 -#define ENV_OUTPATH 0x00000010 -#define ENV_GUIBASE 0x00000020 -#define ENV_CVER 0x00000040 -#define ENV_GVER 0x00000080 -#define ENV_GUIENV 0x00000100 -#define ENV_CPU 0x00000200 -#define ENV_CPUNAME 0x00000400 -#define ENV_DLLSUFF 0x00000800 -#define ENV_COMEX 0x00001000 -#define ENV_COMPATH 0x00002000 -#define ENV_INCLUDE 0x00004000 -#define ENV_LIB 0x00008000 -#define ENV_PATH 0x00010000 -#define ENV_SOLVER 0x00020000 -#define ENV_SOLENV 0x00040000 -#define ENV_SOLROOT 0x00080000 -#define ENV_DEVROOT 0x00100000 -#define ENV_EMERG 0x00200000 -#define ENV_STAND 0x00400000 - -/********************************************************************* -* -* class Prj -* alle Daten eines Projektes werden hier gehalten -* -*********************************************************************/ - -DECL_DEST_LIST ( PrjList_tmp, PrjList, CommandData * ) - -class Star; -class Prj : public PrjList -{ -friend class Star; -private: - BOOL bVisited; - - ByteString aPrjPath; - ByteString aProjectName; - ByteString aProjectPrefix; // max. 2-buchstabige Abk. - SByteStringList* pPrjInitialDepList; - SByteStringList* pPrjDepList; - BOOL bHardDependencies; - BOOL bSorted; - -public: - Prj(); - Prj( ByteString aName ); - ~Prj(); - void SetPreFix( ByteString aPre ){aProjectPrefix = aPre;} - ByteString GetPreFix(){return aProjectPrefix;} - ByteString GetProjectName() - {return aProjectName;} - void SetProjectName(ByteString aName) - {aProjectName = aName;} - BOOL InsertDirectory( ByteString aDirName , USHORT aWhat, - USHORT aWhatOS, ByteString aLogFileName, - const ByteString &rClientRestriction ); - CommandData* RemoveDirectory( ByteString aLogFileName ); - CommandData* GetDirectoryList ( USHORT nWhatOs, USHORT nCommand ); - CommandData* GetDirectoryData( ByteString aLogFileName ); - inline CommandData* GetData( ByteString aLogFileName ) - { return GetDirectoryData( aLogFileName ); }; - - SByteStringList* GetDependencies( BOOL bExpanded = TRUE ); - void AddDependencies( ByteString aStr ); - void HasHardDependencies( BOOL bHard ) { bHardDependencies = bHard; } - BOOL HasHardDependencies() { return bHardDependencies; } -}; - -/********************************************************************* -* -* class Star -* Diese Klasse liest die Projectstruktur aller StarDivision Projekte -* aus \\dev\data1\upenv\data\config\solar.lst aus -* -*********************************************************************/ - -DECL_DEST_LIST ( StarList_tmp, StarList, Prj* ) -DECLARE_LIST ( SolarFileList, String* ) - -class StarFile -{ -private: - String aFileName; - Date aDate; - Time aTime; - - BOOL bExists; - -public: - StarFile( const String &rFile ); - const String &GetName() { return aFileName; } - Date GetDate() { return aDate; } - Time GetTime() { return aTime; } - - BOOL NeedsUpdate(); - BOOL Exists() { return bExists; } -}; - -DECLARE_LIST( StarFileList, StarFile * ) - -#define STAR_MODE_SINGLE_PARSE 0x0000 -#define STAR_MODE_RECURSIVE_PARSE 0x0001 -#define STAR_MODE_MULTIPLE_PARSE 0x0002 - -class Star : public StarList -{ -private: - ByteString aStarName; - - static Link aDBNotFoundHdl; -protected: - NAMESPACE_VOS( OMutex ) aMutex; - - USHORT nStarMode; - SolarFileList aFileList; - StarFileList aLoadedFilesList; - String sSourceRoot; - - void InsertSolarList( String sProject ); - String CreateFileName( String sProject ); - - void Expand_Impl(); - void ExpandPrj_Impl( Prj *pPrj, Prj *pDepPrj ); - -private: - void Read( String &rFileName ); - void Read( SolarFileList *pSOlarFiles ); - -public: - Star(); - Star( String aFileName, USHORT nMode = STAR_MODE_SINGLE_PARSE ); - Star( SolarFileList *pSolarFiles ); - Star( GenericInformationList *pStandLst, ByteString &rVersion, BOOL bLocal = FALSE, - const char *pSourceRoot = NULL ); - - ~Star(); - - static void SetDBNotFoundHdl( const Link &rLink ) { aDBNotFoundHdl = rLink; } - - ByteString GetName(){ return aStarName; }; - - BOOL HasProject( ByteString aProjectName ); - Prj* GetPrj( ByteString aProjectName ); - ByteString GetPrjName( DirEntry &rPath ); - - void InsertToken( char *pChar ); - BOOL NeedsUpdate(); - - USHORT GetMode() { return nStarMode; } -}; - -class StarWriter : public Star -{ -private: - USHORT WritePrj( Prj *pPrj, SvFileStream& rStream ); - -public: - StarWriter( String aFileName, BOOL bReadComments = FALSE, USHORT nMode = STAR_MODE_SINGLE_PARSE ); - StarWriter( SolarFileList *pSolarFiles, BOOL bReadComments = FALSE ); - StarWriter( GenericInformationList *pStandLst, ByteString &rVersion, BOOL bLocal = FALSE, - const char *pSourceRoot = NULL ); - - void CleanUp(); - - BOOL InsertProject ( Prj* pNewPrj ); - Prj* RemoveProject ( ByteString aProjectName ); - - USHORT Read( String aFileName, BOOL bReadComments = FALSE, USHORT nMode = STAR_MODE_SINGLE_PARSE ); - USHORT Read( SolarFileList *pSolarFiles, BOOL bReadComments = FALSE ); - USHORT Write( String aFileName ); - USHORT WriteMultiple( String rSourceRoot ); - - void InsertTokenLine( ByteString& rString ); -}; - #endif diff --git a/tools/inc/bootstrp/sstring.hxx b/tools/inc/bootstrp/sstring.hxx deleted file mode 100644 index 933770887e37..000000000000 --- a/tools/inc/bootstrp/sstring.hxx +++ /dev/null @@ -1,105 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SSTRING_HXX -#define _SSTRING_HXX - -#include -#include - -#define NOT_THERE LIST_ENTRY_NOTFOUND - -#define SStringList SUniStringList -#define StringList UniStringList - -DECLARE_LIST( ByteStringList, ByteString* ) -DECLARE_LIST( UniStringList, UniString* ) - -class SvStream; - -// --------------------- -// - class SStringList - -// --------------------- - -class SByteStringList : public ByteStringList -{ -public: - SByteStringList(); - ~SByteStringList(); - - // neuen ByteString in Liste einfuegen - ULONG PutString( ByteString* ); - ByteString* RemoveString( const ByteString& rName ); - - // Position des ByteString in Liste, wenn nicht enthalten, dann - // return = NOT_THERE - ULONG IsString( ByteString* ); - - // Vorgaenger ermitteln ( auch wenn selbst noch nicht in - // Liste enthalten - ULONG GetPrevString( ByteString* ); - void CleanUp(); - - SByteStringList& operator<< ( SvStream& rStream ); - SByteStringList& operator>> ( SvStream& rStream ); -}; - -// --------------------- -// - class SUniStringList - -// --------------------- - -class SUniStringList : public UniStringList -{ -public: - SUniStringList(); - ~SUniStringList(); - - // neuen UniString in Liste einfuegen - ULONG PutString( UniString* ); - UniString* RemoveString( const UniString& rName ); - - // Position des UniString in Liste, wenn nicht enthalten, dann - // return = NOT_THERE - ULONG IsString( UniString* ); - - // Vorgaenger ermitteln ( auch wenn selbst noch nicht in - // Liste enthalten - ULONG GetPrevString( UniString* ); -}; - -class Text -{ -protected: - String aString; - -public: - Text( char* pChar ); - Text( String &rStr ) { aString = rStr; } - void Stderr(); -}; - -#endif diff --git a/tools/prj/d.lst b/tools/prj/d.lst index 854a6179739a..1c0b5271071d 100644 --- a/tools/prj/d.lst +++ b/tools/prj/d.lst @@ -1,27 +1,12 @@ -mkdir: %_DEST%\inc%_EXT%\bootstrp +mkdir: %_DEST%\inc%_EXT%\tools ..\%__SRC%\bin\mkunroll* %_DEST%\bin%_EXT% ..\%__SRC%\bin\tl?????.dll %_DEST%\bin%_EXT%\tl?????.dll ..\%__SRC%\bin\tl?????.sym %_DEST%\bin%_EXT%\tl?????.sym -..\%__SRC%\lib\atools.lib %_DEST%\lib%_EXT%\atools.lib -..\%__SRC%\lib\btstrp.lib %_DEST%\lib%_EXT%\btstrp.lib -..\%__SRC%\lib\bootstrp2.lib %_DEST%\lib%_EXT%\bootstrp2.lib ..\%__SRC%\lib\itools.lib %_DEST%\lib%_EXT%\itools.lib -..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%\lib*.a -..\%__SRC%\lib\lib*.sl %_DEST%\lib%_EXT%\lib*.sl ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so ..\%__SRC%\lib\lib*.so.* %_DEST%\lib%_EXT%\lib*.so.* ..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%\lib*.dylib -..\%__SRC%\lib\stdstrm.lib %_DEST%\lib%_EXT%\stdstrm.lib -..\%__SRC%\misc\tl?????.map %_DEST%\bin%_EXT%\tl?????.map -..\%__SRC%\slb\btstrpsh.lib %_DEST%\lib%_EXT%\btstrpsh.lib - -..\inc\bootstrp\command.hxx %_DEST%\inc%_EXT%\bootstrp\command.hxx -..\inc\bootstrp\inimgr.hxx %_DEST%\inc%_EXT%\bootstrp\inimgr.hxx -..\inc\bootstrp\listmacr.hxx %_DEST%\inc%_EXT%\bootstrp\listmacr.hxx -..\inc\bootstrp\mkcreate.hxx %_DEST%\inc%_EXT%\bootstrp\mkcreate.hxx -..\inc\bootstrp\prj.hxx %_DEST%\inc%_EXT%\bootstrp\prj.hxx -..\inc\bootstrp\sstring.hxx %_DEST%\inc%_EXT%\bootstrp\sstring.hxx ..\inc\tools\*.h %_DEST%\inc%_EXT%\tools\*.h ..\inc\tools\*.hxx %_DEST%\inc%_EXT%\tools\*.hxx diff --git a/tools/util/makefile.mk b/tools/util/makefile.mk index 568baaacd8f1..735b5380614d 100644 --- a/tools/util/makefile.mk +++ b/tools/util/makefile.mk @@ -38,26 +38,25 @@ ENABLE_EXCEPTIONS=true # --- Allgemein ---------------------------------------------------- # --- STDSTRM.LIB --- -LIB3TARGET= $(LB)$/stdstrm.lib -LIB3ARCHIV= $(LB)$/libstdstrm.a -LIB3FILES= $(LB)$/stream.lib - -LIB7TARGET= $(LB)$/a$(TARGET).lib -LIB7ARCHIV= $(LB)$/liba$(TARGET).a -LIB7FILES= $(LB)$/gen.lib \ - $(LB)$/str.lib \ - $(LB)$/mtools.lib \ - $(LB)$/datetime.lib \ - $(LB)$/fsys.lib \ - $(LB)$/communi.lib \ - $(LB)$/stream.lib \ - $(LB)$/ref.lib \ - $(LB)$/rc.lib \ - $(LB)$/inet.lib \ - $(LB)$/debug.lib - - -LIB7FILES+= $(LB)$/dll.lib +#LIB3TARGET= $(LB)$/stdstrm.lib +#LIB3ARCHIV= $(LB)$/libstdstrm.a +#LIB3FILES= $(LB)$/stream.lib + +#LIB7TARGET= $(LB)$/a$(TARGET).lib +#LIB7ARCHIV= $(LB)$/liba$(TARGET).a +#LIB7FILES= $(LB)$/gen.lib \ +# $(LB)$/str.lib \ +# $(LB)$/mtools.lib \ +# $(LB)$/datetime.lib \ +# $(LB)$/fsys.lib \ +# $(LB)$/communi.lib \ +# $(LB)$/stream.lib \ +# $(LB)$/ref.lib \ +# $(LB)$/rc.lib \ +# $(LB)$/inet.lib \ +# $(LB)$/debug.lib +# +#LIB7FILES+= $(LB)$/dll.lib # --- TOOLS.LIB --- LIB1TARGET:= $(SLB)$/$(TARGET).lib -- cgit From 9ae1020765800cee95851e866d388e9394408471 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 7 May 2010 14:39:55 +0200 Subject: CWS gnumake2: adapt gbuild makefiles to changes in tools/bootstrp --- tools/prj/target_exe_mkunroll.mk | 3 --- tools/prj/target_exe_rscdep.mk | 3 --- tools/prj/target_exe_sspretty.mk | 3 --- tools/prj/target_package_inc.mk | 6 ------ 4 files changed, 15 deletions(-) diff --git a/tools/prj/target_exe_mkunroll.mk b/tools/prj/target_exe_mkunroll.mk index 9d00d75b4bc1..b1ce83680ef8 100644 --- a/tools/prj/target_exe_mkunroll.mk +++ b/tools/prj/target_exe_mkunroll.mk @@ -52,12 +52,9 @@ $(eval $(call gb_Executable_add_linked_libs,mkunroll,\ $(eval $(call gb_Executable_add_exception_objects,mkunroll,\ tools/bootstrp/addexes2/mkfilt \ tools/bootstrp/appdef \ - tools/bootstrp/command \ tools/bootstrp/cppdep \ tools/bootstrp/inimgr \ - tools/bootstrp/mkcreate \ tools/bootstrp/prj \ - tools/bootstrp/sstring \ )) ifeq ($(OS),WNT) diff --git a/tools/prj/target_exe_rscdep.mk b/tools/prj/target_exe_rscdep.mk index 99a717470f19..20f4d22b186c 100644 --- a/tools/prj/target_exe_rscdep.mk +++ b/tools/prj/target_exe_rscdep.mk @@ -48,13 +48,10 @@ $(eval $(call gb_Executable_add_linked_libs,rscdep,\ $(eval $(call gb_Executable_add_exception_objects,rscdep,\ tools/bootstrp/appdef \ - tools/bootstrp/command \ tools/bootstrp/cppdep \ tools/bootstrp/inimgr \ - tools/bootstrp/mkcreate \ tools/bootstrp/prj \ tools/bootstrp/rscdep \ - tools/bootstrp/sstring \ )) ifeq ($(OS),WNT) diff --git a/tools/prj/target_exe_sspretty.mk b/tools/prj/target_exe_sspretty.mk index 6751c53fae84..5b8c83977dcd 100644 --- a/tools/prj/target_exe_sspretty.mk +++ b/tools/prj/target_exe_sspretty.mk @@ -49,13 +49,10 @@ $(eval $(call gb_Executable_add_linked_libs,sspretty,\ $(eval $(call gb_Executable_add_exception_objects,sspretty,\ tools/bootstrp/appdef \ - tools/bootstrp/command \ tools/bootstrp/cppdep \ tools/bootstrp/inimgr \ - tools/bootstrp/mkcreate \ tools/bootstrp/prj \ tools/bootstrp/sspretty \ - tools/bootstrp/sstring \ )) ifeq ($(OS),WNT) diff --git a/tools/prj/target_package_inc.mk b/tools/prj/target_package_inc.mk index 14e70973b276..5deb59a7b0da 100644 --- a/tools/prj/target_package_inc.mk +++ b/tools/prj/target_package_inc.mk @@ -26,12 +26,6 @@ #************************************************************************* $(eval $(call gb_Package_Package,tools_inc,$(SRCDIR)/tools/inc)) -$(eval $(call gb_Package_add_file,tools_inc,inc/bootstrp/command.hxx,bootstrp/command.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/bootstrp/inimgr.hxx,bootstrp/inimgr.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/bootstrp/listmacr.hxx,bootstrp/listmacr.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/bootstrp/mkcreate.hxx,bootstrp/mkcreate.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/bootstrp/prj.hxx,bootstrp/prj.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/bootstrp/sstring.hxx,bootstrp/sstring.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/StringListResource.hxx,tools/StringListResource.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/agapi.hxx,tools/agapi.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/agitem.hxx,tools/agitem.hxx)) -- cgit From 334fd6c47c59b59ba4124734d6ee4203557edc83 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Mon, 17 May 2010 18:08:27 +0200 Subject: CWS gnumake2: hacking the LD_LIBRARY_PATH for svt when using system jpeg (ugly, but slightly better than the hack in the old build system) --- svtools/prj/target_lib_svt.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/svtools/prj/target_lib_svt.mk b/svtools/prj/target_lib_svt.mk index f688dd16fa71..97ad04823d14 100644 --- a/svtools/prj/target_lib_svt.mk +++ b/svtools/prj/target_lib_svt.mk @@ -72,6 +72,9 @@ ifeq ($(SYSTEM_JPEG),YES) $(eval $(call gb_Library_add_linked_libs,svt,\ jpeg \ )) +$(eval $(call gb_Library_set_ldflags,svt,\ + $$(filter-out -L/usr/lib/jvm%,$$(LDFLAGS)) \ +)) else $(eval $(call gb_Library_add_linked_static_libs,svt,\ jpeglib \ -- cgit From 8b8162e0b885268bfa25d22a11a9051d02ef3369 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Fri, 28 May 2010 12:41:16 +0200 Subject: CWS gnumake2: l10ntools cleanup to simplify fixing ---------------- CWS gnumake2: l10ntools cleanup to simplify fixing ---------------- CWS gnumake2: l10ntools cleanup to simplify fixing ---------------- CWS gnumake2: l10ntools cleanup to simplify fixing, fixing filename lookup HG: Enter commit message. Lines beginning with 'HG:' are removed. HG: Remove all lines to abort the collapse operation. --- l10ntools/inc/export.hxx | 61 +++++----- l10ntools/source/merge.cxx | 282 +++++++++++++++++---------------------------- 2 files changed, 132 insertions(+), 211 deletions(-) diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx index 13fad506b54d..eeb0afd38373 100644 --- a/l10ntools/inc/export.hxx +++ b/l10ntools/inc/export.hxx @@ -452,7 +452,6 @@ public: const ByteString &rTitle ) { - sText[ nId ] = rText; bTextFirst[ nId ] = true; sQuickHelpText[ nId ] = rQuickHelpText; @@ -506,39 +505,33 @@ public: class MergeDataFile { -private: - BOOL bErrorLog; - ByteString sErrorLog; - SvFileStream aErrLog; - ByteStringSet aLanguageSet; - MergeDataHashMap aMap; - ByteStringHashMap aLanguageMap; - std::vector aLanguageList; - ByteStringHashMap aFilenames; - - -public: - MergeDataFile( const ByteString &rFileName, const ByteString& rFile , BOOL bErrLog, CharSet aCharSet, bool bCaseSensitive = false ); - ~MergeDataFile(); - - - std::vector GetLanguages(); - MergeData *GetMergeData( ResData *pResData , bool bCaseSensitve = false ); - - PFormEntrys *GetPFormEntrys( ResData *pResData ); - PFormEntrys *GetPFormEntrysCaseSensitive( ResData *pResData ); - - void InsertEntry( const ByteString &rTYP, const ByteString &rGID, const ByteString &rLID, - const ByteString &rPFO, - const ByteString &nLang , const ByteString &rTEXT, - const ByteString &rQHTEXT, const ByteString &rTITLE , - const ByteString &sFilename , bool bCaseSensitive - ); - static USHORT GetLangIndex( USHORT nId ); - static ByteString CreateKey( const ByteString& rTYP , const ByteString& rGID , const ByteString& rLID , const ByteString& rFilename , bool bCaseSensitive = false ); - - ByteString Dump(); - void WriteError( const ByteString &rLine ); + private: + BOOL bErrorLog; + ByteString sErrorLog; + SvFileStream aErrLog; + MergeDataHashMap aMap; + std::set aLanguageSet; + + MergeData *GetMergeData( ResData *pResData , bool bCaseSensitve = false ); + void InsertEntry( const ByteString &rTYP, const ByteString &rGID, const ByteString &rLID, + const ByteString &rPFO, + const ByteString &nLang, const ByteString &rTEXT, + const ByteString &rQHTEXT, const ByteString &rTITLE, + const ByteString &sFilename, bool bCaseSensitive + ); + ByteString Dump(); + void WriteError( const ByteString &rLine ); + + public: + MergeDataFile( const ByteString &rFileName, const ByteString& rFile , BOOL bErrLog, CharSet aCharSet, bool bCaseSensitive = false ); + ~MergeDataFile(); + + std::vector GetLanguages(); + + PFormEntrys *GetPFormEntrys( ResData *pResData ); + PFormEntrys *GetPFormEntrysCaseSensitive( ResData *pResData ); + + static ByteString CreateKey( const ByteString& rTYP , const ByteString& rGID , const ByteString& rLID , const ByteString& rFilename , bool bCaseSensitive = false ); }; diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx index 3284b7026107..660247ce1f8a 100644 --- a/l10ntools/source/merge.cxx +++ b/l10ntools/source/merge.cxx @@ -35,39 +35,36 @@ using namespace std; +namespace +{ + static ::rtl::OString lcl_NormalizeFilename(const ::rtl::OString& rFilename) + { + return rFilename.copy( + ::std::max( + rFilename.lastIndexOf( "\\" ), + rFilename.lastIndexOf( "/" ))+1); + }; +} + extern void ConvertHalfwitdhToFullwidth( String& rString ); // // class PFormEntrys // -ByteString PFormEntrys::Dump(){ +ByteString PFormEntrys::Dump() +{ ByteString sRet( "PFormEntrys\n" ); - //sRet.Append( Export::DumpMap( ByteString("sText") , sText ) ); - //sRet.Append("\n"); ByteString a("sText"); - if ( sText.size() ) Export::DumpMap( a , sText ); + if(sText.size()) + Export::DumpMap(a , sText); return sRet; } -/*****************************************************************************/ BOOL PFormEntrys::GetText( ByteString &rReturn, USHORT nTyp, const ByteString &nLangIndex, BOOL bDel ) -/*****************************************************************************/ { - /*printf("DBG: PFormEntrys::GetText(nId=%s)\n",nLangIndex.GetBuffer() ); - - // DEBUG****************** - ByteStringHashMap::const_iterator idbg; - std::cout << "HASHKEYS : \n"; - for( idbg = sText.begin() ; idbg != sText.end(); ++idbg ) - std::cout << (idbg->first).GetBuffer() << "\n"; - std::cout << "\n\n"; - std::cout << "String sText[ nLangIndex ] = " << sText[ nLangIndex ].GetBuffer() << "\n"; - // DEBUG****************** -*/ - BOOL bReturn=TRUE; switch ( nTyp ) { case STRING_TYP_TEXT : @@ -95,7 +92,6 @@ BOOL PFormEntrys::GetText( ByteString &rReturn, bTitleFirst[ nLangIndex ] = FALSE; break; } - //printf("Returning '%s'\n",rReturn.GetBuffer()); return bReturn; } @@ -104,68 +100,53 @@ BOOL PFormEntrys::GetText( ByteString &rReturn, // class MergeData // -/*****************************************************************************/ MergeData::~MergeData() -/*****************************************************************************/ { } -/*****************************************************************************/ -PFormEntrys* MergeData::GetPFormEntrys( ResData *pResData ) -/*****************************************************************************/ +PFormEntrys* MergeData::GetPFormEntrys(ResData*) { - - (void) pResData; // FIXME - if( aMap.find( ByteString("HACK") ) != aMap.end() ){ - return aMap[ ByteString("HACK") ]; - } - else{ - return 0; - } + if( aMap.find( ByteString("HACK") ) != aMap.end() ) + return aMap[ ByteString("HACK") ]; + return NULL; } -void MergeData::Insert( const ByteString& rPFO , PFormEntrys* pfEntrys ){ - (void) rPFO; // FIXME +void MergeData::Insert(const ByteString&, PFormEntrys* pfEntrys ) +{ aMap.insert( PFormEntrysHashMap::value_type( ByteString("HACK") , pfEntrys ) ); - } + ByteString MergeData::Dump(){ ByteString sRet( "MergeData\n" ); printf("MergeData sTyp = %s , sGid = %s , sLid =%s , sFilename = %s\n",sTyp.GetBuffer(),sGID.GetBuffer(),sLID.GetBuffer(), sFilename.GetBuffer() ); PFormEntrysHashMap::const_iterator idbg; - for( idbg = aMap.begin() ; idbg != aMap.end(); ++idbg ){ + for( idbg = aMap.begin() ; idbg != aMap.end(); ++idbg ) + { printf("aMap[ %s ] = " ,idbg->first.GetBuffer()); ( (PFormEntrys*)(idbg->second) )->Dump(); - printf("\n") ; + printf("\n"); } - printf("\n") ; + printf("\n"); return sRet; } PFormEntrys* MergeData::GetPFObject( const ByteString& rPFO ){ - if( aMap.find( ByteString("HACK") ) != aMap.end() ){ + if( aMap.find( ByteString("HACK") ) != aMap.end() ) return aMap[ rPFO ]; - } - else{ - return 0; - } + return NULL; } -/*****************************************************************************/ PFormEntrys *MergeData::InsertEntry( const ByteString &rPForm ) -/*****************************************************************************/ { PFormEntrys* pFEntrys = new PFormEntrys( rPForm ); aMap.insert( PFormEntrysHashMap::value_type( rPForm , pFEntrys ) ); return pFEntrys; } -/*****************************************************************************/ BOOL MergeData::operator==( ResData *pData ) -/*****************************************************************************/ { ByteString sResTyp_upper( pData->sResTyp ); sResTyp_upper.ToUpperAscii(); @@ -186,130 +167,96 @@ BOOL MergeData::operator==( ResData *pData ) #define FFORMAT_NEW 0x0001 #define FFORMAT_OLD 0x0002 -/*****************************************************************************/ -MergeDataFile::MergeDataFile( const ByteString &rFileName, const ByteString& sFile ,BOOL bErrLog, -// CharSet aCharSet, BOOL bUTF8 , bool bCaseSensitive ) - CharSet aCharSet, bool bCaseSensitive ) -/*****************************************************************************/ - : bErrorLog( bErrLog ) +MergeDataFile::MergeDataFile( + const ByteString &rFileName, + const ByteString& sFile, + BOOL bErrLog, + CharSet aCharSet, + bool bCaseSensitive) + : bErrorLog( bErrLog ) { - SvFileStream aInputStream( String( rFileName, RTL_TEXTENCODING_ASCII_US ), STREAM_STD_READ ); aInputStream.SetStreamCharSet( aCharSet ); ByteString sLine; -// printf("\nReading localize.sdf ...\n"); - ByteString sTYP; - ByteString sGID; - ByteString sLID; - ByteString sPFO; - ByteString nLANG; - ByteString sTEXT; - ByteString sQHTEXT; - ByteString sTITLE; - ByteString sHACK("HACK"); + const ByteString sHACK("HACK"); + const ::rtl::OString sFileNormalized(lcl_NormalizeFilename(sFile)); + const bool isFileEmpty = sFileNormalized.getLength(); - const ByteString sEmpty(""); - - if( !aInputStream.IsOpen() ) { + if( !aInputStream.IsOpen() ) + { printf("Warning : Can't open %s\n", rFileName.GetBuffer()); - //exit( -1 ); return; } - while ( !aInputStream.IsEof()) { + while ( !aInputStream.IsEof()) + { xub_StrLen nToks; aInputStream.ReadLine( sLine ); sLine = sLine.Convert( RTL_TEXTENCODING_MS_1252, aCharSet ); nToks = sLine.GetTokenCount( '\t' ); - if ( nToks == 15 ) { + if ( nToks == 15 ) + { // Skip all wrong filenames - ByteString filename = sLine.GetToken( 1 , '\t' ); - filename = filename.Copy( filename.SearchCharBackward( "\\" )+1 , filename.Len() ); + const ::rtl::OString filename = lcl_NormalizeFilename(sLine.GetToken( 1 , '\t' )); - if( sFile.Equals( sEmpty ) || ( !sFile.Equals( sEmpty ) && filename.Equals( sFile ) ) ) + if(isFileEmpty || (!isFileEmpty && filename.equals(sFileNormalized))) { - xub_StrLen rIdx = 0; - sTYP = sLine.GetToken( 3, '\t', rIdx ); - sGID = sLine.GetToken( 0, '\t', rIdx ); // 4 - sLID = sLine.GetToken( 0, '\t', rIdx ); // 5 - sPFO = sLine.GetToken( 1, '\t', rIdx ); // 7 - sPFO = sHACK; - nLANG = sLine.GetToken( 1, '\t', rIdx ); // 9 - sTEXT = sLine.GetToken( 0, '\t', rIdx ); // 10 - - sQHTEXT = sLine.GetToken( 1, '\t', rIdx ); // 12 - sTITLE = sLine.GetToken( 0, '\t', rIdx ); // 13 - + xub_StrLen rIdx = 0; + const ByteString sTYP = sLine.GetToken( 3, '\t', rIdx ); + const ByteString sGID = sLine.GetToken( 0, '\t', rIdx ); // 4 + const ByteString sLID = sLine.GetToken( 0, '\t', rIdx ); // 5 + ByteString sPFO = sLine.GetToken( 1, '\t', rIdx ); // 7 + sPFO = sHACK; + ByteString nLANG = sLine.GetToken( 1, '\t', rIdx ); // 9 nLANG.EraseLeadingAndTrailingChars(); + const ByteString sTEXT = sLine.GetToken( 0, '\t', rIdx ); // 10 + const ByteString sQHTEXT = sLine.GetToken( 1, '\t', rIdx ); // 12 + const ByteString sTITLE = sLine.GetToken( 0, '\t', rIdx ); // 13 + #ifdef MERGE_SOURCE_LANGUAGES - if( true ){ + if( true ) #else - if ( !nLANG.EqualsIgnoreCaseAscii("en-US") ){ + if( !nLANG.EqualsIgnoreCaseAscii("en-US") ) #endif - ByteStringHashMap::const_iterator lit; - lit = aLanguageMap.find (nLANG); - ByteString aLANG; - if (lit == aLanguageMap.end()) { - aLANG = nLANG; - aLanguageMap.insert( ByteStringHashMap::value_type( aLANG, aLANG ) ); - // Remember read languages for -l all switch - aLanguageList.push_back( nLANG ); - } else - aLANG = lit->first; - - InsertEntry( sTYP, sGID, sLID, sPFO, aLANG, sTEXT, sQHTEXT, sTITLE , filename , bCaseSensitive ); + { + aLanguageSet.insert(nLANG); + InsertEntry( sTYP, sGID, sLID, sPFO, nLANG, sTEXT, sQHTEXT, sTITLE, filename, bCaseSensitive ); } } } - else if ( nToks == 10 ) { + else if ( nToks == 10 ) + { printf("ERROR: File format is obsolete and no longer supported!\n"); } } aInputStream.Close(); } -/*****************************************************************************/ + MergeDataFile::~MergeDataFile() -/*****************************************************************************/ { } -/*****************************************************************************/ -//void MergeDataFile::WriteErrorLog( const ByteString &rFileName ) -/*****************************************************************************/ -//{ -// DEAD -//} - ByteString MergeDataFile::Dump(){ ByteString sRet( "MergeDataFile\n" ); - //sRet.Append( Export::DumpMap( "aLanguageSet" , aLanguageSet ) ); - //sRet.Append( Export::DumpMap( "aLanguageList" , aLanguageList ) ); printf("MergeDataFile\n"); MergeDataHashMap::const_iterator idbg; - for( idbg = aMap.begin() ; idbg != aMap.end(); ++idbg ){ - /*sRet.Append( "aMap[" ); - sRet.Append( idbg->first ); - sRet.Append( "]= " ); - sRet.Append( ((MergeData*) (idbg->second))->Dump() ); - sRet.Append("\n");*/ - + for( idbg = aMap.begin() ; idbg != aMap.end(); ++idbg ) + { printf("aMap[ %s ] = ",idbg->first.GetBuffer()); ((MergeData*) (idbg->second))->Dump(); printf("\n"); } printf("\n"); - //sRet.Append("\n"); return sRet; } -/*****************************************************************************/ void MergeDataFile::WriteError( const ByteString &rLine ) -/*****************************************************************************/ { - if ( bErrorLog ) { + if ( bErrorLog ) + { if ( !aErrLog.IsOpen()) aErrLog.Open( String( sErrorLog, RTL_TEXTENCODING_ASCII_US ), STREAM_STD_WRITE | STREAM_TRUNC ); aErrLog.WriteLine( rLine ); @@ -317,19 +264,18 @@ void MergeDataFile::WriteError( const ByteString &rLine ) else fprintf( stderr, "%s\n", rLine.GetBuffer()); } + std::vector MergeDataFile::GetLanguages(){ - return aLanguageList; + return std::vector(aLanguageSet.begin(),aLanguageSet.end()); } -/*****************************************************************************/ MergeData *MergeDataFile::GetMergeData( ResData *pResData , bool bCaseSensitive ) -/*****************************************************************************/ { ByteString sOldG = pResData->sGId; ByteString sOldL = pResData->sId; ByteString sGID = pResData->sGId; ByteString sLID; - if ( !sGID.Len()) + if(!sGID.Len()) sGID = pResData->sId; else sLID = pResData->sId; @@ -338,23 +284,19 @@ MergeData *MergeDataFile::GetMergeData( ResData *pResData , bool bCaseSensitive ByteString sKey = CreateKey( pResData->sResTyp , pResData->sGId , pResData->sId , pResData->sFilename , bCaseSensitive ); - //printf("DBG: Searching [%s]\n",sKey.GetBuffer()); - if( aMap.find( sKey ) != aMap.end() ){ + if(aMap.find( sKey ) != aMap.end()) + { pResData->sGId = sOldG; pResData->sId = sOldL; - //printf("DBG: Found[%s]\n",sKey.GetBuffer()); return aMap[ sKey ]; } pResData->sGId = sOldG; pResData->sId = sOldL; - //printf("DBG: Found[%s]\n",sKey.GetBuffer()); return NULL; } -/*****************************************************************************/ PFormEntrys *MergeDataFile::GetPFormEntrys( ResData *pResData ) -/*****************************************************************************/ { // search for requested PFormEntrys MergeData *pData = GetMergeData( pResData ); @@ -363,9 +305,7 @@ PFormEntrys *MergeDataFile::GetPFormEntrys( ResData *pResData ) return NULL; } -/*****************************************************************************/ PFormEntrys *MergeDataFile::GetPFormEntrysCaseSensitive( ResData *pResData ) -/*****************************************************************************/ { // search for requested PFormEntrys MergeData *pData = GetMergeData( pResData , true ); @@ -373,70 +313,58 @@ PFormEntrys *MergeDataFile::GetPFormEntrysCaseSensitive( ResData *pResData ) return pData->GetPFormEntrys( pResData ); return NULL; } -/*****************************************************************************/ + void MergeDataFile::InsertEntry( - const ByteString &rTYP, const ByteString &rGID, - const ByteString &rLID, const ByteString &rPFO, - const ByteString &nLANG, const ByteString &rTEXT, - const ByteString &rQHTEXT, const ByteString &rTITLE , - const ByteString &rInFilename , bool bCaseSensitive - ) -/*****************************************************************************/ + const ByteString &rTYP, const ByteString &rGID, + const ByteString &rLID, const ByteString &rPFO, + const ByteString &nLANG, const ByteString &rTEXT, + const ByteString &rQHTEXT, const ByteString &rTITLE , + const ByteString &rInFilename , bool bCaseSensitive + ) { MergeData *pData; - BOOL bFound = FALSE; - - // uniquify the filename to save memory. - ByteStringHashMap::const_iterator fit = aFilenames.find (rInFilename); - ByteString aFilename; - if (fit == aFilenames.end()) { - aFilename = rInFilename; - aFilenames.insert (ByteStringHashMap::value_type (aFilename, aFilename)); - } else - aFilename = fit->first; // search for MergeData - - ByteString sKey = CreateKey( rTYP , rGID , rLID , aFilename , bCaseSensitive ); + ByteString sKey = CreateKey( rTYP , rGID , rLID , rInFilename , bCaseSensitive ); MergeDataHashMap::const_iterator mit; mit = aMap.find( sKey ); - if( mit != aMap.end() ){ + if( mit != aMap.end() ) + { pData = mit->second; - }else{ - pData = new MergeData( rTYP, rGID, rLID, aFilename ); + } + else + { + pData = new MergeData( rTYP, rGID, rLID, rInFilename ); aMap.insert( MergeDataHashMap::value_type( sKey, pData ) ); } - bFound = FALSE; PFormEntrys *pFEntrys = 0; // search for PFormEntrys - pFEntrys = pData->GetPFObject( rPFO ); - if( !pFEntrys ){ + if( !pFEntrys ) + { // create new PFormEntrys, cause no one exists with current properties pFEntrys = new PFormEntrys( rPFO ); pData->Insert( rPFO , pFEntrys ); } // finaly insert the cur string - pFEntrys->InsertEntry( nLANG , rTEXT, rQHTEXT, rTITLE ); - - //printf("DBG: MergeDataFile::Insert[]=( sKey=%s,nLang=%s,rTEXT=%s)\n",sKey2.GetBuffer(),nLANG.GetBuffer(),rTEXT.GetBuffer()); } -ByteString MergeDataFile::CreateKey( const ByteString& rTYP , const ByteString& rGID , const ByteString& rLID , const ByteString& rFilename , bool bCaseSensitive ){ - - ByteString sKey( rTYP ); - sKey.Append( '-' ); - sKey.Append( rGID ); - sKey.Append( '-' ); - sKey.Append( rLID ); - sKey.Append( '-' ); - sKey.Append( rFilename ); - - if( bCaseSensitive ) return sKey; // officecfg case sensitive identifier - else return sKey.ToUpperAscii(); -} - +ByteString MergeDataFile::CreateKey( const ByteString& rTYP , const ByteString& rGID , const ByteString& rLID , const ByteString& rFilename , bool bCaseSensitive ) +{ + static const ::rtl::OString sStroke('-'); + ::rtl::OString sKey( rTYP ); + sKey += sStroke; + sKey += rGID; + sKey += sStroke; + sKey += rLID; + sKey += sStroke; + sKey += lcl_NormalizeFilename(rFilename); + OSL_TRACE("created key: %s", sKey.getStr()); + if(bCaseSensitive) + return sKey; // officecfg case sensitive identifier + return sKey.toAsciiUpperCase(); +} -- cgit From 829b5e25d01442907ce061f1f1eb50bd4c8320f2 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Fri, 18 Jun 2010 19:03:40 +0200 Subject: CWS gnumake2: enabling precompiled headers where possible --- svl/prj/target_lib_svl.mk | 4 +++- svtools/prj/target_lib_svt.mk | 4 +++- toolkit/prj/target_lib_tk.mk | 4 +++- tools/prj/target_lib_tl.mk | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/svl/prj/target_lib_svl.mk b/svl/prj/target_lib_svl.mk index 9791ccf84e47..bfa5cfaa96ee 100644 --- a/svl/prj/target_lib_svl.mk +++ b/svl/prj/target_lib_svl.mk @@ -27,7 +27,9 @@ $(eval $(call gb_Library_Library,svl)) -$(call gb_Library_get_headers_target,svl) : $(call gb_Package_get_target,svl_inc) +$(eval $(call gb_Library_add_package_headers,svl,svl_inc)) + +$(eval $(call gb_Library_add_precompiled_header,svl,$(SRCDIR)/svl/inc/pch/precompiled_svl)) $(eval $(call gb_Library_set_include,svl,\ $$(SOLARINC) \ diff --git a/svtools/prj/target_lib_svt.mk b/svtools/prj/target_lib_svt.mk index 97ad04823d14..8968775b8e7c 100644 --- a/svtools/prj/target_lib_svt.mk +++ b/svtools/prj/target_lib_svt.mk @@ -27,7 +27,9 @@ $(eval $(call gb_Library_Library,svt)) -$(call gb_Library_get_headers_target,svt) : $(call gb_Package_get_target,svtools_inc) +$(eval $(call gb_Library_add_package_headers,svt,svtools_inc)) + +$(eval $(call gb_Library_add_precompiled_header,svt,$(SRCDIR)/svtools/inc/pch/precompiled_svtools)) $(eval $(call gb_Library_set_include,svt,\ $$(INCLUDE) \ diff --git a/toolkit/prj/target_lib_tk.mk b/toolkit/prj/target_lib_tk.mk index d5bdb2fc4341..60d13418fa5b 100644 --- a/toolkit/prj/target_lib_tk.mk +++ b/toolkit/prj/target_lib_tk.mk @@ -27,7 +27,9 @@ $(eval $(call gb_Library_Library,tk)) -$(call gb_Library_get_headers_target,tk) : $(call gb_Package_get_target,toolkit_inc) +$(eval $(call gb_Library_add_package_headers,tk,toolkit_inc)) + +#$(eval $(call gb_Library_add_precompiled_header,tk,$(SRCDIR)/toolkit/inc/pch/precompiled_toolkit)) $(eval $(call gb_Library_set_include,tk,\ $$(INCLUDE) \ diff --git a/tools/prj/target_lib_tl.mk b/tools/prj/target_lib_tl.mk index 30c64badc265..2fc00ec68a8b 100644 --- a/tools/prj/target_lib_tl.mk +++ b/tools/prj/target_lib_tl.mk @@ -27,7 +27,9 @@ $(eval $(call gb_Library_Library,tl)) -$(call gb_Library_get_headers_target,tl) : $(call gb_Package_get_target,tools_inc) +$(eval $(call gb_Library_add_package_headers,tl,tools_inc)) + +$(eval $(call gb_Library_add_precompiled_header,tl,$(SRCDIR)/tools/inc/pch/precompiled_tools)) $(eval $(call gb_Library_set_include,tl,\ $$(INCLUDE) \ -- cgit From 47bc0f3fb1220451173c1972dd83dd2a8e75509b Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Mon, 21 Jun 2010 16:17:24 +0200 Subject: CWS gnumake2: pch for debug builds, fixing header package deps --- tools/prj/target_lib_tl.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/prj/target_lib_tl.mk b/tools/prj/target_lib_tl.mk index 2fc00ec68a8b..6d85f6f39722 100644 --- a/tools/prj/target_lib_tl.mk +++ b/tools/prj/target_lib_tl.mk @@ -29,7 +29,7 @@ $(eval $(call gb_Library_Library,tl)) $(eval $(call gb_Library_add_package_headers,tl,tools_inc)) -$(eval $(call gb_Library_add_precompiled_header,tl,$(SRCDIR)/tools/inc/pch/precompiled_tools)) +#$(eval $(call gb_Library_add_precompiled_header,tl,$(SRCDIR)/tools/inc/pch/precompiled_tools)) $(eval $(call gb_Library_set_include,tl,\ $$(INCLUDE) \ -- cgit From 1801d21c82fbdc8e63785313c488ea220456dda4 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Tue, 22 Jun 2010 14:37:57 +0200 Subject: CWS gnumake2: fixing dep generation, pch flags --- tools/prj/target_lib_tl.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/prj/target_lib_tl.mk b/tools/prj/target_lib_tl.mk index 6d85f6f39722..2fc00ec68a8b 100644 --- a/tools/prj/target_lib_tl.mk +++ b/tools/prj/target_lib_tl.mk @@ -29,7 +29,7 @@ $(eval $(call gb_Library_Library,tl)) $(eval $(call gb_Library_add_package_headers,tl,tools_inc)) -#$(eval $(call gb_Library_add_precompiled_header,tl,$(SRCDIR)/tools/inc/pch/precompiled_tools)) +$(eval $(call gb_Library_add_precompiled_header,tl,$(SRCDIR)/tools/inc/pch/precompiled_tools)) $(eval $(call gb_Library_set_include,tl,\ $$(INCLUDE) \ -- cgit From 1f79d3036954bfca21f6ff7ee9a27bf38439924d Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Fri, 25 Jun 2010 21:46:32 +0200 Subject: CWS gnumake2: intermediate commit (module rework) --- tools/Makefile | 5 +---- tools/prj/target_exe_mkunroll.mk | 2 ++ tools/prj/target_module_tools.mk | 11 ++--------- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index 9ab4b8ba83f4..265fdac07bb1 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -28,9 +28,6 @@ GBUILDDIR := $(SOLARENV)/gbuild include $(GBUILDDIR)/gbuild.mk - -gb_CURRENT_MODULE := $(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))) - -$(eval $(call gb_Module_make_global_targets,$(gb_CURRENT_MODULE))) +$(eval $(call gb_Module_make_global_targets,$(patsubst %/,%,$(dir $(realpath $(firstword $(MAKEFILE_LIST))))))) # vim: set noet sw=4 ts=4: diff --git a/tools/prj/target_exe_mkunroll.mk b/tools/prj/target_exe_mkunroll.mk index b1ce83680ef8..9200ab8a3971 100644 --- a/tools/prj/target_exe_mkunroll.mk +++ b/tools/prj/target_exe_mkunroll.mk @@ -73,4 +73,6 @@ $(eval $(call gb_Executable_add_linked_libs,mkunroll,\ dl \ )) endif + +$(info --- $(gb_Module_TARGETSTACK)) # vim: set noet sw=4 ts=4: diff --git a/tools/prj/target_module_tools.mk b/tools/prj/target_module_tools.mk index 70d14b03dc45..cd260e7709fe 100644 --- a/tools/prj/target_module_tools.mk +++ b/tools/prj/target_module_tools.mk @@ -25,16 +25,9 @@ # #************************************************************************* -$(eval $(call gb_Module_Module,tools,\ - $(call gb_Executable_get_target,mkunroll) \ - $(call gb_Executable_get_target,rscdep) \ - $(call gb_Executable_get_target,so_checksum) \ - $(call gb_Executable_get_target,sspretty) \ - $(call gb_Library_get_target,tl) \ - $(call gb_Package_get_target,tools_inc) \ -)) +$(eval $(call gb_Module_Module,tools)) -$(eval $(call gb_Module_read_includes,tools,\ +$(eval $(call gb_Module_add_targets,tools,\ exe_mkunroll \ exe_rscdep \ exe_so_checksum \ -- cgit From f51c9e5db1b84ce92bb75d3a5faf6ebe9ef5dcc9 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Sat, 26 Jun 2010 01:29:37 +0200 Subject: CWS gnumake2: module reorg --- svl/AllLangResTarget_svl.mk | 49 ++++ svl/Library_fsstorage.mk | 76 ++++++ svl/Library_passwordcontainer.mk | 72 ++++++ svl/Library_svl.mk | 186 +++++++++++++++ svl/Makefile | 9 +- svl/Module_svl.mk | 42 ++++ svl/Package_inc.mk | 129 ++++++++++ svl/prj/target_lib_fsstorage.mk | 76 ------ svl/prj/target_lib_passwordcontainer.mk | 72 ------ svl/prj/target_lib_svl.mk | 186 --------------- svl/prj/target_module_svl.mk | 47 ---- svl/prj/target_package_inc.mk | 129 ---------- svl/prj/target_res_svl.mk | 49 ---- svtools/AllLangResTarget_productregistration.mk | 50 ++++ svtools/AllLangResTarget_svt.mk | 79 +++++++ svtools/Executable_bmp.mk | 71 ++++++ svtools/Executable_bmpsum.mk | 67 ++++++ svtools/Executable_g2g.mk | 67 ++++++ svtools/Library_hatchwindowfactory.mk | 74 ++++++ svtools/Library_productregistration.mk | 75 ++++++ svtools/Library_svt.mk | 298 ++++++++++++++++++++++++ svtools/Makefile | 9 +- svtools/Module_svtools.mk | 48 ++++ svtools/Package_inc.mk | 180 ++++++++++++++ svtools/prj/target_exe_bmp.mk | 71 ------ svtools/prj/target_exe_bmpsum.mk | 67 ------ svtools/prj/target_exe_g2g.mk | 67 ------ svtools/prj/target_lib_hatchwindowfactory.mk | 74 ------ svtools/prj/target_lib_productregistration.mk | 75 ------ svtools/prj/target_lib_svt.mk | 298 ------------------------ svtools/prj/target_module_svtools.mk | 57 ----- svtools/prj/target_package_inc.mk | 180 -------------- svtools/prj/target_res_productregistration.mk | 50 ---- svtools/prj/target_res_svt.mk | 79 ------- toolkit/AllLangResTarget_tk.mk | 45 ++++ toolkit/Library_tk.mk | 172 ++++++++++++++ toolkit/Makefile | 9 +- toolkit/Module_toolkit.mk | 38 +++ toolkit/Package_inc.mk | 60 +++++ toolkit/Package_source.mk | 47 ++++ toolkit/Package_util.mk | 29 +++ toolkit/prj/target_lib_tk.mk | 172 -------------- toolkit/prj/target_module_toolkit.mk | 43 ---- toolkit/prj/target_package_inc.mk | 60 ----- toolkit/prj/target_package_source.mk | 47 ---- toolkit/prj/target_package_util.mk | 29 --- toolkit/prj/target_res_tk.mk | 45 ---- tools/Executable_mkunroll.mk | 77 ++++++ tools/Executable_rscdep.mk | 73 ++++++ tools/Executable_so_checksum.mk | 69 ++++++ tools/Executable_sspretty.mk | 74 ++++++ tools/Library_tl.mk | 180 ++++++++++++++ tools/Makefile | 6 +- tools/Module_tools.mk | 54 +++++ tools/Package_inc.mk | 115 +++++++++ tools/prj/target_exe_mkunroll.mk | 78 ------- tools/prj/target_exe_rscdep.mk | 73 ------ tools/prj/target_exe_so_checksum.mk | 69 ------ tools/prj/target_exe_sspretty.mk | 74 ------ tools/prj/target_lib_tl.mk | 180 -------------- tools/prj/target_module_tools.mk | 52 ----- tools/prj/target_package_inc.mk | 115 --------- 62 files changed, 2616 insertions(+), 2627 deletions(-) create mode 100644 svl/AllLangResTarget_svl.mk create mode 100644 svl/Library_fsstorage.mk create mode 100644 svl/Library_passwordcontainer.mk create mode 100644 svl/Library_svl.mk create mode 100644 svl/Module_svl.mk create mode 100644 svl/Package_inc.mk delete mode 100644 svl/prj/target_lib_fsstorage.mk delete mode 100644 svl/prj/target_lib_passwordcontainer.mk delete mode 100644 svl/prj/target_lib_svl.mk delete mode 100644 svl/prj/target_module_svl.mk delete mode 100644 svl/prj/target_package_inc.mk delete mode 100644 svl/prj/target_res_svl.mk create mode 100644 svtools/AllLangResTarget_productregistration.mk create mode 100644 svtools/AllLangResTarget_svt.mk create mode 100644 svtools/Executable_bmp.mk create mode 100644 svtools/Executable_bmpsum.mk create mode 100644 svtools/Executable_g2g.mk create mode 100644 svtools/Library_hatchwindowfactory.mk create mode 100644 svtools/Library_productregistration.mk create mode 100644 svtools/Library_svt.mk create mode 100644 svtools/Module_svtools.mk create mode 100644 svtools/Package_inc.mk delete mode 100644 svtools/prj/target_exe_bmp.mk delete mode 100644 svtools/prj/target_exe_bmpsum.mk delete mode 100644 svtools/prj/target_exe_g2g.mk delete mode 100644 svtools/prj/target_lib_hatchwindowfactory.mk delete mode 100644 svtools/prj/target_lib_productregistration.mk delete mode 100644 svtools/prj/target_lib_svt.mk delete mode 100644 svtools/prj/target_module_svtools.mk delete mode 100644 svtools/prj/target_package_inc.mk delete mode 100644 svtools/prj/target_res_productregistration.mk delete mode 100644 svtools/prj/target_res_svt.mk create mode 100644 toolkit/AllLangResTarget_tk.mk create mode 100644 toolkit/Library_tk.mk create mode 100644 toolkit/Module_toolkit.mk create mode 100644 toolkit/Package_inc.mk create mode 100644 toolkit/Package_source.mk create mode 100644 toolkit/Package_util.mk delete mode 100644 toolkit/prj/target_lib_tk.mk delete mode 100644 toolkit/prj/target_module_toolkit.mk delete mode 100644 toolkit/prj/target_package_inc.mk delete mode 100644 toolkit/prj/target_package_source.mk delete mode 100644 toolkit/prj/target_package_util.mk delete mode 100644 toolkit/prj/target_res_tk.mk create mode 100644 tools/Executable_mkunroll.mk create mode 100644 tools/Executable_rscdep.mk create mode 100644 tools/Executable_so_checksum.mk create mode 100644 tools/Executable_sspretty.mk create mode 100644 tools/Library_tl.mk create mode 100644 tools/Module_tools.mk create mode 100644 tools/Package_inc.mk delete mode 100644 tools/prj/target_exe_mkunroll.mk delete mode 100644 tools/prj/target_exe_rscdep.mk delete mode 100644 tools/prj/target_exe_so_checksum.mk delete mode 100644 tools/prj/target_exe_sspretty.mk delete mode 100644 tools/prj/target_lib_tl.mk delete mode 100644 tools/prj/target_module_tools.mk delete mode 100644 tools/prj/target_package_inc.mk diff --git a/svl/AllLangResTarget_svl.mk b/svl/AllLangResTarget_svl.mk new file mode 100644 index 000000000000..6759202a5fa4 --- /dev/null +++ b/svl/AllLangResTarget_svl.mk @@ -0,0 +1,49 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_AllLangResTarget_AllLangResTarget,svl)) + +$(eval $(call gb_AllLangResTarget_add_srs,svl,\ + svl/res \ +)) + +$(eval $(call gb_SrsTarget_SrsTarget,svl/res)) + +$(eval $(call gb_SrsTarget_set_include,svl/res,\ + $$(INCLUDE) \ + -I$(WORKDIR)/inc \ + -I$(SRCDIR)/svl/source/inc \ + -I$(SRCDIR)/svl/inc/ \ + -I$(SRCDIR)/svl/inc/svl \ +)) + +$(eval $(call gb_SrsTarget_add_files,svl/res,\ + svl/source/misc/mediatyp.src \ + svl/source/items/cstitem.src \ +)) + + diff --git a/svl/Library_fsstorage.mk b/svl/Library_fsstorage.mk new file mode 100644 index 000000000000..6db23b4ae547 --- /dev/null +++ b/svl/Library_fsstorage.mk @@ -0,0 +1,76 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,fsstorage)) + +$(eval $(call gb_Library_set_include,fsstorage,\ + $$(SOLARINC) \ + -I$(WORKDIR)/inc/svl \ + -I$(WORKDIR)/inc/ \ + -I$(SRCDIR)/svl/inc \ + -I$(SRCDIR)/svl/inc/svl \ + -I$(SRCDIR)/svl/source/inc \ + -I$(SRCDIR)/svl/inc/pch \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_Library_add_linked_libs,fsstorage,\ + comphelper \ + cppu \ + cppuhelper \ + sal \ + stl \ + tl \ + ucbhelper \ + utl \ +)) + +$(eval $(call gb_Library_add_linked_system_libs,fsstorage,\ + icuuc \ + dl \ + m \ + pthread \ +)) + +$(eval $(call gb_Library_add_exception_objects,fsstorage,\ + svl/source/fsstor/fsfactory \ + svl/source/fsstor/fsstorage \ + svl/source/fsstor/oinputstreamcontainer \ + svl/source/fsstor/ostreamcontainer \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,fsstorage,\ + kernel32 \ + msvcrt \ + oldnames \ + user32 \ + uwinapi \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk new file mode 100644 index 000000000000..4285efa53a0b --- /dev/null +++ b/svl/Library_passwordcontainer.mk @@ -0,0 +1,72 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,passwordcontainer)) + +$(eval $(call gb_Library_set_include,passwordcontainer,\ + $$(SOLARINC) \ + -I$(WORKDIR)/inc/svl \ + -I$(WORKDIR)/inc/ \ + -I$(SRCDIR)/svl/inc \ + -I$(SRCDIR)/svl/inc/svl \ + -I$(SRCDIR)/svl/source/inc \ + -I$(SRCDIR)/svl/inc/pch \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_Library_add_linked_libs,passwordcontainer,\ + utl \ + ucbhelper \ + cppuhelper \ + cppu \ + sal \ + stl \ +)) + +$(eval $(call gb_Library_add_linked_system_libs,passwordcontainer,\ + icuuc \ + dl \ + m \ + pthread \ +)) + +$(eval $(call gb_Library_add_exception_objects,passwordcontainer,\ + svl/source/passwordcontainer/passwordcontainer \ + svl/source/passwordcontainer/syscreds \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,passwordcontainer,\ + kernel32 \ + msvcrt \ + oldnames \ + user32 \ + uwinapi \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk new file mode 100644 index 000000000000..bfa5cfaa96ee --- /dev/null +++ b/svl/Library_svl.mk @@ -0,0 +1,186 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,svl)) + +$(eval $(call gb_Library_add_package_headers,svl,svl_inc)) + +$(eval $(call gb_Library_add_precompiled_header,svl,$(SRCDIR)/svl/inc/pch/precompiled_svl)) + +$(eval $(call gb_Library_set_include,svl,\ + $$(SOLARINC) \ + -I$(WORKDIR)/inc/svl \ + -I$(WORKDIR)/inc/ \ + -I$(SRCDIR)/svl/inc \ + -I$(SRCDIR)/svl/source/inc \ + -I$(SRCDIR)/svl/inc/pch \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_Library_set_defs,svl,\ + $$(DEFS) \ + -DSVL_DLLIMPLEMENTATION \ +)) + +$(eval $(call gb_Library_add_linked_libs,svl,\ + basegfx \ + comphelper \ + cppu \ + cppuhelper \ + i18nisolang1 \ + i18nutil \ + jvmfwk \ + sal \ + sot \ + stl \ + tl \ + ucbhelper \ + utl \ + vos3 \ +)) + +$(eval $(call gb_Library_add_linked_system_libs,svl,\ + icuuc \ + dl \ + m \ + pthread \ +)) + + +$(eval $(call gb_Library_add_exception_objects,svl,\ + svl/inc/pch/precompiled_svl \ + svl/source/config/asiancfg \ + svl/source/config/cjkoptions \ + svl/source/config/ctloptions \ + svl/source/config/itemholder2 \ + svl/source/config/languageoptions \ + svl/source/config/srchcfg \ + svl/source/filepicker/pickerhelper \ + svl/source/filepicker/pickerhistory \ + svl/source/filerec/filerec \ + svl/source/items/aeitem \ + svl/source/items/cenumitm \ + svl/source/items/cintitem \ + svl/source/items/cntwall \ + svl/source/items/ctypeitm \ + svl/source/items/custritm \ + svl/source/items/dateitem \ + svl/source/items/eitem \ + svl/source/items/flagitem \ + svl/source/items/globalnameitem \ + svl/source/items/ilstitem \ + svl/source/items/imageitm \ + svl/source/items/intitem \ + svl/source/items/itemiter \ + svl/source/items/itempool \ + svl/source/items/itemprop \ + svl/source/items/itemset \ + svl/source/items/lckbitem \ + svl/source/items/macitem \ + svl/source/items/poolcach \ + svl/source/items/poolio \ + svl/source/items/poolitem \ + svl/source/items/ptitem \ + svl/source/items/rectitem \ + svl/source/items/rngitem \ + svl/source/items/sfontitm \ + svl/source/items/sitem \ + svl/source/items/slstitm \ + svl/source/items/srchitem \ + svl/source/items/stritem \ + svl/source/items/style \ + svl/source/items/stylepool \ + svl/source/items/szitem \ + svl/source/items/visitem \ + svl/source/items/whiter \ + svl/source/memtools/svarray \ + svl/source/misc/PasswordHelper \ + svl/source/misc/adrparse \ + svl/source/misc/documentlockfile \ + svl/source/misc/filenotation \ + svl/source/misc/folderrestriction \ + svl/source/misc/fstathelper \ + svl/source/misc/inethist \ + svl/source/misc/inettype \ + svl/source/misc/lngmisc \ + svl/source/misc/lockfilecommon \ + svl/source/misc/ownlist \ + svl/source/misc/restrictedpaths \ + svl/source/misc/sharecontrolfile \ + svl/source/misc/strmadpt \ + svl/source/misc/svldata \ + svl/source/misc/urihelper \ + svl/source/notify/brdcst \ + svl/source/notify/broadcast \ + svl/source/notify/hint \ + svl/source/notify/isethint \ + svl/source/notify/listener \ + svl/source/notify/listenerbase \ + svl/source/notify/listeneriter \ + svl/source/notify/lstner \ + svl/source/notify/smplhint \ + svl/source/numbers/nbdll \ + svl/source/numbers/numfmuno \ + svl/source/numbers/numhead \ + svl/source/numbers/numuno \ + svl/source/numbers/supservs \ + svl/source/numbers/zforfind \ + svl/source/numbers/zforlist \ + svl/source/numbers/zformat \ + svl/source/numbers/zforscan \ + svl/source/svsql/converter \ + svl/source/undo/undo \ + svl/source/uno/pathservice \ + svl/source/uno/registerservices \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_exception_objects,svl,\ + svl/source/svdde/ddecli \ + svl/source/svdde/ddedata \ + svl/source/svdde/ddeinf \ + svl/source/svdde/ddestrg \ + svl/source/svdde/ddesvr \ + svl/source/svdde/ddewrap \ +)) + +$(eval $(call gb_Library_add_linked_libs,svl,\ + advapi32 \ + kernel32 \ + gdi32 \ + msvcrt \ + shell32 \ + user32 \ + uwinapi \ +)) +else +$(eval $(call gb_Library_add_exception_objects,svl,\ + svl/unx/source/svdde/ddedummy \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/svl/Makefile b/svl/Makefile index 9ab4b8ba83f4..60d34122e271 100644 --- a/svl/Makefile +++ b/svl/Makefile @@ -25,12 +25,13 @@ # #************************************************************************* +ifeq ($(strip $(SOLARENV)),) +$(error No environment set) +endif + GBUILDDIR := $(SOLARENV)/gbuild include $(GBUILDDIR)/gbuild.mk - -gb_CURRENT_MODULE := $(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))) - -$(eval $(call gb_Module_make_global_targets,$(gb_CURRENT_MODULE))) +$(eval $(call gb_Module_make_global_targets)) # vim: set noet sw=4 ts=4: diff --git a/svl/Module_svl.mk b/svl/Module_svl.mk new file mode 100644 index 000000000000..6bba7a0836f7 --- /dev/null +++ b/svl/Module_svl.mk @@ -0,0 +1,42 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Module_Module,svl)) + +$(eval $(call gb_Module_add_targets,svl,\ + AllLangResTarget_svl \ + Library_fsstorage \ + Library_passwordcontainer \ + Library_svl \ + Package_inc \ +)) + +#todo: dde platform dependent +#todo: package_inc +#todo: map file + +# vim: set noet ts=4 sw=4: diff --git a/svl/Package_inc.mk b/svl/Package_inc.mk new file mode 100644 index 000000000000..e2814e6eddab --- /dev/null +++ b/svl/Package_inc.mk @@ -0,0 +1,129 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,svl_inc,$(SRCDIR)/svl/inc)) + +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/aeitem.hxx,svl/aeitem.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/brdcst.hxx,svl/brdcst.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/cenumitm.hxx,svl/cenumitm.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/cintitem.hxx,svl/cintitem.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/cjkoptions.hxx,svl/cjkoptions.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/cntwall.hxx,svl/cntwall.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/ctloptions.hxx,svl/ctloptions.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/ctypeitm.hxx,svl/ctypeitm.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/custritm.hxx,svl/custritm.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/dateitem.hxx,svl/dateitem.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/documentlockfile.hxx,svl/documentlockfile.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/eitem.hxx,svl/eitem.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/filerec.hxx,svl/filerec.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/flagitem.hxx,svl/flagitem.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/globalnameitem.hxx,svl/globalnameitem.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/hint.hxx,svl/hint.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/httpcook.hxx,svl/httpcook.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/ilstitem.hxx,svl/ilstitem.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/imageitm.hxx,svl/imageitm.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/inethist.hxx,svl/inethist.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/inettype.hxx,svl/inettype.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/intitem.hxx,svl/intitem.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/isethint.hxx,svl/isethint.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/itemiter.hxx,svl/itemiter.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/itempool.hxx,svl/itempool.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/itemprop.hxx,svl/itemprop.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/itemset.hxx,svl/itemset.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/languageoptions.hxx,svl/languageoptions.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/lckbitem.hxx,svl/lckbitem.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/lockfilecommon.hxx,svl/lockfilecommon.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/lstner.hxx,svl/lstner.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/macitem.hxx,svl/macitem.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/metitem.hxx,svl/metitem.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/nfkeytab.hxx,svl/nfkeytab.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/nfversi.hxx,svl/nfversi.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/nranges.hxx,svl/nranges.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/ondemand.hxx,svl/ondemand.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/ownlist.hxx,svl/ownlist.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/poolitem.hxx,svl/poolitem.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/ptitem.hxx,svl/ptitem.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/rectitem.hxx,svl/rectitem.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/restrictedpaths.hxx,svl/restrictedpaths.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/rngitem.hxx,svl/rngitem.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/sfontitm.hxx,svl/sfontitm.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/sharecontrolfile.hxx,svl/sharecontrolfile.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/slstitm.hxx,svl/slstitm.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/smplhint.hxx,svl/smplhint.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/solar.hrc,svl/solar.hrc)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/stritem.hxx,svl/stritem.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/style.hrc,svl/style.hrc)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/style.hxx,svl/style.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/svarray.hxx,svl/svarray.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/svdde.hxx,svl/svdde.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/svldata.hxx,svl/svldata.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/svldllapi.h,svl/svldllapi.h)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/svstdarr.hxx,svl/svstdarr.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/svtools.hrc,svl/svtools.hrc)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/szitem.hxx,svl/szitem.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/undo.hxx,svl/undo.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/urlfilter.hxx,svl/urlfilter.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/visitem.hxx,svl/visitem.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/zforlist.hxx,svl/zforlist.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/zformat.hxx,svl/zformat.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/PasswordHelper.hxx,svl/PasswordHelper.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/adrparse.hxx,svl/adrparse.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/broadcast.hxx,svl/broadcast.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/cntnrsrt.hxx,svl/cntnrsrt.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/cntwids.hrc,svl/cntwids.hrc)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/converter.hxx,svl/converter.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/filenotation.hxx,svl/filenotation.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/folderrestriction.hxx,svl/folderrestriction.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/fstathelper.hxx,svl/fstathelper.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/inetdef.hxx,svl/inetdef.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/inetmsg.hxx,svl/inetmsg.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/inetstrm.hxx,svl/inetstrm.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/instrm.hxx,svl/instrm.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/listener.hxx,svl/listener.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/listeneriter.hxx,svl/listeneriter.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/lngmisc.hxx,svl/lngmisc.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/memberid.hrc,svl/memberid.hrc)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/nfsymbol.hxx,svl/nfsymbol.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/numuno.hxx,svl/numuno.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/outstrm.hxx,svl/outstrm.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/pickerhelper.hxx,svl/pickerhelper.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/pickerhistory.hxx,svl/pickerhistory.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/pickerhistoryaccess.hxx,svl/pickerhistoryaccess.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/poolcach.hxx,svl/poolcach.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/strmadpt.hxx,svl/strmadpt.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/stylepool.hxx,svl/stylepool.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/urihelper.hxx,svl/urihelper.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/urlbmk.hxx,svl/urlbmk.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/whiter.hxx,svl/whiter.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/xmlement.hxx,svl/xmlement.hxx)) + +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/asiancfg.hxx,svl/asiancfg.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/broadcast.hxx,svl/broadcast.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/mailenum.hxx,svl/mailenum.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/srchcfg.hxx,svl/srchcfg.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/srchdefs.hxx,svl/srchdefs.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/srchitem.hxx,svl/srchitem.hxx)) diff --git a/svl/prj/target_lib_fsstorage.mk b/svl/prj/target_lib_fsstorage.mk deleted file mode 100644 index 6db23b4ae547..000000000000 --- a/svl/prj/target_lib_fsstorage.mk +++ /dev/null @@ -1,76 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Library_Library,fsstorage)) - -$(eval $(call gb_Library_set_include,fsstorage,\ - $$(SOLARINC) \ - -I$(WORKDIR)/inc/svl \ - -I$(WORKDIR)/inc/ \ - -I$(SRCDIR)/svl/inc \ - -I$(SRCDIR)/svl/inc/svl \ - -I$(SRCDIR)/svl/source/inc \ - -I$(SRCDIR)/svl/inc/pch \ - -I$(OUTDIR)/inc/offuh \ - -I$(OUTDIR)/inc \ -)) - -$(eval $(call gb_Library_add_linked_libs,fsstorage,\ - comphelper \ - cppu \ - cppuhelper \ - sal \ - stl \ - tl \ - ucbhelper \ - utl \ -)) - -$(eval $(call gb_Library_add_linked_system_libs,fsstorage,\ - icuuc \ - dl \ - m \ - pthread \ -)) - -$(eval $(call gb_Library_add_exception_objects,fsstorage,\ - svl/source/fsstor/fsfactory \ - svl/source/fsstor/fsstorage \ - svl/source/fsstor/oinputstreamcontainer \ - svl/source/fsstor/ostreamcontainer \ -)) - -ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,fsstorage,\ - kernel32 \ - msvcrt \ - oldnames \ - user32 \ - uwinapi \ -)) -endif -# vim: set noet sw=4 ts=4: diff --git a/svl/prj/target_lib_passwordcontainer.mk b/svl/prj/target_lib_passwordcontainer.mk deleted file mode 100644 index 4285efa53a0b..000000000000 --- a/svl/prj/target_lib_passwordcontainer.mk +++ /dev/null @@ -1,72 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Library_Library,passwordcontainer)) - -$(eval $(call gb_Library_set_include,passwordcontainer,\ - $$(SOLARINC) \ - -I$(WORKDIR)/inc/svl \ - -I$(WORKDIR)/inc/ \ - -I$(SRCDIR)/svl/inc \ - -I$(SRCDIR)/svl/inc/svl \ - -I$(SRCDIR)/svl/source/inc \ - -I$(SRCDIR)/svl/inc/pch \ - -I$(OUTDIR)/inc/offuh \ - -I$(OUTDIR)/inc \ -)) - -$(eval $(call gb_Library_add_linked_libs,passwordcontainer,\ - utl \ - ucbhelper \ - cppuhelper \ - cppu \ - sal \ - stl \ -)) - -$(eval $(call gb_Library_add_linked_system_libs,passwordcontainer,\ - icuuc \ - dl \ - m \ - pthread \ -)) - -$(eval $(call gb_Library_add_exception_objects,passwordcontainer,\ - svl/source/passwordcontainer/passwordcontainer \ - svl/source/passwordcontainer/syscreds \ -)) - -ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,passwordcontainer,\ - kernel32 \ - msvcrt \ - oldnames \ - user32 \ - uwinapi \ -)) -endif -# vim: set noet sw=4 ts=4: diff --git a/svl/prj/target_lib_svl.mk b/svl/prj/target_lib_svl.mk deleted file mode 100644 index bfa5cfaa96ee..000000000000 --- a/svl/prj/target_lib_svl.mk +++ /dev/null @@ -1,186 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Library_Library,svl)) - -$(eval $(call gb_Library_add_package_headers,svl,svl_inc)) - -$(eval $(call gb_Library_add_precompiled_header,svl,$(SRCDIR)/svl/inc/pch/precompiled_svl)) - -$(eval $(call gb_Library_set_include,svl,\ - $$(SOLARINC) \ - -I$(WORKDIR)/inc/svl \ - -I$(WORKDIR)/inc/ \ - -I$(SRCDIR)/svl/inc \ - -I$(SRCDIR)/svl/source/inc \ - -I$(SRCDIR)/svl/inc/pch \ - -I$(OUTDIR)/inc/offuh \ - -I$(OUTDIR)/inc \ -)) - -$(eval $(call gb_Library_set_defs,svl,\ - $$(DEFS) \ - -DSVL_DLLIMPLEMENTATION \ -)) - -$(eval $(call gb_Library_add_linked_libs,svl,\ - basegfx \ - comphelper \ - cppu \ - cppuhelper \ - i18nisolang1 \ - i18nutil \ - jvmfwk \ - sal \ - sot \ - stl \ - tl \ - ucbhelper \ - utl \ - vos3 \ -)) - -$(eval $(call gb_Library_add_linked_system_libs,svl,\ - icuuc \ - dl \ - m \ - pthread \ -)) - - -$(eval $(call gb_Library_add_exception_objects,svl,\ - svl/inc/pch/precompiled_svl \ - svl/source/config/asiancfg \ - svl/source/config/cjkoptions \ - svl/source/config/ctloptions \ - svl/source/config/itemholder2 \ - svl/source/config/languageoptions \ - svl/source/config/srchcfg \ - svl/source/filepicker/pickerhelper \ - svl/source/filepicker/pickerhistory \ - svl/source/filerec/filerec \ - svl/source/items/aeitem \ - svl/source/items/cenumitm \ - svl/source/items/cintitem \ - svl/source/items/cntwall \ - svl/source/items/ctypeitm \ - svl/source/items/custritm \ - svl/source/items/dateitem \ - svl/source/items/eitem \ - svl/source/items/flagitem \ - svl/source/items/globalnameitem \ - svl/source/items/ilstitem \ - svl/source/items/imageitm \ - svl/source/items/intitem \ - svl/source/items/itemiter \ - svl/source/items/itempool \ - svl/source/items/itemprop \ - svl/source/items/itemset \ - svl/source/items/lckbitem \ - svl/source/items/macitem \ - svl/source/items/poolcach \ - svl/source/items/poolio \ - svl/source/items/poolitem \ - svl/source/items/ptitem \ - svl/source/items/rectitem \ - svl/source/items/rngitem \ - svl/source/items/sfontitm \ - svl/source/items/sitem \ - svl/source/items/slstitm \ - svl/source/items/srchitem \ - svl/source/items/stritem \ - svl/source/items/style \ - svl/source/items/stylepool \ - svl/source/items/szitem \ - svl/source/items/visitem \ - svl/source/items/whiter \ - svl/source/memtools/svarray \ - svl/source/misc/PasswordHelper \ - svl/source/misc/adrparse \ - svl/source/misc/documentlockfile \ - svl/source/misc/filenotation \ - svl/source/misc/folderrestriction \ - svl/source/misc/fstathelper \ - svl/source/misc/inethist \ - svl/source/misc/inettype \ - svl/source/misc/lngmisc \ - svl/source/misc/lockfilecommon \ - svl/source/misc/ownlist \ - svl/source/misc/restrictedpaths \ - svl/source/misc/sharecontrolfile \ - svl/source/misc/strmadpt \ - svl/source/misc/svldata \ - svl/source/misc/urihelper \ - svl/source/notify/brdcst \ - svl/source/notify/broadcast \ - svl/source/notify/hint \ - svl/source/notify/isethint \ - svl/source/notify/listener \ - svl/source/notify/listenerbase \ - svl/source/notify/listeneriter \ - svl/source/notify/lstner \ - svl/source/notify/smplhint \ - svl/source/numbers/nbdll \ - svl/source/numbers/numfmuno \ - svl/source/numbers/numhead \ - svl/source/numbers/numuno \ - svl/source/numbers/supservs \ - svl/source/numbers/zforfind \ - svl/source/numbers/zforlist \ - svl/source/numbers/zformat \ - svl/source/numbers/zforscan \ - svl/source/svsql/converter \ - svl/source/undo/undo \ - svl/source/uno/pathservice \ - svl/source/uno/registerservices \ -)) - -ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_exception_objects,svl,\ - svl/source/svdde/ddecli \ - svl/source/svdde/ddedata \ - svl/source/svdde/ddeinf \ - svl/source/svdde/ddestrg \ - svl/source/svdde/ddesvr \ - svl/source/svdde/ddewrap \ -)) - -$(eval $(call gb_Library_add_linked_libs,svl,\ - advapi32 \ - kernel32 \ - gdi32 \ - msvcrt \ - shell32 \ - user32 \ - uwinapi \ -)) -else -$(eval $(call gb_Library_add_exception_objects,svl,\ - svl/unx/source/svdde/ddedummy \ -)) -endif -# vim: set noet sw=4 ts=4: diff --git a/svl/prj/target_module_svl.mk b/svl/prj/target_module_svl.mk deleted file mode 100644 index ac4a2ba621fe..000000000000 --- a/svl/prj/target_module_svl.mk +++ /dev/null @@ -1,47 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Module_read_includes,svl,\ - lib_svl \ - lib_fsstorage \ - lib_passwordcontainer \ - res_svl \ - package_inc \ -)) - -$(eval $(call gb_Module_Module,svl,\ - $(call gb_AllLangResTarget_get_target,svl) \ - $(call gb_Library_get_target,fsstorage) \ - $(call gb_Library_get_target,passwordcontainer) \ - $(call gb_Library_get_target,svl) \ - $(call gb_Package_get_target,svl_inc) \ -)) - - -#todo: dde platform dependent -#todo: package_inc -#todo: map file diff --git a/svl/prj/target_package_inc.mk b/svl/prj/target_package_inc.mk deleted file mode 100644 index e2814e6eddab..000000000000 --- a/svl/prj/target_package_inc.mk +++ /dev/null @@ -1,129 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Package_Package,svl_inc,$(SRCDIR)/svl/inc)) - -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/aeitem.hxx,svl/aeitem.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/brdcst.hxx,svl/brdcst.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/cenumitm.hxx,svl/cenumitm.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/cintitem.hxx,svl/cintitem.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/cjkoptions.hxx,svl/cjkoptions.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/cntwall.hxx,svl/cntwall.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/ctloptions.hxx,svl/ctloptions.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/ctypeitm.hxx,svl/ctypeitm.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/custritm.hxx,svl/custritm.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/dateitem.hxx,svl/dateitem.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/documentlockfile.hxx,svl/documentlockfile.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/eitem.hxx,svl/eitem.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/filerec.hxx,svl/filerec.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/flagitem.hxx,svl/flagitem.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/globalnameitem.hxx,svl/globalnameitem.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/hint.hxx,svl/hint.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/httpcook.hxx,svl/httpcook.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/ilstitem.hxx,svl/ilstitem.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/imageitm.hxx,svl/imageitm.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/inethist.hxx,svl/inethist.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/inettype.hxx,svl/inettype.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/intitem.hxx,svl/intitem.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/isethint.hxx,svl/isethint.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/itemiter.hxx,svl/itemiter.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/itempool.hxx,svl/itempool.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/itemprop.hxx,svl/itemprop.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/itemset.hxx,svl/itemset.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/languageoptions.hxx,svl/languageoptions.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/lckbitem.hxx,svl/lckbitem.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/lockfilecommon.hxx,svl/lockfilecommon.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/lstner.hxx,svl/lstner.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/macitem.hxx,svl/macitem.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/metitem.hxx,svl/metitem.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/nfkeytab.hxx,svl/nfkeytab.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/nfversi.hxx,svl/nfversi.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/nranges.hxx,svl/nranges.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/ondemand.hxx,svl/ondemand.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/ownlist.hxx,svl/ownlist.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/poolitem.hxx,svl/poolitem.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/ptitem.hxx,svl/ptitem.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/rectitem.hxx,svl/rectitem.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/restrictedpaths.hxx,svl/restrictedpaths.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/rngitem.hxx,svl/rngitem.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/sfontitm.hxx,svl/sfontitm.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/sharecontrolfile.hxx,svl/sharecontrolfile.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/slstitm.hxx,svl/slstitm.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/smplhint.hxx,svl/smplhint.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/solar.hrc,svl/solar.hrc)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/stritem.hxx,svl/stritem.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/style.hrc,svl/style.hrc)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/style.hxx,svl/style.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/svarray.hxx,svl/svarray.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/svdde.hxx,svl/svdde.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/svldata.hxx,svl/svldata.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/svldllapi.h,svl/svldllapi.h)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/svstdarr.hxx,svl/svstdarr.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/svtools.hrc,svl/svtools.hrc)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/szitem.hxx,svl/szitem.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/undo.hxx,svl/undo.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/urlfilter.hxx,svl/urlfilter.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/visitem.hxx,svl/visitem.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/zforlist.hxx,svl/zforlist.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/zformat.hxx,svl/zformat.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/PasswordHelper.hxx,svl/PasswordHelper.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/adrparse.hxx,svl/adrparse.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/broadcast.hxx,svl/broadcast.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/cntnrsrt.hxx,svl/cntnrsrt.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/cntwids.hrc,svl/cntwids.hrc)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/converter.hxx,svl/converter.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/filenotation.hxx,svl/filenotation.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/folderrestriction.hxx,svl/folderrestriction.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/fstathelper.hxx,svl/fstathelper.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/inetdef.hxx,svl/inetdef.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/inetmsg.hxx,svl/inetmsg.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/inetstrm.hxx,svl/inetstrm.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/instrm.hxx,svl/instrm.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/listener.hxx,svl/listener.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/listeneriter.hxx,svl/listeneriter.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/lngmisc.hxx,svl/lngmisc.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/memberid.hrc,svl/memberid.hrc)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/nfsymbol.hxx,svl/nfsymbol.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/numuno.hxx,svl/numuno.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/outstrm.hxx,svl/outstrm.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/pickerhelper.hxx,svl/pickerhelper.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/pickerhistory.hxx,svl/pickerhistory.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/pickerhistoryaccess.hxx,svl/pickerhistoryaccess.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/poolcach.hxx,svl/poolcach.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/strmadpt.hxx,svl/strmadpt.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/stylepool.hxx,svl/stylepool.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/urihelper.hxx,svl/urihelper.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/urlbmk.hxx,svl/urlbmk.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/whiter.hxx,svl/whiter.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/xmlement.hxx,svl/xmlement.hxx)) - -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/asiancfg.hxx,svl/asiancfg.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/broadcast.hxx,svl/broadcast.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/mailenum.hxx,svl/mailenum.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/srchcfg.hxx,svl/srchcfg.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/srchdefs.hxx,svl/srchdefs.hxx)) -$(eval $(call gb_Package_add_file,svl_inc,inc/svl/srchitem.hxx,svl/srchitem.hxx)) diff --git a/svl/prj/target_res_svl.mk b/svl/prj/target_res_svl.mk deleted file mode 100644 index 6759202a5fa4..000000000000 --- a/svl/prj/target_res_svl.mk +++ /dev/null @@ -1,49 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,svl)) - -$(eval $(call gb_AllLangResTarget_add_srs,svl,\ - svl/res \ -)) - -$(eval $(call gb_SrsTarget_SrsTarget,svl/res)) - -$(eval $(call gb_SrsTarget_set_include,svl/res,\ - $$(INCLUDE) \ - -I$(WORKDIR)/inc \ - -I$(SRCDIR)/svl/source/inc \ - -I$(SRCDIR)/svl/inc/ \ - -I$(SRCDIR)/svl/inc/svl \ -)) - -$(eval $(call gb_SrsTarget_add_files,svl/res,\ - svl/source/misc/mediatyp.src \ - svl/source/items/cstitem.src \ -)) - - diff --git a/svtools/AllLangResTarget_productregistration.mk b/svtools/AllLangResTarget_productregistration.mk new file mode 100644 index 000000000000..af510d338c6e --- /dev/null +++ b/svtools/AllLangResTarget_productregistration.mk @@ -0,0 +1,50 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_AllLangResTarget_AllLangResTarget,productregistration)) + +$(eval $(call gb_AllLangResTarget_set_reslocation,productregistration,svtools)) + +$(eval $(call gb_AllLangResTarget_add_srs,productregistration,\ + svt/productregistration \ +)) + +$(eval $(call gb_SrsTarget_SrsTarget,svt/productregistration)) + +$(eval $(call gb_SrsTarget_set_include,svt/productregistration,\ + $$(INCLUDE) \ + -I$(WORKDIR)/inc \ + -I$(SRCDIR)/svtools/source/inc \ + -I$(SRCDIR)/svtools/inc/ \ + -I$(SRCDIR)/svtools/inc/svtools \ +)) + +$(eval $(call gb_SrsTarget_add_files,svt/productregistration,\ + svtools/source/productregistration/registrationdlg.src \ +)) + + diff --git a/svtools/AllLangResTarget_svt.mk b/svtools/AllLangResTarget_svt.mk new file mode 100644 index 000000000000..1e3e21b7ca6b --- /dev/null +++ b/svtools/AllLangResTarget_svt.mk @@ -0,0 +1,79 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_AllLangResTarget_AllLangResTarget,svt)) + +$(eval $(call gb_AllLangResTarget_set_reslocation,svt,svtools)) + +$(eval $(call gb_AllLangResTarget_add_srs,svt,\ + svt/res \ +)) + +$(eval $(call gb_SrsTarget_SrsTarget,svt/res)) + +$(eval $(call gb_SrsTarget_set_include,svt/res,\ + $$(INCLUDE) \ + -I$(WORKDIR)/inc \ + -I$(SRCDIR)/svtools/source/uno \ + -I$(SRCDIR)/svtools/source/inc \ + -I$(SRCDIR)/svtools/inc/ \ + -I$(SRCDIR)/svtools/inc/svtools \ +)) + +$(eval $(call gb_SrsTarget_add_files,svt/res,\ + svtools/source/brwbox/editbrowsebox.src \ + svtools/source/contnr/fileview.src \ + svtools/source/contnr/svcontnr.src \ + svtools/source/contnr/templwin.src \ + svtools/source/control/calendar.src \ + svtools/source/control/ctrlbox.src \ + svtools/source/control/ctrltool.src \ + svtools/source/control/filectrl.src \ + svtools/source/dialogs/addresstemplate.src \ + svtools/source/dialogs/colrdlg.src \ + svtools/source/dialogs/filedlg2.src \ + svtools/source/dialogs/formats.src \ + svtools/source/dialogs/logindlg.src \ + svtools/source/dialogs/printdlg.src \ + svtools/source/dialogs/prnsetup.src \ + svtools/source/dialogs/so3res.src \ + svtools/source/dialogs/wizardmachine.src \ + svtools/source/filter.vcl/filter/dlgejpg.src \ + svtools/source/filter.vcl/filter/dlgepng.src \ + svtools/source/filter.vcl/filter/dlgexpor.src \ + svtools/source/filter.vcl/filter/strings.src \ + svtools/source/java/javaerror.src \ + svtools/source/misc/ehdl.src \ + svtools/source/misc/helpagent.src \ + svtools/source/misc/imagemgr.src \ + svtools/source/misc/langtab.src \ + svtools/source/misc/undo.src \ + svtools/source/plugapp/testtool.src \ + svtools/source/uno/unoifac2.src \ +)) + + diff --git a/svtools/Executable_bmp.mk b/svtools/Executable_bmp.mk new file mode 100644 index 000000000000..57b34292ff11 --- /dev/null +++ b/svtools/Executable_bmp.mk @@ -0,0 +1,71 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Executable_Executable,bmp)) + +$(eval $(call gb_Executable_set_include,bmp,\ + $$(INCLUDE) \ + -I$(WORKDIR)/inc/svtools \ + -I$(WORKDIR)/inc/ \ + -I$(OUTDIR)/inc/ \ + -I$(SRCDIR)/svtools/inc \ + -I$(SRCDIR)/svtools/inc/svtools \ + -I$(SRCDIR)/svtools/source/inc \ + -I$(SRCDIR)/svtools/inc/pch \ + -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Executable_add_linked_libs,bmp,\ + stl \ + vcl \ + tl \ + vos3 \ + sal \ +)) + +$(eval $(call gb_Executable_add_exception_objects,bmp,\ + svtools/bmpmaker/bmp \ + svtools/bmpmaker/bmpcore \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_Executable_add_linked_libs,bmp,\ + kernel32 \ + msvcrt \ + oldnames \ + user32 \ + uwinapi \ +)) +endif + +ifeq ($(OS),LINUX) +$(eval $(call gb_Executable_add_linked_libs,bmp,\ + pthread \ + dl \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/svtools/Executable_bmpsum.mk b/svtools/Executable_bmpsum.mk new file mode 100644 index 000000000000..ec0f90f2b04b --- /dev/null +++ b/svtools/Executable_bmpsum.mk @@ -0,0 +1,67 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Executable_Executable,bmpsum)) + +$(eval $(call gb_Executable_set_include,bmpsum,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/ \ + -I$(OUTDIR)/inc/offuh/ \ + -I$(SRCDIR)/svtools/inc/ \ + -I$(SRCDIR)/svtools/inc/pch/ \ + -I$(SRCDIR)/svtools/inc/svtools/ \ +)) + +$(eval $(call gb_Executable_add_linked_libs,bmpsum,\ + stl \ + vcl \ + tl \ + vos3 \ + sal \ +)) + +$(eval $(call gb_Executable_add_exception_objects,bmpsum,\ + svtools/bmpmaker/bmpsum \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_Executable_add_linked_libs,bmpsum,\ + kernel32 \ + msvcrt \ + oldnames \ + user32 \ + uwinapi \ +)) +endif + +ifeq ($(OS),LINUX) +$(eval $(call gb_Executable_add_linked_libs,bmpsum,\ + pthread \ + dl \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/svtools/Executable_g2g.mk b/svtools/Executable_g2g.mk new file mode 100644 index 000000000000..4bba4dc2644f --- /dev/null +++ b/svtools/Executable_g2g.mk @@ -0,0 +1,67 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Executable_Executable,g2g)) + +$(eval $(call gb_Executable_set_include,g2g,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/ \ + -I$(OUTDIR)/inc/offuh/ \ + -I$(SRCDIR)/svtools/inc/ \ + -I$(SRCDIR)/svtools/inc/pch/ \ + -I$(SRCDIR)/svtools/inc/svtools/ \ +)) + +$(eval $(call gb_Executable_add_linked_libs,g2g,\ + stl \ + vcl \ + tl \ + vos3 \ + svt \ + sal \ +)) + +$(eval $(call gb_Executable_add_exception_objects,g2g,\ + svtools/bmpmaker/g2g \ +)) +ifeq ($(OS),WNT) +$(eval $(call gb_Executable_add_linked_libs,g2g,\ + kernel32 \ + msvcrt \ + oldnames \ + user32 \ + uwinapi \ +)) +endif +ifeq ($(OS),LINUX) +$(eval $(call gb_Executable_add_linked_libs,g2g,\ + pthread \ + dl \ + X11 \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/svtools/Library_hatchwindowfactory.mk b/svtools/Library_hatchwindowfactory.mk new file mode 100644 index 000000000000..448517271e19 --- /dev/null +++ b/svtools/Library_hatchwindowfactory.mk @@ -0,0 +1,74 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,hatchwindowfactory)) + +$(eval $(call gb_Library_set_include,hatchwindowfactory,\ + $$(INCLUDE) \ + -I$(WORKDIR)/inc/svtools \ + -I$(WORKDIR)/inc/ \ + -I$(SRCDIR)/svtools/inc/pch/ \ + -I$(OUTDIR)/inc/ \ + -I$(SRCDIR)/svtools/inc \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_Library_add_linked_libs,hatchwindowfactory,\ + tk \ + tl \ + cppu \ + cppuhelper \ + sal \ + vcl \ +)) + +$(eval $(call gb_Library_add_exception_objects,hatchwindowfactory,\ + svtools/source/hatchwindow/hatchwindowfactory \ + svtools/source/hatchwindow/documentcloser \ + svtools/source/hatchwindow/ipwin \ + svtools/source/hatchwindow/hatchwindow \ +)) + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,hatchwindowfactory,\ + dl \ + m \ + pthread \ +)) +endif +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,hatchwindowfactory,\ + kernel32 \ + msvcrt \ + oldnames \ + stl \ + user32 \ + uwinapi \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/svtools/Library_productregistration.mk b/svtools/Library_productregistration.mk new file mode 100644 index 000000000000..7dc480c8ea5a --- /dev/null +++ b/svtools/Library_productregistration.mk @@ -0,0 +1,75 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,productregistration)) + +$(eval $(call gb_Library_set_include,productregistration,\ + $$(SOLARINC) \ + -I$(WORKDIR)/inc/svtools \ + -I$(WORKDIR)/inc/ \ + -I$(SRCDIR)/svtools/inc/pch/ \ + -I$(OUTDIR)/inc/ \ + -I$(SRCDIR)/svtools/inc \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_Library_add_linked_libs,productregistration,\ + svl \ + tk \ + tl \ + cppu \ + cppuhelper \ + sal \ + stl \ + utl \ + vcl \ +)) + +$(eval $(call gb_Library_add_exception_objects,productregistration,\ + svtools/source/productregistration/productregistration \ + svtools/source/productregistration/registrationdlg \ +)) + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,productregistration,\ + dl \ + m \ + pthread \ +)) +endif + +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,productregistration,\ + kernel32 \ + msvcrt \ + oldnames \ + user32 \ + uwinapi \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk new file mode 100644 index 000000000000..8968775b8e7c --- /dev/null +++ b/svtools/Library_svt.mk @@ -0,0 +1,298 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,svt)) + +$(eval $(call gb_Library_add_package_headers,svt,svtools_inc)) + +$(eval $(call gb_Library_add_precompiled_header,svt,$(SRCDIR)/svtools/inc/pch/precompiled_svtools)) + +$(eval $(call gb_Library_set_include,svt,\ + $$(INCLUDE) \ + -I$(WORKDIR)/inc/svtools \ + -I$(WORKDIR)/inc/ \ + -I$(OUTDIR)/inc/ \ + -I$(SRCDIR)/svtools/inc \ + -I$(SRCDIR)/svtools/inc/svtools \ + -I$(SRCDIR)/svtools/source/inc \ + -I$(SRCDIR)/svtools/inc/pch \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_Library_set_defs,svt,\ + $$(DEFS) \ + -DSVT_DLLIMPLEMENTATION \ +)) + +$(eval $(call gb_Library_add_linked_libs,svt,\ + basegfx \ + comphelper \ + cppu \ + cppuhelper \ + i18nisolang1 \ + i18nutil \ + icuuc \ + jvmfwk \ + sal \ + sot \ + stl \ + svl \ + tk \ + tl \ + ucbhelper \ + utl \ + vcl \ + vos3 \ +)) + +ifeq ($(SYSTEM_JPEG),YES) +$(eval $(call gb_Library_add_linked_libs,svt,\ + jpeg \ +)) +$(eval $(call gb_Library_set_ldflags,svt,\ + $$(filter-out -L/usr/lib/jvm%,$$(LDFLAGS)) \ +)) +else +$(eval $(call gb_Library_add_linked_static_libs,svt,\ + jpeglib \ +)) +endif + +$(eval $(call gb_Library_add_exception_objects,svt,\ + svtools/source/edit/svmedit \ + svtools/source/edit/svmedit2 \ + svtools/source/edit/textundo \ + svtools/source/edit/syntaxhighlight \ + svtools/source/edit/textwindowpeer \ + svtools/source/edit/sychconv \ + svtools/source/edit/xtextedt \ + svtools/source/edit/txtattr \ + svtools/source/edit/textdoc \ + svtools/source/edit/texteng \ + svtools/source/edit/textdata \ + svtools/source/edit/editsyntaxhighlighter \ + svtools/source/edit/textview \ + svtools/source/urlobj/inetimg \ + svtools/source/java/javainteractionhandler \ + svtools/source/java/javacontext \ + svtools/source/svhtml/htmlout \ + svtools/source/svhtml/htmlsupp \ + svtools/source/svhtml/parhtml \ + svtools/source/svhtml/htmlkywd \ + svtools/source/config/itemholder2 \ + svtools/source/config/optionsdrawinglayer \ + svtools/source/config/menuoptions \ + svtools/source/config/helpopt \ + svtools/source/config/htmlcfg \ + svtools/source/config/accessibilityoptions \ + svtools/source/config/printoptions \ + svtools/source/config/miscopt \ + svtools/source/config/extcolorcfg \ + svtools/source/config/colorcfg \ + svtools/source/config/fontsubstconfig \ + svtools/source/config/apearcfg \ + svtools/source/misc/acceleratorexecute \ + svtools/source/misc/chartprettypainter \ + svtools/source/misc/cliplistener \ + svtools/source/misc/dialogclosedlistener \ + svtools/source/misc/dialogcontrolling \ + svtools/source/misc/ehdl \ + svtools/source/misc/embedhlp \ + svtools/source/misc/embedtransfer \ + svtools/source/misc/helpagentwindow \ + svtools/source/misc/imagemgr \ + svtools/source/misc/imageresourceaccess \ + svtools/source/misc/imap \ + svtools/source/misc/imap2 \ + svtools/source/misc/imap3 \ + svtools/source/misc/itemdel \ + svtools/source/misc/langtab \ + svtools/source/misc/stringtransfer \ + svtools/source/misc/svtaccessiblefactory \ + svtools/source/misc/svtdata \ + svtools/source/misc/templatefoldercache \ + svtools/source/misc/transfer2 \ + svtools/source/misc/transfer \ + svtools/source/misc/unitconv \ + svtools/source/misc/wallitem \ + svtools/source/plugapp/ttprops \ + svtools/source/control/ctrlbox \ + svtools/source/control/valueacc \ + svtools/source/control/valueset \ + svtools/source/control/taskbar \ + svtools/source/control/urlcontrol \ + svtools/source/control/scriptedtext \ + svtools/source/control/headbar \ + svtools/source/control/fileurlbox \ + svtools/source/control/fmtfield \ + svtools/source/control/collatorres \ + svtools/source/control/indexentryres \ + svtools/source/control/filectrl \ + svtools/source/control/scrwin \ + svtools/source/control/taskbox \ + svtools/source/control/hyperlabel \ + svtools/source/control/filectrl2 \ + svtools/source/control/fixedhyper \ + svtools/source/control/taskstat \ + svtools/source/control/inettbc \ + svtools/source/control/calendar \ + svtools/source/control/roadmap \ + svtools/source/control/ctrltool \ + svtools/source/control/asynclink \ + svtools/source/control/stdctrl \ + svtools/source/control/ctrldll \ + svtools/source/control/tabbar \ + svtools/source/control/ruler \ + svtools/source/control/stdmenu \ + svtools/source/control/prgsbar \ + svtools/source/control/taskmisc \ + svtools/source/dialogs/insdlg \ + svtools/source/dialogs/roadmapwizard \ + svtools/source/dialogs/mcvmath \ + svtools/source/dialogs/logindlg \ + svtools/source/dialogs/wizdlg \ + svtools/source/dialogs/addresstemplate \ + svtools/source/dialogs/printdlg \ + svtools/source/dialogs/filedlg2 \ + svtools/source/dialogs/colctrl \ + svtools/source/dialogs/colrdlg \ + svtools/source/dialogs/wizardmachine \ + svtools/source/dialogs/prnsetup \ + svtools/source/dialogs/filedlg \ + svtools/source/dialogs/property \ + svtools/source/table/tablecontrol \ + svtools/source/table/tablegeometry \ + svtools/source/table/gridtablerenderer \ + svtools/source/table/tabledatawindow \ + svtools/source/table/defaultinputhandler \ + svtools/source/table/tablecontrol_impl \ + svtools/source/contnr/svlbox \ + svtools/source/contnr/svtabbx \ + svtools/source/contnr/ivctrl \ + svtools/source/contnr/templwin \ + svtools/source/contnr/svicnvw \ + svtools/source/contnr/contentenumeration \ + svtools/source/contnr/svimpbox \ + svtools/source/contnr/imivctl1 \ + svtools/source/contnr/svtreebx \ + svtools/source/contnr/fileview \ + svtools/source/contnr/svimpicn \ + svtools/source/contnr/svlbitm \ + svtools/source/contnr/ctrdll \ + svtools/source/contnr/tooltiplbox \ + svtools/source/contnr/treelist \ + svtools/source/contnr/imivctl2 \ + svtools/source/uno/unoiface \ + svtools/source/uno/genericunodialog \ + svtools/source/uno/unocontroltablemodel \ + svtools/source/uno/contextmenuhelper \ + svtools/source/uno/toolboxcontroller \ + svtools/source/uno/generictoolboxcontroller \ + svtools/source/uno/addrtempuno \ + svtools/source/uno/miscservices \ + svtools/source/uno/statusbarcontroller \ + svtools/source/uno/svtxgridcontrol \ + svtools/source/uno/unoimap \ + svtools/source/uno/unoevent \ + svtools/source/uno/treecontrolpeer \ + svtools/source/uno/framestatuslistener \ + svtools/source/brwbox/editbrowsebox \ + svtools/source/brwbox/brwhead \ + svtools/source/brwbox/brwbox3 \ + svtools/source/brwbox/brwbox1 \ + svtools/source/brwbox/ebbcontrols \ + svtools/source/brwbox/brwbox2 \ + svtools/source/brwbox/datwin \ + svtools/source/brwbox/editbrowsebox2 \ + svtools/source/svrtf/rtfkeywd \ + svtools/source/svrtf/svparser \ + svtools/source/svrtf/parrtf \ + svtools/source/svrtf/rtfout \ + svtools/source/filter.vcl/filter/dlgepng \ + svtools/source/filter.vcl/filter/filter2 \ + svtools/source/filter.vcl/filter/FilterConfigItem \ + svtools/source/filter.vcl/filter/sgvspln \ + svtools/source/filter.vcl/filter/filter \ + svtools/source/filter.vcl/filter/sgvtext \ + svtools/source/filter.vcl/filter/sgfbram \ + svtools/source/filter.vcl/filter/SvFilterOptionsDialog \ + svtools/source/filter.vcl/filter/dlgexpor \ + svtools/source/filter.vcl/filter/fldll \ + svtools/source/filter.vcl/filter/sgvmain \ + svtools/source/filter.vcl/filter/FilterConfigCache \ + svtools/source/filter.vcl/filter/dlgejpg \ + svtools/source/filter.vcl/wmf/winwmf \ + svtools/source/filter.vcl/wmf/winmtf \ + svtools/source/filter.vcl/wmf/emfwr \ + svtools/source/filter.vcl/wmf/wmf \ + svtools/source/filter.vcl/wmf/enhwmf \ + svtools/source/filter.vcl/wmf/wmfwr \ + svtools/source/filter.vcl/igif/decode \ + svtools/source/filter.vcl/igif/gifread \ + svtools/source/filter.vcl/ixbm/xbmread \ + svtools/source/filter.vcl/jpeg/jpeg \ + svtools/source/filter.vcl/ixpm/xpmread \ + svtools/source/graphic/descriptor \ + svtools/source/graphic/graphic \ + svtools/source/graphic/graphicunofactory \ + svtools/source/graphic/grfattr \ + svtools/source/graphic/grfcache \ + svtools/source/graphic/grfmgr \ + svtools/source/graphic/grfmgr2 \ + svtools/source/graphic/provider \ + svtools/source/graphic/renderer \ + svtools/source/graphic/transformer \ +)) + +$(eval $(call gb_Library_add_cobjects,svt,\ + svtools/source/filter.vcl/jpeg/jpegc \ +)) + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,svt,\ + dl \ + m \ + pthread \ +)) +endif + +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,svt,\ + advapi32 \ + gdi32 \ + kernel32 \ + msvcrt \ + oldnames \ + ole32 \ + oleaut32 \ + user32 \ + uuid \ + uwinapi \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/svtools/Makefile b/svtools/Makefile index 9ab4b8ba83f4..60d34122e271 100644 --- a/svtools/Makefile +++ b/svtools/Makefile @@ -25,12 +25,13 @@ # #************************************************************************* +ifeq ($(strip $(SOLARENV)),) +$(error No environment set) +endif + GBUILDDIR := $(SOLARENV)/gbuild include $(GBUILDDIR)/gbuild.mk - -gb_CURRENT_MODULE := $(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))) - -$(eval $(call gb_Module_make_global_targets,$(gb_CURRENT_MODULE))) +$(eval $(call gb_Module_make_global_targets)) # vim: set noet sw=4 ts=4: diff --git a/svtools/Module_svtools.mk b/svtools/Module_svtools.mk new file mode 100644 index 000000000000..bc760add6d26 --- /dev/null +++ b/svtools/Module_svtools.mk @@ -0,0 +1,48 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Module_Module,svtools)) + +$(eval $(call gb_Module_add_targets,svtools,\ + AllLangResTarget_productregistration \ + AllLangResTarget_svt \ + Executable_bmp \ + Executable_bmpsum \ + Executable_g2g \ + Library_hatchwindowfactory \ + Library_productregistration \ + Library_svt \ + Package_inc \ +)) + +#todo: javapatchres +#todo: jpeg on mac in svtools/util/makefile.mk +#todo: deliver errtxt.src as ehdl.srs +#todo: nooptfiles filter, filterconfigitem, FilterConfigCache, SvFilterOptionsDialog +#todo: map file + +# vim: set noet sw=4 ts=4: diff --git a/svtools/Package_inc.mk b/svtools/Package_inc.mk new file mode 100644 index 000000000000..f47251f31590 --- /dev/null +++ b/svtools/Package_inc.mk @@ -0,0 +1,180 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,svtools_inc,$(SRCDIR)/svtools/inc)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/AccessibleBrowseBoxObjType.hxx,svtools/AccessibleBrowseBoxObjType.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/DocumentInfoPreview.hxx,svtools/DocumentInfoPreview.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/FilterConfigItem.hxx,svtools/FilterConfigItem.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/QueryFolderName.hxx,svtools/QueryFolderName.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/acceleratorexecute.hxx,svtools/acceleratorexecute.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibilityoptions.hxx,svtools/accessibilityoptions.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessiblefactory.hxx,svtools/accessiblefactory.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibletable.hxx,svtools/accessibletable.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibletableprovider.hxx,svtools/accessibletableprovider.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/addresstemplate.hxx,svtools/addresstemplate.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/apearcfg.hxx,svtools/apearcfg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/asynclink.hxx,svtools/asynclink.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/brwbox.hxx,svtools/brwbox.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/brwhead.hxx,svtools/brwhead.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/calendar.hxx,svtools/calendar.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/chartprettypainter.hxx,svtools/chartprettypainter.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/cliplistener.hxx,svtools/cliplistener.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/colctrl.hxx,svtools/colctrl.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/collatorres.hxx,svtools/collatorres.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/colorcfg.hxx,svtools/colorcfg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/colrdlg.hxx,svtools/colrdlg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/contextmenuhelper.hxx,svtools/contextmenuhelper.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/controldims.hrc,svtools/controldims.hrc)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ctrlbox.hxx,svtools/ctrlbox.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ctrltool.hxx,svtools/ctrltool.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/dialogclosedlistener.hxx,svtools/dialogclosedlistener.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/dialogcontrolling.hxx,svtools/dialogcontrolling.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/editbrowsebox.hxx,svtools/editbrowsebox.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/editimplementation.hxx,svtools/editimplementation.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/editsyntaxhighlighter.hxx,svtools/editsyntaxhighlighter.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ehdl.hxx,svtools/ehdl.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/embedhlp.hxx,svtools/embedhlp.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/embedtransfer.hxx,svtools/embedtransfer.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/expander.hxx,svtools/expander.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/extcolorcfg.hxx,svtools/extcolorcfg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/extensionlistbox.hxx,svtools/extensionlistbox.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filectrl.hxx,svtools/filectrl.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filedlg.hxx,svtools/filedlg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filedlg2.hrc,svtools/filedlg2.hrc)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fileurlbox.hxx,svtools/fileurlbox.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fileview.hxx,svtools/fileview.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filter.hxx,svtools/filter.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fixedhyper.hxx,svtools/fixedhyper.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fltcall.hxx,svtools/fltcall.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fltdefs.hxx,svtools/fltdefs.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fmtfield.hxx,svtools/fmtfield.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fontsubstconfig.hxx,svtools/fontsubstconfig.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/framestatuslistener.hxx,svtools/framestatuslistener.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/generictoolboxcontroller.hxx,svtools/generictoolboxcontroller.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/genericunodialog.hxx,svtools/genericunodialog.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/grfmgr.hxx,svtools/grfmgr.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/headbar.hxx,svtools/headbar.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/helpagentwindow.hxx,svtools/helpagentwindow.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/helpid.hrc,svtools/helpid.hrc)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/helpopt.hxx,svtools/helpopt.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/htmlcfg.hxx,svtools/htmlcfg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/htmlkywd.hxx,svtools/htmlkywd.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/htmlout.hxx,svtools/htmlout.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/htmltokn.h,svtools/htmltokn.h)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/hyperlabel.hxx,svtools/hyperlabel.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imagemgr.hrc,svtools/imagemgr.hrc)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imagemgr.hxx,svtools/imagemgr.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imageresourceaccess.hxx,svtools/imageresourceaccess.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imap.hxx,svtools/imap.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imapcirc.hxx,svtools/imapcirc.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imapobj.hxx,svtools/imapobj.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imappoly.hxx,svtools/imappoly.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imaprect.hxx,svtools/imaprect.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imgdef.hxx,svtools/imgdef.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/indexentryres.hxx,svtools/indexentryres.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/inetimg.hxx,svtools/inetimg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/inettbc.hxx,svtools/inettbc.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/insdlg.hxx,svtools/insdlg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/itemdel.hxx,svtools/itemdel.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ivctrl.hxx,svtools/ivctrl.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/javacontext.hxx,svtools/javacontext.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/javainteractionhandler.hxx,svtools/javainteractionhandler.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/langtab.hxx,svtools/langtab.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/localresaccess.hxx,svtools/localresaccess.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/logindlg.hxx,svtools/logindlg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/menuoptions.hxx,svtools/menuoptions.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/miscopt.hxx,svtools/miscopt.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/optionsdrawinglayer.hxx,svtools/optionsdrawinglayer.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/parhtml.hxx,svtools/parhtml.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/parrtf.hxx,svtools/parrtf.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/prgsbar.hxx,svtools/prgsbar.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/printdlg.hxx,svtools/printdlg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/printoptions.hxx,svtools/printoptions.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/prnsetup.hxx,svtools/prnsetup.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/roadmap.hxx,svtools/roadmap.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/roadmapwizard.hxx,svtools/roadmapwizard.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/rtfkeywd.hxx,svtools/rtfkeywd.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/rtfout.hxx,svtools/rtfout.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/rtftoken.h,svtools/rtftoken.h)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ruler.hxx,svtools/ruler.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/scriptedtext.hxx,svtools/scriptedtext.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/scrwin.hxx,svtools/scrwin.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/sfxecode.hxx,svtools/sfxecode.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/soerr.hxx,svtools/soerr.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/sores.hxx,svtools/sores.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/statusbarcontroller.hxx,svtools/statusbarcontroller.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/stdctrl.hxx,svtools/stdctrl.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/stdmenu.hxx,svtools/stdmenu.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/stringtransfer.hxx,svtools/stringtransfer.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svicnvw.hxx,svtools/svicnvw.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svlbitm.hxx,svtools/svlbitm.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svlbox.hxx,svtools/svlbox.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svmedit.hxx,svtools/svmedit.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svmedit2.hxx,svtools/svmedit2.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svparser.hxx,svtools/svparser.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtabbx.hxx,svtools/svtabbx.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtdata.hxx,svtools/svtdata.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtdllapi.h,svtools/svtdllapi.h)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtreebx.hxx,svtools/svtreebx.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svxbox.hxx,svtools/svxbox.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/sychconv.hxx,svtools/sychconv.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/syntaxhighlight.hxx,svtools/syntaxhighlight.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/tabbar.hxx,svtools/tabbar.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/abstracttablecontrol.hxx,svtools/table/abstracttablecontrol.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/defaultinputhandler.hxx,svtools/table/defaultinputhandler.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/gridtablerenderer.hxx,svtools/table/gridtablerenderer.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tablecontrol.hxx,svtools/table/tablecontrol.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tabledatawindow.hxx,svtools/table/tabledatawindow.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tableinputhandler.hxx,svtools/table/tableinputhandler.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tablemodel.hxx,svtools/table/tablemodel.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tablerenderer.hxx,svtools/table/tablerenderer.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tabletypes.hxx,svtools/table/tabletypes.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/taskbar.hxx,svtools/taskbar.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/templatefoldercache.hxx,svtools/templatefoldercache.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/templdlg.hxx,svtools/templdlg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/testtool.hxx,svtools/testtool.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/textdata.hxx,svtools/textdata.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/texteng.hxx,svtools/texteng.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/textview.hxx,svtools/textview.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/textwindowpeer.hxx,svtools/textwindowpeer.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolboxcontroller.hxx,svtools/toolboxcontroller.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/tooltiplbox.hxx,svtools/tooltiplbox.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/transfer.hxx,svtools/transfer.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/treelist.hxx,svtools/treelist.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ttprops.hxx,svtools/ttprops.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/txtattr.hxx,svtools/txtattr.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/txtcmp.hxx,svtools/txtcmp.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/unitconv.hxx,svtools/unitconv.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/unoevent.hxx,svtools/unoevent.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/unoimap.hxx,svtools/unoimap.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/urlcontrol.hxx,svtools/urlcontrol.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/valueset.hxx,svtools/valueset.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wallitem.hxx,svtools/wallitem.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wizardmachine.hxx,svtools/wizardmachine.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wizdlg.hxx,svtools/wizdlg.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wmf.hxx,svtools/wmf.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/xtextedt.hxx,svtools/xtextedt.hxx)) diff --git a/svtools/prj/target_exe_bmp.mk b/svtools/prj/target_exe_bmp.mk deleted file mode 100644 index 57b34292ff11..000000000000 --- a/svtools/prj/target_exe_bmp.mk +++ /dev/null @@ -1,71 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Executable_Executable,bmp)) - -$(eval $(call gb_Executable_set_include,bmp,\ - $$(INCLUDE) \ - -I$(WORKDIR)/inc/svtools \ - -I$(WORKDIR)/inc/ \ - -I$(OUTDIR)/inc/ \ - -I$(SRCDIR)/svtools/inc \ - -I$(SRCDIR)/svtools/inc/svtools \ - -I$(SRCDIR)/svtools/source/inc \ - -I$(SRCDIR)/svtools/inc/pch \ - -I$(OUTDIR)/inc/offuh \ -)) - -$(eval $(call gb_Executable_add_linked_libs,bmp,\ - stl \ - vcl \ - tl \ - vos3 \ - sal \ -)) - -$(eval $(call gb_Executable_add_exception_objects,bmp,\ - svtools/bmpmaker/bmp \ - svtools/bmpmaker/bmpcore \ -)) - -ifeq ($(OS),WNT) -$(eval $(call gb_Executable_add_linked_libs,bmp,\ - kernel32 \ - msvcrt \ - oldnames \ - user32 \ - uwinapi \ -)) -endif - -ifeq ($(OS),LINUX) -$(eval $(call gb_Executable_add_linked_libs,bmp,\ - pthread \ - dl \ -)) -endif -# vim: set noet sw=4 ts=4: diff --git a/svtools/prj/target_exe_bmpsum.mk b/svtools/prj/target_exe_bmpsum.mk deleted file mode 100644 index ec0f90f2b04b..000000000000 --- a/svtools/prj/target_exe_bmpsum.mk +++ /dev/null @@ -1,67 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Executable_Executable,bmpsum)) - -$(eval $(call gb_Executable_set_include,bmpsum,\ - $$(INCLUDE) \ - -I$(OUTDIR)/inc/ \ - -I$(OUTDIR)/inc/offuh/ \ - -I$(SRCDIR)/svtools/inc/ \ - -I$(SRCDIR)/svtools/inc/pch/ \ - -I$(SRCDIR)/svtools/inc/svtools/ \ -)) - -$(eval $(call gb_Executable_add_linked_libs,bmpsum,\ - stl \ - vcl \ - tl \ - vos3 \ - sal \ -)) - -$(eval $(call gb_Executable_add_exception_objects,bmpsum,\ - svtools/bmpmaker/bmpsum \ -)) - -ifeq ($(OS),WNT) -$(eval $(call gb_Executable_add_linked_libs,bmpsum,\ - kernel32 \ - msvcrt \ - oldnames \ - user32 \ - uwinapi \ -)) -endif - -ifeq ($(OS),LINUX) -$(eval $(call gb_Executable_add_linked_libs,bmpsum,\ - pthread \ - dl \ -)) -endif -# vim: set noet sw=4 ts=4: diff --git a/svtools/prj/target_exe_g2g.mk b/svtools/prj/target_exe_g2g.mk deleted file mode 100644 index 4bba4dc2644f..000000000000 --- a/svtools/prj/target_exe_g2g.mk +++ /dev/null @@ -1,67 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Executable_Executable,g2g)) - -$(eval $(call gb_Executable_set_include,g2g,\ - $$(INCLUDE) \ - -I$(OUTDIR)/inc/ \ - -I$(OUTDIR)/inc/offuh/ \ - -I$(SRCDIR)/svtools/inc/ \ - -I$(SRCDIR)/svtools/inc/pch/ \ - -I$(SRCDIR)/svtools/inc/svtools/ \ -)) - -$(eval $(call gb_Executable_add_linked_libs,g2g,\ - stl \ - vcl \ - tl \ - vos3 \ - svt \ - sal \ -)) - -$(eval $(call gb_Executable_add_exception_objects,g2g,\ - svtools/bmpmaker/g2g \ -)) -ifeq ($(OS),WNT) -$(eval $(call gb_Executable_add_linked_libs,g2g,\ - kernel32 \ - msvcrt \ - oldnames \ - user32 \ - uwinapi \ -)) -endif -ifeq ($(OS),LINUX) -$(eval $(call gb_Executable_add_linked_libs,g2g,\ - pthread \ - dl \ - X11 \ -)) -endif -# vim: set noet sw=4 ts=4: diff --git a/svtools/prj/target_lib_hatchwindowfactory.mk b/svtools/prj/target_lib_hatchwindowfactory.mk deleted file mode 100644 index 448517271e19..000000000000 --- a/svtools/prj/target_lib_hatchwindowfactory.mk +++ /dev/null @@ -1,74 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Library_Library,hatchwindowfactory)) - -$(eval $(call gb_Library_set_include,hatchwindowfactory,\ - $$(INCLUDE) \ - -I$(WORKDIR)/inc/svtools \ - -I$(WORKDIR)/inc/ \ - -I$(SRCDIR)/svtools/inc/pch/ \ - -I$(OUTDIR)/inc/ \ - -I$(SRCDIR)/svtools/inc \ - -I$(OUTDIR)/inc/offuh \ - -I$(OUTDIR)/inc \ -)) - -$(eval $(call gb_Library_add_linked_libs,hatchwindowfactory,\ - tk \ - tl \ - cppu \ - cppuhelper \ - sal \ - vcl \ -)) - -$(eval $(call gb_Library_add_exception_objects,hatchwindowfactory,\ - svtools/source/hatchwindow/hatchwindowfactory \ - svtools/source/hatchwindow/documentcloser \ - svtools/source/hatchwindow/ipwin \ - svtools/source/hatchwindow/hatchwindow \ -)) - -ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,hatchwindowfactory,\ - dl \ - m \ - pthread \ -)) -endif -ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,hatchwindowfactory,\ - kernel32 \ - msvcrt \ - oldnames \ - stl \ - user32 \ - uwinapi \ -)) -endif -# vim: set noet sw=4 ts=4: diff --git a/svtools/prj/target_lib_productregistration.mk b/svtools/prj/target_lib_productregistration.mk deleted file mode 100644 index 7dc480c8ea5a..000000000000 --- a/svtools/prj/target_lib_productregistration.mk +++ /dev/null @@ -1,75 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Library_Library,productregistration)) - -$(eval $(call gb_Library_set_include,productregistration,\ - $$(SOLARINC) \ - -I$(WORKDIR)/inc/svtools \ - -I$(WORKDIR)/inc/ \ - -I$(SRCDIR)/svtools/inc/pch/ \ - -I$(OUTDIR)/inc/ \ - -I$(SRCDIR)/svtools/inc \ - -I$(OUTDIR)/inc/offuh \ - -I$(OUTDIR)/inc \ -)) - -$(eval $(call gb_Library_add_linked_libs,productregistration,\ - svl \ - tk \ - tl \ - cppu \ - cppuhelper \ - sal \ - stl \ - utl \ - vcl \ -)) - -$(eval $(call gb_Library_add_exception_objects,productregistration,\ - svtools/source/productregistration/productregistration \ - svtools/source/productregistration/registrationdlg \ -)) - -ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,productregistration,\ - dl \ - m \ - pthread \ -)) -endif - -ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,productregistration,\ - kernel32 \ - msvcrt \ - oldnames \ - user32 \ - uwinapi \ -)) -endif -# vim: set noet sw=4 ts=4: diff --git a/svtools/prj/target_lib_svt.mk b/svtools/prj/target_lib_svt.mk deleted file mode 100644 index 8968775b8e7c..000000000000 --- a/svtools/prj/target_lib_svt.mk +++ /dev/null @@ -1,298 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Library_Library,svt)) - -$(eval $(call gb_Library_add_package_headers,svt,svtools_inc)) - -$(eval $(call gb_Library_add_precompiled_header,svt,$(SRCDIR)/svtools/inc/pch/precompiled_svtools)) - -$(eval $(call gb_Library_set_include,svt,\ - $$(INCLUDE) \ - -I$(WORKDIR)/inc/svtools \ - -I$(WORKDIR)/inc/ \ - -I$(OUTDIR)/inc/ \ - -I$(SRCDIR)/svtools/inc \ - -I$(SRCDIR)/svtools/inc/svtools \ - -I$(SRCDIR)/svtools/source/inc \ - -I$(SRCDIR)/svtools/inc/pch \ - -I$(OUTDIR)/inc/offuh \ - -I$(OUTDIR)/inc \ -)) - -$(eval $(call gb_Library_set_defs,svt,\ - $$(DEFS) \ - -DSVT_DLLIMPLEMENTATION \ -)) - -$(eval $(call gb_Library_add_linked_libs,svt,\ - basegfx \ - comphelper \ - cppu \ - cppuhelper \ - i18nisolang1 \ - i18nutil \ - icuuc \ - jvmfwk \ - sal \ - sot \ - stl \ - svl \ - tk \ - tl \ - ucbhelper \ - utl \ - vcl \ - vos3 \ -)) - -ifeq ($(SYSTEM_JPEG),YES) -$(eval $(call gb_Library_add_linked_libs,svt,\ - jpeg \ -)) -$(eval $(call gb_Library_set_ldflags,svt,\ - $$(filter-out -L/usr/lib/jvm%,$$(LDFLAGS)) \ -)) -else -$(eval $(call gb_Library_add_linked_static_libs,svt,\ - jpeglib \ -)) -endif - -$(eval $(call gb_Library_add_exception_objects,svt,\ - svtools/source/edit/svmedit \ - svtools/source/edit/svmedit2 \ - svtools/source/edit/textundo \ - svtools/source/edit/syntaxhighlight \ - svtools/source/edit/textwindowpeer \ - svtools/source/edit/sychconv \ - svtools/source/edit/xtextedt \ - svtools/source/edit/txtattr \ - svtools/source/edit/textdoc \ - svtools/source/edit/texteng \ - svtools/source/edit/textdata \ - svtools/source/edit/editsyntaxhighlighter \ - svtools/source/edit/textview \ - svtools/source/urlobj/inetimg \ - svtools/source/java/javainteractionhandler \ - svtools/source/java/javacontext \ - svtools/source/svhtml/htmlout \ - svtools/source/svhtml/htmlsupp \ - svtools/source/svhtml/parhtml \ - svtools/source/svhtml/htmlkywd \ - svtools/source/config/itemholder2 \ - svtools/source/config/optionsdrawinglayer \ - svtools/source/config/menuoptions \ - svtools/source/config/helpopt \ - svtools/source/config/htmlcfg \ - svtools/source/config/accessibilityoptions \ - svtools/source/config/printoptions \ - svtools/source/config/miscopt \ - svtools/source/config/extcolorcfg \ - svtools/source/config/colorcfg \ - svtools/source/config/fontsubstconfig \ - svtools/source/config/apearcfg \ - svtools/source/misc/acceleratorexecute \ - svtools/source/misc/chartprettypainter \ - svtools/source/misc/cliplistener \ - svtools/source/misc/dialogclosedlistener \ - svtools/source/misc/dialogcontrolling \ - svtools/source/misc/ehdl \ - svtools/source/misc/embedhlp \ - svtools/source/misc/embedtransfer \ - svtools/source/misc/helpagentwindow \ - svtools/source/misc/imagemgr \ - svtools/source/misc/imageresourceaccess \ - svtools/source/misc/imap \ - svtools/source/misc/imap2 \ - svtools/source/misc/imap3 \ - svtools/source/misc/itemdel \ - svtools/source/misc/langtab \ - svtools/source/misc/stringtransfer \ - svtools/source/misc/svtaccessiblefactory \ - svtools/source/misc/svtdata \ - svtools/source/misc/templatefoldercache \ - svtools/source/misc/transfer2 \ - svtools/source/misc/transfer \ - svtools/source/misc/unitconv \ - svtools/source/misc/wallitem \ - svtools/source/plugapp/ttprops \ - svtools/source/control/ctrlbox \ - svtools/source/control/valueacc \ - svtools/source/control/valueset \ - svtools/source/control/taskbar \ - svtools/source/control/urlcontrol \ - svtools/source/control/scriptedtext \ - svtools/source/control/headbar \ - svtools/source/control/fileurlbox \ - svtools/source/control/fmtfield \ - svtools/source/control/collatorres \ - svtools/source/control/indexentryres \ - svtools/source/control/filectrl \ - svtools/source/control/scrwin \ - svtools/source/control/taskbox \ - svtools/source/control/hyperlabel \ - svtools/source/control/filectrl2 \ - svtools/source/control/fixedhyper \ - svtools/source/control/taskstat \ - svtools/source/control/inettbc \ - svtools/source/control/calendar \ - svtools/source/control/roadmap \ - svtools/source/control/ctrltool \ - svtools/source/control/asynclink \ - svtools/source/control/stdctrl \ - svtools/source/control/ctrldll \ - svtools/source/control/tabbar \ - svtools/source/control/ruler \ - svtools/source/control/stdmenu \ - svtools/source/control/prgsbar \ - svtools/source/control/taskmisc \ - svtools/source/dialogs/insdlg \ - svtools/source/dialogs/roadmapwizard \ - svtools/source/dialogs/mcvmath \ - svtools/source/dialogs/logindlg \ - svtools/source/dialogs/wizdlg \ - svtools/source/dialogs/addresstemplate \ - svtools/source/dialogs/printdlg \ - svtools/source/dialogs/filedlg2 \ - svtools/source/dialogs/colctrl \ - svtools/source/dialogs/colrdlg \ - svtools/source/dialogs/wizardmachine \ - svtools/source/dialogs/prnsetup \ - svtools/source/dialogs/filedlg \ - svtools/source/dialogs/property \ - svtools/source/table/tablecontrol \ - svtools/source/table/tablegeometry \ - svtools/source/table/gridtablerenderer \ - svtools/source/table/tabledatawindow \ - svtools/source/table/defaultinputhandler \ - svtools/source/table/tablecontrol_impl \ - svtools/source/contnr/svlbox \ - svtools/source/contnr/svtabbx \ - svtools/source/contnr/ivctrl \ - svtools/source/contnr/templwin \ - svtools/source/contnr/svicnvw \ - svtools/source/contnr/contentenumeration \ - svtools/source/contnr/svimpbox \ - svtools/source/contnr/imivctl1 \ - svtools/source/contnr/svtreebx \ - svtools/source/contnr/fileview \ - svtools/source/contnr/svimpicn \ - svtools/source/contnr/svlbitm \ - svtools/source/contnr/ctrdll \ - svtools/source/contnr/tooltiplbox \ - svtools/source/contnr/treelist \ - svtools/source/contnr/imivctl2 \ - svtools/source/uno/unoiface \ - svtools/source/uno/genericunodialog \ - svtools/source/uno/unocontroltablemodel \ - svtools/source/uno/contextmenuhelper \ - svtools/source/uno/toolboxcontroller \ - svtools/source/uno/generictoolboxcontroller \ - svtools/source/uno/addrtempuno \ - svtools/source/uno/miscservices \ - svtools/source/uno/statusbarcontroller \ - svtools/source/uno/svtxgridcontrol \ - svtools/source/uno/unoimap \ - svtools/source/uno/unoevent \ - svtools/source/uno/treecontrolpeer \ - svtools/source/uno/framestatuslistener \ - svtools/source/brwbox/editbrowsebox \ - svtools/source/brwbox/brwhead \ - svtools/source/brwbox/brwbox3 \ - svtools/source/brwbox/brwbox1 \ - svtools/source/brwbox/ebbcontrols \ - svtools/source/brwbox/brwbox2 \ - svtools/source/brwbox/datwin \ - svtools/source/brwbox/editbrowsebox2 \ - svtools/source/svrtf/rtfkeywd \ - svtools/source/svrtf/svparser \ - svtools/source/svrtf/parrtf \ - svtools/source/svrtf/rtfout \ - svtools/source/filter.vcl/filter/dlgepng \ - svtools/source/filter.vcl/filter/filter2 \ - svtools/source/filter.vcl/filter/FilterConfigItem \ - svtools/source/filter.vcl/filter/sgvspln \ - svtools/source/filter.vcl/filter/filter \ - svtools/source/filter.vcl/filter/sgvtext \ - svtools/source/filter.vcl/filter/sgfbram \ - svtools/source/filter.vcl/filter/SvFilterOptionsDialog \ - svtools/source/filter.vcl/filter/dlgexpor \ - svtools/source/filter.vcl/filter/fldll \ - svtools/source/filter.vcl/filter/sgvmain \ - svtools/source/filter.vcl/filter/FilterConfigCache \ - svtools/source/filter.vcl/filter/dlgejpg \ - svtools/source/filter.vcl/wmf/winwmf \ - svtools/source/filter.vcl/wmf/winmtf \ - svtools/source/filter.vcl/wmf/emfwr \ - svtools/source/filter.vcl/wmf/wmf \ - svtools/source/filter.vcl/wmf/enhwmf \ - svtools/source/filter.vcl/wmf/wmfwr \ - svtools/source/filter.vcl/igif/decode \ - svtools/source/filter.vcl/igif/gifread \ - svtools/source/filter.vcl/ixbm/xbmread \ - svtools/source/filter.vcl/jpeg/jpeg \ - svtools/source/filter.vcl/ixpm/xpmread \ - svtools/source/graphic/descriptor \ - svtools/source/graphic/graphic \ - svtools/source/graphic/graphicunofactory \ - svtools/source/graphic/grfattr \ - svtools/source/graphic/grfcache \ - svtools/source/graphic/grfmgr \ - svtools/source/graphic/grfmgr2 \ - svtools/source/graphic/provider \ - svtools/source/graphic/renderer \ - svtools/source/graphic/transformer \ -)) - -$(eval $(call gb_Library_add_cobjects,svt,\ - svtools/source/filter.vcl/jpeg/jpegc \ -)) - -ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,svt,\ - dl \ - m \ - pthread \ -)) -endif - -ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,svt,\ - advapi32 \ - gdi32 \ - kernel32 \ - msvcrt \ - oldnames \ - ole32 \ - oleaut32 \ - user32 \ - uuid \ - uwinapi \ -)) -endif -# vim: set noet sw=4 ts=4: diff --git a/svtools/prj/target_module_svtools.mk b/svtools/prj/target_module_svtools.mk deleted file mode 100644 index 88e6228b83e4..000000000000 --- a/svtools/prj/target_module_svtools.mk +++ /dev/null @@ -1,57 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Module_Module,svtools,\ - $(call gb_AllLangResTarget_get_target,productregistration) \ - $(call gb_AllLangResTarget_get_target,svt) \ - $(call gb_Executable_get_target,bmp) \ - $(call gb_Executable_get_target,bmpsum) \ - $(call gb_Executable_get_target,g2g) \ - $(call gb_Library_get_target,hatchwindowfactory) \ - $(call gb_Library_get_target,productregistration) \ - $(call gb_Library_get_target,svt) \ - $(call gb_Package_get_target,svtools_inc) \ -)) - -$(eval $(call gb_Module_read_includes,svtools,\ - exe_bmp \ - exe_bmpsum \ - exe_g2g \ - lib_hatchwindowfactory \ - lib_productregistration \ - lib_svt \ - package_inc \ - res_productregistration \ - res_svt \ -)) - -#todo: javapatchres -#todo: jpeg on mac in svtools/util/makefile.mk -#todo: deliver errtxt.src as ehdl.srs -#todo: nooptfiles filter, filterconfigitem, FilterConfigCache, SvFilterOptionsDialog -#todo: map file -# vim: set noet sw=4 ts=4: diff --git a/svtools/prj/target_package_inc.mk b/svtools/prj/target_package_inc.mk deleted file mode 100644 index f47251f31590..000000000000 --- a/svtools/prj/target_package_inc.mk +++ /dev/null @@ -1,180 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Package_Package,svtools_inc,$(SRCDIR)/svtools/inc)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/AccessibleBrowseBoxObjType.hxx,svtools/AccessibleBrowseBoxObjType.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/DocumentInfoPreview.hxx,svtools/DocumentInfoPreview.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/FilterConfigItem.hxx,svtools/FilterConfigItem.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/QueryFolderName.hxx,svtools/QueryFolderName.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/acceleratorexecute.hxx,svtools/acceleratorexecute.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibilityoptions.hxx,svtools/accessibilityoptions.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessiblefactory.hxx,svtools/accessiblefactory.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibletable.hxx,svtools/accessibletable.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibletableprovider.hxx,svtools/accessibletableprovider.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/addresstemplate.hxx,svtools/addresstemplate.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/apearcfg.hxx,svtools/apearcfg.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/asynclink.hxx,svtools/asynclink.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/brwbox.hxx,svtools/brwbox.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/brwhead.hxx,svtools/brwhead.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/calendar.hxx,svtools/calendar.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/chartprettypainter.hxx,svtools/chartprettypainter.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/cliplistener.hxx,svtools/cliplistener.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/colctrl.hxx,svtools/colctrl.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/collatorres.hxx,svtools/collatorres.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/colorcfg.hxx,svtools/colorcfg.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/colrdlg.hxx,svtools/colrdlg.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/contextmenuhelper.hxx,svtools/contextmenuhelper.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/controldims.hrc,svtools/controldims.hrc)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ctrlbox.hxx,svtools/ctrlbox.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ctrltool.hxx,svtools/ctrltool.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/dialogclosedlistener.hxx,svtools/dialogclosedlistener.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/dialogcontrolling.hxx,svtools/dialogcontrolling.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/editbrowsebox.hxx,svtools/editbrowsebox.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/editimplementation.hxx,svtools/editimplementation.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/editsyntaxhighlighter.hxx,svtools/editsyntaxhighlighter.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ehdl.hxx,svtools/ehdl.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/embedhlp.hxx,svtools/embedhlp.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/embedtransfer.hxx,svtools/embedtransfer.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/expander.hxx,svtools/expander.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/extcolorcfg.hxx,svtools/extcolorcfg.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/extensionlistbox.hxx,svtools/extensionlistbox.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filectrl.hxx,svtools/filectrl.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filedlg.hxx,svtools/filedlg.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filedlg2.hrc,svtools/filedlg2.hrc)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fileurlbox.hxx,svtools/fileurlbox.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fileview.hxx,svtools/fileview.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filter.hxx,svtools/filter.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fixedhyper.hxx,svtools/fixedhyper.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fltcall.hxx,svtools/fltcall.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fltdefs.hxx,svtools/fltdefs.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fmtfield.hxx,svtools/fmtfield.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fontsubstconfig.hxx,svtools/fontsubstconfig.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/framestatuslistener.hxx,svtools/framestatuslistener.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/generictoolboxcontroller.hxx,svtools/generictoolboxcontroller.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/genericunodialog.hxx,svtools/genericunodialog.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/grfmgr.hxx,svtools/grfmgr.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/headbar.hxx,svtools/headbar.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/helpagentwindow.hxx,svtools/helpagentwindow.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/helpid.hrc,svtools/helpid.hrc)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/helpopt.hxx,svtools/helpopt.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/htmlcfg.hxx,svtools/htmlcfg.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/htmlkywd.hxx,svtools/htmlkywd.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/htmlout.hxx,svtools/htmlout.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/htmltokn.h,svtools/htmltokn.h)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/hyperlabel.hxx,svtools/hyperlabel.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imagemgr.hrc,svtools/imagemgr.hrc)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imagemgr.hxx,svtools/imagemgr.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imageresourceaccess.hxx,svtools/imageresourceaccess.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imap.hxx,svtools/imap.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imapcirc.hxx,svtools/imapcirc.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imapobj.hxx,svtools/imapobj.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imappoly.hxx,svtools/imappoly.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imaprect.hxx,svtools/imaprect.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imgdef.hxx,svtools/imgdef.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/indexentryres.hxx,svtools/indexentryres.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/inetimg.hxx,svtools/inetimg.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/inettbc.hxx,svtools/inettbc.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/insdlg.hxx,svtools/insdlg.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/itemdel.hxx,svtools/itemdel.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ivctrl.hxx,svtools/ivctrl.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/javacontext.hxx,svtools/javacontext.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/javainteractionhandler.hxx,svtools/javainteractionhandler.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/langtab.hxx,svtools/langtab.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/localresaccess.hxx,svtools/localresaccess.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/logindlg.hxx,svtools/logindlg.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/menuoptions.hxx,svtools/menuoptions.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/miscopt.hxx,svtools/miscopt.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/optionsdrawinglayer.hxx,svtools/optionsdrawinglayer.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/parhtml.hxx,svtools/parhtml.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/parrtf.hxx,svtools/parrtf.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/prgsbar.hxx,svtools/prgsbar.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/printdlg.hxx,svtools/printdlg.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/printoptions.hxx,svtools/printoptions.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/prnsetup.hxx,svtools/prnsetup.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/roadmap.hxx,svtools/roadmap.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/roadmapwizard.hxx,svtools/roadmapwizard.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/rtfkeywd.hxx,svtools/rtfkeywd.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/rtfout.hxx,svtools/rtfout.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/rtftoken.h,svtools/rtftoken.h)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ruler.hxx,svtools/ruler.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/scriptedtext.hxx,svtools/scriptedtext.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/scrwin.hxx,svtools/scrwin.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/sfxecode.hxx,svtools/sfxecode.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/soerr.hxx,svtools/soerr.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/sores.hxx,svtools/sores.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/statusbarcontroller.hxx,svtools/statusbarcontroller.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/stdctrl.hxx,svtools/stdctrl.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/stdmenu.hxx,svtools/stdmenu.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/stringtransfer.hxx,svtools/stringtransfer.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svicnvw.hxx,svtools/svicnvw.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svlbitm.hxx,svtools/svlbitm.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svlbox.hxx,svtools/svlbox.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svmedit.hxx,svtools/svmedit.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svmedit2.hxx,svtools/svmedit2.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svparser.hxx,svtools/svparser.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtabbx.hxx,svtools/svtabbx.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtdata.hxx,svtools/svtdata.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtdllapi.h,svtools/svtdllapi.h)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtreebx.hxx,svtools/svtreebx.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svxbox.hxx,svtools/svxbox.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/sychconv.hxx,svtools/sychconv.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/syntaxhighlight.hxx,svtools/syntaxhighlight.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/tabbar.hxx,svtools/tabbar.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/abstracttablecontrol.hxx,svtools/table/abstracttablecontrol.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/defaultinputhandler.hxx,svtools/table/defaultinputhandler.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/gridtablerenderer.hxx,svtools/table/gridtablerenderer.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tablecontrol.hxx,svtools/table/tablecontrol.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tabledatawindow.hxx,svtools/table/tabledatawindow.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tableinputhandler.hxx,svtools/table/tableinputhandler.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tablemodel.hxx,svtools/table/tablemodel.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tablerenderer.hxx,svtools/table/tablerenderer.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tabletypes.hxx,svtools/table/tabletypes.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/taskbar.hxx,svtools/taskbar.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/templatefoldercache.hxx,svtools/templatefoldercache.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/templdlg.hxx,svtools/templdlg.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/testtool.hxx,svtools/testtool.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/textdata.hxx,svtools/textdata.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/texteng.hxx,svtools/texteng.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/textview.hxx,svtools/textview.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/textwindowpeer.hxx,svtools/textwindowpeer.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolboxcontroller.hxx,svtools/toolboxcontroller.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/tooltiplbox.hxx,svtools/tooltiplbox.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/transfer.hxx,svtools/transfer.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/treelist.hxx,svtools/treelist.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ttprops.hxx,svtools/ttprops.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/txtattr.hxx,svtools/txtattr.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/txtcmp.hxx,svtools/txtcmp.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/unitconv.hxx,svtools/unitconv.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/unoevent.hxx,svtools/unoevent.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/unoimap.hxx,svtools/unoimap.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/urlcontrol.hxx,svtools/urlcontrol.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/valueset.hxx,svtools/valueset.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wallitem.hxx,svtools/wallitem.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wizardmachine.hxx,svtools/wizardmachine.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wizdlg.hxx,svtools/wizdlg.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wmf.hxx,svtools/wmf.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/xtextedt.hxx,svtools/xtextedt.hxx)) diff --git a/svtools/prj/target_res_productregistration.mk b/svtools/prj/target_res_productregistration.mk deleted file mode 100644 index af510d338c6e..000000000000 --- a/svtools/prj/target_res_productregistration.mk +++ /dev/null @@ -1,50 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,productregistration)) - -$(eval $(call gb_AllLangResTarget_set_reslocation,productregistration,svtools)) - -$(eval $(call gb_AllLangResTarget_add_srs,productregistration,\ - svt/productregistration \ -)) - -$(eval $(call gb_SrsTarget_SrsTarget,svt/productregistration)) - -$(eval $(call gb_SrsTarget_set_include,svt/productregistration,\ - $$(INCLUDE) \ - -I$(WORKDIR)/inc \ - -I$(SRCDIR)/svtools/source/inc \ - -I$(SRCDIR)/svtools/inc/ \ - -I$(SRCDIR)/svtools/inc/svtools \ -)) - -$(eval $(call gb_SrsTarget_add_files,svt/productregistration,\ - svtools/source/productregistration/registrationdlg.src \ -)) - - diff --git a/svtools/prj/target_res_svt.mk b/svtools/prj/target_res_svt.mk deleted file mode 100644 index 1e3e21b7ca6b..000000000000 --- a/svtools/prj/target_res_svt.mk +++ /dev/null @@ -1,79 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,svt)) - -$(eval $(call gb_AllLangResTarget_set_reslocation,svt,svtools)) - -$(eval $(call gb_AllLangResTarget_add_srs,svt,\ - svt/res \ -)) - -$(eval $(call gb_SrsTarget_SrsTarget,svt/res)) - -$(eval $(call gb_SrsTarget_set_include,svt/res,\ - $$(INCLUDE) \ - -I$(WORKDIR)/inc \ - -I$(SRCDIR)/svtools/source/uno \ - -I$(SRCDIR)/svtools/source/inc \ - -I$(SRCDIR)/svtools/inc/ \ - -I$(SRCDIR)/svtools/inc/svtools \ -)) - -$(eval $(call gb_SrsTarget_add_files,svt/res,\ - svtools/source/brwbox/editbrowsebox.src \ - svtools/source/contnr/fileview.src \ - svtools/source/contnr/svcontnr.src \ - svtools/source/contnr/templwin.src \ - svtools/source/control/calendar.src \ - svtools/source/control/ctrlbox.src \ - svtools/source/control/ctrltool.src \ - svtools/source/control/filectrl.src \ - svtools/source/dialogs/addresstemplate.src \ - svtools/source/dialogs/colrdlg.src \ - svtools/source/dialogs/filedlg2.src \ - svtools/source/dialogs/formats.src \ - svtools/source/dialogs/logindlg.src \ - svtools/source/dialogs/printdlg.src \ - svtools/source/dialogs/prnsetup.src \ - svtools/source/dialogs/so3res.src \ - svtools/source/dialogs/wizardmachine.src \ - svtools/source/filter.vcl/filter/dlgejpg.src \ - svtools/source/filter.vcl/filter/dlgepng.src \ - svtools/source/filter.vcl/filter/dlgexpor.src \ - svtools/source/filter.vcl/filter/strings.src \ - svtools/source/java/javaerror.src \ - svtools/source/misc/ehdl.src \ - svtools/source/misc/helpagent.src \ - svtools/source/misc/imagemgr.src \ - svtools/source/misc/langtab.src \ - svtools/source/misc/undo.src \ - svtools/source/plugapp/testtool.src \ - svtools/source/uno/unoifac2.src \ -)) - - diff --git a/toolkit/AllLangResTarget_tk.mk b/toolkit/AllLangResTarget_tk.mk new file mode 100644 index 000000000000..571d5dfbff70 --- /dev/null +++ b/toolkit/AllLangResTarget_tk.mk @@ -0,0 +1,45 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_AllLangResTarget_AllLangResTarget,tk)) + +$(eval $(call gb_AllLangResTarget_set_reslocation,tk,toolkit/source/awt)) + +$(eval $(call gb_AllLangResTarget_add_srs,tk,\ + toolkit/awt \ +)) + +$(eval $(call gb_SrsTarget_SrsTarget,toolkit/awt)) + +$(eval $(call gb_SrsTarget_set_include,toolkit/awt,\ + $$(INCLUDE) \ + -I$(SRCDIR)/toolkit/source/awt \ +)) + +$(eval $(call gb_SrsTarget_add_files,toolkit/awt,\ + toolkit/source/awt/xthrobber.src \ +)) diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk new file mode 100644 index 000000000000..60d13418fa5b --- /dev/null +++ b/toolkit/Library_tk.mk @@ -0,0 +1,172 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,tk)) + +$(eval $(call gb_Library_add_package_headers,tk,toolkit_inc)) + +#$(eval $(call gb_Library_add_precompiled_header,tk,$(SRCDIR)/toolkit/inc/pch/precompiled_toolkit)) + +$(eval $(call gb_Library_set_include,tk,\ + $$(INCLUDE) \ + -I$(WORKDIR)/inc/toolkit/ \ + -I$(SRCDIR)/toolkit/inc \ + -I$(SRCDIR)/toolkit/inc/pch \ + -I$(SRCDIR)/toolkit/source \ + -I$(OUTDIR)/inc/toolkit \ + -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_set_defs,tk,\ + $$(DEFS) \ + -DTOOLKIT_DLLIMPLEMENTATION \ +)) + +$(eval $(call gb_Library_add_linked_libs,tk,\ + comphelper \ + stl \ + tl \ + cppu \ + cppuhelper \ + sal \ + utl \ + vcl \ +)) + +$(eval $(call gb_Library_add_exception_objects,tk,\ + toolkit/source/awt/asynccallback \ + toolkit/source/awt/vclxaccessiblecomponent \ + toolkit/source/awt/vclxbitmap \ + toolkit/source/awt/vclxbutton \ + toolkit/source/awt/vclxcontainer \ + toolkit/source/awt/vclxdevice \ + toolkit/source/awt/vclxdialog \ + toolkit/source/awt/vclxfixedline \ + toolkit/source/awt/vclxfont \ + toolkit/source/awt/vclxgraphics \ + toolkit/source/awt/vclxmenu \ + toolkit/source/awt/vclxplugin \ + toolkit/source/awt/vclxpointer \ + toolkit/source/awt/vclxprinter \ + toolkit/source/awt/vclxregion \ + toolkit/source/awt/vclxscroller \ + toolkit/source/awt/vclxspinbutton \ + toolkit/source/awt/vclxsplitter \ + toolkit/source/awt/vclxsystemdependentwindow \ + toolkit/source/awt/vclxtabcontrol \ + toolkit/source/awt/vclxtabpage \ + toolkit/source/awt/vclxtoolkit \ + toolkit/source/awt/vclxtopwindow \ + toolkit/source/awt/vclxwindow \ + toolkit/source/awt/vclxwindow1 \ + toolkit/source/awt/vclxwindows \ + toolkit/source/awt/xsimpleanimation \ + toolkit/source/awt/xthrobber \ + toolkit/source/controls/accessiblecontrolcontext \ + toolkit/source/controls/dialogcontrol \ + toolkit/source/controls/eventcontainer \ + toolkit/source/controls/formattedcontrol \ + toolkit/source/controls/geometrycontrolmodel \ + toolkit/source/controls/grid/defaultgridcolumnmodel \ + toolkit/source/controls/grid/defaultgriddatamodel \ + toolkit/source/controls/grid/gridcolumn \ + toolkit/source/controls/grid/gridcontrol \ + toolkit/source/controls/roadmapcontrol \ + toolkit/source/controls/roadmapentry \ + toolkit/source/controls/stdtabcontroller \ + toolkit/source/controls/stdtabcontrollermodel \ + toolkit/source/controls/tkscrollbar \ + toolkit/source/controls/tksimpleanimation \ + toolkit/source/controls/tkspinbutton \ + toolkit/source/controls/tkthrobber \ + toolkit/source/controls/tree/treecontrol \ + toolkit/source/controls/tree/treedatamodel \ + toolkit/source/controls/unocontrol \ + toolkit/source/controls/unocontrolbase \ + toolkit/source/controls/unocontrolcontainer \ + toolkit/source/controls/unocontrolcontainermodel \ + toolkit/source/controls/unocontrolmodel \ + toolkit/source/controls/unocontrols \ + toolkit/source/helper/accessibilityclient \ + toolkit/source/helper/externallock \ + toolkit/source/helper/fixedhyperbase \ + toolkit/source/helper/formpdfexport \ + toolkit/source/helper/imagealign \ + toolkit/source/helper/listenermultiplexer \ + toolkit/source/helper/property \ + toolkit/source/helper/registerservices \ + toolkit/source/helper/servicenames \ + toolkit/source/helper/throbberimpl \ + toolkit/source/helper/tkresmgr \ + toolkit/source/helper/unomemorystream \ + toolkit/source/helper/unopropertyarrayhelper \ + toolkit/source/helper/unowrapper \ + toolkit/source/helper/vclunohelper \ + toolkit/source/layout/core/bin \ + toolkit/source/layout/core/box \ + toolkit/source/layout/core/box-base \ + toolkit/source/layout/core/byteseq \ + toolkit/source/layout/core/container \ + toolkit/source/layout/core/dialogbuttonhbox \ + toolkit/source/layout/core/factory \ + toolkit/source/layout/core/flow \ + toolkit/source/layout/core/helper \ + toolkit/source/layout/core/import \ + toolkit/source/layout/core/localized-string \ + toolkit/source/layout/core/proplist \ + toolkit/source/layout/core/root \ + toolkit/source/layout/core/table \ + toolkit/source/layout/core/timer \ + toolkit/source/layout/core/translate \ + toolkit/source/layout/core/vcl \ + toolkit/source/layout/vcl/wbutton \ + toolkit/source/layout/vcl/wcontainer \ + toolkit/source/layout/vcl/wfield \ + toolkit/source/layout/vcl/wrapper \ +)) + +ifeq ($(GUIBASE),aqua) +$(eval $(call gb_Library_set_cxxflags,tk,\ + $$(CXXFLAGS) $(gb_OBJCXXFLAGS))) +endif + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,tk,\ + X11 \ + dl \ + m \ + pthread \ +)) +endif +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,tk,\ + kernel32 \ + msvcrt \ + uwinapi \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/toolkit/Makefile b/toolkit/Makefile index 9ab4b8ba83f4..60d34122e271 100644 --- a/toolkit/Makefile +++ b/toolkit/Makefile @@ -25,12 +25,13 @@ # #************************************************************************* +ifeq ($(strip $(SOLARENV)),) +$(error No environment set) +endif + GBUILDDIR := $(SOLARENV)/gbuild include $(GBUILDDIR)/gbuild.mk - -gb_CURRENT_MODULE := $(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))) - -$(eval $(call gb_Module_make_global_targets,$(gb_CURRENT_MODULE))) +$(eval $(call gb_Module_make_global_targets)) # vim: set noet sw=4 ts=4: diff --git a/toolkit/Module_toolkit.mk b/toolkit/Module_toolkit.mk new file mode 100644 index 000000000000..ce54e3243fe4 --- /dev/null +++ b/toolkit/Module_toolkit.mk @@ -0,0 +1,38 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Module_Module,toolkit)) + +$(eval $(call gb_Module_add_targets,toolkit,\ + Library_tk \ + Package_inc \ + Package_source \ + Package_util \ + AllLangResTarget_tk \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/toolkit/Package_inc.mk b/toolkit/Package_inc.mk new file mode 100644 index 000000000000..be23e1a95a1c --- /dev/null +++ b/toolkit/Package_inc.mk @@ -0,0 +1,60 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,toolkit_inc,$(SRCDIR)/toolkit/inc)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/layout/layout-post.hxx,layout/layout-post.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/layout/layout-pre.hxx,layout/layout-pre.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/layout/layout.hxx,layout/layout.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxaccessiblecomponent.hxx,toolkit/awt/vclxaccessiblecomponent.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxcontainer.hxx,toolkit/awt/vclxcontainer.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxdevice.hxx,toolkit/awt/vclxdevice.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxfont.hxx,toolkit/awt/vclxfont.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxmenu.hxx,toolkit/awt/vclxmenu.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxtoolkit.hxx,toolkit/awt/vclxtoolkit.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxtopwindow.hxx,toolkit/awt/vclxtopwindow.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxwindow.hxx,toolkit/awt/vclxwindow.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxwindows.hxx,toolkit/awt/vclxwindows.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/controls/unocontrol.hxx,toolkit/controls/unocontrol.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/controls/unocontrolbase.hxx,toolkit/controls/unocontrolbase.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/controls/unocontrolmodel.hxx,toolkit/controls/unocontrolmodel.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/controls/unocontrols.hxx,toolkit/controls/unocontrols.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/dllapi.h,toolkit/dllapi.h)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/accessiblefactory.hxx,toolkit/helper/accessiblefactory.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/convert.hxx,toolkit/helper/convert.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/emptyfontdescriptor.hxx,toolkit/helper/emptyfontdescriptor.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/externallock.hxx,toolkit/helper/externallock.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/fixedhyperbase.hxx,toolkit/helper/fixedhyperbase.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/formpdfexport.hxx,toolkit/helper/formpdfexport.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/listenermultiplexer.hxx,toolkit/helper/listenermultiplexer.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/macros.hxx,toolkit/helper/macros.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/mutexandbroadcasthelper.hxx,toolkit/helper/mutexandbroadcasthelper.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/mutexhelper.hxx,toolkit/helper/mutexhelper.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/property.hxx,toolkit/helper/property.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/servicenames.hxx,toolkit/helper/servicenames.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/unowrapper.hxx,toolkit/helper/unowrapper.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/vclunohelper.hxx,toolkit/helper/vclunohelper.hxx)) +$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/unohlp.hxx,toolkit/helper/vclunohelper.hxx)) diff --git a/toolkit/Package_source.mk b/toolkit/Package_source.mk new file mode 100644 index 000000000000..8a5aa5ffc3cb --- /dev/null +++ b/toolkit/Package_source.mk @@ -0,0 +1,47 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,toolkit_source,$(SRCDIR)/toolkit/source)) +$(eval $(call gb_Package_add_file,toolkit_source,inc/toolkit/awt/vclxdialog.hxx,awt/vclxdialog.hxx)) +$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/bin.hxx,layout/core/bin.hxx)) +$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/box-base.hxx,layout/core/box-base.hxx)) +$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/box.hxx,layout/core/box.hxx)) +$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/container.hxx,layout/core/container.hxx)) +$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/dialogbuttonhbox.hxx,layout/core/dialogbuttonhbox.hxx)) +$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/factory.hxx,layout/core/factory.hxx)) +$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/flow.hxx,layout/core/flow.hxx)) +$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/helper.hxx,layout/core/helper.hxx)) +$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/import.hxx,layout/core/import.hxx)) +$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/localized-string.hxx,layout/core/localized-string.hxx)) +$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/precompiled_xmlscript.hxx,layout/core/precompiled_xmlscript.hxx)) +$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/proplist.hxx,layout/core/proplist.hxx)) +$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/root.hxx,layout/core/root.hxx)) +$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/table.hxx,layout/core/table.hxx)) +$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/timer.hxx,layout/core/timer.hxx)) +$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/translate.hxx,layout/core/translate.hxx)) +$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/vcl.hxx,layout/core/vcl.hxx)) +$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/vcl/wrapper.hxx,layout/vcl/wrapper.hxx)) diff --git a/toolkit/Package_util.mk b/toolkit/Package_util.mk new file mode 100644 index 000000000000..990248eb142d --- /dev/null +++ b/toolkit/Package_util.mk @@ -0,0 +1,29 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,toolkit_util,$(SRCDIR)/toolkit/util)) +$(eval $(call gb_Package_add_file,toolkit_util,xml/toolkit.xml,toolkit.xml)) diff --git a/toolkit/prj/target_lib_tk.mk b/toolkit/prj/target_lib_tk.mk deleted file mode 100644 index 60d13418fa5b..000000000000 --- a/toolkit/prj/target_lib_tk.mk +++ /dev/null @@ -1,172 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Library_Library,tk)) - -$(eval $(call gb_Library_add_package_headers,tk,toolkit_inc)) - -#$(eval $(call gb_Library_add_precompiled_header,tk,$(SRCDIR)/toolkit/inc/pch/precompiled_toolkit)) - -$(eval $(call gb_Library_set_include,tk,\ - $$(INCLUDE) \ - -I$(WORKDIR)/inc/toolkit/ \ - -I$(SRCDIR)/toolkit/inc \ - -I$(SRCDIR)/toolkit/inc/pch \ - -I$(SRCDIR)/toolkit/source \ - -I$(OUTDIR)/inc/toolkit \ - -I$(OUTDIR)/inc/offuh \ -)) - -$(eval $(call gb_Library_set_defs,tk,\ - $$(DEFS) \ - -DTOOLKIT_DLLIMPLEMENTATION \ -)) - -$(eval $(call gb_Library_add_linked_libs,tk,\ - comphelper \ - stl \ - tl \ - cppu \ - cppuhelper \ - sal \ - utl \ - vcl \ -)) - -$(eval $(call gb_Library_add_exception_objects,tk,\ - toolkit/source/awt/asynccallback \ - toolkit/source/awt/vclxaccessiblecomponent \ - toolkit/source/awt/vclxbitmap \ - toolkit/source/awt/vclxbutton \ - toolkit/source/awt/vclxcontainer \ - toolkit/source/awt/vclxdevice \ - toolkit/source/awt/vclxdialog \ - toolkit/source/awt/vclxfixedline \ - toolkit/source/awt/vclxfont \ - toolkit/source/awt/vclxgraphics \ - toolkit/source/awt/vclxmenu \ - toolkit/source/awt/vclxplugin \ - toolkit/source/awt/vclxpointer \ - toolkit/source/awt/vclxprinter \ - toolkit/source/awt/vclxregion \ - toolkit/source/awt/vclxscroller \ - toolkit/source/awt/vclxspinbutton \ - toolkit/source/awt/vclxsplitter \ - toolkit/source/awt/vclxsystemdependentwindow \ - toolkit/source/awt/vclxtabcontrol \ - toolkit/source/awt/vclxtabpage \ - toolkit/source/awt/vclxtoolkit \ - toolkit/source/awt/vclxtopwindow \ - toolkit/source/awt/vclxwindow \ - toolkit/source/awt/vclxwindow1 \ - toolkit/source/awt/vclxwindows \ - toolkit/source/awt/xsimpleanimation \ - toolkit/source/awt/xthrobber \ - toolkit/source/controls/accessiblecontrolcontext \ - toolkit/source/controls/dialogcontrol \ - toolkit/source/controls/eventcontainer \ - toolkit/source/controls/formattedcontrol \ - toolkit/source/controls/geometrycontrolmodel \ - toolkit/source/controls/grid/defaultgridcolumnmodel \ - toolkit/source/controls/grid/defaultgriddatamodel \ - toolkit/source/controls/grid/gridcolumn \ - toolkit/source/controls/grid/gridcontrol \ - toolkit/source/controls/roadmapcontrol \ - toolkit/source/controls/roadmapentry \ - toolkit/source/controls/stdtabcontroller \ - toolkit/source/controls/stdtabcontrollermodel \ - toolkit/source/controls/tkscrollbar \ - toolkit/source/controls/tksimpleanimation \ - toolkit/source/controls/tkspinbutton \ - toolkit/source/controls/tkthrobber \ - toolkit/source/controls/tree/treecontrol \ - toolkit/source/controls/tree/treedatamodel \ - toolkit/source/controls/unocontrol \ - toolkit/source/controls/unocontrolbase \ - toolkit/source/controls/unocontrolcontainer \ - toolkit/source/controls/unocontrolcontainermodel \ - toolkit/source/controls/unocontrolmodel \ - toolkit/source/controls/unocontrols \ - toolkit/source/helper/accessibilityclient \ - toolkit/source/helper/externallock \ - toolkit/source/helper/fixedhyperbase \ - toolkit/source/helper/formpdfexport \ - toolkit/source/helper/imagealign \ - toolkit/source/helper/listenermultiplexer \ - toolkit/source/helper/property \ - toolkit/source/helper/registerservices \ - toolkit/source/helper/servicenames \ - toolkit/source/helper/throbberimpl \ - toolkit/source/helper/tkresmgr \ - toolkit/source/helper/unomemorystream \ - toolkit/source/helper/unopropertyarrayhelper \ - toolkit/source/helper/unowrapper \ - toolkit/source/helper/vclunohelper \ - toolkit/source/layout/core/bin \ - toolkit/source/layout/core/box \ - toolkit/source/layout/core/box-base \ - toolkit/source/layout/core/byteseq \ - toolkit/source/layout/core/container \ - toolkit/source/layout/core/dialogbuttonhbox \ - toolkit/source/layout/core/factory \ - toolkit/source/layout/core/flow \ - toolkit/source/layout/core/helper \ - toolkit/source/layout/core/import \ - toolkit/source/layout/core/localized-string \ - toolkit/source/layout/core/proplist \ - toolkit/source/layout/core/root \ - toolkit/source/layout/core/table \ - toolkit/source/layout/core/timer \ - toolkit/source/layout/core/translate \ - toolkit/source/layout/core/vcl \ - toolkit/source/layout/vcl/wbutton \ - toolkit/source/layout/vcl/wcontainer \ - toolkit/source/layout/vcl/wfield \ - toolkit/source/layout/vcl/wrapper \ -)) - -ifeq ($(GUIBASE),aqua) -$(eval $(call gb_Library_set_cxxflags,tk,\ - $$(CXXFLAGS) $(gb_OBJCXXFLAGS))) -endif - -ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,tk,\ - X11 \ - dl \ - m \ - pthread \ -)) -endif -ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,tk,\ - kernel32 \ - msvcrt \ - uwinapi \ -)) -endif -# vim: set noet sw=4 ts=4: diff --git a/toolkit/prj/target_module_toolkit.mk b/toolkit/prj/target_module_toolkit.mk deleted file mode 100644 index b6723fd8403d..000000000000 --- a/toolkit/prj/target_module_toolkit.mk +++ /dev/null @@ -1,43 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Module_read_includes,toolkit,\ - lib_tk \ - package_inc \ - package_source \ - package_util \ - res_tk \ -)) - -$(eval $(call gb_Module_Module,toolkit,\ - $(call gb_AllLangResTarget_get_target,tk) \ - $(call gb_Library_get_target,tk) \ - $(call gb_Package_get_target,toolkit_inc) \ - $(call gb_Package_get_target,toolkit_source) \ - $(call gb_Package_get_target,toolkit_util) \ -)) -# vim: set noet sw=4 ts=4: diff --git a/toolkit/prj/target_package_inc.mk b/toolkit/prj/target_package_inc.mk deleted file mode 100644 index be23e1a95a1c..000000000000 --- a/toolkit/prj/target_package_inc.mk +++ /dev/null @@ -1,60 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Package_Package,toolkit_inc,$(SRCDIR)/toolkit/inc)) -$(eval $(call gb_Package_add_file,toolkit_inc,inc/layout/layout-post.hxx,layout/layout-post.hxx)) -$(eval $(call gb_Package_add_file,toolkit_inc,inc/layout/layout-pre.hxx,layout/layout-pre.hxx)) -$(eval $(call gb_Package_add_file,toolkit_inc,inc/layout/layout.hxx,layout/layout.hxx)) -$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxaccessiblecomponent.hxx,toolkit/awt/vclxaccessiblecomponent.hxx)) -$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxcontainer.hxx,toolkit/awt/vclxcontainer.hxx)) -$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxdevice.hxx,toolkit/awt/vclxdevice.hxx)) -$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxfont.hxx,toolkit/awt/vclxfont.hxx)) -$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxmenu.hxx,toolkit/awt/vclxmenu.hxx)) -$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxtoolkit.hxx,toolkit/awt/vclxtoolkit.hxx)) -$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxtopwindow.hxx,toolkit/awt/vclxtopwindow.hxx)) -$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxwindow.hxx,toolkit/awt/vclxwindow.hxx)) -$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxwindows.hxx,toolkit/awt/vclxwindows.hxx)) -$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/controls/unocontrol.hxx,toolkit/controls/unocontrol.hxx)) -$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/controls/unocontrolbase.hxx,toolkit/controls/unocontrolbase.hxx)) -$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/controls/unocontrolmodel.hxx,toolkit/controls/unocontrolmodel.hxx)) -$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/controls/unocontrols.hxx,toolkit/controls/unocontrols.hxx)) -$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/dllapi.h,toolkit/dllapi.h)) -$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/accessiblefactory.hxx,toolkit/helper/accessiblefactory.hxx)) -$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/convert.hxx,toolkit/helper/convert.hxx)) -$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/emptyfontdescriptor.hxx,toolkit/helper/emptyfontdescriptor.hxx)) -$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/externallock.hxx,toolkit/helper/externallock.hxx)) -$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/fixedhyperbase.hxx,toolkit/helper/fixedhyperbase.hxx)) -$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/formpdfexport.hxx,toolkit/helper/formpdfexport.hxx)) -$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/listenermultiplexer.hxx,toolkit/helper/listenermultiplexer.hxx)) -$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/macros.hxx,toolkit/helper/macros.hxx)) -$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/mutexandbroadcasthelper.hxx,toolkit/helper/mutexandbroadcasthelper.hxx)) -$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/mutexhelper.hxx,toolkit/helper/mutexhelper.hxx)) -$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/property.hxx,toolkit/helper/property.hxx)) -$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/servicenames.hxx,toolkit/helper/servicenames.hxx)) -$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/unowrapper.hxx,toolkit/helper/unowrapper.hxx)) -$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/vclunohelper.hxx,toolkit/helper/vclunohelper.hxx)) -$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/unohlp.hxx,toolkit/helper/vclunohelper.hxx)) diff --git a/toolkit/prj/target_package_source.mk b/toolkit/prj/target_package_source.mk deleted file mode 100644 index 8a5aa5ffc3cb..000000000000 --- a/toolkit/prj/target_package_source.mk +++ /dev/null @@ -1,47 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Package_Package,toolkit_source,$(SRCDIR)/toolkit/source)) -$(eval $(call gb_Package_add_file,toolkit_source,inc/toolkit/awt/vclxdialog.hxx,awt/vclxdialog.hxx)) -$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/bin.hxx,layout/core/bin.hxx)) -$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/box-base.hxx,layout/core/box-base.hxx)) -$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/box.hxx,layout/core/box.hxx)) -$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/container.hxx,layout/core/container.hxx)) -$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/dialogbuttonhbox.hxx,layout/core/dialogbuttonhbox.hxx)) -$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/factory.hxx,layout/core/factory.hxx)) -$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/flow.hxx,layout/core/flow.hxx)) -$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/helper.hxx,layout/core/helper.hxx)) -$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/import.hxx,layout/core/import.hxx)) -$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/localized-string.hxx,layout/core/localized-string.hxx)) -$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/precompiled_xmlscript.hxx,layout/core/precompiled_xmlscript.hxx)) -$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/proplist.hxx,layout/core/proplist.hxx)) -$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/root.hxx,layout/core/root.hxx)) -$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/table.hxx,layout/core/table.hxx)) -$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/timer.hxx,layout/core/timer.hxx)) -$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/translate.hxx,layout/core/translate.hxx)) -$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/vcl.hxx,layout/core/vcl.hxx)) -$(eval $(call gb_Package_add_file,toolkit_source,inc/layout/vcl/wrapper.hxx,layout/vcl/wrapper.hxx)) diff --git a/toolkit/prj/target_package_util.mk b/toolkit/prj/target_package_util.mk deleted file mode 100644 index 990248eb142d..000000000000 --- a/toolkit/prj/target_package_util.mk +++ /dev/null @@ -1,29 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Package_Package,toolkit_util,$(SRCDIR)/toolkit/util)) -$(eval $(call gb_Package_add_file,toolkit_util,xml/toolkit.xml,toolkit.xml)) diff --git a/toolkit/prj/target_res_tk.mk b/toolkit/prj/target_res_tk.mk deleted file mode 100644 index 571d5dfbff70..000000000000 --- a/toolkit/prj/target_res_tk.mk +++ /dev/null @@ -1,45 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,tk)) - -$(eval $(call gb_AllLangResTarget_set_reslocation,tk,toolkit/source/awt)) - -$(eval $(call gb_AllLangResTarget_add_srs,tk,\ - toolkit/awt \ -)) - -$(eval $(call gb_SrsTarget_SrsTarget,toolkit/awt)) - -$(eval $(call gb_SrsTarget_set_include,toolkit/awt,\ - $$(INCLUDE) \ - -I$(SRCDIR)/toolkit/source/awt \ -)) - -$(eval $(call gb_SrsTarget_add_files,toolkit/awt,\ - toolkit/source/awt/xthrobber.src \ -)) diff --git a/tools/Executable_mkunroll.mk b/tools/Executable_mkunroll.mk new file mode 100644 index 000000000000..4ee724d8ffc0 --- /dev/null +++ b/tools/Executable_mkunroll.mk @@ -0,0 +1,77 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Executable_Executable,mkunroll)) + +$(eval $(call gb_Executable_set_include,mkunroll,\ + $$(INCLUDE) \ + -I$(SRCDIR)/tools/inc/ \ + -I$(SRCDIR)/tools/inc/pch \ + -I$(SRCDIR)/tools/bootstrp/ \ +)) + +$(eval $(call gb_Executable_set_cxxflags,mkunroll,\ + $$(CXXFLAGS) \ + -D_TOOLS_STRINGLIST \ +)) + +$(eval $(call gb_Executable_add_linked_libs,mkunroll,\ + basegfx \ + sal \ + stl \ + tl \ + vos3 \ +)) + +# used to link against basegfxlx comphelp4gcc3 i18nisolang1gcc3 ucbhelper4gcc3 uno_cppu uno_cppuhelpergcc3 uno_salhelpergcc3 - seems to be superficial + +$(eval $(call gb_Executable_add_exception_objects,mkunroll,\ + tools/bootstrp/addexes2/mkfilt \ + tools/bootstrp/appdef \ + tools/bootstrp/cppdep \ + tools/bootstrp/inimgr \ + tools/bootstrp/prj \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_Executable_add_linked_libs,mkunroll,\ + kernel32 \ + user32 \ + msvcrt \ + oldnames \ + uwinapi \ +)) +endif + +ifeq ($(OS),LINUX) +$(eval $(call gb_Executable_add_linked_libs,mkunroll,\ + pthread \ + dl \ +)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/tools/Executable_rscdep.mk b/tools/Executable_rscdep.mk new file mode 100644 index 000000000000..20f4d22b186c --- /dev/null +++ b/tools/Executable_rscdep.mk @@ -0,0 +1,73 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Executable_Executable,rscdep)) + +$(eval $(call gb_Executable_set_include,rscdep,\ + $$(INCLUDE) \ + -I$(SRCDIR)/tools/inc/ \ + -I$(SRCDIR)/tools/inc/pch \ + -I$(SRCDIR)/tools/bootstrp/ \ +)) + +$(eval $(call gb_Executable_set_cxxflags,rscdep,\ + $$(CXXFLAGS) \ + -D_TOOLS_STRINGLIST \ +)) + +$(eval $(call gb_Executable_add_linked_libs,rscdep,\ + sal \ + stl \ + tl \ + vos3 \ +)) + +$(eval $(call gb_Executable_add_exception_objects,rscdep,\ + tools/bootstrp/appdef \ + tools/bootstrp/cppdep \ + tools/bootstrp/inimgr \ + tools/bootstrp/prj \ + tools/bootstrp/rscdep \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_Executable_add_linked_libs,rscdep,\ + kernel32 \ + user32 \ + msvcrt \ + oldnames \ + uwinapi \ +)) +endif + +ifeq ($(OS),LINUX) +$(eval $(call gb_Executable_add_linked_libs,rscdep,\ + pthread \ + dl \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/tools/Executable_so_checksum.mk b/tools/Executable_so_checksum.mk new file mode 100644 index 000000000000..d852c22ef5de --- /dev/null +++ b/tools/Executable_so_checksum.mk @@ -0,0 +1,69 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Executable_Executable,so_checksum)) + +$(eval $(call gb_Executable_set_include,so_checksum,\ + $$(INCLUDE) \ + -I$(SRCDIR)/tools/inc/ \ + -I$(SRCDIR)/tools/inc/pch \ + -I$(SRCDIR)/tools/bootstrp/ \ +)) + +$(eval $(call gb_Executable_set_cxxflags,so_checksum,\ + $$(CXXFLAGS) \ + -D_TOOLS_STRINGLIST \ +)) + +$(eval $(call gb_Executable_add_linked_libs,so_checksum,\ + sal \ + tl \ +)) +# used to link against basegfxlx comphelp4gcc3 i18nisolang1gcc3 ucbhelper4gcc3 uno_cppu uno_cppuhelpergcc3 uno_salhelpergcc3 vos3gcc3 - seems to be superficial + +$(eval $(call gb_Executable_add_exception_objects,so_checksum,\ + tools/bootstrp/md5 \ + tools/bootstrp/so_checksum \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_Executable_add_linked_libs,so_checksum,\ + kernel32 \ + user32 \ + msvcrt \ + oldnames \ + uwinapi \ +)) +endif + +ifeq ($(OS),LINUX) +$(eval $(call gb_Executable_add_linked_libs,so_checksum,\ + pthread \ + dl \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/tools/Executable_sspretty.mk b/tools/Executable_sspretty.mk new file mode 100644 index 000000000000..5b8c83977dcd --- /dev/null +++ b/tools/Executable_sspretty.mk @@ -0,0 +1,74 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Executable_Executable,sspretty)) + +$(eval $(call gb_Executable_set_include,sspretty,\ + $$(INCLUDE) \ + -I$(SRCDIR)/tools/inc/ \ + -I$(SRCDIR)/tools/inc/pch \ + -I$(SRCDIR)/tools/bootstrp/ \ +)) + +$(eval $(call gb_Executable_set_cxxflags,sspretty,\ + $$(CXXFLAGS) \ + -D_TOOLS_STRINGLIST \ +)) + +$(eval $(call gb_Executable_add_linked_libs,sspretty,\ + sal \ + stl \ + tl \ + vos3 \ +)) +# used to link against basegfxlx comphelp4gcc3 i18nisolang1gcc3 ucbhelper4gcc3 uno_cppu uno_cppuhelpergcc3 uno_salhelpergcc3 - seems to be superficial + +$(eval $(call gb_Executable_add_exception_objects,sspretty,\ + tools/bootstrp/appdef \ + tools/bootstrp/cppdep \ + tools/bootstrp/inimgr \ + tools/bootstrp/prj \ + tools/bootstrp/sspretty \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_Executable_add_linked_libs,sspretty,\ + kernel32 \ + user32 \ + msvcrt \ + oldnames \ + uwinapi \ +)) +endif + +ifeq ($(OS),LINUX) +$(eval $(call gb_Executable_add_linked_libs,sspretty,\ + pthread \ + dl \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk new file mode 100644 index 000000000000..2fc00ec68a8b --- /dev/null +++ b/tools/Library_tl.mk @@ -0,0 +1,180 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,tl)) + +$(eval $(call gb_Library_add_package_headers,tl,tools_inc)) + +$(eval $(call gb_Library_add_precompiled_header,tl,$(SRCDIR)/tools/inc/pch/precompiled_tools)) + +$(eval $(call gb_Library_set_include,tl,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc \ + -I$(WORKDIR)/inc/tools \ + -I$(SRCDIR)/tools/inc \ + -I$(SRCDIR)/tools/inc/pch \ + -I$(SRCDIR)/solenv/inc \ + -I$(SRCDIR)/solenv/inc/Xp31 \ + -I$(OUTDIR)/inc/tools \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc/stl \ +)) + +$(eval $(call gb_Library_set_cxxflags,tl,\ + $$(CXXFLAGS) \ + -DSHARED_LIB \ + -DTOOLS_DLLIMPLEMENTATION \ + -DVCL \ +)) + +$(eval $(call gb_Library_add_linked_libs,tl,\ + basegfx \ + comphelper \ + i18nisolang1 \ + stl \ + cppu \ + sal \ + vos3 \ +)) + + +$(eval $(call gb_Library_add_exception_objects,tl,\ + tools/source/communi/geninfo \ + tools/source/communi/parser \ + tools/source/datetime/datetime \ + tools/source/datetime/tdate \ + tools/source/datetime/ttime \ + tools/source/debug/debug \ + tools/source/debug/stcktree \ + tools/source/fsys/comdep \ + tools/source/fsys/dirent \ + tools/source/fsys/filecopy \ + tools/source/fsys/fstat \ + tools/source/fsys/tdir \ + tools/source/fsys/tempfile \ + tools/source/fsys/urlobj \ + tools/source/fsys/wldcrd \ + tools/source/generic/b3dtrans \ + tools/source/generic/bigint \ + tools/source/generic/color \ + tools/source/generic/config \ + tools/source/generic/fract \ + tools/source/generic/gen \ + tools/source/generic/line \ + tools/source/generic/link \ + tools/source/generic/poly \ + tools/source/generic/poly2 \ + tools/source/generic/svborder \ + tools/source/generic/toolsin \ + tools/source/inet/inetmime \ + tools/source/inet/inetmsg \ + tools/source/inet/inetstrm \ + tools/source/memtools/contnr \ + tools/source/memtools/mempool \ + tools/source/memtools/multisel \ + tools/source/memtools/table \ + tools/source/memtools/unqidx \ + tools/source/misc/appendunixshellword \ + tools/source/misc/extendapplicationenvironment \ + tools/source/misc/getprocessworkingdir \ + tools/source/misc/solarmutex \ + tools/source/rc/isofallback \ + tools/source/rc/rc \ + tools/source/rc/resary \ + tools/source/rc/resmgr \ + tools/source/ref/errinf \ + tools/source/ref/globname \ + tools/source/ref/pstm \ + tools/source/ref/ref \ + tools/source/stream/cachestr \ + tools/source/stream/stream \ + tools/source/stream/strmsys \ + tools/source/stream/vcompat \ + tools/source/string/debugprint \ + tools/source/string/tenccvt \ + tools/source/string/tstring \ + tools/source/string/tustring \ + tools/source/testtoolloader/testtoolloader \ + tools/source/zcodec/zcodec \ +)) + +ifeq ($(GUI),UNX) +$(eval $(call gb_Library_add_exception_objects,tl,\ + tools/unx/source/dll/toolsdll \ +)) +endif + +ifeq ($(SYSTEM_ZLIB),YES) +$(eval $(call gb_Library_set_cxxflags,tl,\ + $$(CXXFLAGS) \ + -DSYSTEM_ZLIB \ +)) +$(eval $(call gb_Library_add_linked_libs,tl,\ + z \ +)) +else +$(eval $(call gb_Library_add_linked_static_libs,tl,\ + zlib \ +)) +endif + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,tl,\ + dl \ + m \ + pthread \ +)) +endif + +ifeq ($(OS),WNT) +$(eval $(call gb_Library_set_include,tl,\ + $$(INCLUDE) \ + -I$(SRCDIR)/tools/win/inc \ +)) + +$(eval $(call gb_Library_add_exception_objects,tl,\ + tools/win/source/dll/toolsdll \ +)) + +$(eval $(call gb_Library_add_linked_libs,tl,\ + advapi32 \ + kernel32 \ + mpr \ + msvcrt \ + oldnames \ + ole32 \ + shell32 \ + user32 \ + uuid \ + uwinapi \ +)) +endif +# tools/source/string/debugprint -DDEBUG -DEXCEPTIONS_OFF -DOSL_DEBUG_LEVEL=2 -DSHAREDLIB -DTOOLS_DLLIMPLEMENTATION -D_DLL_ -O0 -fno-exceptions -fpic -fvisibility=hidden -g +# -DOPTIMIZE +# no -DTOOLS_DLLIMPLEMENTATION on toolsdll +# -DEXCEPTIONS_OFF -fno-exceptions on geninfo parser datetime tdate ttime bigint color config fract gen line link poly2 svborder toolsin inetmime inetmsg inetstrm contnr mempool multisel table unqidx cachestr stream strmsys vcompat tenccvt tstring tustring testtoolloader +# vim: set noet sw=4 ts=4: diff --git a/tools/Makefile b/tools/Makefile index 265fdac07bb1..60d34122e271 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -25,9 +25,13 @@ # #************************************************************************* +ifeq ($(strip $(SOLARENV)),) +$(error No environment set) +endif + GBUILDDIR := $(SOLARENV)/gbuild include $(GBUILDDIR)/gbuild.mk -$(eval $(call gb_Module_make_global_targets,$(patsubst %/,%,$(dir $(realpath $(firstword $(MAKEFILE_LIST))))))) +$(eval $(call gb_Module_make_global_targets)) # vim: set noet sw=4 ts=4: diff --git a/tools/Module_tools.mk b/tools/Module_tools.mk new file mode 100644 index 000000000000..447aba59cb50 --- /dev/null +++ b/tools/Module_tools.mk @@ -0,0 +1,54 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Module_Module,tools)) + +$(eval $(call gb_Module_add_targets,tools,\ + Executable_mkunroll \ + Executable_rscdep \ + Executable_so_checksum \ + Executable_sspretty \ + Library_tl \ + Package_inc \ +)) + +# TODO: +#COPY tools/unxlngx6.pro/lib/atools.lib unxlngx6.pro/lib/atools.lib +#COPY tools/unxlngx6.pro/lib/bootstrp2.lib unxlngx6.pro/lib/bootstrp2.lib +#COPY tools/unxlngx6.pro/lib/btstrp.lib unxlngx6.pro/lib/btstrp.lib +#COPY tools/unxlngx6.pro/lib/libatools.a unxlngx6.pro/lib/libatools.a +#COPY tools/unxlngx6.pro/lib/libbootstrp2.a unxlngx6.pro/lib/libbootstrp2.a +#COPY tools/unxlngx6.pro/lib/libbtstrp.a unxlngx6.pro/lib/libbtstrp.a +#COPY tools/unxlngx6.pro/lib/libstdstrm.a unxlngx6.pro/lib/libstdstrm.a +#COPY tools/unxlngx6.pro/lib/stdstrm.lib unxlngx6.pro/lib/stdstrm.lib +#COPY tools/unxlngx6.pro/obj/pathutils.obj unxlngx6.pro/lib/pathutils-obj.obj +#COPY tools/unxlngx6.pro/slo/pathutils.obj unxlngx6.pro/lib/pathutils-slo.obj + +#todo: link tools dynamically everywhere +#todo: ALWAYSDBGFLAG etc. + +# vim: set noet sw=4 ts=4: diff --git a/tools/Package_inc.mk b/tools/Package_inc.mk new file mode 100644 index 000000000000..5deb59a7b0da --- /dev/null +++ b/tools/Package_inc.mk @@ -0,0 +1,115 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,tools_inc,$(SRCDIR)/tools/inc)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/StringListResource.hxx,tools/StringListResource.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/agapi.hxx,tools/agapi.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/agitem.hxx,tools/agitem.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/appendunixshellword.hxx,tools/appendunixshellword.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/bigint.hxx,tools/bigint.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/cachestr.hxx,tools/cachestr.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/chapi.hxx,tools/chapi.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/color.hxx,tools/color.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/config.hxx,tools/config.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/contnr.hxx,tools/contnr.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/date.hxx,tools/date.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/datetime.hxx,tools/datetime.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/debug.hxx,tools/debug.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/diagnose_ex.h,tools/diagnose_ex.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/download.hxx,tools/download.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/dynary.hxx,tools/dynary.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/eacopier.hxx,tools/eacopier.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/errcode.hxx,tools/errcode.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/errinf.hxx,tools/errinf.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/extendapplicationenvironment.hxx,tools/extendapplicationenvironment.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/fldunit.hxx,tools/fldunit.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/fontenum.hxx,tools/fontenum.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/fract.hxx,tools/fract.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/fsys.hxx,tools/fsys.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/gen.hxx,tools/gen.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/geninfo.hxx,tools/geninfo.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/getprocessworkingdir.hxx,tools/getprocessworkingdir.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/globname.hxx,tools/globname.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/inetdef.hxx,tools/inetdef.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/inetmime.hxx,tools/inetmime.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/inetmsg.hxx,tools/inetmsg.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/inetstrm.hxx,tools/inetstrm.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/iparser.hxx,tools/iparser.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/isofallback.hxx,tools/isofallback.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/line.hxx,tools/line.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/link.hxx,tools/link.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/list.hxx,tools/list.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/mapunit.hxx,tools/mapunit.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/mempool.hxx,tools/mempool.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/multisel.hxx,tools/multisel.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/ownlist.hxx,tools/ownlist.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/pathutils.hxx,tools/pathutils.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/poly.hxx,tools/poly.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/postsys.h,tools/postsys.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/postwin.h,tools/postwin.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/postx.h,tools/postx.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/presys.h,tools/presys.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/prewin.h,tools/prewin.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/prex.h,tools/prex.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/pstm.hxx,tools/pstm.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/queue.hxx,tools/queue.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/rc.h,tools/rc.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/rc.hxx,tools/rc.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/rcid.h,tools/rcid.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/ref.hxx,tools/ref.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/resary.hxx,tools/resary.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/resid.hxx,tools/resid.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/resmgr.hxx,tools/resmgr.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/rtti.hxx,tools/rtti.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/shl.hxx,tools/shl.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/simplerm.hxx,tools/simplerm.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/solar.h,tools/solar.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/solarmutex.hxx,tools/solarmutex.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/stack.hxx,tools/stack.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/stream.hxx,tools/stream.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/string.hxx,tools/string.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/svborder.hxx,tools/svborder.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/svwin.h,tools/svwin.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/table.hxx,tools/table.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/tempfile.hxx,tools/tempfile.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/tenccvt.hxx,tools/tenccvt.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/testtoolloader.hxx,tools/testtoolloader.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/time.hxx,tools/time.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/tools.h,tools/tools.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/toolsdllapi.h,tools/toolsdllapi.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/unqid.hxx,tools/unqid.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/unqidx.hxx,tools/unqidx.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/urlkeys.hxx,tools/urlkeys.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/urlobj.hxx,tools/urlobj.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/vcompat.hxx,tools/vcompat.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/vector2d.hxx,tools/vector2d.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/weakbase.h,tools/weakbase.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/weakbase.hxx,tools/weakbase.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/wintypes.hxx,tools/wintypes.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/wldcrd.hxx,tools/wldcrd.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/zcodec.hxx,tools/zcodec.hxx)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/b3dtrans.hxx,tools/b3dtrans.hxx)) diff --git a/tools/prj/target_exe_mkunroll.mk b/tools/prj/target_exe_mkunroll.mk deleted file mode 100644 index 9200ab8a3971..000000000000 --- a/tools/prj/target_exe_mkunroll.mk +++ /dev/null @@ -1,78 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Executable_Executable,mkunroll)) - -$(eval $(call gb_Executable_set_include,mkunroll,\ - $$(INCLUDE) \ - -I$(SRCDIR)/tools/inc/ \ - -I$(SRCDIR)/tools/inc/pch \ - -I$(SRCDIR)/tools/bootstrp/ \ -)) - -$(eval $(call gb_Executable_set_cxxflags,mkunroll,\ - $$(CXXFLAGS) \ - -D_TOOLS_STRINGLIST \ -)) - -$(eval $(call gb_Executable_add_linked_libs,mkunroll,\ - basegfx \ - sal \ - stl \ - tl \ - vos3 \ -)) - -# used to link against basegfxlx comphelp4gcc3 i18nisolang1gcc3 ucbhelper4gcc3 uno_cppu uno_cppuhelpergcc3 uno_salhelpergcc3 - seems to be superficial - -$(eval $(call gb_Executable_add_exception_objects,mkunroll,\ - tools/bootstrp/addexes2/mkfilt \ - tools/bootstrp/appdef \ - tools/bootstrp/cppdep \ - tools/bootstrp/inimgr \ - tools/bootstrp/prj \ -)) - -ifeq ($(OS),WNT) -$(eval $(call gb_Executable_add_linked_libs,mkunroll,\ - kernel32 \ - user32 \ - msvcrt \ - oldnames \ - uwinapi \ -)) -endif - -ifeq ($(OS),LINUX) -$(eval $(call gb_Executable_add_linked_libs,mkunroll,\ - pthread \ - dl \ -)) -endif - -$(info --- $(gb_Module_TARGETSTACK)) -# vim: set noet sw=4 ts=4: diff --git a/tools/prj/target_exe_rscdep.mk b/tools/prj/target_exe_rscdep.mk deleted file mode 100644 index 20f4d22b186c..000000000000 --- a/tools/prj/target_exe_rscdep.mk +++ /dev/null @@ -1,73 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Executable_Executable,rscdep)) - -$(eval $(call gb_Executable_set_include,rscdep,\ - $$(INCLUDE) \ - -I$(SRCDIR)/tools/inc/ \ - -I$(SRCDIR)/tools/inc/pch \ - -I$(SRCDIR)/tools/bootstrp/ \ -)) - -$(eval $(call gb_Executable_set_cxxflags,rscdep,\ - $$(CXXFLAGS) \ - -D_TOOLS_STRINGLIST \ -)) - -$(eval $(call gb_Executable_add_linked_libs,rscdep,\ - sal \ - stl \ - tl \ - vos3 \ -)) - -$(eval $(call gb_Executable_add_exception_objects,rscdep,\ - tools/bootstrp/appdef \ - tools/bootstrp/cppdep \ - tools/bootstrp/inimgr \ - tools/bootstrp/prj \ - tools/bootstrp/rscdep \ -)) - -ifeq ($(OS),WNT) -$(eval $(call gb_Executable_add_linked_libs,rscdep,\ - kernel32 \ - user32 \ - msvcrt \ - oldnames \ - uwinapi \ -)) -endif - -ifeq ($(OS),LINUX) -$(eval $(call gb_Executable_add_linked_libs,rscdep,\ - pthread \ - dl \ -)) -endif -# vim: set noet sw=4 ts=4: diff --git a/tools/prj/target_exe_so_checksum.mk b/tools/prj/target_exe_so_checksum.mk deleted file mode 100644 index d852c22ef5de..000000000000 --- a/tools/prj/target_exe_so_checksum.mk +++ /dev/null @@ -1,69 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Executable_Executable,so_checksum)) - -$(eval $(call gb_Executable_set_include,so_checksum,\ - $$(INCLUDE) \ - -I$(SRCDIR)/tools/inc/ \ - -I$(SRCDIR)/tools/inc/pch \ - -I$(SRCDIR)/tools/bootstrp/ \ -)) - -$(eval $(call gb_Executable_set_cxxflags,so_checksum,\ - $$(CXXFLAGS) \ - -D_TOOLS_STRINGLIST \ -)) - -$(eval $(call gb_Executable_add_linked_libs,so_checksum,\ - sal \ - tl \ -)) -# used to link against basegfxlx comphelp4gcc3 i18nisolang1gcc3 ucbhelper4gcc3 uno_cppu uno_cppuhelpergcc3 uno_salhelpergcc3 vos3gcc3 - seems to be superficial - -$(eval $(call gb_Executable_add_exception_objects,so_checksum,\ - tools/bootstrp/md5 \ - tools/bootstrp/so_checksum \ -)) - -ifeq ($(OS),WNT) -$(eval $(call gb_Executable_add_linked_libs,so_checksum,\ - kernel32 \ - user32 \ - msvcrt \ - oldnames \ - uwinapi \ -)) -endif - -ifeq ($(OS),LINUX) -$(eval $(call gb_Executable_add_linked_libs,so_checksum,\ - pthread \ - dl \ -)) -endif -# vim: set noet sw=4 ts=4: diff --git a/tools/prj/target_exe_sspretty.mk b/tools/prj/target_exe_sspretty.mk deleted file mode 100644 index 5b8c83977dcd..000000000000 --- a/tools/prj/target_exe_sspretty.mk +++ /dev/null @@ -1,74 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Executable_Executable,sspretty)) - -$(eval $(call gb_Executable_set_include,sspretty,\ - $$(INCLUDE) \ - -I$(SRCDIR)/tools/inc/ \ - -I$(SRCDIR)/tools/inc/pch \ - -I$(SRCDIR)/tools/bootstrp/ \ -)) - -$(eval $(call gb_Executable_set_cxxflags,sspretty,\ - $$(CXXFLAGS) \ - -D_TOOLS_STRINGLIST \ -)) - -$(eval $(call gb_Executable_add_linked_libs,sspretty,\ - sal \ - stl \ - tl \ - vos3 \ -)) -# used to link against basegfxlx comphelp4gcc3 i18nisolang1gcc3 ucbhelper4gcc3 uno_cppu uno_cppuhelpergcc3 uno_salhelpergcc3 - seems to be superficial - -$(eval $(call gb_Executable_add_exception_objects,sspretty,\ - tools/bootstrp/appdef \ - tools/bootstrp/cppdep \ - tools/bootstrp/inimgr \ - tools/bootstrp/prj \ - tools/bootstrp/sspretty \ -)) - -ifeq ($(OS),WNT) -$(eval $(call gb_Executable_add_linked_libs,sspretty,\ - kernel32 \ - user32 \ - msvcrt \ - oldnames \ - uwinapi \ -)) -endif - -ifeq ($(OS),LINUX) -$(eval $(call gb_Executable_add_linked_libs,sspretty,\ - pthread \ - dl \ -)) -endif -# vim: set noet sw=4 ts=4: diff --git a/tools/prj/target_lib_tl.mk b/tools/prj/target_lib_tl.mk deleted file mode 100644 index 2fc00ec68a8b..000000000000 --- a/tools/prj/target_lib_tl.mk +++ /dev/null @@ -1,180 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Library_Library,tl)) - -$(eval $(call gb_Library_add_package_headers,tl,tools_inc)) - -$(eval $(call gb_Library_add_precompiled_header,tl,$(SRCDIR)/tools/inc/pch/precompiled_tools)) - -$(eval $(call gb_Library_set_include,tl,\ - $$(INCLUDE) \ - -I$(OUTDIR)/inc \ - -I$(WORKDIR)/inc/tools \ - -I$(SRCDIR)/tools/inc \ - -I$(SRCDIR)/tools/inc/pch \ - -I$(SRCDIR)/solenv/inc \ - -I$(SRCDIR)/solenv/inc/Xp31 \ - -I$(OUTDIR)/inc/tools \ - -I$(OUTDIR)/inc/offuh \ - -I$(OUTDIR)/inc/stl \ -)) - -$(eval $(call gb_Library_set_cxxflags,tl,\ - $$(CXXFLAGS) \ - -DSHARED_LIB \ - -DTOOLS_DLLIMPLEMENTATION \ - -DVCL \ -)) - -$(eval $(call gb_Library_add_linked_libs,tl,\ - basegfx \ - comphelper \ - i18nisolang1 \ - stl \ - cppu \ - sal \ - vos3 \ -)) - - -$(eval $(call gb_Library_add_exception_objects,tl,\ - tools/source/communi/geninfo \ - tools/source/communi/parser \ - tools/source/datetime/datetime \ - tools/source/datetime/tdate \ - tools/source/datetime/ttime \ - tools/source/debug/debug \ - tools/source/debug/stcktree \ - tools/source/fsys/comdep \ - tools/source/fsys/dirent \ - tools/source/fsys/filecopy \ - tools/source/fsys/fstat \ - tools/source/fsys/tdir \ - tools/source/fsys/tempfile \ - tools/source/fsys/urlobj \ - tools/source/fsys/wldcrd \ - tools/source/generic/b3dtrans \ - tools/source/generic/bigint \ - tools/source/generic/color \ - tools/source/generic/config \ - tools/source/generic/fract \ - tools/source/generic/gen \ - tools/source/generic/line \ - tools/source/generic/link \ - tools/source/generic/poly \ - tools/source/generic/poly2 \ - tools/source/generic/svborder \ - tools/source/generic/toolsin \ - tools/source/inet/inetmime \ - tools/source/inet/inetmsg \ - tools/source/inet/inetstrm \ - tools/source/memtools/contnr \ - tools/source/memtools/mempool \ - tools/source/memtools/multisel \ - tools/source/memtools/table \ - tools/source/memtools/unqidx \ - tools/source/misc/appendunixshellword \ - tools/source/misc/extendapplicationenvironment \ - tools/source/misc/getprocessworkingdir \ - tools/source/misc/solarmutex \ - tools/source/rc/isofallback \ - tools/source/rc/rc \ - tools/source/rc/resary \ - tools/source/rc/resmgr \ - tools/source/ref/errinf \ - tools/source/ref/globname \ - tools/source/ref/pstm \ - tools/source/ref/ref \ - tools/source/stream/cachestr \ - tools/source/stream/stream \ - tools/source/stream/strmsys \ - tools/source/stream/vcompat \ - tools/source/string/debugprint \ - tools/source/string/tenccvt \ - tools/source/string/tstring \ - tools/source/string/tustring \ - tools/source/testtoolloader/testtoolloader \ - tools/source/zcodec/zcodec \ -)) - -ifeq ($(GUI),UNX) -$(eval $(call gb_Library_add_exception_objects,tl,\ - tools/unx/source/dll/toolsdll \ -)) -endif - -ifeq ($(SYSTEM_ZLIB),YES) -$(eval $(call gb_Library_set_cxxflags,tl,\ - $$(CXXFLAGS) \ - -DSYSTEM_ZLIB \ -)) -$(eval $(call gb_Library_add_linked_libs,tl,\ - z \ -)) -else -$(eval $(call gb_Library_add_linked_static_libs,tl,\ - zlib \ -)) -endif - -ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,tl,\ - dl \ - m \ - pthread \ -)) -endif - -ifeq ($(OS),WNT) -$(eval $(call gb_Library_set_include,tl,\ - $$(INCLUDE) \ - -I$(SRCDIR)/tools/win/inc \ -)) - -$(eval $(call gb_Library_add_exception_objects,tl,\ - tools/win/source/dll/toolsdll \ -)) - -$(eval $(call gb_Library_add_linked_libs,tl,\ - advapi32 \ - kernel32 \ - mpr \ - msvcrt \ - oldnames \ - ole32 \ - shell32 \ - user32 \ - uuid \ - uwinapi \ -)) -endif -# tools/source/string/debugprint -DDEBUG -DEXCEPTIONS_OFF -DOSL_DEBUG_LEVEL=2 -DSHAREDLIB -DTOOLS_DLLIMPLEMENTATION -D_DLL_ -O0 -fno-exceptions -fpic -fvisibility=hidden -g -# -DOPTIMIZE -# no -DTOOLS_DLLIMPLEMENTATION on toolsdll -# -DEXCEPTIONS_OFF -fno-exceptions on geninfo parser datetime tdate ttime bigint color config fract gen line link poly2 svborder toolsin inetmime inetmsg inetstrm contnr mempool multisel table unqidx cachestr stream strmsys vcompat tenccvt tstring tustring testtoolloader -# vim: set noet sw=4 ts=4: diff --git a/tools/prj/target_module_tools.mk b/tools/prj/target_module_tools.mk deleted file mode 100644 index cd260e7709fe..000000000000 --- a/tools/prj/target_module_tools.mk +++ /dev/null @@ -1,52 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Module_Module,tools)) - -$(eval $(call gb_Module_add_targets,tools,\ - exe_mkunroll \ - exe_rscdep \ - exe_so_checksum \ - exe_sspretty \ - lib_tl \ - package_inc \ -)) - -# TODO: -#COPY tools/unxlngx6.pro/lib/atools.lib unxlngx6.pro/lib/atools.lib -#COPY tools/unxlngx6.pro/lib/bootstrp2.lib unxlngx6.pro/lib/bootstrp2.lib -#COPY tools/unxlngx6.pro/lib/btstrp.lib unxlngx6.pro/lib/btstrp.lib -#COPY tools/unxlngx6.pro/lib/libatools.a unxlngx6.pro/lib/libatools.a -#COPY tools/unxlngx6.pro/lib/libbootstrp2.a unxlngx6.pro/lib/libbootstrp2.a -#COPY tools/unxlngx6.pro/lib/libbtstrp.a unxlngx6.pro/lib/libbtstrp.a -#COPY tools/unxlngx6.pro/lib/libstdstrm.a unxlngx6.pro/lib/libstdstrm.a -#COPY tools/unxlngx6.pro/lib/stdstrm.lib unxlngx6.pro/lib/stdstrm.lib -#COPY tools/unxlngx6.pro/obj/pathutils.obj unxlngx6.pro/lib/pathutils-obj.obj -#COPY tools/unxlngx6.pro/slo/pathutils.obj unxlngx6.pro/lib/pathutils-slo.obj - -#todo: link tools dynamically everywhere -#todo: ALWAYSDBGFLAG etc. diff --git a/tools/prj/target_package_inc.mk b/tools/prj/target_package_inc.mk deleted file mode 100644 index 5deb59a7b0da..000000000000 --- a/tools/prj/target_package_inc.mk +++ /dev/null @@ -1,115 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Package_Package,tools_inc,$(SRCDIR)/tools/inc)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/StringListResource.hxx,tools/StringListResource.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/agapi.hxx,tools/agapi.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/agitem.hxx,tools/agitem.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/appendunixshellword.hxx,tools/appendunixshellword.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/bigint.hxx,tools/bigint.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/cachestr.hxx,tools/cachestr.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/chapi.hxx,tools/chapi.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/color.hxx,tools/color.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/config.hxx,tools/config.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/contnr.hxx,tools/contnr.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/date.hxx,tools/date.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/datetime.hxx,tools/datetime.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/debug.hxx,tools/debug.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/diagnose_ex.h,tools/diagnose_ex.h)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/download.hxx,tools/download.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/dynary.hxx,tools/dynary.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/eacopier.hxx,tools/eacopier.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/errcode.hxx,tools/errcode.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/errinf.hxx,tools/errinf.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/extendapplicationenvironment.hxx,tools/extendapplicationenvironment.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/fldunit.hxx,tools/fldunit.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/fontenum.hxx,tools/fontenum.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/fract.hxx,tools/fract.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/fsys.hxx,tools/fsys.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/gen.hxx,tools/gen.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/geninfo.hxx,tools/geninfo.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/getprocessworkingdir.hxx,tools/getprocessworkingdir.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/globname.hxx,tools/globname.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/inetdef.hxx,tools/inetdef.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/inetmime.hxx,tools/inetmime.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/inetmsg.hxx,tools/inetmsg.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/inetstrm.hxx,tools/inetstrm.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/iparser.hxx,tools/iparser.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/isofallback.hxx,tools/isofallback.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/line.hxx,tools/line.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/link.hxx,tools/link.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/list.hxx,tools/list.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/mapunit.hxx,tools/mapunit.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/mempool.hxx,tools/mempool.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/multisel.hxx,tools/multisel.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/ownlist.hxx,tools/ownlist.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/pathutils.hxx,tools/pathutils.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/poly.hxx,tools/poly.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/postsys.h,tools/postsys.h)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/postwin.h,tools/postwin.h)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/postx.h,tools/postx.h)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/presys.h,tools/presys.h)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/prewin.h,tools/prewin.h)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/prex.h,tools/prex.h)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/pstm.hxx,tools/pstm.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/queue.hxx,tools/queue.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/rc.h,tools/rc.h)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/rc.hxx,tools/rc.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/rcid.h,tools/rcid.h)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/ref.hxx,tools/ref.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/resary.hxx,tools/resary.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/resid.hxx,tools/resid.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/resmgr.hxx,tools/resmgr.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/rtti.hxx,tools/rtti.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/shl.hxx,tools/shl.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/simplerm.hxx,tools/simplerm.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/solar.h,tools/solar.h)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/solarmutex.hxx,tools/solarmutex.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/stack.hxx,tools/stack.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/stream.hxx,tools/stream.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/string.hxx,tools/string.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/svborder.hxx,tools/svborder.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/svwin.h,tools/svwin.h)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/table.hxx,tools/table.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/tempfile.hxx,tools/tempfile.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/tenccvt.hxx,tools/tenccvt.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/testtoolloader.hxx,tools/testtoolloader.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/time.hxx,tools/time.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/tools.h,tools/tools.h)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/toolsdllapi.h,tools/toolsdllapi.h)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/unqid.hxx,tools/unqid.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/unqidx.hxx,tools/unqidx.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/urlkeys.hxx,tools/urlkeys.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/urlobj.hxx,tools/urlobj.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/vcompat.hxx,tools/vcompat.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/vector2d.hxx,tools/vector2d.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/weakbase.h,tools/weakbase.h)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/weakbase.hxx,tools/weakbase.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/wintypes.hxx,tools/wintypes.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/wldcrd.hxx,tools/wldcrd.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/zcodec.hxx,tools/zcodec.hxx)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/b3dtrans.hxx,tools/b3dtrans.hxx)) -- cgit From 5fc7423878d02fac53b3140aff0d6d89fd74232d Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Sat, 26 Jun 2010 02:05:52 +0200 Subject: CWS gnumake2: reaching through verbosity and max processes --- svl/prj/makefile.mk | 35 ++++++++++++++++++++++++++++++++++- svtools/prj/makefile.mk | 35 ++++++++++++++++++++++++++++++++++- toolkit/prj/makefile.mk | 35 ++++++++++++++++++++++++++++++++++- tools/prj/makefile.mk | 35 ++++++++++++++++++++++++++++++++++- 4 files changed, 136 insertions(+), 4 deletions(-) diff --git a/svl/prj/makefile.mk b/svl/prj/makefile.mk index 2a0b99e72fd5..967bfea90d3c 100644 --- a/svl/prj/makefile.mk +++ b/svl/prj/makefile.mk @@ -1,2 +1,35 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +.IF $(VERBOSE) +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF + all: - cd .. && make -srj9 + @cd .. && make $(VERBOSEFLAG) -r -j$(MAXPROCESS) diff --git a/svtools/prj/makefile.mk b/svtools/prj/makefile.mk index 2a0b99e72fd5..967bfea90d3c 100644 --- a/svtools/prj/makefile.mk +++ b/svtools/prj/makefile.mk @@ -1,2 +1,35 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +.IF $(VERBOSE) +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF + all: - cd .. && make -srj9 + @cd .. && make $(VERBOSEFLAG) -r -j$(MAXPROCESS) diff --git a/toolkit/prj/makefile.mk b/toolkit/prj/makefile.mk index 2a0b99e72fd5..967bfea90d3c 100644 --- a/toolkit/prj/makefile.mk +++ b/toolkit/prj/makefile.mk @@ -1,2 +1,35 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +.IF $(VERBOSE) +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF + all: - cd .. && make -srj9 + @cd .. && make $(VERBOSEFLAG) -r -j$(MAXPROCESS) diff --git a/tools/prj/makefile.mk b/tools/prj/makefile.mk index 2a0b99e72fd5..967bfea90d3c 100644 --- a/tools/prj/makefile.mk +++ b/tools/prj/makefile.mk @@ -1,2 +1,35 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +.IF $(VERBOSE) +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF + all: - cd .. && make -srj9 + @cd .. && make $(VERBOSEFLAG) -r -j$(MAXPROCESS) -- cgit From 396a4b3141eef99475a4f4b61ae754db69531e12 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Mon, 5 Jul 2010 18:06:39 +0200 Subject: CWS gnumake2: more multi-repo work for modules --- tools/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/Makefile b/tools/Makefile index 60d34122e271..cd5308a477df 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -32,6 +32,7 @@ endif GBUILDDIR := $(SOLARENV)/gbuild include $(GBUILDDIR)/gbuild.mk -$(eval $(call gb_Module_make_global_targets)) +$(eval $(call gb_Module_set_current_repo,$(realpath $(gb_Module_CURRENTREPO)..))) +$(eval $(call gb_Module_make_global_targets,$(foreach module,$(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))),$(module)/Module_$(module).mk))) # vim: set noet sw=4 ts=4: -- cgit From 35d5e1b45653eafe422c281356df9d833da43e04 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Tue, 6 Jul 2010 12:47:44 +0200 Subject: CWS gnumake2: more multi-repo work --- tools/Makefile | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index cd5308a477df..903d994acd8b 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -25,14 +25,9 @@ # #************************************************************************* -ifeq ($(strip $(SOLARENV)),) -$(error No environment set) -endif - -GBUILDDIR := $(SOLARENV)/gbuild +include $(dir $(firstword $(MAKEFILE_LIST)))/../SourcePaths.mk include $(GBUILDDIR)/gbuild.mk -$(eval $(call gb_Module_set_current_repo,$(realpath $(gb_Module_CURRENTREPO)..))) -$(eval $(call gb_Module_make_global_targets,$(foreach module,$(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))),$(module)/Module_$(module).mk))) +$(eval $(call gb_Module_make_global_targets,$(foreach module,$(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))),$(CURRENTREPO)/$(module)/Module_$(module).mk))) # vim: set noet sw=4 ts=4: -- cgit From b2f9ce87249dfe76e25e2d6062c50c38fc60df23 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Wed, 7 Jul 2010 13:17:37 +0200 Subject: CWS gnumake2: resolved dep generation dep cycle --- tools/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/Makefile b/tools/Makefile index 903d994acd8b..b198cc3d4c32 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -25,7 +25,8 @@ # #************************************************************************* -include $(dir $(firstword $(MAKEFILE_LIST)))/../SourcePaths.mk +include $(dir $(firstword $(MAKEFILE_LIST)))/../SourcePath.mk +GBUILDDIR := $(SOLARENV)/gbuild include $(GBUILDDIR)/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(foreach module,$(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))),$(CURRENTREPO)/$(module)/Module_$(module).mk))) -- cgit From f4e0343a4dc083f8c255cf40f567e635e6fe7eaf Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Wed, 7 Jul 2010 18:09:58 +0200 Subject: CWS gnumake2: fixing all module makefiles (copy from tools) --- svl/Makefile | 7 ++----- svtools/Makefile | 7 ++----- toolkit/Makefile | 7 ++----- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/svl/Makefile b/svl/Makefile index 60d34122e271..b198cc3d4c32 100644 --- a/svl/Makefile +++ b/svl/Makefile @@ -25,13 +25,10 @@ # #************************************************************************* -ifeq ($(strip $(SOLARENV)),) -$(error No environment set) -endif - +include $(dir $(firstword $(MAKEFILE_LIST)))/../SourcePath.mk GBUILDDIR := $(SOLARENV)/gbuild include $(GBUILDDIR)/gbuild.mk -$(eval $(call gb_Module_make_global_targets)) +$(eval $(call gb_Module_make_global_targets,$(foreach module,$(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))),$(CURRENTREPO)/$(module)/Module_$(module).mk))) # vim: set noet sw=4 ts=4: diff --git a/svtools/Makefile b/svtools/Makefile index 60d34122e271..b198cc3d4c32 100644 --- a/svtools/Makefile +++ b/svtools/Makefile @@ -25,13 +25,10 @@ # #************************************************************************* -ifeq ($(strip $(SOLARENV)),) -$(error No environment set) -endif - +include $(dir $(firstword $(MAKEFILE_LIST)))/../SourcePath.mk GBUILDDIR := $(SOLARENV)/gbuild include $(GBUILDDIR)/gbuild.mk -$(eval $(call gb_Module_make_global_targets)) +$(eval $(call gb_Module_make_global_targets,$(foreach module,$(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))),$(CURRENTREPO)/$(module)/Module_$(module).mk))) # vim: set noet sw=4 ts=4: diff --git a/toolkit/Makefile b/toolkit/Makefile index 60d34122e271..b198cc3d4c32 100644 --- a/toolkit/Makefile +++ b/toolkit/Makefile @@ -25,13 +25,10 @@ # #************************************************************************* -ifeq ($(strip $(SOLARENV)),) -$(error No environment set) -endif - +include $(dir $(firstword $(MAKEFILE_LIST)))/../SourcePath.mk GBUILDDIR := $(SOLARENV)/gbuild include $(GBUILDDIR)/gbuild.mk -$(eval $(call gb_Module_make_global_targets)) +$(eval $(call gb_Module_make_global_targets,$(foreach module,$(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))),$(CURRENTREPO)/$(module)/Module_$(module).mk))) # vim: set noet sw=4 ts=4: -- cgit From 13650e71469d579a91f3de3eefa977e825567b57 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Thu, 8 Jul 2010 13:58:34 +0200 Subject: CWS gnumake2: using gnu make directly from build.pl --- svl/prj/build.lst | 19 +------------------ svl/prj/gbuild.lst | 5 ----- svtools/prj/build.lst | 29 ++--------------------------- svtools/prj/gbuild.lst | 4 ---- toolkit/prj/build.lst | 16 +++------------- toolkit/prj/gbuild.lst | 3 --- tools/prj/build.lst | 32 +++----------------------------- tools/prj/gbuild.lst | 3 --- 8 files changed, 9 insertions(+), 102 deletions(-) delete mode 100644 svl/prj/gbuild.lst delete mode 100644 svtools/prj/gbuild.lst delete mode 100644 toolkit/prj/gbuild.lst delete mode 100644 tools/prj/gbuild.lst diff --git a/svl/prj/build.lst b/svl/prj/build.lst index f2d4bf324d01..dc1b23e2971a 100644 --- a/svl/prj/build.lst +++ b/svl/prj/build.lst @@ -1,22 +1,5 @@ sl svl : l10n rsc offuh ucbhelper unotools cppu cppuhelper comphelper sal sot NULL sl svl usr1 - all svl_mkout NULL -sl svl\inc nmake - all svl_inc NULL -sl svl\unx\source\svdde nmake - u svl_usdde svl_inc NULL -sl svl\unx\source\svdde nmake - p svl_psdde svl_inc NULL -sl svl\source\config nmake - all svl_conf svl_inc NULL -sl svl\source\filepicker nmake - all svl_filepick svl_inc NULL -sl svl\source\filerec nmake - all svl_file svl_inc NULL -sl svl\source\items nmake - all svl__item svl_inc NULL -sl svl\source\memtools nmake - all svl_mem svl_inc NULL -sl svl\source\misc nmake - all svl__misc svl_inc NULL -sl svl\source\notify nmake - all svl_not svl_inc NULL -sl svl\source\numbers nmake - all svl_num svl_inc NULL -sl svl\source\svdde nmake - all svl__dde svl_inc NULL -sl svl\source\svsql nmake - all svl_sql svl_inc NULL -sl svl\source\undo nmake - all svl_undo svl_inc NULL -sl svl\source\uno nmake - all svl_uno svl_inc NULL -sl svl\util nmake - all svl_util svl_usdde.u svl_psdde.p svl_conf svl_filepick svl_file svl__item svl_mem svl__misc svl_not svl_num svl__dde svl_sql svl_undo svl_uno NULL -sl svl\source\fsstor nmake - all svl_fsstor svl_inc NULL -sl svl\source\passwordcontainer nmake - all svl_passcont svl_inc NULL +sl svl\prj nmake - all svl_prj NULL diff --git a/svl/prj/gbuild.lst b/svl/prj/gbuild.lst deleted file mode 100644 index dc1b23e2971a..000000000000 --- a/svl/prj/gbuild.lst +++ /dev/null @@ -1,5 +0,0 @@ -sl svl : l10n rsc offuh ucbhelper unotools cppu cppuhelper comphelper sal sot NULL -sl svl usr1 - all svl_mkout NULL -sl svl\prj nmake - all svl_prj NULL - - diff --git a/svtools/prj/build.lst b/svtools/prj/build.lst index 4b2cd9f9b26b..17542856e75c 100644 --- a/svtools/prj/build.lst +++ b/svtools/prj/build.lst @@ -1,29 +1,4 @@ st svtools : l10n svl offuh toolkit ucbhelper unotools JPEG:jpeg cppu cppuhelper comphelper sal sot jvmfwk NULL st svtools usr1 - all st_mkout NULL -st svtools\inc nmake - all st_inc NULL -st svtools\bmpmaker nmake - all st_bmp st_inc NULL -st svtools\source\brwbox nmake - all st__brw st_bmp st_inc NULL -st svtools\source\config nmake - all st_conf st_inc NULL -st svtools\source\contnr nmake - all st__ctr st_inc NULL -st svtools\source\control nmake - all st_ctl st_inc NULL -st svtools\source\dialogs nmake - all st_dial st_inc NULL -st svtools\source\edit nmake - all st_edit st_inc NULL -st svtools\source\filter.vcl\filter nmake - all st_vfilt st_inc NULL -st svtools\source\filter.vcl\wmf nmake - all st_vwmf st_inc NULL -st svtools\source\filter.vcl\igif nmake - all st_vigif st_inc NULL -st svtools\source\filter.vcl\jpeg nmake - all st_vjpeg st_inc NULL -st svtools\source\filter.vcl\ixbm nmake - all st_vixbm st_inc NULL -st svtools\source\filter.vcl\ixpm nmake - all st_vixpm st_inc NULL -st svtools\source\graphic nmake - all st_svtgraphic st_inc NULL -st svtools\source\java nmake - all st_svtjava st_inc NULL -st svtools\source\misc nmake - all st__misc st_bmp st_inc NULL -st svtools\source\plugapp nmake - all st_papp st_inc NULL -st svtools\source\svhtml nmake - all st_html st_inc NULL -st svtools\source\svrtf nmake - all st_rtf st_inc NULL -st svtools\source\table nmake - all st_table st_inc NULL -st svtools\source\uno nmake - all st_uno st_inc NULL -st svtools\source\urlobj nmake - all st__url st_inc NULL -st svtools\util nmake - all st_util st_svtgraphic st__brw st__ctr st_conf st_ctl st_dial st_edit st__misc st__url st_html st_papp st_rtf st_table st_uno st_vfilt st_vigif st_vixbm st_vixpm st_vjpeg st_vwmf st_svtjava NULL -st svtools\source\hatchwindow nmake - all st_hatchwin st_inc NULL -st svtools\source\productregistration nmake - all st_prodreg st_util st_inc NULL -st svtools\workben\unodialog nmake - all st_workben_udlg st_util NULL +st svtools\prj nmake - all st_prj NULL + diff --git a/svtools/prj/gbuild.lst b/svtools/prj/gbuild.lst deleted file mode 100644 index 17542856e75c..000000000000 --- a/svtools/prj/gbuild.lst +++ /dev/null @@ -1,4 +0,0 @@ -st svtools : l10n svl offuh toolkit ucbhelper unotools JPEG:jpeg cppu cppuhelper comphelper sal sot jvmfwk NULL -st svtools usr1 - all st_mkout NULL -st svtools\prj nmake - all st_prj NULL - diff --git a/toolkit/prj/build.lst b/toolkit/prj/build.lst index 304d0e7c978f..b9403f4fd164 100644 --- a/toolkit/prj/build.lst +++ b/toolkit/prj/build.lst @@ -1,13 +1,3 @@ -ti toolkit : vcl NULL -ti toolkit usr1 - all ti_mkout NULL -ti toolkit\prj get - all ti_prj NULL -ti toolkit\inc nmake - all ti_inc NULL -ti toolkit\uiconfig\layout nmake - all ti_uiconfig_layout NULL -ti toolkit\source\helper nmake - all ti_helper ti_inc NULL -ti toolkit\source\awt nmake - all ti_awt ti_inc NULL -ti toolkit\source\controls nmake - all ti_controls ti_inc NULL -ti toolkit\source\controls\tree nmake - all ti_tree NULL -ti toolkit\source\controls\grid nmake - all ti_grid NULL -ti toolkit\source\layout\core nmake - all ti_layout_core NULL -ti toolkit\source\layout\vcl nmake - all ti_layout_vcl NULL -ti toolkit\util nmake - all ti_util ti_awt ti_controls ti_layout_core ti_helper ti_tree ti_grid ti_layout_vcl NULL +ti toolkit : vcl NULL +ti toolkit usr1 - all ti_mkout NULL +ti toolkit\prj nmake - all ti_prj NULL diff --git a/toolkit/prj/gbuild.lst b/toolkit/prj/gbuild.lst deleted file mode 100644 index b9403f4fd164..000000000000 --- a/toolkit/prj/gbuild.lst +++ /dev/null @@ -1,3 +0,0 @@ -ti toolkit : vcl NULL -ti toolkit usr1 - all ti_mkout NULL -ti toolkit\prj nmake - all ti_prj NULL diff --git a/tools/prj/build.lst b/tools/prj/build.lst index 6f07015178d2..3194cbb4e87c 100644 --- a/tools/prj/build.lst +++ b/tools/prj/build.lst @@ -1,29 +1,3 @@ -tl tools : cppu external offuh vos ZLIB:zlib EXPAT:expat basegfx comphelper i18npool NULL -tl tools usr1 - all tl_mkout NULL -tl tools\bootstrp\isdll get - all tl_bsisdll NULL -tl tools\inc nmake - all tl_inc NULL -tl tools\prj get - all tl_prj NULL -tl tools\prj usr7 - all tl_deliver NULL -tl tools\prj usr42 - all tl_zn NULL -tl tools\workben get - all tl_wben NULL -tl tools\source\testtoolloader nmake - all tl_ttloader tl_inc NULL -tl tools\source\generic nmake - all tl_gen tl_fsys tl_inc NULL -tl tools\source\memtools nmake - all tl_mem tl_fsys tl_inc NULL -tl tools\source\debug nmake - all tl_deb tl_fsys tl_inc NULL -tl tools\source\datetime nmake - all tl_dat tl_fsys tl_inc NULL -tl tools\source\stream nmake - all tl_str tl_fsys tl_inc NULL -tl tools\source\rc nmake - all tl_rc tl_fsys tl_inc NULL -tl tools\source\ref nmake - all tl_ref tl_fsys tl_inc NULL -tl tools\source\fsys nmake - all tl_fsys tl_inc NULL -tl tools\source\zcodec nmake - all tl_zco tl_fsys tl_inc NULL -tl tools\source\communi nmake - all tl_com tl_fsys tl_inc NULL -tl tools\source\inet nmake - all tl_inet tl_fsys tl_inc NULL -tl tools\source\string nmake - all tl_string tl_fsys tl_inc NULL -tl tools\source\misc nmake - all tl_misc tl_inc NULL -tl tools\win\source\dll nmake - w tl_dllw tl_inc NULL -tl tools\os2\source\dll nmake - p tl_dllp tl_inc NULL -tl tools\unx\source\dll nmake - u tl_dllu tl_inc NULL -tl tools\util nmake - all tl_utl tl_com tl_dat tl_deb tl_dllu.u tl_dllp.p tl_dllw.w tl_fsys tl_gen tl_inet tl_mem tl_rc tl_ref tl_str tl_string tl_misc tl_zco tl_ttloader NULL -tl tools\bootstrp nmake - all tl_bstrp tl_utl tl_inc NULL -tl tools\bootstrp\addexes2 nmake - all tl_bsexes2 tl_bstrp tl_inc NULL - +tl tools : cppu external offuh vos ZLIB:zlib EXPAT:expat basegfx comphelper i18npool NULL +tl tools usr1 - all tl_mkout NULL +tl tools\prj nmake - all tl_prj NULL diff --git a/tools/prj/gbuild.lst b/tools/prj/gbuild.lst deleted file mode 100644 index 3194cbb4e87c..000000000000 --- a/tools/prj/gbuild.lst +++ /dev/null @@ -1,3 +0,0 @@ -tl tools : cppu external offuh vos ZLIB:zlib EXPAT:expat basegfx comphelper i18npool NULL -tl tools usr1 - all tl_mkout NULL -tl tools\prj nmake - all tl_prj NULL -- cgit From 74284c8e763f19cd9f7891c5c836e0a53abf06b3 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Tue, 20 Jul 2010 16:48:23 +0200 Subject: CWS gnumake2: using GNUMAKE variable from configure --- svl/prj/makefile.mk | 2 +- svtools/prj/makefile.mk | 2 +- toolkit/prj/makefile.mk | 2 +- tools/prj/makefile.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/svl/prj/makefile.mk b/svl/prj/makefile.mk index 967bfea90d3c..8b00cb5a5818 100644 --- a/svl/prj/makefile.mk +++ b/svl/prj/makefile.mk @@ -32,4 +32,4 @@ VERBOSEFLAG := -s .ENDIF all: - @cd .. && make $(VERBOSEFLAG) -r -j$(MAXPROCESS) + @cd .. && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) diff --git a/svtools/prj/makefile.mk b/svtools/prj/makefile.mk index 967bfea90d3c..8b00cb5a5818 100644 --- a/svtools/prj/makefile.mk +++ b/svtools/prj/makefile.mk @@ -32,4 +32,4 @@ VERBOSEFLAG := -s .ENDIF all: - @cd .. && make $(VERBOSEFLAG) -r -j$(MAXPROCESS) + @cd .. && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) diff --git a/toolkit/prj/makefile.mk b/toolkit/prj/makefile.mk index 967bfea90d3c..8b00cb5a5818 100644 --- a/toolkit/prj/makefile.mk +++ b/toolkit/prj/makefile.mk @@ -32,4 +32,4 @@ VERBOSEFLAG := -s .ENDIF all: - @cd .. && make $(VERBOSEFLAG) -r -j$(MAXPROCESS) + @cd .. && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) diff --git a/tools/prj/makefile.mk b/tools/prj/makefile.mk index 967bfea90d3c..8b00cb5a5818 100644 --- a/tools/prj/makefile.mk +++ b/tools/prj/makefile.mk @@ -32,4 +32,4 @@ VERBOSEFLAG := -s .ENDIF all: - @cd .. && make $(VERBOSEFLAG) -r -j$(MAXPROCESS) + @cd .. && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) -- cgit From 93a3eed87acd6581f851ff92a3332de8e0ff8c29 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Fri, 23 Jul 2010 12:48:45 +0200 Subject: gnumake2: some more checks for module makefiles --- svl/Makefile | 10 +++++++++- svl/prj/makefile.mk | 9 +++++++-- svtools/Makefile | 10 +++++++++- svtools/prj/makefile.mk | 9 +++++++-- toolkit/Makefile | 10 +++++++++- toolkit/prj/makefile.mk | 9 +++++++-- tools/Makefile | 10 +++++++++- tools/prj/makefile.mk | 9 +++++++-- 8 files changed, 64 insertions(+), 12 deletions(-) diff --git a/svl/Makefile b/svl/Makefile index b198cc3d4c32..3225bc97e12c 100644 --- a/svl/Makefile +++ b/svl/Makefile @@ -25,7 +25,15 @@ # #************************************************************************* -include $(dir $(firstword $(MAKEFILE_LIST)))/../SourcePath.mk +ifneq ($(MAKE_VERSION),3.81) +$(error You need at least GNU Make 3.81!) +endif + +ifeq ($(strip $(SOLARENV)),) +$(error No environment set!) +endif + +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../SourcePath.mk GBUILDDIR := $(SOLARENV)/gbuild include $(GBUILDDIR)/gbuild.mk diff --git a/svl/prj/makefile.mk b/svl/prj/makefile.mk index 8b00cb5a5818..3b1b54d4357f 100644 --- a/svl/prj/makefile.mk +++ b/svl/prj/makefile.mk @@ -25,11 +25,16 @@ # #************************************************************************* -.IF $(VERBOSE) +PRJ=.. +TARGET=prj + +.INCLUDE : settings.mk + +.IF "$(VERBOSE)"!="" VERBOSEFLAG := .ELSE VERBOSEFLAG := -s .ENDIF all: - @cd .. && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) diff --git a/svtools/Makefile b/svtools/Makefile index b198cc3d4c32..3225bc97e12c 100644 --- a/svtools/Makefile +++ b/svtools/Makefile @@ -25,7 +25,15 @@ # #************************************************************************* -include $(dir $(firstword $(MAKEFILE_LIST)))/../SourcePath.mk +ifneq ($(MAKE_VERSION),3.81) +$(error You need at least GNU Make 3.81!) +endif + +ifeq ($(strip $(SOLARENV)),) +$(error No environment set!) +endif + +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../SourcePath.mk GBUILDDIR := $(SOLARENV)/gbuild include $(GBUILDDIR)/gbuild.mk diff --git a/svtools/prj/makefile.mk b/svtools/prj/makefile.mk index 8b00cb5a5818..3b1b54d4357f 100644 --- a/svtools/prj/makefile.mk +++ b/svtools/prj/makefile.mk @@ -25,11 +25,16 @@ # #************************************************************************* -.IF $(VERBOSE) +PRJ=.. +TARGET=prj + +.INCLUDE : settings.mk + +.IF "$(VERBOSE)"!="" VERBOSEFLAG := .ELSE VERBOSEFLAG := -s .ENDIF all: - @cd .. && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) diff --git a/toolkit/Makefile b/toolkit/Makefile index b198cc3d4c32..3225bc97e12c 100644 --- a/toolkit/Makefile +++ b/toolkit/Makefile @@ -25,7 +25,15 @@ # #************************************************************************* -include $(dir $(firstword $(MAKEFILE_LIST)))/../SourcePath.mk +ifneq ($(MAKE_VERSION),3.81) +$(error You need at least GNU Make 3.81!) +endif + +ifeq ($(strip $(SOLARENV)),) +$(error No environment set!) +endif + +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../SourcePath.mk GBUILDDIR := $(SOLARENV)/gbuild include $(GBUILDDIR)/gbuild.mk diff --git a/toolkit/prj/makefile.mk b/toolkit/prj/makefile.mk index 8b00cb5a5818..3b1b54d4357f 100644 --- a/toolkit/prj/makefile.mk +++ b/toolkit/prj/makefile.mk @@ -25,11 +25,16 @@ # #************************************************************************* -.IF $(VERBOSE) +PRJ=.. +TARGET=prj + +.INCLUDE : settings.mk + +.IF "$(VERBOSE)"!="" VERBOSEFLAG := .ELSE VERBOSEFLAG := -s .ENDIF all: - @cd .. && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) diff --git a/tools/Makefile b/tools/Makefile index b198cc3d4c32..3225bc97e12c 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -25,7 +25,15 @@ # #************************************************************************* -include $(dir $(firstword $(MAKEFILE_LIST)))/../SourcePath.mk +ifneq ($(MAKE_VERSION),3.81) +$(error You need at least GNU Make 3.81!) +endif + +ifeq ($(strip $(SOLARENV)),) +$(error No environment set!) +endif + +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../SourcePath.mk GBUILDDIR := $(SOLARENV)/gbuild include $(GBUILDDIR)/gbuild.mk diff --git a/tools/prj/makefile.mk b/tools/prj/makefile.mk index 8b00cb5a5818..3b1b54d4357f 100644 --- a/tools/prj/makefile.mk +++ b/tools/prj/makefile.mk @@ -25,11 +25,16 @@ # #************************************************************************* -.IF $(VERBOSE) +PRJ=.. +TARGET=prj + +.INCLUDE : settings.mk + +.IF "$(VERBOSE)"!="" VERBOSEFLAG := .ELSE VERBOSEFLAG := -s .ENDIF all: - @cd .. && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) -- cgit From 6f339a64fa98a3517dca2f6aae8bbe2b176382aa Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Mon, 26 Jul 2010 17:26:37 +0200 Subject: gnumake2: fixing rscdep on windows, delivering manifests for executables on windows --- tools/Executable_rscdep.mk | 1 + tools/bootstrp/rscdep.cxx | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/Executable_rscdep.mk b/tools/Executable_rscdep.mk index 20f4d22b186c..3f3a283da65b 100644 --- a/tools/Executable_rscdep.mk +++ b/tools/Executable_rscdep.mk @@ -56,6 +56,7 @@ $(eval $(call gb_Executable_add_exception_objects,rscdep,\ ifeq ($(OS),WNT) $(eval $(call gb_Executable_add_linked_libs,rscdep,\ + gnu_getopt \ kernel32 \ user32 \ msvcrt \ diff --git a/tools/bootstrp/rscdep.cxx b/tools/bootstrp/rscdep.cxx index 37edfc6a8c18..9eddce53a678 100644 --- a/tools/bootstrp/rscdep.cxx +++ b/tools/bootstrp/rscdep.cxx @@ -80,7 +80,7 @@ void RscHrcDep::Execute() //static String aDelim; -SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv ) +int main( int argc, char** argv ) { int c; char aBuf[255]; -- cgit From 9307b32be5c14515bb030afd6308acdfe7ffe011 Mon Sep 17 00:00:00 2001 From: os Date: Wed, 28 Jul 2010 12:29:06 +0200 Subject: #i84723# overlapping in ruler prevented (from gang65) --- svtools/source/control/ruler.cxx | 42 ++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 19 deletions(-) mode change 100644 => 100755 svtools/source/control/ruler.cxx diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx old mode 100644 new mode 100755 index 6fcbd92597ba..011dd4cd7956 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -468,6 +468,7 @@ void Ruler::ImplDrawTicks( long nMin, long nMax, long nStart, long nCenter ) BOOL bNoTicks = FALSE; // Groessenvorberechnung + // Sizes calculation BOOL bVertRight = FALSE; if ( mnWinStyle & WB_HORZ ) nTickWidth = aPixSize.Width(); @@ -486,19 +487,21 @@ void Ruler::ImplDrawTicks( long nMin, long nMax, long nStart, long nCenter ) } long nMaxWidth = maVirDev.PixelToLogic( Size( mpData->nPageWidth, 0 ), maMapMode ).Width(); if ( nMaxWidth < 0 ) - nMaxWidth *= -1; + nMaxWidth = -nMaxWidth; nMaxWidth /= aImplRulerUnitTab[mnUnitIndex].nTickUnit; UniString aNumStr( UniString::CreateFromInt32( nMaxWidth ) ); long nTxtWidth = GetTextWidth( aNumStr ); - if ( (nTxtWidth*2) > nTickWidth ) + + const long nTextOff = 4; + if ( nTickWidth < nTxtWidth+nTextOff ) { + // Calculate the scale of the ruler long nMulti = 1; long nOrgTick3 = nTick3; - long nTextOff = 2; while ( nTickWidth < nTxtWidth+nTextOff ) { long nOldMulti = nMulti; - if ( !nTickWidth ) + if ( !nTickWidth ) //If nTickWidth equals 0 nMulti *= 10; else if ( nMulti < 10 ) nMulti++; @@ -516,8 +519,7 @@ void Ruler::ImplDrawTicks( long nMin, long nMax, long nStart, long nCenter ) bNoTicks = TRUE; break; } - if ( nMulti >= 100 ) - nTextOff = 4; + nTick3 = nOrgTick3 * nMulti; aPixSize = maVirDev.LogicToPixel( Size( nTick3, nTick3 ), maMapMode ); if ( mnWinStyle & WB_HORZ ) @@ -541,7 +543,7 @@ void Ruler::ImplDrawTicks( long nMin, long nMax, long nStart, long nCenter ) { if ( nStart > nMin ) { - // Nur 0 malen, wenn Margin1 nicht gleich dem NullPunkt ist + // 0 is only painted when Margin1 is not equal to zero if ( (mpData->nMargin1Style & RULER_STYLE_INVISIBLE) || (mpData->nMargin1 != 0) ) { aNumStr = (sal_Unicode)'0'; @@ -564,7 +566,7 @@ void Ruler::ImplDrawTicks( long nMin, long nMax, long nStart, long nCenter ) else n = aPixSize.Height(); - // Tick3 - Ausgabe (Text) + // Tick3 - Output (Text) if ( !(nTick % nTick3) ) { aNumStr = UniString::CreateFromInt32( nTick / aImplRulerUnitTab[mnUnitIndex].nTickUnit ); @@ -573,7 +575,9 @@ void Ruler::ImplDrawTicks( long nMin, long nMax, long nStart, long nCenter ) nX = nStart+n; //different orientation needs a different starting position nY = bVertRight ? nCenter+nTxtHeight2 : nCenter-nTxtHeight2; - if ( nX < nMax ) + + // Check if we can display full number + if ( nX < (nMax-nTxtWidth2) ) { if ( mnWinStyle & WB_HORZ ) nX -= nTxtWidth2; @@ -582,7 +586,7 @@ void Ruler::ImplDrawTicks( long nMin, long nMax, long nStart, long nCenter ) ImplVDrawText( nX, nY, aNumStr ); } nX = nStart-n; - if ( nX > nMin ) + if ( nX > (nMin+nTxtWidth2) ) { if ( mnWinStyle & WB_HORZ ) nX -= nTxtWidth2; @@ -591,7 +595,7 @@ void Ruler::ImplDrawTicks( long nMin, long nMax, long nStart, long nCenter ) ImplVDrawText( nX, nY, aNumStr ); } } - // Tick/Tick2 - Ausgabe (Striche) + // Tick/Tick2 - Output (Strokes) else { if ( !(nTick % aImplRulerUnitTab[mnUnitIndex].nTick2) ) @@ -1258,7 +1262,7 @@ void Ruler::ImplFormat() Size aVirDevSize; BOOL b3DLook = !(rStyleSettings.GetOptions() & STYLE_OPTION_MONO); - // VirtualDevice initialisieren + // VirtualDevice initialize if ( mnWinStyle & WB_HORZ ) { aVirDevSize.Width() = mnVirWidth; @@ -1387,15 +1391,15 @@ void Ruler::ImplFormat() if ( nP2 < nVirRight ) nMax--; - // Beschriftung ausgeben + // Draw captions ImplDrawTicks( nMin, nMax, nStart, nCenter ); } - // Spalten ausgeben + // Draw borders if ( mpData->pBorders ) ImplDrawBorders( nVirLeft, nP2, nVirTop, nVirBottom ); - // Einzuege ausgeben + // Draw indents if ( mpData->pIndents ) ImplDrawIndents( nVirLeft, nP2, nVirTop-1, nVirBottom+1 ); @@ -2888,7 +2892,7 @@ void Ruler::SetMargin2( long nPos, USHORT nMarginStyle ) void Ruler::SetLines( USHORT n, const RulerLine* pLineAry ) { - // Testen, ob sich was geaendert hat + // To determine if what has changed if ( mpData->nLines == n ) { USHORT i = n; @@ -2907,18 +2911,18 @@ void Ruler::SetLines( USHORT n, const RulerLine* pLineAry ) return; } - // Neue Werte setzen und neu ausgeben + // New values and new share issue BOOL bMustUpdate; if ( IsReallyVisible() && IsUpdateMode() ) bMustUpdate = TRUE; else bMustUpdate = FALSE; - // Alte Linien loeschen + // Delete old lines if ( bMustUpdate ) ImplInvertLines(); - // Neue Daten setzen + // New data set if ( !n || !pLineAry ) { if ( !mpData->pLines ) -- cgit From c80e8fd6f78dfc860f67c0b72481066eff3ce8c1 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Thu, 29 Jul 2010 20:08:54 +0200 Subject: vmiklos01: #i113532# add defines for new rtf keywords --- svtools/inc/rtfkeywd.hxx | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/svtools/inc/rtfkeywd.hxx b/svtools/inc/rtfkeywd.hxx index 5ccd9149bd68..60963c58abbc 100644 --- a/svtools/inc/rtfkeywd.hxx +++ b/svtools/inc/rtfkeywd.hxx @@ -39,6 +39,7 @@ #define OOO_STRING_SVTOOLS_RTF_ALT "\\alt" #define OOO_STRING_SVTOOLS_RTF_ANNOTATION "\\annotation" #define OOO_STRING_SVTOOLS_RTF_ANSI "\\ansi" +#define OOO_STRING_SVTOOLS_RTF_ATNDATE "\\atndate" #define OOO_STRING_SVTOOLS_RTF_ATNID "\\atnid" #define OOO_STRING_SVTOOLS_RTF_AUTHOR "\\author" #define OOO_STRING_SVTOOLS_RTF_B "\\b" @@ -976,12 +977,15 @@ #define OOO_STRING_SVTOOLS_RTF_SHPBXCOLUMN "\\shpbxcolumn" #define OOO_STRING_SVTOOLS_RTF_SHPBXMARGIN "\\shpbxmargin" #define OOO_STRING_SVTOOLS_RTF_SHPBXPAGE "\\shpbxpage" +#define OOO_STRING_SVTOOLS_RTF_SHPBXIGNORE "\\shpbxignore" #define OOO_STRING_SVTOOLS_RTF_SHPBYMARGIN "\\shpbymargin" #define OOO_STRING_SVTOOLS_RTF_SHPBYPAGE "\\shpbypage" #define OOO_STRING_SVTOOLS_RTF_SHPBYPARA "\\shpbypara" +#define OOO_STRING_SVTOOLS_RTF_SHPBYIGNORE "\\shpbyignore" #define OOO_STRING_SVTOOLS_RTF_SHPFBLWTXT "\\shpfblwtxt" #define OOO_STRING_SVTOOLS_RTF_SHPFHDR "\\shpfhdr" #define OOO_STRING_SVTOOLS_RTF_SHPGRP "\\shpgrp" +#define OOO_STRING_SVTOOLS_RTF_SHPINST "\\shpinst" #define OOO_STRING_SVTOOLS_RTF_SHPLEFT "\\shpleft" #define OOO_STRING_SVTOOLS_RTF_SHPLID "\\shplid" #define OOO_STRING_SVTOOLS_RTF_SHPLOCKANCHOR "\\shplockanchor" @@ -993,6 +997,7 @@ #define OOO_STRING_SVTOOLS_RTF_SHPWRK "\\shpwrk" #define OOO_STRING_SVTOOLS_RTF_SHPWR "\\shpwr" #define OOO_STRING_SVTOOLS_RTF_SHPZ "\\shpz" +#define OOO_STRING_SVTOOLS_RTF_SP "\\sp" #define OOO_STRING_SVTOOLS_RTF_SPRSBSP "\\sprsbsp" #define OOO_STRING_SVTOOLS_RTF_SPRSLNSP "\\sprslnsp" #define OOO_STRING_SVTOOLS_RTF_SPRSTSM "\\sprstsm" @@ -1138,4 +1143,11 @@ #define OOO_STRING_SVTOOLS_RTF_OLHWAVE "\\olhwave" #define OOO_STRING_SVTOOLS_RTF_OLOLDBWAVE "\\ololdbwave" +// Support for nested tables +#define OOO_STRING_SVTOOLS_RTF_ITAP "\\itap" +#define OOO_STRING_SVTOOLS_RTF_NESTCELL "\\nestcell" +#define OOO_STRING_SVTOOLS_RTF_NESTTABLEPROPRS "\\nesttableprops" +#define OOO_STRING_SVTOOLS_RTF_NESTROW "\\nestrow" +#define OOO_STRING_SVTOOLS_RTF_NONESTTABLES "\\nonesttables" + #endif // _RTFKEYWD_HXX -- cgit From c240e18cddbef2bc3eda6210e02b9dc274b59728 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Wed, 4 Aug 2010 16:32:43 +0200 Subject: gnumake2: added static ooopathutils lib --- tools/Module_tools.mk | 3 +-- tools/StaticLibrary_ooopathutils.mk | 51 +++++++++++++++++++++++++++++++++++++ tools/source/misc/pathutils.cxx | 1 - 3 files changed, 52 insertions(+), 3 deletions(-) create mode 100755 tools/StaticLibrary_ooopathutils.mk diff --git a/tools/Module_tools.mk b/tools/Module_tools.mk index 447aba59cb50..bba1d8240cdf 100644 --- a/tools/Module_tools.mk +++ b/tools/Module_tools.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Module_add_targets,tools,\ Executable_sspretty \ Library_tl \ Package_inc \ + StaticLibrary_ooopathutils \ )) # TODO: @@ -45,8 +46,6 @@ $(eval $(call gb_Module_add_targets,tools,\ #COPY tools/unxlngx6.pro/lib/libbtstrp.a unxlngx6.pro/lib/libbtstrp.a #COPY tools/unxlngx6.pro/lib/libstdstrm.a unxlngx6.pro/lib/libstdstrm.a #COPY tools/unxlngx6.pro/lib/stdstrm.lib unxlngx6.pro/lib/stdstrm.lib -#COPY tools/unxlngx6.pro/obj/pathutils.obj unxlngx6.pro/lib/pathutils-obj.obj -#COPY tools/unxlngx6.pro/slo/pathutils.obj unxlngx6.pro/lib/pathutils-slo.obj #todo: link tools dynamically everywhere #todo: ALWAYSDBGFLAG etc. diff --git a/tools/StaticLibrary_ooopathutils.mk b/tools/StaticLibrary_ooopathutils.mk new file mode 100755 index 000000000000..914b478345d7 --- /dev/null +++ b/tools/StaticLibrary_ooopathutils.mk @@ -0,0 +1,51 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_StaticLibrary_StaticLibrary,ooopathutils)) + +$(eval $(call gb_StaticLibrary_add_package_headers,ooopathutils,tools_inc)) + +$(eval $(call gb_StaticLibrary_add_exception_objects,ooopathutils,\ + tools/source/misc/pathutils \ +)) + + +# HACK for now +define StaticLibrary_ooopathutils_hack +$(call gb_StaticLibrary_get_target,ooopathutils) : $(OUTDIR)/lib/$(1) + +$(OUTDIR)/lib/$(1) : $(call gb_CxxObject_get_target,tools/source/misc/pathutils) + cp -f $$< $$@ + +endef + +ifeq ($(OS),WNT) +$(eval $(call StaticLibrary_ooopathutils_hack,pathutils-obj.obj)) +else +$(eval $(call StaticLibrary_ooopathutils_hack,pathutils-obj.o)) +endif +# vim: set noet sw=4 ts=4: diff --git a/tools/source/misc/pathutils.cxx b/tools/source/misc/pathutils.cxx index 397bade136e7..4685f96ca187 100644 --- a/tools/source/misc/pathutils.cxx +++ b/tools/source/misc/pathutils.cxx @@ -25,7 +25,6 @@ * ************************************************************************/ -#include "precompiled_tools.hxx" #include "sal/config.h" #if defined WNT -- cgit From 841c2c37e5186b2de0b075a03528f11d8b06c6a7 Mon Sep 17 00:00:00 2001 From: Mikhail Voytenko Date: Mon, 23 Aug 2010 19:20:31 +0200 Subject: mib19: #163018# allow to intercept the messages to the system child windows --- vcl/inc/vcl/salframe.hxx | 1 - vcl/inc/vcl/salobj.hxx | 2 ++ vcl/inc/vcl/window.h | 3 ++- vcl/inc/vcl/window.hxx | 3 +++ vcl/source/window/window.cxx | 7 ++++++ vcl/win/inc/saldata.hxx | 1 + vcl/win/inc/salobj.h | 2 ++ vcl/win/source/app/salinst.cxx | 15 ++++++++---- vcl/win/source/gdi/salprn.cxx | 15 ++++++++---- vcl/win/source/window/salobj.cxx | 50 ++++++++++++++++++++++++++++++++++++++++ 10 files changed, 89 insertions(+), 10 deletions(-) diff --git a/vcl/inc/vcl/salframe.hxx b/vcl/inc/vcl/salframe.hxx index 08548d7dda40..d82a2099f315 100644 --- a/vcl/inc/vcl/salframe.hxx +++ b/vcl/inc/vcl/salframe.hxx @@ -270,7 +270,6 @@ public: // done setting up the clipregion virtual void EndSetClipRegion() = 0; - // Callbacks (indepent part in vcl/source/window/winproc.cxx) // for default message handling return 0 void SetCallback( Window* pWindow, SALFRAMEPROC pProc ) diff --git a/vcl/inc/vcl/salobj.hxx b/vcl/inc/vcl/salobj.hxx index e453bf5c6f87..adf0e0a3d45d 100644 --- a/vcl/inc/vcl/salobj.hxx +++ b/vcl/inc/vcl/salobj.hxx @@ -73,6 +73,8 @@ public: virtual const SystemEnvData* GetSystemData() const = 0; + virtual void InterceptChildWindowKeyDown( sal_Bool bIntercept ) = 0; + void SetCallback( void* pInst, SALOBJECTPROC pProc ) { m_pInst = pInst; m_pCallback = pProc; } long CallCallback( USHORT nEvent, const void* pEvent ) diff --git a/vcl/inc/vcl/window.h b/vcl/inc/vcl/window.h index 691c3ed18421..c12dcd618d92 100644 --- a/vcl/inc/vcl/window.h +++ b/vcl/inc/vcl/window.h @@ -355,7 +355,8 @@ public: mbDisableAccessibleLabelForRelation:1, mbDisableAccessibleLabeledByRelation:1, mbHelpTextDynamic:1, - mbFakeFocusSet:1; + mbFakeFocusSet:1, + mbInterceptChildWindowKeyDown:1; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxDNDListenerContainer; }; diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx index 8264767e59ad..a7628da0b408 100644 --- a/vcl/inc/vcl/window.hxx +++ b/vcl/inc/vcl/window.hxx @@ -1101,6 +1101,9 @@ public: */ void doLazyDelete(); + // let the window intercept the KeyDown messages of the system children + void InterceptChildWindowKeyDown( sal_Bool bIntercept ); + virtual XubString GetSurroundingText() const; virtual Selection GetSurroundingTextSelection() const; }; diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index adedbde4c0f2..370669d6969b 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -4791,6 +4791,13 @@ void Window::doLazyDelete() vcl::LazyDeletor::Delete( this ); } +// ----------------------------------------------------------------------- +void Window::InterceptChildWindowKeyDown( sal_Bool bIntercept ) +{ + if( mpWindowImpl->mpSysObj ) + mpWindowImpl->mpSysObj->InterceptChildWindowKeyDown( bIntercept ); +} + // ----------------------------------------------------------------------- void Window::MouseMove( const MouseEvent& rMEvt ) diff --git a/vcl/win/inc/saldata.hxx b/vcl/win/inc/saldata.hxx index ec67272ed07f..f95f1e0ca96b 100644 --- a/vcl/win/inc/saldata.hxx +++ b/vcl/win/inc/saldata.hxx @@ -213,6 +213,7 @@ void ImplSalYieldMutexAcquire(); void ImplSalYieldMutexRelease(); ULONG ImplSalReleaseYieldMutex(); void ImplSalAcquireYieldMutex( ULONG nCount ); +sal_Bool ImplInterceptChildWindowKeyDown( MSG& rMsg ); // \\WIN\SOURCE\WINDOW\SALFRAME.CXX LRESULT CALLBACK SalFrameWndProcA( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam ); diff --git a/vcl/win/inc/salobj.h b/vcl/win/inc/salobj.h index 11ae96931321..ae7ea5271800 100644 --- a/vcl/win/inc/salobj.h +++ b/vcl/win/inc/salobj.h @@ -46,6 +46,7 @@ public: RGNDATA* mpStdClipRgnData; // Cache Standard-ClipRegion-Data RECT* mpNextClipRect; // Naechstes ClipRegion-Rect BOOL mbFirstClipRect; // Flag for first cliprect to insert + sal_Bool mbInterceptChildWindowKeyDown; // Intercept the KeyDown event sent to system child window WinSalObject* mpNextObject; // pointer to next object @@ -64,6 +65,7 @@ public: virtual void SetBackground(); virtual void SetBackground( SalColor nSalColor ); virtual const SystemEnvData* GetSystemData() const; + virtual void InterceptChildWindowKeyDown( sal_Bool bIntercept ); }; #endif // _SV_SALOBJ_H diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx index 97dbb5285cca..9514bc9a2ace 100644 --- a/vcl/win/source/app/salinst.cxx +++ b/vcl/win/source/app/salinst.cxx @@ -721,8 +721,12 @@ void ImplSalYield( BOOL bWait, BOOL bHandleAllCurrentEvents ) { if ( ImplPeekMessage( &aMsg, 0, 0, 0, PM_REMOVE ) ) { - TranslateMessage( &aMsg ); - ImplSalDispatchMessage( &aMsg ); + if ( !ImplInterceptChildWindowKeyDown( aMsg ) ) + { + TranslateMessage( &aMsg ); + ImplSalDispatchMessage( &aMsg ); + } + bOneEvent = bWasMsg = true; } else @@ -733,8 +737,11 @@ void ImplSalYield( BOOL bWait, BOOL bHandleAllCurrentEvents ) { if ( ImplGetMessage( &aMsg, 0, 0, 0 ) ) { - TranslateMessage( &aMsg ); - ImplSalDispatchMessage( &aMsg ); + if ( !ImplInterceptChildWindowKeyDown( aMsg ) ) + { + TranslateMessage( &aMsg ); + ImplSalDispatchMessage( &aMsg ); + } } } } diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx index 9d8d41723f64..702ff639ed84 100644 --- a/vcl/win/source/gdi/salprn.cxx +++ b/vcl/win/source/gdi/salprn.cxx @@ -1798,8 +1798,11 @@ WIN_BOOL CALLBACK SalPrintAbortProc( HDC hPrnDC, int /* nError */ ) MSG aMsg; if ( ImplPeekMessage( &aMsg, 0, 0, 0, PM_REMOVE ) ) { - TranslateMessage( &aMsg ); - ImplDispatchMessage( &aMsg ); + if ( !ImplInterceptChildWindowKeyDown( aMsg ) ) + { + TranslateMessage( &aMsg ); + ImplDispatchMessage( &aMsg ); + } i++; if ( i > 15 ) bWhile = FALSE; @@ -2060,8 +2063,12 @@ BOOL WinSalPrinter::StartJob( const XubString* pFileName, MSG aMsg; if ( ImplPeekMessage( &aMsg, 0, 0, 0, PM_REMOVE ) ) { - TranslateMessage( &aMsg ); - ImplDispatchMessage( &aMsg ); + if ( !ImplInterceptChildWindowKeyDown( aMsg ) ) + { + TranslateMessage( &aMsg ); + ImplDispatchMessage( &aMsg ); + } + i++; if ( i > 15 ) bWhile = FALSE; diff --git a/vcl/win/source/window/salobj.cxx b/vcl/win/source/window/salobj.cxx index 2f657968284f..6d00242ef313 100644 --- a/vcl/win/source/window/salobj.cxx +++ b/vcl/win/source/window/salobj.cxx @@ -39,6 +39,7 @@ #include #include #include +#include // ======================================================================= @@ -101,6 +102,46 @@ WinSalFrame* ImplFindSalObjectFrame( HWND hWnd ) return pFrame; } +// ----------------------------------------------------------------------- + +sal_Bool ImplInterceptChildWindowKeyDown( MSG& rMsg ) +{ + sal_Bool bResult = sal_False; + if ( rMsg.message == WM_KEYDOWN ) + { + wchar_t pClassName[10]; + sal_Int32 nLen = GetClassNameW( rMsg.hwnd, pClassName, 10 ); + if ( !( nLen == 9 && wcsncmp( pClassName, SAL_OBJECT_CLASSNAMEW, nLen ) == 0 ) ) + { + // look for the first SalObject in the parent hierarchy + HWND hWin = rMsg.hwnd; + HWND hLastOLEWindow = hWin; + WinSalObject* pSalObj = NULL; + do + { + hLastOLEWindow = hWin; + hWin = ::GetParent( hWin ); + if ( hWin ) + { + nLen = GetClassNameW( hWin, pClassName, 10 ); + if ( nLen == 9 && wcsncmp( pClassName, SAL_OBJECT_CLASSNAMEW, nLen ) == 0 ) + pSalObj = GetSalObjWindowPtr( hWin ); + } + } while( hWin && !pSalObj ); + + if ( pSalObj && pSalObj->mbInterceptChildWindowKeyDown && pSalObj->maSysData.hWnd ) + { + bResult = ( 1 == ImplSendMessage( pSalObj->maSysData.hWnd, rMsg.message, rMsg.wParam, rMsg.lParam ) ); + } + } + } + + return bResult; +} + +// ----------------------------------------------------------------------- + + // ----------------------------------------------------------------------- LRESULT CALLBACK SalSysMsgProc( int nCode, WPARAM wParam, LPARAM lParam ) @@ -623,6 +664,7 @@ WinSalObject::WinSalObject() mhLastFocusWnd = 0; maSysData.nSize = sizeof( SystemEnvData ); mpStdClipRgnData = NULL; + mbInterceptChildWindowKeyDown = sal_False; // Insert object in objectlist mpNextObject = pSalData->mpFirstObject; @@ -836,3 +878,11 @@ const SystemEnvData* WinSalObject::GetSystemData() const { return &maSysData; } + +// ----------------------------------------------------------------------- + +void WinSalObject::InterceptChildWindowKeyDown( sal_Bool bIntercept ) +{ + mbInterceptChildWindowKeyDown = bIntercept; +} + -- cgit From 123175d154c725a8238a408abce8d6491ed7df1c Mon Sep 17 00:00:00 2001 From: Mikhail Voytenko Date: Mon, 23 Aug 2010 19:27:56 +0200 Subject: mib19: #163018# adjust other platforms --- vcl/aqua/inc/salobj.h | 1 + vcl/aqua/source/window/salobj.cxx | 6 ++++++ vcl/os2/inc/salobj.h | 1 + vcl/os2/source/window/salobj.cxx | 6 ++++++ vcl/unx/inc/salobj.h | 1 + vcl/unx/source/window/salobj.cxx | 7 +++++++ 6 files changed, 22 insertions(+) diff --git a/vcl/aqua/inc/salobj.h b/vcl/aqua/inc/salobj.h index 0041b22c16a0..56b07cea4262 100644 --- a/vcl/aqua/inc/salobj.h +++ b/vcl/aqua/inc/salobj.h @@ -81,6 +81,7 @@ public: virtual void SetBackground(); virtual void SetBackground( SalColor nSalColor ); virtual const SystemEnvData* GetSystemData() const; + virtual void InterceptChildWindowKeyDown( sal_Bool bIntercept ); }; #endif // _SV_SALOBJ_H diff --git a/vcl/aqua/source/window/salobj.cxx b/vcl/aqua/source/window/salobj.cxx index 07d337dcc81a..f300929f04fe 100644 --- a/vcl/aqua/source/window/salobj.cxx +++ b/vcl/aqua/source/window/salobj.cxx @@ -237,3 +237,9 @@ const SystemEnvData* AquaSalObject::GetSystemData() const return &maSysData; } +// ----------------------------------------------------------------------- + +void AquaSalObject::InterceptChildWindowKeyDown( sal_Bool /*bIntercept*/ ) +{ +} + diff --git a/vcl/os2/inc/salobj.h b/vcl/os2/inc/salobj.h index 5b4ac21ccdd6..04fdef90bf67 100644 --- a/vcl/os2/inc/salobj.h +++ b/vcl/os2/inc/salobj.h @@ -64,6 +64,7 @@ public: virtual void SetBackground(); virtual void SetBackground( SalColor nSalColor ); virtual const SystemEnvData* GetSystemData() const; + virtual void InterceptChildWindowKeyDown( sal_Bool bIntercept ); }; #endif // _SV_SALOBJ_H diff --git a/vcl/os2/source/window/salobj.cxx b/vcl/os2/source/window/salobj.cxx index 85ed1a606d08..e55ce448f7d0 100644 --- a/vcl/os2/source/window/salobj.cxx +++ b/vcl/os2/source/window/salobj.cxx @@ -566,3 +566,9 @@ void Os2SalObject::SetCallback( void* pInst, SALOBJECTPROC pProc ) } #endif +// ----------------------------------------------------------------------- + +void Os2SalObject::InterceptChildWindowKeyDown( sal_Bool /*bIntercept*/ ) +{ +} + diff --git a/vcl/unx/inc/salobj.h b/vcl/unx/inc/salobj.h index fa9f1309c8ca..d7d9334f281b 100644 --- a/vcl/unx/inc/salobj.h +++ b/vcl/unx/inc/salobj.h @@ -98,6 +98,7 @@ public: virtual const SystemEnvData* GetSystemData() const; + virtual void InterceptChildWindowKeyDown( sal_Bool bIntercept ); }; #endif // _SV_SALOBJ_H diff --git a/vcl/unx/source/window/salobj.cxx b/vcl/unx/source/window/salobj.cxx index 647b95ae032c..2ff6d05c35c6 100644 --- a/vcl/unx/source/window/salobj.cxx +++ b/vcl/unx/source/window/salobj.cxx @@ -559,3 +559,10 @@ long X11SalObject::Dispatch( XEvent* pEvent ) } return 0; } + +// ----------------------------------------------------------------------- + +void X11SalObject::InterceptChildWindowKeyDown( sal_Bool /*bIntercept*/ ) +{ +} + -- cgit -- cgit From 836d3f493757d14b8cc8b449a766780ee4eb1bd0 Mon Sep 17 00:00:00 2001 From: Kai Sommerfeld Date: Tue, 24 Aug 2010 13:49:08 +0200 Subject: #i107134# - add support for https proxy server. --- ucbhelper/source/client/proxydecider.cxx | 239 ++++++++++++++++--------------- 1 file changed, 122 insertions(+), 117 deletions(-) diff --git a/ucbhelper/source/client/proxydecider.cxx b/ucbhelper/source/client/proxydecider.cxx index 8505472e1b1f..d6fc260f558b 100644 --- a/ucbhelper/source/client/proxydecider.cxx +++ b/ucbhelper/source/client/proxydecider.cxx @@ -51,13 +51,15 @@ using namespace com::sun::star; using namespace ucbhelper; -#define CONFIG_ROOT_KEY "org.openoffice.Inet/Settings" -#define PROXY_TYPE_KEY "ooInetProxyType" -#define NO_PROXY_LIST_KEY "ooInetNoProxy" -#define HTTP_PROXY_NAME_KEY "ooInetHTTPProxyName" -#define HTTP_PROXY_PORT_KEY "ooInetHTTPProxyPort" -#define FTP_PROXY_NAME_KEY "ooInetFTPProxyName" -#define FTP_PROXY_PORT_KEY "ooInetFTPProxyPort" +#define CONFIG_ROOT_KEY "org.openoffice.Inet/Settings" +#define PROXY_TYPE_KEY "ooInetProxyType" +#define NO_PROXY_LIST_KEY "ooInetNoProxy" +#define HTTP_PROXY_NAME_KEY "ooInetHTTPProxyName" +#define HTTP_PROXY_PORT_KEY "ooInetHTTPProxyPort" +#define HTTPS_PROXY_NAME_KEY "ooInetHTTPSProxyName" +#define HTTPS_PROXY_PORT_KEY "ooInetHTTPSProxyPort" +#define FTP_PROXY_NAME_KEY "ooInetFTPProxyName" +#define FTP_PROXY_PORT_KEY "ooInetFTPProxyPort" //========================================================================= namespace ucbhelper @@ -132,6 +134,7 @@ class InternetProxyDecider_Impl : { mutable osl::Mutex m_aMutex; InternetProxyServer m_aHttpProxy; + InternetProxyServer m_aHttpsProxy; InternetProxyServer m_aFtpProxy; const InternetProxyServer m_aEmptyProxy; sal_Int32 m_nProxyType; @@ -245,6 +248,63 @@ bool WildCard::Matches( const rtl::OUString& rString ) const return ( *pStr == '\0' ) && ( *pWild == '\0' ); } +//========================================================================= +bool getConfigStringValue( + const uno::Reference< container::XNameAccess > & xNameAccess, + const char * key, + rtl::OUString & value ) +{ + try + { + if ( !( xNameAccess->getByName( rtl::OUString::createFromAscii( key ) ) + >>= value ) ) + { + OSL_ENSURE( sal_False, + "InternetProxyDecider - " + "Error getting config item value!" ); + return false; + } + } + catch ( lang::WrappedTargetException const & ) + { + return false; + } + catch ( container::NoSuchElementException const & ) + { + return false; + } + return true; +} + +//========================================================================= +bool getConfigInt32Value( + const uno::Reference< container::XNameAccess > & xNameAccess, + const char * key, + sal_Int32 & value ) +{ + try + { + uno::Any aValue = xNameAccess->getByName( + rtl::OUString::createFromAscii( key ) ); + if ( aValue.hasValue() && !( aValue >>= value ) ) + { + OSL_ENSURE( sal_False, + "InternetProxyDecider - " + "Error getting config item value!" ); + return false; + } + } + catch ( lang::WrappedTargetException const & ) + { + return false; + } + catch ( container::NoSuchElementException const & ) + { + return false; + } + return true; +} + //========================================================================= //========================================================================= // @@ -291,127 +351,43 @@ InternetProxyDecider_Impl::InternetProxyDecider_Impl( if ( xNameAccess.is() ) { - try - { - if ( !( xNameAccess->getByName( - rtl::OUString::createFromAscii( - PROXY_TYPE_KEY ) ) >>= m_nProxyType ) ) - { - OSL_ENSURE( sal_False, - "InternetProxyDecider - " - "Error getting config item value!" ); - } - } - catch ( lang::WrappedTargetException const & ) - { - } - catch ( container::NoSuchElementException const & ) - { - } + // *** Proxy type *** + getConfigInt32Value( + xNameAccess, PROXY_TYPE_KEY, m_nProxyType ); + // *** No proxy list *** rtl::OUString aNoProxyList; - try - { - if ( !( xNameAccess->getByName( - rtl::OUString::createFromAscii( - NO_PROXY_LIST_KEY ) ) >>= aNoProxyList ) ) - { - OSL_ENSURE( sal_False, - "InternetProxyDecider - " - "Error getting config item value!" ); - } - } - catch ( lang::WrappedTargetException const & ) - { - } - catch ( container::NoSuchElementException const & ) - { - } - + getConfigStringValue( + xNameAccess, NO_PROXY_LIST_KEY, aNoProxyList ); setNoProxyList( aNoProxyList ); - try - { - if ( !( xNameAccess->getByName( - rtl::OUString::createFromAscii( - HTTP_PROXY_NAME_KEY ) ) - >>= m_aHttpProxy.aName ) ) - { - OSL_ENSURE( sal_False, - "InternetProxyDecider - " - "Error getting config item value!" ); - } - } - catch ( lang::WrappedTargetException const & ) - { - } - catch ( container::NoSuchElementException const & ) - { - } + // *** HTTP *** + getConfigStringValue( + xNameAccess, HTTP_PROXY_NAME_KEY, m_aHttpProxy.aName ); m_aHttpProxy.nPort = -1; - try - { - uno::Any aValue = xNameAccess->getByName( - rtl::OUString::createFromAscii( - HTTP_PROXY_PORT_KEY ) ); - if ( aValue.hasValue() && - !( aValue >>= m_aHttpProxy.nPort ) ) - { - OSL_ENSURE( sal_False, - "InternetProxyDecider - " - "Error getting config item value!" ); - } - } - catch ( lang::WrappedTargetException const & ) - { - } - catch ( container::NoSuchElementException const & ) - { - } - + getConfigInt32Value( + xNameAccess, HTTP_PROXY_PORT_KEY, m_aHttpProxy.nPort ); if ( m_aHttpProxy.nPort == -1 ) m_aHttpProxy.nPort = 80; // standard HTTP port. - try - { - if ( !( xNameAccess->getByName( - rtl::OUString::createFromAscii( - FTP_PROXY_NAME_KEY ) ) - >>= m_aFtpProxy.aName ) ) - { - OSL_ENSURE( sal_False, - "InternetProxyDecider - " - "Error getting config item value!" ); - } - } - catch ( lang::WrappedTargetException const & ) - { - } - catch ( container::NoSuchElementException const & ) - { - } + // *** HTTPS *** + getConfigStringValue( + xNameAccess, HTTPS_PROXY_NAME_KEY, m_aHttpsProxy.aName ); + + m_aHttpsProxy.nPort = -1; + getConfigInt32Value( + xNameAccess, HTTPS_PROXY_PORT_KEY, m_aHttpsProxy.nPort ); + if ( m_aHttpsProxy.nPort == -1 ) + m_aHttpsProxy.nPort = 443; // standard HTTPS port. + + // *** FTP *** + getConfigStringValue( + xNameAccess, FTP_PROXY_NAME_KEY, m_aFtpProxy.aName ); m_aFtpProxy.nPort = -1; - try - { - uno::Any aValue = xNameAccess->getByName( - rtl::OUString::createFromAscii( - FTP_PROXY_PORT_KEY ) ); - if ( aValue.hasValue() && - !( aValue >>= m_aFtpProxy.nPort ) ) - { - OSL_ENSURE( sal_False, - "InternetProxyDecider - " - "Error getting config item value!" ); - } - } - catch ( lang::WrappedTargetException const & ) - { - } - catch ( container::NoSuchElementException const & ) - { - } + getConfigInt32Value( + xNameAccess, FTP_PROXY_PORT_KEY, m_aFtpProxy.nPort ); } // Register as listener for config changes. @@ -588,6 +564,12 @@ const InternetProxyServer & InternetProxyDecider_Impl::getProxy( if ( m_aFtpProxy.aName.getLength() > 0 && m_aFtpProxy.nPort >= 0 ) return m_aFtpProxy; } + else if ( rProtocol.toAsciiLowerCase() + .equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "https" ) ) ) + { + if ( m_aHttpsProxy.aName.getLength() ) + return m_aHttpsProxy; + } else if ( m_aHttpProxy.aName.getLength() ) { // All other protocols use the HTTP proxy. @@ -661,6 +643,29 @@ void SAL_CALL InternetProxyDecider_Impl::changesOccurred( if ( m_aHttpProxy.nPort == -1 ) m_aHttpProxy.nPort = 80; // standard HTTP port. } + else if ( aKey.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( + HTTPS_PROXY_NAME_KEY ) ) ) + { + if ( !( rElem.Element >>= m_aHttpsProxy.aName ) ) + { + OSL_ENSURE( sal_False, + "InternetProxyDecider - changesOccurred - " + "Error getting config item value!" ); + } + } + else if ( aKey.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( + HTTPS_PROXY_PORT_KEY ) ) ) + { + if ( !( rElem.Element >>= m_aHttpsProxy.nPort ) ) + { + OSL_ENSURE( sal_False, + "InternetProxyDecider - changesOccurred - " + "Error getting config item value!" ); + } + + if ( m_aHttpsProxy.nPort == -1 ) + m_aHttpsProxy.nPort = 443; // standard HTTPS port. + } else if ( aKey.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( FTP_PROXY_NAME_KEY ) ) ) { -- cgit From 96315579c14ca9f80a03b59bf277b19378c237aa Mon Sep 17 00:00:00 2001 From: Kai Sommerfeld Date: Fri, 27 Aug 2010 13:46:58 +0200 Subject: whitespace cleanup. --- svtools/source/control/inettbc.cxx | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) mode change 100644 => 100755 svtools/source/control/inettbc.cxx diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx old mode 100644 new mode 100755 index 02a578629039..3a78eb7da95d --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -41,10 +41,7 @@ #include #include #include - -#ifndef _COM_SUN_STAR_TASK_XINTERACTIONHANDLER_HDL_ -#include -#endif +#include #include #include #include @@ -426,7 +423,7 @@ void SvtMatchContext_Impl::ReadFolder( const String& rURL, uno::Reference< XDynamicResultSet > xDynResultSet; ResultSetInclude eInclude = INCLUDE_FOLDERS_AND_DOCUMENTS; if ( bOnlyDirectories ) - eInclude = INCLUDE_FOLDERS_ONLY; + eInclude = INCLUDE_FOLDERS_ONLY; xDynResultSet = aCnt.createDynamicCursor( aProps, eInclude ); @@ -654,7 +651,7 @@ void SvtMatchContext_Impl::run() { // if text input is a directory, it must be part of the match list! Until then it is scanned if ( UCBContentHelper::IsFolder( aMainURL ) && aURLObject.hasFinalSlash() ) - Insert( aText, aMatch ); + Insert( aText, aMatch ); else // otherwise the parent folder will be taken aURLObject.removeSegment(); @@ -1314,7 +1311,7 @@ sal_Bool SvtURLBox_Impl::TildeParsing( return sal_False; // no such user #else pPasswd = getpwnam( OUStringToOString( OUString( aUserName ), RTL_TEXTENCODING_ASCII_US ).getStr() ); - if( pPasswd ) + if( pPasswd ) aParseTilde = String::CreateFromAscii( pPasswd->pw_dir ); else return sal_False; // no such user -- cgit From a5dde485a2387fa6de8a75855efc741b478c44e4 Mon Sep 17 00:00:00 2001 From: Kai Sommerfeld Date: Fri, 27 Aug 2010 15:29:33 +0200 Subject: #i114146# - auto completion must match url schemes case insensitive. --- svtools/source/control/inettbc.cxx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index 3a78eb7da95d..d5bbb94e2103 100755 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -162,7 +162,7 @@ SvtMatchContext_Impl::SvtMatchContext_Impl( SvtURLBox* pBoxP, const String& rText ) : aLink( STATIC_LINK( this, SvtMatchContext_Impl, Select_Impl ) ) , aBaseURL( pBoxP->aBaseURL ) - , aText( rText ) + , aText( rText ) , pBox( pBoxP ) , bStop( FALSE ) , bOnlyDirectories( pBoxP->bOnlyDirectories ) @@ -681,6 +681,7 @@ void SvtMatchContext_Impl::run() aCurObj.SetURL( *aPickList.GetObject( nPos ) ); aCurObj.SetSmartURL( aCurObj.GetURLNoPass()); aCurMainURL = aCurObj.GetMainURL( INetURLObject::NO_DECODE ); + if( eProt != INET_PROT_NOT_VALID && aCurObj.GetProtocol() != eProt ) continue; @@ -705,7 +706,7 @@ void SvtMatchContext_Impl::run() { // try if text matches the scheme String aScheme( INetURLObject::GetScheme( aCurObj.GetProtocol() ) ); - if ( aText.CompareTo( aScheme, aText.Len() ) == COMPARE_EQUAL && aText.Len() < aScheme.Len() ) + if ( aText.CompareIgnoreCaseToAscii( aScheme, aText.Len() ) == COMPARE_EQUAL && aText.Len() < aScheme.Len() ) { if( bFull ) aMatch = aCurObj.GetMainURL( INetURLObject::NO_DECODE ); @@ -724,7 +725,7 @@ void SvtMatchContext_Impl::run() aCurString.Erase( 0, aScheme.Len() ); } - if( aText.CompareTo( aCurString, aText.Len() )== COMPARE_EQUAL ) + if( aText.CompareIgnoreCaseToAscii( aCurString, aText.Len() )== COMPARE_EQUAL ) { if( bFull ) aMatch = aCurObj.GetMainURL( INetURLObject::NO_DECODE ); -- cgit From d1f21e02385cc8c6de03ec4cf51d1354d97d120d Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Fri, 27 Aug 2010 17:02:19 +0200 Subject: dba34a: #i112876# fixed warnings (thanks to CMC) --- comphelper/inc/comphelper/property.hxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/comphelper/inc/comphelper/property.hxx b/comphelper/inc/comphelper/property.hxx index 5631cf5670f2..9b5b1a9804fe 100644 --- a/comphelper/inc/comphelper/property.hxx +++ b/comphelper/inc/comphelper/property.hxx @@ -150,11 +150,11 @@ COMPHELPER_DLLPUBLIC void copyProperties(const staruno::Reference -sal_Bool tryPropertyValue(staruno::Any& /*out*/_rConvertedValue, staruno::Any& /*out*/_rOldValue, const staruno::Any& _rValueToSet, const TYPE& _rCurrentValue) +template +sal_Bool tryPropertyValue(staruno::Any& /*out*/_rConvertedValue, staruno::Any& /*out*/_rOldValue, const staruno::Any& _rValueToSet, const T& _rCurrentValue) { sal_Bool bModified(sal_False); - TYPE aNewValue; + T aNewValue = T(); ::cppu::convertPropertyValue(aNewValue, _rValueToSet); if (aNewValue != _rCurrentValue) { @@ -207,7 +207,7 @@ sal_Bool tryPropertyValueEnum(staruno::Any& /*out*/_rConvertedValue, staruno::An inline sal_Bool tryPropertyValue(staruno::Any& /*out*/_rConvertedValue, staruno::Any& /*out*/_rOldValue, const staruno::Any& _rValueToSet, sal_Bool _bCurrentValue) { sal_Bool bModified(sal_False); - sal_Bool bNewValue; + sal_Bool bNewValue(sal_False); ::cppu::convertPropertyValue(bNewValue, _rValueToSet); if (bNewValue != _bCurrentValue) { -- cgit From d8c1d48900e68ab5290e28dbc26b3628f274188e Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Fri, 27 Aug 2010 17:06:19 +0200 Subject: dba34a: #i113551# fixed documentation (thanks to simonaw) --- comphelper/inc/comphelper/servicedecl.hxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/comphelper/inc/comphelper/servicedecl.hxx b/comphelper/inc/comphelper/servicedecl.hxx index 5d11d41831f5..ab45261885c5 100644 --- a/comphelper/inc/comphelper/servicedecl.hxx +++ b/comphelper/inc/comphelper/servicedecl.hxx @@ -67,7 +67,7 @@ typedef ::boost::function3< The declaration can be done in various ways, the (simplest) form is 
    -    class MyClass : cppu::WeakImplHelper2 {
+    class MyClass : public cppu::WeakImplHelper2 {
     public:
         MyClass( uno::Reference const& xContext )
         [...]
@@ -85,7 +85,7 @@ typedef ::boost::function3<
     context:
 
     
    -    class MyClass : cppu::WeakImplHelper2 {
+    class MyClass : public cppu::WeakImplHelper2 {
     public:
         MyClass( uno::Sequence const& args,
                  uno::Reference const& xContext )
-- 
cgit 


From 23be3a441f7db8495e6cbb64412a066d3fd63ce2 Mon Sep 17 00:00:00 2001
From: "Daniel Rentz [dr]" 
Date: Mon, 30 Aug 2010 14:34:00 +0200
Subject: mib19: #163429# switch off form design mode in new documents created
 with VBA symbol Workbooks.Add

---
 comphelper/inc/comphelper/mediadescriptor.hxx | 26 +++++++++----------
 comphelper/source/misc/mediadescriptor.cxx    | 36 ++++++++++++++++-----------
 2 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/comphelper/inc/comphelper/mediadescriptor.hxx b/comphelper/inc/comphelper/mediadescriptor.hxx
index 7d2333045390..e3d690091327 100644
--- a/comphelper/inc/comphelper/mediadescriptor.hxx
+++ b/comphelper/inc/comphelper/mediadescriptor.hxx
@@ -127,10 +127,6 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap
     //-------------------------------------------
     // interface
     public:
-        /** Value type of the 'ComponentData' property.
-         */
-        typedef ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > ComponentDataSequence;
-
         //---------------------------------------
         /** @short  these ctors do nothing - excepting that they forward
                     the given parameters to the base class ctors.
@@ -204,8 +200,9 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap
         /** Returns a value from the sequence contained in the property
             'ComponentData' of this media descriptor.
 
-            @descr  The property 'ComponentData' should be empty or should
-                contain a value of type ComponentDataSequence (see above).
+            @descr  The property 'ComponentData' should be empty, or should
+                contain a value of type sequence
+                or sequence.
 
             @return  The value with the specified name, if existing in the
                 sequence of the 'ComponentData' property, otherwise an empty
@@ -218,10 +215,11 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap
         /** Inserts a value into the sequence contained in the property
             'ComponentData' of the media descriptor.
 
-            @descr  The property 'ComponentData' should be empty or should
-                contain a value of type ComponentDataSequence (see above). The
-                passed value will be inserted into the sequence, or, if already
-                existing, will be overwritten.
+            @descr  The property 'ComponentData' should be empty, or should
+                contain a value of type sequence
+                or sequence. The passed value
+                will be inserted into the sequence, or, if already existing,
+                will be overwritten.
 
             @param rName  The name of the value to be inserted into the
                 sequence of the 'ComponentData' property.
@@ -237,10 +235,10 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap
         /** Removes a value from the sequence contained in the property
             'ComponentData' of the media descriptor.
 
-            @descr  The property 'ComponentData' should be empty or should
-                contain a value of type ComponentDataSequence (see above). The
-                value with the passed name will be removed from the sequence,
-                if existing.
+            @descr  The property 'ComponentData' should be empty, or should
+                contain a value of type sequence
+                or sequence. The value with
+                the passed name will be removed from the sequence, if existing.
 
             @param rName  The name of the value to be removed from the sequence
                 of the 'ComponentData' property.
diff --git a/comphelper/source/misc/mediadescriptor.cxx b/comphelper/source/misc/mediadescriptor.cxx
index 9e02afe8c56c..468e1e153bff 100644
--- a/comphelper/source/misc/mediadescriptor.cxx
+++ b/comphelper/source/misc/mediadescriptor.cxx
@@ -28,6 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_comphelper.hxx"
 #include 
+#include 
 #include 
 
 #include 
@@ -477,27 +478,30 @@ sal_Bool MediaDescriptor::isStreamReadOnly() const
 
 css::uno::Any MediaDescriptor::getComponentDataEntry( const ::rtl::OUString& rName ) const
 {
-    SequenceAsHashMap aCompDataMap( getUnpackedValueOrDefault( PROP_COMPONENTDATA(), ComponentDataSequence() ) );
-    SequenceAsHashMap::iterator aIt = aCompDataMap.find( rName );
-    return (aIt == aCompDataMap.end()) ? css::uno::Any() : aIt->second;
+    css::uno::Any aEntry;
+    SequenceAsHashMap::const_iterator aPropertyIter = find( PROP_COMPONENTDATA() );
+    if( aPropertyIter != end() )
+        return NamedValueCollection( aPropertyIter->second ).get( rName );
+    return css::uno::Any();
 }
 
 void MediaDescriptor::setComponentDataEntry( const ::rtl::OUString& rName, const css::uno::Any& rValue )
 {
     if( rValue.hasValue() )
     {
-        // get or craete the 'ComponentData' property entry
+        // get or create the 'ComponentData' property entry
         css::uno::Any& rCompDataAny = operator[]( PROP_COMPONENTDATA() );
-        // check type, insert the value
-        OSL_ENSURE( !rCompDataAny.hasValue() || rCompDataAny.has< ComponentDataSequence >(),
-            "MediaDescriptor::setComponentDataEntry - incompatible 'ComponentData' property in media descriptor" );
-        if( !rCompDataAny.hasValue() || rCompDataAny.has< ComponentDataSequence >() )
+        // insert the value (retain sequence type, create NamedValue elements by default)
+        bool bHasNamedValues = !rCompDataAny.hasValue() || rCompDataAny.has< css::uno::Sequence< css::beans::NamedValue > >();
+        bool bHasPropValues = rCompDataAny.has< css::uno::Sequence< css::beans::PropertyValue > >();
+        OSL_ENSURE( bHasNamedValues || bHasPropValues, "MediaDescriptor::setComponentDataEntry - incompatible 'ComponentData' property in media descriptor" );
+        if( bHasNamedValues || bHasPropValues )
         {
             // insert or overwrite the passed value
             SequenceAsHashMap aCompDataMap( rCompDataAny );
             aCompDataMap[ rName ] = rValue;
-            // write back the sequence (sal_False = use NamedValue instead of PropertyValue)
-            rCompDataAny = aCompDataMap.getAsConstAny( sal_False );
+            // write back the sequence (restore sequence with correct element type)
+            rCompDataAny = aCompDataMap.getAsConstAny( bHasPropValues );
         }
     }
     else
@@ -512,18 +516,20 @@ void MediaDescriptor::clearComponentDataEntry( const ::rtl::OUString& rName )
     SequenceAsHashMap::iterator aPropertyIter = find( PROP_COMPONENTDATA() );
     if( aPropertyIter != end() )
     {
-        OSL_ENSURE( aPropertyIter->second.has< ComponentDataSequence >(),
-            "MediaDescriptor::clearComponentDataEntry - incompatible 'ComponentData' property in media descriptor" );
-        if( aPropertyIter->second.has< ComponentDataSequence >() )
+        css::uno::Any& rCompDataAny = aPropertyIter->second;
+        bool bHasNamedValues = rCompDataAny.has< css::uno::Sequence< css::beans::NamedValue > >();
+        bool bHasPropValues = rCompDataAny.has< css::uno::Sequence< css::beans::PropertyValue > >();
+        OSL_ENSURE( bHasNamedValues || bHasPropValues, "MediaDescriptor::clearComponentDataEntry - incompatible 'ComponentData' property in media descriptor" );
+        if( bHasNamedValues || bHasPropValues )
         {
             // remove the value with the passed name
-            SequenceAsHashMap aCompDataMap( aPropertyIter->second );
+            SequenceAsHashMap aCompDataMap( rCompDataAny );
             aCompDataMap.erase( rName );
             // write back the sequence, or remove it completely if it is empty
             if( aCompDataMap.empty() )
                 erase( aPropertyIter );
             else
-                aPropertyIter->second = aCompDataMap.getAsConstAny( sal_False );
+                rCompDataAny = aCompDataMap.getAsConstAny( bHasPropValues );
         }
     }
 }
-- 
cgit 


From 7892835026e31c1745e77b9b3834df1a7ad0fc07 Mon Sep 17 00:00:00 2001
From: "Philipp Lohmann [pl]" 
Date: Mon, 30 Aug 2010 17:59:59 +0200
Subject: vcl115: #163153# we need to release the clipboard after flush and
 ignore further requests for data.

---
 vcl/aqua/source/dtrans/aqua_clipboard.cxx | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/vcl/aqua/source/dtrans/aqua_clipboard.cxx b/vcl/aqua/source/dtrans/aqua_clipboard.cxx
index 52fb13e1e11f..abffeebcb6c1 100644
--- a/vcl/aqua/source/dtrans/aqua_clipboard.cxx
+++ b/vcl/aqua/source/dtrans/aqua_clipboard.cxx
@@ -322,14 +322,17 @@ void AquaClipboard::fireLostClipboardOwnershipEvent(Reference o
 
 void AquaClipboard::provideDataForType(NSPasteboard* sender, NSString* type)
 {
-  DataProviderPtr_t dp = mpDataFlavorMapper->getDataProvider(type, mXClipboardContent);
-  NSData* pBoardData = NULL;
-
-  if (dp.get() != NULL)
-  {
-      pBoardData = (NSData*)dp->getSystemData();
-      [sender setData: pBoardData forType: type];
-  }
+    if( mXClipboardContent.is() )
+    {
+        DataProviderPtr_t dp = mpDataFlavorMapper->getDataProvider(type, mXClipboardContent);
+        NSData* pBoardData = NULL;
+
+        if (dp.get() != NULL)
+        {
+            pBoardData = (NSData*)dp->getSystemData();
+            [sender setData: pBoardData forType: type];
+        }
+    }
 }
 
 
@@ -340,20 +343,21 @@ void AquaClipboard::provideDataForType(NSPasteboard* sender, NSString* type)
 void SAL_CALL AquaClipboard::flushClipboard()
   throw(RuntimeException)
 {
-  if (mXClipboardContent.is())
+    if (mXClipboardContent.is())
     {
           Sequence flavorList = mXClipboardContent->getTransferDataFlavors();
         sal_uInt32 nFlavors = flavorList.getLength();
 
         for (sal_uInt32 i = 0; i < nFlavors; i++)
-          {
+        {
             NSString* sysType = mpDataFlavorMapper->openOfficeToSystemFlavor(flavorList[i]);
 
             if (sysType != NULL)
-              {
+            {
                 provideDataForType(mPasteboard, sysType);
-              }
-          }
+            }
+        }
+        mXClipboardContent.clear();
     }
 }
 
-- 
cgit 


From 3036c496a1f303386d9d7eebe4317ea6c7d3cf0c Mon Sep 17 00:00:00 2001
From: Daniel Rentz 
Date: Tue, 31 Aug 2010 11:29:02 +0200
Subject: mib19: missing implementations of abstract function

---
 vcl/unx/gtk/window/gtkobject.cxx      | 5 +++++
 vcl/unx/headless/svpdummies.cxx       | 1 +
 vcl/unx/headless/svpdummies.hxx       | 2 ++
 vcl/unx/inc/plugins/gtk/gtkobject.hxx | 1 +
 4 files changed, 9 insertions(+)

diff --git a/vcl/unx/gtk/window/gtkobject.cxx b/vcl/unx/gtk/window/gtkobject.cxx
index 2a2bbe78078a..c5f5a168f653 100644
--- a/vcl/unx/gtk/window/gtkobject.cxx
+++ b/vcl/unx/gtk/window/gtkobject.cxx
@@ -209,3 +209,8 @@ void GtkSalObject::signalDestroy( GtkObject* pObj, gpointer object )
         pThis->m_pSocket = NULL;
     }
 }
+
+void GtkSalObject::InterceptChildWindowKeyDown( sal_Bool /*bIntercept*/ )
+{
+}
+
diff --git a/vcl/unx/headless/svpdummies.cxx b/vcl/unx/headless/svpdummies.cxx
index 5983ff18c34f..0a67b147804a 100644
--- a/vcl/unx/headless/svpdummies.cxx
+++ b/vcl/unx/headless/svpdummies.cxx
@@ -61,6 +61,7 @@ void SvpSalObject::GrabFocus() {}
 void SvpSalObject::SetBackground() {}
 void SvpSalObject::SetBackground( SalColor ) {}
 const SystemEnvData* SvpSalObject::GetSystemData() const { return &m_aSystemChildData; }
+void SvpSalObject::InterceptChildWindowKeyDown( sal_Bool ) {}
 
 // SalI18NImeStatus
 SvpImeStatus::~SvpImeStatus() {}
diff --git a/vcl/unx/headless/svpdummies.hxx b/vcl/unx/headless/svpdummies.hxx
index febf7eef6bbe..ea7667ce51ca 100644
--- a/vcl/unx/headless/svpdummies.hxx
+++ b/vcl/unx/headless/svpdummies.hxx
@@ -58,6 +58,8 @@ public:
     virtual void                    SetBackground( SalColor nSalColor );
 
     virtual const SystemEnvData*    GetSystemData() const;
+
+    virtual void InterceptChildWindowKeyDown( sal_Bool bIntercept );
 };
 
 class SvpImeStatus : public SalI18NImeStatus
diff --git a/vcl/unx/inc/plugins/gtk/gtkobject.hxx b/vcl/unx/inc/plugins/gtk/gtkobject.hxx
index ea740249f1c6..9d3f235b8894 100644
--- a/vcl/unx/inc/plugins/gtk/gtkobject.hxx
+++ b/vcl/unx/inc/plugins/gtk/gtkobject.hxx
@@ -64,6 +64,7 @@ public:
 
     virtual const SystemEnvData*    GetSystemData() const;
 
+    virtual void InterceptChildWindowKeyDown( sal_Bool bIntercept );
 };
 
 #endif // _SV_SALOBJ_H
-- 
cgit 


From 62580204bb6ed8c8812d85fd465fe38e8e79e00e Mon Sep 17 00:00:00 2001
From: Kai Sommerfeld 
Date: Wed, 1 Sep 2010 15:23:16 +0200
Subject: Fixed typos in documantation.

---
 ucbhelper/inc/ucbhelper/simplenameclashresolverequest.hxx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ucbhelper/inc/ucbhelper/simplenameclashresolverequest.hxx b/ucbhelper/inc/ucbhelper/simplenameclashresolverequest.hxx
index 7f3da27ece7c..8ab8ead7cffb 100644
--- a/ucbhelper/inc/ucbhelper/simplenameclashresolverequest.hxx
+++ b/ucbhelper/inc/ucbhelper/simplenameclashresolverequest.hxx
@@ -37,7 +37,7 @@ namespace ucbhelper {
 /**
   * This class implements a simple name clash resolve interaction request.
   * Instances can be passed directly to XInteractionHandler::handle(...). Each
-  * instance contains an NameClashResolveRequest and two interaction
+  * instance contains a NameClashResolveRequest and two interaction
   * continuations: "Abort" and "SupplyName". Another continuation
   * ("ReplaceExistingData") may be supplied optionally.
   *
@@ -56,11 +56,11 @@ public:
       *
       * @param rTargetFolderURL contains the URL of the folder that contains
       *        the clashing resource.
-      * @param rClashingName contains the clashing name,
+      * @param rClashingName contains the clashing name.
       * @param rProposedNewName contains a proposal for the new name or is
       *        empty.
-      * @param bSupportsOverwriteData indictes whether an
-      *        InteractioneplaceExistingData continuation shall be supplied
+      * @param bSupportsOverwriteData indicates whether an
+      *        InteractionReplaceExistingData continuation shall be supplied
       *        with the interaction request.
       */
     SimpleNameClashResolveRequest( const rtl::OUString & rTargetFolderURL,
-- 
cgit 


From acbb009ba0992ec4ad4c9848c0b0ac9ee81effa4 Mon Sep 17 00:00:00 2001
From: Rene Engelhard 
Date: Thu, 2 Sep 2010 15:13:41 +0200
Subject: gnumake2: move make 3.81 check into configure

---
 svl/Makefile     | 4 ----
 svtools/Makefile | 4 ----
 toolkit/Makefile | 4 ----
 tools/Makefile   | 4 ----
 4 files changed, 16 deletions(-)

diff --git a/svl/Makefile b/svl/Makefile
index 3225bc97e12c..c19100ee9a5b 100644
--- a/svl/Makefile
+++ b/svl/Makefile
@@ -25,10 +25,6 @@
 #
 #*************************************************************************
 
-ifneq ($(MAKE_VERSION),3.81)
-$(error You need at least GNU Make 3.81!)
-endif
-
 ifeq ($(strip $(SOLARENV)),)
 $(error No environment set!)
 endif
diff --git a/svtools/Makefile b/svtools/Makefile
index 3225bc97e12c..c19100ee9a5b 100644
--- a/svtools/Makefile
+++ b/svtools/Makefile
@@ -25,10 +25,6 @@
 #
 #*************************************************************************
 
-ifneq ($(MAKE_VERSION),3.81)
-$(error You need at least GNU Make 3.81!)
-endif
-
 ifeq ($(strip $(SOLARENV)),)
 $(error No environment set!)
 endif
diff --git a/toolkit/Makefile b/toolkit/Makefile
index 3225bc97e12c..c19100ee9a5b 100644
--- a/toolkit/Makefile
+++ b/toolkit/Makefile
@@ -25,10 +25,6 @@
 #
 #*************************************************************************
 
-ifneq ($(MAKE_VERSION),3.81)
-$(error You need at least GNU Make 3.81!)
-endif
-
 ifeq ($(strip $(SOLARENV)),)
 $(error No environment set!)
 endif
diff --git a/tools/Makefile b/tools/Makefile
index 3225bc97e12c..c19100ee9a5b 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -25,10 +25,6 @@
 #
 #*************************************************************************
 
-ifneq ($(MAKE_VERSION),3.81)
-$(error You need at least GNU Make 3.81!)
-endif
-
 ifeq ($(strip $(SOLARENV)),)
 $(error No environment set!)
 endif
-- 
cgit 


From a555527edb34036835b167f0b3b7f6d515f098c4 Mon Sep 17 00:00:00 2001
From: "Philipp Lohmann [pl]" 
Date: Thu, 2 Sep 2010 18:58:54 +0200
Subject: pl08: #i114277# enhance SfxPasswordDialog

---
 vcl/inc/vcl/arrange.hxx       | 28 ++++++++++++++++++++++------
 vcl/source/window/arrange.cxx | 41 ++++++++++++++++++++++++++++-------------
 2 files changed, 50 insertions(+), 19 deletions(-)

diff --git a/vcl/inc/vcl/arrange.hxx b/vcl/inc/vcl/arrange.hxx
index eed33e379e5b..d33bac7ccd7f 100644
--- a/vcl/inc/vcl/arrange.hxx
+++ b/vcl/inc/vcl/arrange.hxx
@@ -76,11 +76,13 @@ namespace vcl
 
             Element( Window* i_pWin,
                      boost::shared_ptr const & i_pChild = boost::shared_ptr(),
-                     sal_Int32 i_nExpandPriority = 0
+                     sal_Int32 i_nExpandPriority = 0,
+                     const Size& i_rMinSize = Size()
                    )
             : m_pElement( i_pWin )
             , m_pChild( i_pChild )
             , m_nExpandPriority( i_nExpandPriority )
+            , m_aMinSize( i_rMinSize )
             , m_bHidden( false )
             , m_nLeftBorder( 0 )
             , m_nTopBorder( 0 )
@@ -183,6 +185,19 @@ namespace vcl
             }
         }
 
+        void getBorders( size_t i_nIndex, long* i_pLeft = NULL, long* i_pTop = NULL, long* i_pRight = NULL, long* i_pBottom = NULL ) const
+        {
+            const Element* pEle = getConstElement( i_nIndex );
+            if( pEle )
+            {
+                if( i_pLeft )   *i_pLeft   = pEle->m_nLeftBorder;
+                if( i_pTop )    *i_pTop    = pEle->m_nTopBorder;
+                if( i_pRight )  *i_pRight  = pEle->m_nRightBorder;
+                if( i_pBottom ) *i_pBottom = pEle->m_nBottomBorder;
+            }
+        }
+
+
         void show( bool i_bShow = true, bool i_bImmediateUpdate = true );
 
         void setManagedArea( const Rectangle& i_rArea )
@@ -234,7 +249,7 @@ namespace vcl
 
         // add a managed window at the given index
         // an index smaller than zero means add the window at the end
-        size_t addWindow( Window*, sal_Int32 i_nExpandPrio = 0, size_t i_nIndex = ~0 );
+        size_t addWindow( Window*, sal_Int32 i_nExpandPrio = 0, const Size& i_rMinSize = Size(), size_t i_nIndex = ~0 );
         void remove( Window* );
 
         size_t addChild( boost::shared_ptr const &, sal_Int32 i_nExpandPrio = 0, size_t i_nIndex = ~0 );
@@ -304,7 +319,7 @@ namespace vcl
 
         // returns the index of the added label
         size_t addRow( Window* i_pLabel, boost::shared_ptr const& i_rElement, long i_nIndent = 0 );
-        size_t addRow( Window* i_pLabel, Window* i_pElement, long i_nIndent = 0 );
+        size_t addRow( Window* i_pLabel, Window* i_pElement, long i_nIndent = 0, const Size& i_rElementMinSize = Size() );
     };
 
     class VCL_DLLPUBLIC Indenter : public WindowArranger
@@ -386,9 +401,10 @@ namespace vcl
             MatrixElement( Window* i_pWin,
                            sal_uInt32 i_nX, sal_uInt32 i_nY,
                            boost::shared_ptr const & i_pChild = boost::shared_ptr(),
-                           sal_Int32 i_nExpandPriority = 0
+                           sal_Int32 i_nExpandPriority = 0,
+                           const Size& i_rMinSize = Size()
                           )
-            : WindowArranger::Element( i_pWin, i_pChild, i_nExpandPriority )
+            : WindowArranger::Element( i_pWin, i_pChild, i_nExpandPriority, i_rMinSize )
             , m_nX( i_nX )
             , m_nY( i_nY )
             {
@@ -422,7 +438,7 @@ namespace vcl
         virtual size_t countElements() const { return m_aElements.size(); }
 
         // add a managed window at the given matrix position
-        size_t addWindow( Window*, sal_uInt32 i_nX, sal_uInt32 i_nY, sal_Int32 i_nExpandPrio = 0 );
+        size_t addWindow( Window*, sal_uInt32 i_nX, sal_uInt32 i_nY, sal_Int32 i_nExpandPrio = 0, const Size& i_rMinSize = Size() );
         void remove( Window* );
 
         size_t addChild( boost::shared_ptr const &, sal_uInt32 i_nX, sal_uInt32 i_nY, sal_Int32 i_nExpandPrio = 0 );
diff --git a/vcl/source/window/arrange.cxx b/vcl/source/window/arrange.cxx
index ea827a224f4a..bba5eeb013a3 100644
--- a/vcl/source/window/arrange.cxx
+++ b/vcl/source/window/arrange.cxx
@@ -178,16 +178,26 @@ Size WindowArranger::Element::getOptimalSize( WindowSizeType i_eType ) const
     Size aResult;
     if( ! m_bHidden )
     {
+        bool bVisible = false;
         if( m_pElement && m_pElement->IsVisible() )
+        {
             aResult = m_pElement->GetOptimalSize( i_eType );
-        else if( m_pChild )
+            bVisible = true;
+        }
+        else if( m_pChild && m_pChild->isVisible() )
+        {
             aResult = m_pChild->getOptimalSize( i_eType );
-        if( aResult.Width() < m_aMinSize.Width() )
-            aResult.Width() = m_aMinSize.Width();
-        if( aResult.Height() < m_aMinSize.Height() )
-            aResult.Height() = m_aMinSize.Height();
-        aResult.Width() += getBorderValue( m_nLeftBorder ) + getBorderValue( m_nRightBorder );
-        aResult.Height() += getBorderValue( m_nTopBorder ) + getBorderValue( m_nBottomBorder );
+            bVisible = true;
+        }
+        if( bVisible )
+        {
+            if( aResult.Width() < m_aMinSize.Width() )
+                aResult.Width() = m_aMinSize.Width();
+            if( aResult.Height() < m_aMinSize.Height() )
+                aResult.Height() = m_aMinSize.Height();
+            aResult.Width() += getBorderValue( m_nLeftBorder ) + getBorderValue( m_nRightBorder );
+            aResult.Height() += getBorderValue( m_nTopBorder ) + getBorderValue( m_nBottomBorder );
+        }
     }
 
     return aResult;
@@ -477,20 +487,20 @@ void RowOrColumn::resize()
     }
 }
 
-size_t RowOrColumn::addWindow( Window* i_pWindow, sal_Int32 i_nExpandPrio, size_t i_nIndex )
+size_t RowOrColumn::addWindow( Window* i_pWindow, sal_Int32 i_nExpandPrio, const Size& i_rMinSize, size_t i_nIndex )
 {
     size_t nIndex = i_nIndex;
     if( i_nIndex >= m_aElements.size() )
     {
         nIndex = m_aElements.size();
-        m_aElements.push_back( WindowArranger::Element( i_pWindow, boost::shared_ptr(), i_nExpandPrio ) );
+        m_aElements.push_back( WindowArranger::Element( i_pWindow, boost::shared_ptr(), i_nExpandPrio, i_rMinSize ) );
     }
     else
     {
         std::vector< WindowArranger::Element >::iterator it = m_aElements.begin();
         while( i_nIndex-- )
             ++it;
-        m_aElements.insert( it, WindowArranger::Element( i_pWindow, boost::shared_ptr(), i_nExpandPrio ) );
+        m_aElements.insert( it, WindowArranger::Element( i_pWindow, boost::shared_ptr(), i_nExpandPrio, i_rMinSize ) );
     }
     return nIndex;
 }
@@ -664,6 +674,9 @@ long LabelColumn::getLabelWidth() const
                 if( pLW )
                 {
                     Size aLabSize( pLW->GetOptimalSize( WINDOWSIZE_MINIMUM ) );
+                    long nLB = 0;
+                    pLabel->getBorders(0, &nLB);
+                    aLabSize.Width() += getBorderValue( nLB );
                     if( aLabSize.Width() > nWidth )
                         nWidth = aLabSize.Width();
                 }
@@ -754,12 +767,13 @@ size_t LabelColumn::addRow( Window* i_pLabel, boost::shared_ptr
     return nIndex;
 }
 
-size_t LabelColumn::addRow( Window* i_pLabel, Window* i_pElement, long i_nIndent )
+size_t LabelColumn::addRow( Window* i_pLabel, Window* i_pElement, long i_nIndent, const Size& i_rElementMinSize )
 {
     boost::shared_ptr< LabeledElement > xLabel( new LabeledElement( this, 1 ) );
     xLabel->setLabel( i_pLabel );
     xLabel->setBorders( 0, i_nIndent, 0, 0, 0 );
     xLabel->setElement( i_pElement );
+    xLabel->setMinimumSize( 1, i_rElementMinSize );
     size_t nIndex = addChild( xLabel );
     resize();
     return nIndex;
@@ -918,7 +932,7 @@ void MatrixArranger::resize()
     }
 }
 
-size_t MatrixArranger::addWindow( Window* i_pWindow, sal_uInt32 i_nX, sal_uInt32 i_nY, sal_Int32 i_nExpandPrio )
+size_t MatrixArranger::addWindow( Window* i_pWindow, sal_uInt32 i_nX, sal_uInt32 i_nY, sal_Int32 i_nExpandPrio, const Size& i_rMinSize )
 {
     sal_uInt64 nMapValue = getMap( i_nX, i_nY );
     std::map< sal_uInt64, size_t >::const_iterator it = m_aMatrixMap.find( nMapValue );
@@ -926,7 +940,7 @@ size_t MatrixArranger::addWindow( Window* i_pWindow, sal_uInt32 i_nX, sal_uInt32
     if( it == m_aMatrixMap.end() )
     {
         m_aMatrixMap[ nMapValue ] = nIndex = m_aElements.size();
-        m_aElements.push_back( MatrixElement( i_pWindow, i_nX, i_nY, boost::shared_ptr(), i_nExpandPrio ) );
+        m_aElements.push_back( MatrixElement( i_pWindow, i_nX, i_nY, boost::shared_ptr(), i_nExpandPrio, i_rMinSize ) );
     }
     else
     {
@@ -934,6 +948,7 @@ size_t MatrixArranger::addWindow( Window* i_pWindow, sal_uInt32 i_nX, sal_uInt32
         rEle.m_pElement = i_pWindow;
         rEle.m_pChild.reset();
         rEle.m_nExpandPriority = i_nExpandPrio;
+        rEle.m_aMinSize = i_rMinSize;
         rEle.m_nX = i_nX;
         rEle.m_nY = i_nY;
         nIndex = it->second;
-- 
cgit 


From cda727307f4b2c4d31c0d9a013e9501327faaae5 Mon Sep 17 00:00:00 2001
From: "Frank Schoenheit [fs]" 
Date: Fri, 3 Sep 2010 17:53:47 +0200
Subject: dba34a: removed SvLBox'es (and friends) Set/GetWindowBits. They were
 used in parallel to Window's Set/GetStyle, with WB_* values which overlapped
 with existing (generic) WB_* bits. Since this overlapping has been removed,
 there's no need to have both Style and WindowBits at those classes. Should
 remove some source of confusion and error (and, well, perhaps introduce some
 new errors :) ).

---
 svtools/inc/svtools/svicnvw.hxx        |  3 +--
 svtools/inc/svtools/svlbox.hxx         |  1 -
 svtools/inc/svtools/svtreebx.hxx       | 12 +++-------
 svtools/source/contnr/svicnvw.cxx      | 10 ++++----
 svtools/source/contnr/svimpbox.cxx     | 44 ++++++++++++++++++----------------
 svtools/source/contnr/svimpicn.cxx     | 19 +++++++--------
 svtools/source/contnr/svlbox.cxx       |  2 --
 svtools/source/contnr/svtreebx.cxx     | 37 ++++++++++++++++------------
 svtools/source/inc/svimpbox.hxx        |  4 ++--
 svtools/source/inc/svimpicn.hxx        |  3 +--
 svtools/source/uno/treecontrolpeer.cxx | 24 +++++++++----------
 tools/inc/tools/wintypes.hxx           |  5 ++++
 12 files changed, 82 insertions(+), 82 deletions(-)

diff --git a/svtools/inc/svtools/svicnvw.hxx b/svtools/inc/svtools/svicnvw.hxx
index ac15f0b55be6..68a76d25e108 100644
--- a/svtools/inc/svtools/svicnvw.hxx
+++ b/svtools/inc/svtools/svicnvw.hxx
@@ -89,7 +89,6 @@ class SvIconView : public SvLBox
     SvImpIconView*  pImp;
     Image           aCollapsedEntryBmp;
     Image           aExpandedEntryBmp;
-    WinBits         nWinBits;
     USHORT          nIcnVwFlags;
     void            SetModel( SvLBoxTreeList* );
 
@@ -111,6 +110,7 @@ protected:
     virtual void    ReadDragServerInfo( const Point&, SvLBoxDDInfo* );
     virtual void    Command( const CommandEvent& rCEvt );
     virtual void    PreparePaint( SvLBoxEntry* );
+    virtual void    StateChanged( StateChangedType nStateChange );
 
 public:
 
@@ -203,7 +203,6 @@ public:
 
     SvLBoxEntry*    GetEntryFromLogicPos( const Point& rDocPos ) const;
 
-    void            SetWindowBits( WinBits nWinStyle );
     virtual void    PaintEntry( SvLBoxEntry* );
     virtual void    PaintEntry( SvLBoxEntry*, const Point& rDocPos );
     Rectangle       GetFocusRect( SvLBoxEntry* );
diff --git a/svtools/inc/svtools/svlbox.hxx b/svtools/inc/svtools/svlbox.hxx
index f33784f45397..5b1f13120756 100644
--- a/svtools/inc/svtools/svlbox.hxx
+++ b/svtools/inc/svtools/svlbox.hxx
@@ -290,7 +290,6 @@ class SVT_DLLPUBLIC SvLBox
 
 protected:
 
-    WinBits         nWindowStyle;
     Link            aExpandedHdl;
     Link            aExpandingHdl;
     Link            aSelectHdl;
diff --git a/svtools/inc/svtools/svtreebx.hxx b/svtools/inc/svtools/svtreebx.hxx
index 787e0956888f..79402cb13f23 100644
--- a/svtools/inc/svtools/svtreebx.hxx
+++ b/svtools/inc/svtools/svtreebx.hxx
@@ -39,11 +39,6 @@ class TabBar;
 
 #define SV_TAB_BORDER 8
 
-#define WB_HASBUTTONSATROOT       ((WinBits)0x0800)
-#define WB_NOINITIALSELECTION       WB_DROPDOWN
-#define WB_HIDESELECTION            WB_NOHIDESELECTION
-#define WB_FORCE_MAKEVISIBLE        WB_SPIN
-
 #define SV_LISTBOX_ID_TREEBOX 1   // fuer SvLBox::IsA()
 #define SV_ENTRYHEIGHTOFFS_PIXEL 2
 
@@ -97,9 +92,11 @@ class SVT_DLLPUBLIC SvTreeListBox : public SvLBox
                                 USHORT nTabFlagMask=0xffff,
                                 BOOL bHasClipRegion=FALSE );
 
-    SVT_DLLPRIVATE void         InitTreeView( WinBits nWinStyle );
+    SVT_DLLPRIVATE void         InitTreeView();
     SVT_DLLPRIVATE SvLBoxItem*      GetItem_Impl( SvLBoxEntry*, long nX, SvLBoxTab** ppTab,
                         USHORT nEmptyWidth );
+    SVT_DLLPRIVATE void         ImplInitStyle();
+
 #endif
 
 protected:
@@ -318,9 +315,6 @@ public:
     SvLBoxEntry*    GetEntry( SvLBoxEntry* pParent, ULONG nPos ) const { return SvLBox::GetEntry(pParent,nPos); }
     SvLBoxEntry*    GetEntry( ULONG nRootPos ) const { return SvLBox::GetEntry(nRootPos);}
 
-    void            SetWindowBits( WinBits nWinStyle );
-    WinBits         GetWindowBits() const { return nWindowStyle; }
-
     void            PaintEntry( SvLBoxEntry* );
     long            PaintEntry( SvLBoxEntry*, long nLine,
                                 USHORT nTabFlagMask=0xffff );
diff --git a/svtools/source/contnr/svicnvw.cxx b/svtools/source/contnr/svicnvw.cxx
index b16cd67d12a5..5556d299b2c2 100644
--- a/svtools/source/contnr/svicnvw.cxx
+++ b/svtools/source/contnr/svicnvw.cxx
@@ -50,7 +50,6 @@ SvIcnVwDataEntry::~SvIcnVwDataEntry()
 SvIconView::SvIconView( Window* pParent, WinBits nWinStyle ) :
     SvLBox( pParent, nWinStyle | WB_BORDER )
 {
-    nWinBits = nWinStyle;
     nIcnVwFlags = 0;
     pImp = new SvImpIconView( this, GetModel(), nWinStyle | WB_ICON );
     pImp->mpViewData = 0;
@@ -72,8 +71,6 @@ SvIconView::SvIconView( Window* pParent , const ResId& rResId ) :
     SetBackground( Wallpaper( rStyleSettings.GetFieldColor() ) );
     SetDefaultFont();
     pImp->SetSelectionMode( GetSelectionMode() );
-    pImp->SetWindowBits( nWindowStyle );
-    nWinBits = nWindowStyle;
 }
 
 SvIconView::~SvIconView()
@@ -403,10 +400,11 @@ SvLBoxEntry* SvIconView::GetEntryFromLogicPos( const Point& rDocPos ) const
 }
 
 
-void SvIconView::SetWindowBits( WinBits nWinStyle )
+void SvIconView::StateChanged( StateChangedType i_nStateChange )
 {
-    nWinBits = nWinStyle;
-    pImp->SetWindowBits( nWinStyle );
+    SvLBox::StateChanged( i_nStateChange );
+    if ( i_nStateChange == STATE_CHANGE_STYLE )
+        pImp->SetStyle( GetStyle() );
 }
 
 void SvIconView::PaintEntry( SvLBoxEntry* pEntry )
diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index 35324d551858..fc50d7dda4ad 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -83,7 +83,7 @@ SvImpLBox::SvImpLBox( SvTreeListBox* pLBView, SvLBoxTreeList* pLBTree, WinBits n
     pTree = pLBTree;
     aSelEng.SetFunctionSet( (FunctionSet*)&aFctSet );
     aSelEng.ExpandSelectionOnMouseMove( FALSE );
-    SetWindowBits( nWinStyle );
+    SetStyle( nWinStyle );
     SetSelectionMode( SINGLE_SELECTION );
     SetDragDropMode( 0 );
 
@@ -253,10 +253,10 @@ void SvImpLBox::CalcCellFocusRect( SvLBoxEntry* pEntry, Rectangle& rRect )
     }
 }
 
-void SvImpLBox::SetWindowBits( WinBits nWinStyle )
+void SvImpLBox::SetStyle( WinBits i_nWinStyle )
 {
-    nWinBits = nWinStyle;
-    if((nWinStyle & WB_SIMPLEMODE) && aSelEng.GetSelectionMode()==MULTIPLE_SELECTION)
+    m_nStyle = i_nWinStyle;
+    if ( ( m_nStyle & WB_SIMPLEMODE) && ( aSelEng.GetSelectionMode() == MULTIPLE_SELECTION ) )
         aSelEng.AddAlways( TRUE );
 }
 
@@ -952,7 +952,7 @@ void SvImpLBox::Paint( const Rectangle& rRect )
 
     // erst die Linien Zeichnen, dann clippen!
     pView->SetClipRegion();
-    if( nWinBits & ( WB_HASLINES | WB_HASLINESATROOT ) )
+    if( m_nStyle & ( WB_HASLINES | WB_HASLINESATROOT ) )
         DrawNet();
 
     pView->SetClipRegion( aClipRegion );
@@ -969,7 +969,7 @@ void SvImpLBox::Paint( const Rectangle& rRect )
     {
         // do not select if multiselection or explicit set
         BOOL bNotSelect = ( aSelEng.GetSelectionMode() == MULTIPLE_SELECTION )
-                || ( ( nWinBits & WB_NOINITIALSELECTION ) == WB_NOINITIALSELECTION );
+                || ( ( m_nStyle & WB_NOINITIALSELECTION ) == WB_NOINITIALSELECTION );
         SetCursor( pStartEntry, bNotSelect );
     }
 
@@ -994,7 +994,7 @@ void SvImpLBox::MakeVisible( SvLBoxEntry* pEntry, BOOL bMoveToTop )
     if( bInView && (!bMoveToTop || pStartEntry == pEntry) )
         return;  // ist schon sichtbar
 
-    if( pStartEntry || (nWinBits & WB_FORCE_MAKEVISIBLE) )
+    if( pStartEntry || (m_nStyle & WB_FORCE_MAKEVISIBLE) )
         nFlags &= (~F_FILLING);
     if( !bInView )
     {
@@ -1132,7 +1132,7 @@ void SvImpLBox::DrawNet()
             pView->DrawLine( aPos1, aPos2 );
         }
         // Sichtbar im Control ?
-        if( n>= nOffs && ((nWinBits & WB_HASLINESATROOT) || !pTree->IsAtRootDepth(pEntry)))
+        if( n>= nOffs && ((m_nStyle & WB_HASLINESATROOT) || !pTree->IsAtRootDepth(pEntry)))
         {
             // kann aPos1 recyclet werden ?
             if( !pView->IsExpanded(pEntry) )
@@ -1154,7 +1154,7 @@ void SvImpLBox::DrawNet()
         nY += nEntryHeight;
         pEntry = (SvLBoxEntry*)(pView->NextVisible( pEntry ));
     }
-    if( nWinBits & WB_HASLINESATROOT )
+    if( m_nStyle & WB_HASLINESATROOT )
     {
         pEntry = pView->First();
         aPos1.X() = pView->GetTabPos( pEntry, pFirstDynamicTab);
@@ -1248,7 +1248,8 @@ USHORT SvImpLBox::AdjustScrollBars( Size& rSize )
 
     Size aOSize( pView->Control::GetOutputSizePixel() );
 
-    BOOL bVerSBar = ( pView->nWindowStyle & WB_VSCROLL ) != 0;
+    const WinBits nWindowStyle = pView->GetStyle();
+    BOOL bVerSBar = ( nWindowStyle & WB_VSCROLL ) != 0;
     BOOL bHorBar = FALSE;
     long nMaxRight = aOSize.Width(); //GetOutputSize().Width();
     Point aOrigin( pView->GetMapMode().GetOrigin() );
@@ -1256,7 +1257,7 @@ USHORT SvImpLBox::AdjustScrollBars( Size& rSize )
     nMaxRight += aOrigin.X() - 1;
     long nVis = nMostRight - aOrigin.X();
     if( pTabBar || (
-        (pView->nWindowStyle & WB_HSCROLL) &&
+        (nWindowStyle & WB_HSCROLL) &&
         (nVis < nMostRight || nMaxRight < nMostRight) ))
         bHorBar = TRUE;
 
@@ -1274,7 +1275,7 @@ USHORT SvImpLBox::AdjustScrollBars( Size& rSize )
         nMaxRight -= nVerSBarWidth;
         if( !bHorBar )
         {
-            if( (pView->nWindowStyle & WB_HSCROLL) &&
+            if( (nWindowStyle & WB_HSCROLL) &&
                 (nVis < nMostRight || nMaxRight < nMostRight) )
                 bHorBar = TRUE;
         }
@@ -1439,7 +1440,7 @@ void SvImpLBox::FillView()
 
 void SvImpLBox::ShowVerSBar()
 {
-    BOOL bVerBar = ( pView->nWindowStyle & WB_VSCROLL ) != 0;
+    BOOL bVerBar = ( pView->GetStyle() & WB_VSCROLL ) != 0;
     ULONG nVis = 0;
     if( !bVerBar )
         nVis = pView->GetVisibleCount();
@@ -1681,7 +1682,7 @@ void SvImpLBox::EntrySelected( SvLBoxEntry* pEntry, BOOL bSelect )
         return;
 
     /*
-    if( (nWinBits & WB_HIDESELECTION) && pEntry && !pView->HasFocus() )
+    if( (m_nStyle & WB_HIDESELECTION) && pEntry && !pView->HasFocus() )
     {
         SvViewData* pViewData = pView->GetViewData( pEntry );
         pViewData->SetCursored( bSelect );
@@ -1943,7 +1944,7 @@ void SvImpLBox::EntryInserted( SvLBoxEntry* pEntry )
         // die Linien invalidieren
         /*
         if( (bEntryVisible || bPrevEntryVisible) &&
-            (nWinBits & ( WB_HASLINES | WB_HASLINESATROOT )) )
+            (m_nStyle & ( WB_HASLINES | WB_HASLINESATROOT )) )
         {
             SvLBoxTab* pTab = pView->GetFirstDynamicTab();
             if( pTab )
@@ -2265,6 +2266,7 @@ BOOL SvImpLBox::KeyInput( const KeyEvent& rKEvt)
 
     SvLBoxEntry* pNewCursor;
 
+    const WinBits nWindowStyle = pView->GetStyle();
     switch( aCode )
     {
         case KEY_UP:
@@ -2348,7 +2350,7 @@ BOOL SvImpLBox::KeyInput( const KeyEvent& rKEvt)
                     CallEventListeners( VCLEVENT_LISTBOX_SELECT, pCursor );
                 }
             }
-            else if( pView->nWindowStyle & WB_HSCROLL )
+            else if( nWindowStyle & WB_HSCROLL )
             {
                 long    nThumb = aHorSBar.GetThumbPos();
                 nThumb += aHorSBar.GetLineSize();
@@ -2379,7 +2381,7 @@ BOOL SvImpLBox::KeyInput( const KeyEvent& rKEvt)
                     CallEventListeners( VCLEVENT_LISTBOX_SELECT, pCursor );
                 }
             }
-            else if ( pView->nWindowStyle & WB_HSCROLL )
+            else if ( nWindowStyle & WB_HSCROLL )
             {
                 long    nThumb = aHorSBar.GetThumbPos();
                 nThumb -= aHorSBar.GetLineSize();
@@ -2520,7 +2522,7 @@ BOOL SvImpLBox::KeyInput( const KeyEvent& rKEvt)
 
         case KEY_F8:
             if( bShift && pView->GetSelectionMode()==MULTIPLE_SELECTION &&
-                !(nWinBits & WB_SIMPLEMODE))
+                !(m_nStyle & WB_SIMPLEMODE))
             {
                 if( aSelEng.IsAlwaysAdding() )
                     aSelEng.AddAlways( FALSE );
@@ -2698,7 +2700,7 @@ void __EXPORT SvImpLBox::GetFocus()
 //      if( bSimpleTravel && !pView->IsSelected(pCursor) )
 //          pView->Select( pCursor, TRUE );
     }
-    if( nWinBits & WB_HIDESELECTION )
+    if( m_nStyle & WB_HIDESELECTION )
     {
         SvLBoxEntry* pEntry = pView->FirstSelected();
         while( pEntry )
@@ -2731,7 +2733,7 @@ void __EXPORT SvImpLBox::LoseFocus()
         pView->SetEntryFocus( pCursor,FALSE );
     ShowCursor( FALSE );
 
-    if( nWinBits & WB_HIDESELECTION )
+    if( m_nStyle & WB_HIDESELECTION )
     {
         SvLBoxEntry* pEntry = pView->FirstSelected();
         while( pEntry )
@@ -3029,7 +3031,7 @@ void SvImpLBox::SetSelectionMode( SelectionMode eSelMode  )
         bSimpleTravel = TRUE;
     else
         bSimpleTravel = FALSE;
-    if( (nWinBits & WB_SIMPLEMODE) && (eSelMode == MULTIPLE_SELECTION) )
+    if( (m_nStyle & WB_SIMPLEMODE) && (eSelMode == MULTIPLE_SELECTION) )
         aSelEng.AddAlways( TRUE );
 }
 
diff --git a/svtools/source/contnr/svimpicn.cxx b/svtools/source/contnr/svimpicn.cxx
index d1e471953663..0d335429d564 100644
--- a/svtools/source/contnr/svimpicn.cxx
+++ b/svtools/source/contnr/svimpicn.cxx
@@ -708,7 +708,7 @@ public:
 
 
 SvImpIconView::SvImpIconView( SvIconView* pCurView, SvLBoxTreeList* pTree,
-    WinBits nWinStyle ) :
+    WinBits i_nWinStyle ) :
     aVerSBar( pCurView, WB_DRAG | WB_VSCROLL ),
     aHorSBar( pCurView, WB_DRAG | WB_HSCROLL )
 {
@@ -716,7 +716,7 @@ SvImpIconView::SvImpIconView( SvIconView* pCurView, SvLBoxTreeList* pTree,
     pModel = pTree;
     pCurParent = 0;
     pZOrderList = new SvPtrarr;
-    SetWindowBits( nWinStyle );
+    SetStyle( i_nWinStyle );
     nHorDist = 0;
     nVerDist = 0;
     nFlags = 0;
@@ -785,13 +785,12 @@ void SvImpIconView::Clear( BOOL bInCtor )
     AdjustScrollBars();
 }
 
-void SvImpIconView::SetWindowBits( WinBits nWinStyle )
+void SvImpIconView::SetStyle( const WinBits i_nWinStyle )
 {
-    nWinBits = nWinStyle;
     nViewMode = VIEWMODE_TEXT;
-    if( nWinStyle & WB_NAME )
+    if( i_nWinStyle & WB_NAME )
         nViewMode = VIEWMODE_NAME;
-    if( nWinStyle & WB_ICON )
+    if( i_nWinStyle & WB_ICON )
         nViewMode = VIEWMODE_ICON;
 }
 
@@ -1754,8 +1753,8 @@ void SvImpIconView::AdjustScrollBars()
     else
         nVisibleHeight = nRealHeight;
 
-    bool bVerSBar = (pView->nWindowStyle & WB_VSCROLL) ? true : false;
-    bool bHorSBar = (pView->nWindowStyle & WB_HSCROLL) ? true : false;
+    bool bVerSBar = (pView->GetStyle() & WB_VSCROLL) ? true : false;
+    bool bHorSBar = (pView->GetStyle() & WB_HSCROLL) ? true : false;
 
     USHORT nResult = 0;
     if( nVirtHeight )
@@ -1903,7 +1902,7 @@ BOOL SvImpIconView::CheckHorScrollBar()
         return FALSE;
     const MapMode& rMapMode = pView->GetMapMode();
     Point aOrigin( rMapMode.GetOrigin() );
-    if(!(pView->nWindowStyle & WB_HSCROLL) && !aOrigin.X() )
+    if(!(pView->GetStyle() & WB_HSCROLL) && !aOrigin.X() )
     {
         long nWidth = aOutputSize.Width();
         USHORT nCount = pZOrderList->Count();
@@ -1941,7 +1940,7 @@ BOOL SvImpIconView::CheckVerScrollBar()
         return FALSE;
     const MapMode& rMapMode = pView->GetMapMode();
     Point aOrigin( rMapMode.GetOrigin() );
-    if(!(pView->nWindowStyle & WB_VSCROLL) && !aOrigin.Y() )
+    if(!(pView->GetStyle() & WB_VSCROLL) && !aOrigin.Y() )
     {
         long nDeepest = 0;
         long nHeight = aOutputSize.Height();
diff --git a/svtools/source/contnr/svlbox.cxx b/svtools/source/contnr/svlbox.cxx
index a69253c69629..a8bb6055768e 100644
--- a/svtools/source/contnr/svlbox.cxx
+++ b/svtools/source/contnr/svlbox.cxx
@@ -699,7 +699,6 @@ SvLBox::SvLBox( Window* pParent, WinBits nWinStyle  ) :
     DropTargetHelper( this ), DragSourceHelper( this ), eSelMode( NO_SELECTION )
 {
     DBG_CTOR(SvLBox,0);
-    nWindowStyle = nWinStyle;
     nDragOptions =  DND_ACTION_COPYMOVE | DND_ACTION_LINK;
     nImpFlags = 0;
     pTargetEntry = 0;
@@ -724,7 +723,6 @@ SvLBox::SvLBox( Window* pParent, const ResId& rResId ) :
     DBG_CTOR(SvLBox,0);
     pTargetEntry = 0;
     nImpFlags = 0;
-    nWindowStyle = 0;
     pLBoxImpl = new SvLBox_Impl( *this );
     nDragOptions = DND_ACTION_COPYMOVE | DND_ACTION_LINK;
     nDragDropMode = 0;
diff --git a/svtools/source/contnr/svtreebx.cxx b/svtools/source/contnr/svtreebx.cxx
index a8635c99d127..f4780fbf08ad 100644
--- a/svtools/source/contnr/svtreebx.cxx
+++ b/svtools/source/contnr/svtreebx.cxx
@@ -65,10 +65,10 @@ DBG_NAME(SvTreeListBox)
 #define SV_LBOX_DEFAULT_INDENT_PIXEL 20
 
 SvTreeListBox::SvTreeListBox( Window* pParent, WinBits nWinStyle )
-    : SvLBox(pParent,nWinStyle )
+    : SvLBox( pParent, nWinStyle )
 {
     DBG_CTOR(SvTreeListBox,0);
-    InitTreeView( nWinStyle );
+    InitTreeView();
 
     SetSublistOpenWithLeftRight();
 }
@@ -78,13 +78,13 @@ SvTreeListBox::SvTreeListBox( Window* pParent , const ResId& rResId )
 {
     DBG_CTOR(SvTreeListBox,0);
 
-    InitTreeView( 0 );
+    InitTreeView();
     Resize();
 
     SetSublistOpenWithLeftRight();
 }
 
-void SvTreeListBox::InitTreeView( WinBits nWinStyle )
+void SvTreeListBox::InitTreeView()
 {
     DBG_CHKTHIS(SvTreeListBox,0);
     pCheckButtonData = NULL;
@@ -102,7 +102,7 @@ void SvTreeListBox::InitTreeView( WinBits nWinStyle )
     nTreeFlags = TREEFLAG_RECALCTABS;
     nIndent = SV_LBOX_DEFAULT_INDENT_PIXEL;
     nEntryHeightOffs = SV_ENTRYHEIGHTOFFS_PIXEL;
-    pImp = new SvImpLBox( this, GetModel(), nWinStyle );
+    pImp = new SvImpLBox( this, GetModel(), GetStyle() );
 
     aContextBmpMode = SVLISTENTRYFLAG_EXPANDED;
     nContextBmpWidthMax = 0;
@@ -110,7 +110,7 @@ void SvTreeListBox::InitTreeView( WinBits nWinStyle )
     SetSpaceBetweenEntries( 0 );
     SetLineColor();
     InitSettings( TRUE, TRUE, TRUE );
-    SetWindowBits( nWinStyle );
+    ImplInitStyle();
     SetTabs();
 }
 
@@ -227,8 +227,9 @@ void SvTreeListBox::SetTabs()
         EndEditing( TRUE );
     nTreeFlags &= (~TREEFLAG_RECALCTABS);
     nFocusWidth = -1;
-    BOOL bHasButtons = (nWindowStyle & WB_HASBUTTONS)!=0;
-    BOOL bHasButtonsAtRoot = (nWindowStyle & (WB_HASLINESATROOT |
+    const WinBits nStyle( GetStyle() );
+    BOOL bHasButtons = (nStyle & WB_HASBUTTONS)!=0;
+    BOOL bHasButtonsAtRoot = (nStyle & (WB_HASLINESATROOT |
                                               WB_HASBUTTONSATROOT))!=0;
     long nStartPos = TAB_STARTPOS;
     long nNodeWidthPixel = GetExpandedNodeBmp().GetSizePixel().Width();
@@ -1492,12 +1493,14 @@ SvLBoxEntry* SvTreeListBox::GetCurEntry() const
     return pImp->GetCurEntry();
 }
 
-void SvTreeListBox::SetWindowBits( WinBits nWinStyle )
+void SvTreeListBox::ImplInitStyle()
 {
     DBG_CHKTHIS(SvTreeListBox,0);
-    nWindowStyle = nWinStyle;
+
+    const WinBits nWindowStyle = GetStyle();
+
     nTreeFlags |= TREEFLAG_RECALCTABS;
-    if( nWinStyle & WB_SORT )
+    if( nWindowStyle & WB_SORT )
     {
         GetModel()->SetSortMode( SortAscending );
         GetModel()->SetCompareHdl( LINK(this,SvTreeListBox,DefaultCompare));
@@ -1508,9 +1511,9 @@ void SvTreeListBox::SetWindowBits( WinBits nWinStyle )
         GetModel()->SetCompareHdl( Link() );
     }
 #ifdef OS2
-    nWinStyle |= WB_VSCROLL;
+    nWindowStyle |= WB_VSCROLL;
 #endif
-    pImp->SetWindowBits( nWinStyle );
+    pImp->SetStyle( nWindowStyle );
     pImp->Resize();
     Invalidate();
 }
@@ -1578,8 +1581,9 @@ long SvTreeListBox::PaintEntry1(SvLBoxEntry* pEntry,long nLine,USHORT nTabFlags,
     BOOL bInUse = pEntry->HasInUseEmphasis();
     // wenn eine ClipRegion von aussen gesetzt wird, dann
     // diese nicht zuruecksetzen
-    BOOL bResetClipRegion = !bHasClipRegion;
-    BOOL bHideSelection = ((nWindowStyle & WB_HIDESELECTION) && !HasFocus())!=0;
+    const WinBits nWindowStyle = GetStyle();
+    const BOOL bResetClipRegion = !bHasClipRegion;
+    const BOOL bHideSelection = ((nWindowStyle & WB_HIDESELECTION) && !HasFocus())!=0;
     const StyleSettings& rSettings = GetSettings().GetStyleSettings();
 
     Font aHighlightFont( GetFont() );
@@ -2367,6 +2371,7 @@ void SvTreeListBox::ModelNotification( USHORT nActionId, SvListEntry* pEntry1,
 long SvTreeListBox::GetTextOffset() const
 {
     DBG_CHKTHIS(SvTreeListBox,0);
+    const WinBits nWindowStyle = GetStyle();
     BOOL bHasButtons = (nWindowStyle & WB_HASBUTTONS)!=0;
     BOOL bHasButtonsAtRoot = (nWindowStyle & (WB_HASLINESATROOT |
                                               WB_HASBUTTONSATROOT))!=0;
@@ -2519,6 +2524,8 @@ void SvTreeListBox::DataChanged( const DataChangedEvent& rDCEvt )
 void SvTreeListBox::StateChanged( StateChangedType i_nStateChange )
 {
     SvLBox::StateChanged( i_nStateChange );
+    if ( i_nStateChange == STATE_CHANGE_STYLE )
+        ImplInitStyle();
 }
 
 void SvTreeListBox::InitSettings(BOOL bFont,BOOL bForeground,BOOL bBackground)
diff --git a/svtools/source/inc/svimpbox.hxx b/svtools/source/inc/svimpbox.hxx
index 92b9f960b65c..6919944daef4 100644
--- a/svtools/source/inc/svimpbox.hxx
+++ b/svtools/source/inc/svimpbox.hxx
@@ -153,7 +153,7 @@ private:
     USHORT              nFlags;
     USHORT              nCurTabPos;
 
-    WinBits             nWinBits;
+    WinBits             m_nStyle;
     ExtendedWinBits     nExtendedWinBits;
     BOOL                bSimpleTravel : 1; // ist TRUE bei SINGLE_SELECTION
     BOOL                bUpdateMode : 1;
@@ -264,7 +264,7 @@ public:
     ~SvImpLBox();
 
     void                Clear();
-    void                SetWindowBits( WinBits nWinStyle );
+    void                SetStyle( WinBits i_nWinStyle );
     void                SetExtendedWindowBits( ExtendedWinBits _nBits );
     ExtendedWinBits     GetExtendedWindowBits() const { return nExtendedWinBits; }
     void                SetModel( SvLBoxTreeList* pModel ) { pTree = pModel;}
diff --git a/svtools/source/inc/svimpicn.hxx b/svtools/source/inc/svimpicn.hxx
index 20f98d2bcbbd..7d5c2b1b41e3 100644
--- a/svtools/source/inc/svimpicn.hxx
+++ b/svtools/source/inc/svimpicn.hxx
@@ -96,7 +96,6 @@ class SvImpIconView
                     nGridDY;
     long            nHorSBarHeight,
                     nVerSBarWidth;
-    WinBits         nWinBits;
     int             nViewMode;
     long            nHorDist;
     long            nVerDist;
@@ -171,7 +170,7 @@ public:
                     ~SvImpIconView();
 
     void            Clear( BOOL bInCtor = FALSE );
-    void            SetWindowBits( WinBits nWinStyle );
+    void            SetStyle( const WinBits i_nWinStyle );
     void            SetModel( SvLBoxTreeList* pTree, SvLBoxEntry* pParent )
                         { pModel = pTree; SetCurParent(pParent); }
     void            EntryInserted( SvLBoxEntry*);
diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx
index d1ea854cce61..f37d5f80ed68 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.cxx
@@ -1327,12 +1327,12 @@ void TreeControlPeer::setProperty( const ::rtl::OUString& PropertyName, const An
             sal_Bool bEnabled = sal_False;
             if ( aValue >>= bEnabled )
             {
-                WinBits nStyle = rTree.GetWindowBits();
+                WinBits nStyle = rTree.GetStyle();
                 if ( bEnabled )
                     nStyle |= WB_HIDESELECTION;
                 else
                     nStyle &= ~WB_HIDESELECTION;
-                rTree.SetWindowBits( nStyle );
+                rTree.SetStyle( nStyle );
             }
         }
         break;
@@ -1390,11 +1390,11 @@ void TreeControlPeer::setProperty( const ::rtl::OUString& PropertyName, const An
             sal_Bool bEnabled = false;
             if( aValue >>= bEnabled )
             {
-                WinBits nBits = rTree.GetWindowBits() & (~WB_HASLINES);
+                WinBits nBits = rTree.GetStyle() & (~WB_HASLINES);
                 if( bEnabled )
                     nBits |= WB_HASLINES;
-                if( nBits != rTree.GetWindowBits() )
-                    rTree.SetWindowBits( nBits );
+                if( nBits != rTree.GetStyle() )
+                    rTree.SetStyle( nBits );
             }
             break;
         }
@@ -1403,11 +1403,11 @@ void TreeControlPeer::setProperty( const ::rtl::OUString& PropertyName, const An
             sal_Bool bEnabled = false;
             if( aValue >>= bEnabled )
             {
-                WinBits nBits = rTree.GetWindowBits() & (~WB_HASLINESATROOT);
+                WinBits nBits = rTree.GetStyle() & (~WB_HASLINESATROOT);
                 if( bEnabled )
                     nBits |= WB_HASLINESATROOT;
-                if( nBits != rTree.GetWindowBits() )
-                    rTree.SetWindowBits( nBits );
+                if( nBits != rTree.GetStyle() )
+                    rTree.SetStyle( nBits );
             }
             break;
         }
@@ -1428,7 +1428,7 @@ Any TreeControlPeer::getProperty( const ::rtl::OUString& PropertyName ) throw(Ru
         switch(nPropId)
         {
         case BASEPROPERTY_HIDEINACTIVESELECTION:
-            return Any( ( rTree.GetWindowBits() & WB_HIDESELECTION ) != 0 ? sal_True : sal_False );
+            return Any( ( rTree.GetStyle() & WB_HIDESELECTION ) != 0 ? sal_True : sal_False );
 
         case BASEPROPERTY_TREE_SELECTIONTYPE:
         {
@@ -1456,9 +1456,9 @@ Any TreeControlPeer::getProperty( const ::rtl::OUString& PropertyName ) throw(Ru
         case BASEPROPERTY_TREE_ROOTDISPLAYED:
             return Any( mbIsRootDisplayed );
         case BASEPROPERTY_TREE_SHOWSHANDLES:
-            return Any( (rTree.GetWindowBits() & WB_HASLINES) != 0 ? sal_True : sal_False );
+            return Any( (rTree.GetStyle() & WB_HASLINES) != 0 ? sal_True : sal_False );
         case BASEPROPERTY_TREE_SHOWSROOTHANDLES:
-            return Any( (rTree.GetWindowBits() & WB_HASLINESATROOT) != 0 ? sal_True : sal_False );
+            return Any( (rTree.GetStyle() & WB_HASLINESATROOT) != 0 ? sal_True : sal_False );
         }
     }
     return VCLXWindow::getProperty( PropertyName );
@@ -1527,7 +1527,7 @@ UnoTreeListBoxImpl::UnoTreeListBoxImpl( TreeControlPeer* pPeer, Window* pParent,
 : SvTreeListBox( pParent, nWinStyle )
 , mxPeer( pPeer )
 {
-    SetWindowBits( WB_BORDER | WB_HASLINES |WB_HASBUTTONS | WB_HASLINESATROOT | WB_HASBUTTONSATROOT | WB_HSCROLL );
+    SetStyle( WB_BORDER | WB_HASLINES |WB_HASBUTTONS | WB_HASLINESATROOT | WB_HASBUTTONSATROOT | WB_HSCROLL );
     SetNodeDefaultImages();
     SetSelectHdl( LINK(this, UnoTreeListBoxImpl, OnSelectionChangeHdl) );
     SetDeselectHdl( LINK(this, UnoTreeListBoxImpl, OnSelectionChangeHdl) );
diff --git a/tools/inc/tools/wintypes.hxx b/tools/inc/tools/wintypes.hxx
index 7d6296b76e8c..2e1762ed4757 100644
--- a/tools/inc/tools/wintypes.hxx
+++ b/tools/inc/tools/wintypes.hxx
@@ -277,6 +277,11 @@ typedef sal_Int64 WinBits;
 #define WB_HASBUTTONS           ((WinBits)0x00800000)
 #define WB_HASLINES             ((WinBits)0x01000000)
 #define WB_HASLINESATROOT       ((WinBits)0x02000000)
+#define WB_HASBUTTONSATROOT     ((WinBits)0x04000000)
+#define WB_NOINITIALSELECTION   ((WinBits)0x08000000)
+#define WB_HIDESELECTION        ((WinBits)0x10000000)
+#define WB_FORCE_MAKEVISIBLE    ((WinBits)0x20000000)
+
 
 // For FileOpen Dialog
 #define WB_PATH                 ((WinBits)0x00100000)
-- 
cgit 


From e72893613b012342a96d0bfa045b56922db46328 Mon Sep 17 00:00:00 2001
From: Carsten Driesner 
Date: Tue, 7 Sep 2010 18:19:15 +0200
Subject: fwk149: #i113055# Fixed suspicious self assignment

---
 svtools/source/filter.vcl/wmf/winmtf.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/svtools/source/filter.vcl/wmf/winmtf.cxx b/svtools/source/filter.vcl/wmf/winmtf.cxx
index bf176015fd77..787e6522b890 100644
--- a/svtools/source/filter.vcl/wmf/winmtf.cxx
+++ b/svtools/source/filter.vcl/wmf/winmtf.cxx
@@ -2043,7 +2043,7 @@ void WinMtfOutput::ModifyWorldTransform( const XForm& rXForm, UINT32 nMode )
         case MWT_IDENTITY :
         {
             maXForm.eM11 = maXForm.eM12 = maXForm.eM21 = maXForm.eM22 = 1.0f;
-            maXForm.eDx = maXForm.eDx = 0.0f;
+            maXForm.eDx = maXForm.eDy = 0.0f;
         }
         break;
 
-- 
cgit 


From 1d29a2121c1fbd720af089f670b605f778301f37 Mon Sep 17 00:00:00 2001
From: "Frank Schoenheit [fs]" 
Date: Mon, 13 Sep 2010 18:56:26 +0200
Subject: dba34a: #i100000#

---
 svtools/source/contnr/svimpbox.cxx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index fc50d7dda4ad..7de5f38fab69 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -45,6 +45,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #ifndef _SVTOOLS_HRC
 #include 
-- 
cgit 


From 53fadd15f72ba8726bb42fbe175796e86fe00055 Mon Sep 17 00:00:00 2001
From: "Frank Schoenheit [fs]" 
Date: Thu, 16 Sep 2010 08:24:24 +0200
Subject: dba34a: ensure the newly introduced WinBits for TreeListBoxes do not
 overlap with existing win bits also used by this class

---
 tools/inc/tools/wintypes.hxx | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tools/inc/tools/wintypes.hxx b/tools/inc/tools/wintypes.hxx
index 2e1762ed4757..ae90392c7034 100644
--- a/tools/inc/tools/wintypes.hxx
+++ b/tools/inc/tools/wintypes.hxx
@@ -274,13 +274,13 @@ typedef sal_Int64 WinBits;
 #define WB_STDTABCONTROL        0
 
 // For TreeListBox
-#define WB_HASBUTTONS           ((WinBits)0x00800000)
-#define WB_HASLINES             ((WinBits)0x01000000)
-#define WB_HASLINESATROOT       ((WinBits)0x02000000)
-#define WB_HASBUTTONSATROOT     ((WinBits)0x04000000)
-#define WB_NOINITIALSELECTION   ((WinBits)0x08000000)
-#define WB_HIDESELECTION        ((WinBits)0x10000000)
-#define WB_FORCE_MAKEVISIBLE    ((WinBits)0x20000000)
+#define WB_HASBUTTONS           ((WinBits)SAL_CONST_INT64(0x0100000000))
+#define WB_HASLINES             ((WinBits)SAL_CONST_INT64(0x0200000000))
+#define WB_HASLINESATROOT       ((WinBits)SAL_CONST_INT64(0x0400000000))
+#define WB_HASBUTTONSATROOT     ((WinBits)SAL_CONST_INT64(0x0800000000))
+#define WB_NOINITIALSELECTION   ((WinBits)SAL_CONST_INT64(0x1000000000))
+#define WB_HIDESELECTION        ((WinBits)SAL_CONST_INT64(0x2000000000))
+#define WB_FORCE_MAKEVISIBLE    ((WinBits)SAL_CONST_INT64(0x4000000000))
 
 
 // For FileOpen Dialog
-- 
cgit 


From 104f2f23ffda13dc8a49b4bdc392bcfdc527c580 Mon Sep 17 00:00:00 2001
From: "Frank Schoenheit [fs]" 
Date: Thu, 16 Sep 2010 14:25:54 +0200
Subject: dba34a: #i111148# do not call setPropertyValue from within
 setFastPropertyValue_NoBroadcast, this is prone to deadlocks. Instead, use
 the newly introduced setDependentFastPropertyValue, which postpones the
 notifications to a more appropriate point in time

---
 toolkit/source/controls/unocontrols.cxx | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx
index d0961188d06c..d3838a7421a4 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.cxx
@@ -592,7 +592,7 @@ void SAL_CALL GraphicControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 n
                 mbAdjustingGraphic = true;
                 ::rtl::OUString sImageURL;
                 OSL_VERIFY( rValue >>= sImageURL );
-                setPropertyValue( GetPropertyName( BASEPROPERTY_GRAPHIC ), uno::makeAny( getGraphicFromURL_nothrow( sImageURL ) ) );
+                setDependentFastPropertyValue( BASEPROPERTY_GRAPHIC, uno::makeAny( getGraphicFromURL_nothrow( sImageURL ) ) );
                 mbAdjustingGraphic = false;
             }
             break;
@@ -601,7 +601,7 @@ void SAL_CALL GraphicControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 n
             if ( !mbAdjustingGraphic && ImplHasProperty( BASEPROPERTY_IMAGEURL ) )
             {
                 mbAdjustingGraphic = true;
-                setPropertyValue( GetPropertyName( BASEPROPERTY_IMAGEURL ), uno::makeAny( ::rtl::OUString() ) );
+                setDependentFastPropertyValue( BASEPROPERTY_IMAGEURL, uno::makeAny( ::rtl::OUString() ) );
                 mbAdjustingGraphic = false;
             }
             break;
@@ -612,7 +612,7 @@ void SAL_CALL GraphicControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 n
                 mbAdjustingImagePosition = true;
                 sal_Int16 nUNOValue = 0;
                 OSL_VERIFY( rValue >>= nUNOValue );
-                setPropertyValue( GetPropertyName( BASEPROPERTY_IMAGEPOSITION ), uno::makeAny( getExtendedImagePosition( nUNOValue ) ) );
+                setDependentFastPropertyValue( BASEPROPERTY_IMAGEPOSITION, uno::makeAny( getExtendedImagePosition( nUNOValue ) ) );
                 mbAdjustingImagePosition = false;
             }
             break;
@@ -622,7 +622,7 @@ void SAL_CALL GraphicControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 n
                 mbAdjustingImagePosition = true;
                 sal_Int16 nUNOValue = 0;
                 OSL_VERIFY( rValue >>= nUNOValue );
-                setPropertyValue( GetPropertyName( BASEPROPERTY_IMAGEALIGN ), uno::makeAny( getCompatibleImageAlign( translateImagePosition( nUNOValue ) ) ) );
+                setDependentFastPropertyValue( BASEPROPERTY_IMAGEALIGN, uno::makeAny( getCompatibleImageAlign( translateImagePosition( nUNOValue ) ) ) );
                 mbAdjustingImagePosition = false;
             }
             break;
@@ -888,7 +888,7 @@ void SAL_CALL UnoControlImageControlModel::setFastPropertyValue_NoBroadcast( sal
                 mbAdjustingImageScaleMode = true;
                 sal_Int16 nScaleMode( awt::ImageScaleMode::Anisotropic );
                 OSL_VERIFY( _rValue >>= nScaleMode );
-                setPropertyValue( GetPropertyName( BASEPROPERTY_SCALEIMAGE ), uno::makeAny( sal_Bool( nScaleMode != awt::ImageScaleMode::None ) ) );
+                setDependentFastPropertyValue( BASEPROPERTY_SCALEIMAGE, uno::makeAny( sal_Bool( nScaleMode != awt::ImageScaleMode::None ) ) );
                 mbAdjustingImageScaleMode = false;
             }
             break;
@@ -898,7 +898,7 @@ void SAL_CALL UnoControlImageControlModel::setFastPropertyValue_NoBroadcast( sal
                 mbAdjustingImageScaleMode = true;
                 sal_Bool bScale = sal_True;
                 OSL_VERIFY( _rValue >>= bScale );
-                setPropertyValue( GetPropertyName( BASEPROPERTY_IMAGE_SCALE_MODE ), uno::makeAny( bScale ? awt::ImageScaleMode::Anisotropic : awt::ImageScaleMode::None ) );
+                setDependentFastPropertyValue( BASEPROPERTY_IMAGE_SCALE_MODE, uno::makeAny( bScale ? awt::ImageScaleMode::Anisotropic : awt::ImageScaleMode::None ) );
                 mbAdjustingImageScaleMode = false;
             }
             break;
@@ -1917,7 +1917,7 @@ void SAL_CALL UnoControlListBoxModel::setFastPropertyValue_NoBroadcast( sal_Int3
         uno::Sequence aSeq;
         uno::Any aAny;
         aAny <<= aSeq;
-        setPropertyValue( GetPropertyName( BASEPROPERTY_SELECTEDITEMS ), aAny );
+        setDependentFastPropertyValue( BASEPROPERTY_SELECTEDITEMS, aAny );
 
         if ( !m_pData->m_bSettingLegacyProperty )
         {
-- 
cgit 


From 92f5bd3418d9da6d58665ec6093b8990f73bf53d Mon Sep 17 00:00:00 2001
From: "Frank Schoenheit [fs]" 
Date: Fri, 17 Sep 2010 08:00:05 +0200
Subject: dba34a: querydeep.* is not used anymore

---
 comphelper/inc/comphelper/querydeep.hxx | 484 --------------------------------
 comphelper/source/misc/makefile.mk      |   1 -
 comphelper/source/misc/querydeep.cxx    |  76 -----
 3 files changed, 561 deletions(-)
 delete mode 100644 comphelper/inc/comphelper/querydeep.hxx
 delete mode 100644 comphelper/source/misc/querydeep.cxx

diff --git a/comphelper/inc/comphelper/querydeep.hxx b/comphelper/inc/comphelper/querydeep.hxx
deleted file mode 100644
index 4115412d8d6c..000000000000
--- a/comphelper/inc/comphelper/querydeep.hxx
+++ /dev/null
@@ -1,484 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * 
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _COMPHELPER_QUERYDEEPINTERFACE_HXX
-#define _COMPHELPER_QUERYDEEPINTERFACE_HXX
-
-#include 
-#include 
-#include 
-
-/** */ //for docpp
-namespace comphelper
-{
-
-//--------------------------------------------------------------------------------------------------------
-/**
- * Inspect interfaces types whether they are related by inheritance.
- *
    
- * @return      true if rType is derived from rBaseType
- * @param       rBaseType   a Type of an interface.
- * @param       rType       a Type of an interface.
- */
-sal_Bool isDerivedFrom(
-    const ::com::sun::star::uno::Type & rBaseType,
-    const ::com::sun::star::uno::Type & rType );
-
-//--------------------------------------------------------------------------------------------------------
-/**
- * Inspect interface types whether they are related by inheritance.
- *
    
- * @return      true if p is of a type derived from rBaseType
- * @param       rBaseType   a Type of an interface.
- * @param       p           a pointer to an interface.
- */
-template 
-inline sal_Bool isDerivedFrom(
-    const ::com::sun::star::uno::Type& rBaseType,
-    Interface* /*p*/)
-{
-    return isDerivedFrom(rBaseType, Interface::static_type());
-}
-
-//--------------------------------------------------------------------------------------------------------
-// possible optimization ?
-//  Any aRet(::cppu::queryInterface(rType, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12));
-//  if (aRet.hasValue())
-//      return aRet;
-
-/**
- * Inspect types and choose return proper interface.
- *
    
- * @param       p1      a pointer to an interface.
- */
-template< class Interface1 >
-inline ::com::sun::star::uno::Any queryDeepInterface(
-    const ::com::sun::star::uno::Type & rType,
-    Interface1 * p1 )
-{
-    if (isDerivedFrom(rType, Interface1::static_type()))
-        return ::com::sun::star::uno::Any( &p1, rType );
-    else
-        return ::com::sun::star::uno::Any();
-}
-
-/**
- * Inspect types and choose return proper interface.
- *
    
- * @param       p1      a pointer to an interface.
- * @param       p2      a pointer to an interface.
- */
-template< class Interface1, class Interface2 >
-inline ::com::sun::star::uno::Any queryDeepInterface(
-    const ::com::sun::star::uno::Type & rType,
-    Interface1 * p1, Interface2 * p2 )
-{
-    if (isDerivedFrom(rType, Interface1::static_type()))
-        return ::com::sun::star::uno::Any( &p1, rType );
-    else if (isDerivedFrom(rType, Interface2::static_type()))
-        return ::com::sun::star::uno::Any( &p2, rType );
-    else
-        return ::com::sun::star::uno::Any();
-}
-
-/**
- * Inspect types and choose return proper interface.
- *
    
- * @param       p1      a pointer to an interface.
- * @param       p2      a pointer to an interface.
- * @param       p3      a pointer to an interface.
- */
-template< class Interface1, class Interface2, class Interface3 >
-inline ::com::sun::star::uno::Any queryDeepInterface(
-    const ::com::sun::star::uno::Type & rType,
-    Interface1 * p1, Interface2 * p2, Interface3 * p3 )
-{
-    if (isDerivedFrom(rType, Interface1::static_type()))
-        return ::com::sun::star::uno::Any( &p1, rType );
-    else if (isDerivedFrom(rType, Interface2::static_type()))
-        return ::com::sun::star::uno::Any( &p2, rType );
-    else if (isDerivedFrom(rType, Interface3::static_type()))
-        return ::com::sun::star::uno::Any( &p3, rType );
-    else
-        return ::com::sun::star::uno::Any();
-}
-
-/**
- * Inspect types and choose return proper interface.
- *
    
- * @param       p1      a pointer to an interface.
- * @param       p2      a pointer to an interface.
- * @param       p3      a pointer to an interface.
- * @param       p4      a pointer to an interface.
- */
-template< class Interface1, class Interface2, class Interface3, class Interface4 >
-inline ::com::sun::star::uno::Any queryDeepInterface(
-    const ::com::sun::star::uno::Type & rType,
-    Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4 )
-{
-    if (isDerivedFrom(rType, Interface1::static_type()))
-        return ::com::sun::star::uno::Any( &p1, rType );
-    else if (isDerivedFrom(rType, Interface2::static_type()))
-        return ::com::sun::star::uno::Any( &p2, rType );
-    else if (isDerivedFrom(rType, Interface3::static_type()))
-        return ::com::sun::star::uno::Any( &p3, rType );
-    else if (isDerivedFrom(rType, Interface4::static_type()))
-        return ::com::sun::star::uno::Any( &p4, rType );
-    else
-        return ::com::sun::star::uno::Any();
-}
-
-/**
- * Inspect types and choose return proper interface.
- *
    
- * @param       p1      a pointer to an interface.
- * @param       p2      a pointer to an interface.
- * @param       p3      a pointer to an interface.
- * @param       p4      a pointer to an interface.
- * @param       p5      a pointer to an interface.
- */
-template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5 >
-inline ::com::sun::star::uno::Any queryDeepInterface(
-    const ::com::sun::star::uno::Type & rType,
-    Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4, Interface5 * p5 )
-{
-    if (isDerivedFrom(rType, Interface1::static_type()))
-        return ::com::sun::star::uno::Any( &p1, rType );
-    else if (isDerivedFrom(rType, Interface2::static_type()))
-        return ::com::sun::star::uno::Any( &p2, rType );
-    else if (isDerivedFrom(rType, Interface3::static_type()))
-        return ::com::sun::star::uno::Any( &p3, rType );
-    else if (isDerivedFrom(rType, Interface4::static_type()))
-        return ::com::sun::star::uno::Any( &p4, rType );
-    else if (isDerivedFrom(rType, Interface5::static_type()))
-        return ::com::sun::star::uno::Any( &p5, rType );
-    else
-        return ::com::sun::star::uno::Any();
-}
-
-/**
- * Inspect types and choose return proper interface.
- *
    
- * @param       p1      a pointer to an interface.
- * @param       p2      a pointer to an interface.
- * @param       p3      a pointer to an interface.
- * @param       p4      a pointer to an interface.
- * @param       p5      a pointer to an interface.
- * @param       p6      a pointer to an interface.
- */
-template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5,
-          class Interface6 >
-inline ::com::sun::star::uno::Any queryDeepInterface(
-    const ::com::sun::star::uno::Type & rType,
-    Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4, Interface5 * p5,
-    Interface6 * p6 )
-{
-    if (isDerivedFrom(rType, Interface1::static_type()))
-        return ::com::sun::star::uno::Any( &p1, rType );
-    else if (isDerivedFrom(rType, Interface2::static_type()))
-        return ::com::sun::star::uno::Any( &p2, rType );
-    else if (isDerivedFrom(rType, Interface3::static_type()))
-        return ::com::sun::star::uno::Any( &p3, rType );
-    else if (isDerivedFrom(rType, Interface4::static_type()))
-        return ::com::sun::star::uno::Any( &p4, rType );
-    else if (isDerivedFrom(rType, Interface5::static_type()))
-        return ::com::sun::star::uno::Any( &p5, rType );
-    else if (isDerivedFrom(rType, Interface6::static_type()))
-        return ::com::sun::star::uno::Any( &p6, rType );
-    else
-        return ::com::sun::star::uno::Any();
-}
-
-/**
- * Inspect types and choose return proper interface.
- *
    
- * @param       p1      a pointer to an interface.
- * @param       p2      a pointer to an interface.
- * @param       p3      a pointer to an interface.
- * @param       p4      a pointer to an interface.
- * @param       p5      a pointer to an interface.
- * @param       p6      a pointer to an interface.
- * @param       p7      a pointer to an interface.
- */
-template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5,
-          class Interface6, class Interface7 >
-inline ::com::sun::star::uno::Any queryDeepInterface(
-    const ::com::sun::star::uno::Type & rType,
-    Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4, Interface5 * p5,
-    Interface6 * p6, Interface7 * p7 )
-{
-    if (isDerivedFrom(rType, Interface1::static_type()))
-        return ::com::sun::star::uno::Any( &p1, rType );
-    else if (isDerivedFrom(rType, Interface2::static_type()))
-        return ::com::sun::star::uno::Any( &p2, rType );
-    else if (isDerivedFrom(rType, Interface3::static_type()))
-        return ::com::sun::star::uno::Any( &p3, rType );
-    else if (isDerivedFrom(rType, Interface4::static_type()))
-        return ::com::sun::star::uno::Any( &p4, rType );
-    else if (isDerivedFrom(rType, Interface5::static_type()))
-        return ::com::sun::star::uno::Any( &p5, rType );
-    else if (isDerivedFrom(rType, Interface6::static_type()))
-        return ::com::sun::star::uno::Any( &p6, rType );
-    else if (isDerivedFrom(rType, Interface7::static_type()))
-        return ::com::sun::star::uno::Any( &p7, rType );
-    else
-        return ::com::sun::star::uno::Any();
-}
-
-/**
- * Inspect types and choose return proper interface.
- *
    
- * @param       p1      a pointer to an interface.
- * @param       p2      a pointer to an interface.
- * @param       p3      a pointer to an interface.
- * @param       p4      a pointer to an interface.
- * @param       p5      a pointer to an interface.
- * @param       p6      a pointer to an interface.
- * @param       p7      a pointer to an interface.
- * @param       p8      a pointer to an interface.
- */
-template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5,
-          class Interface6, class Interface7, class Interface8 >
-inline ::com::sun::star::uno::Any queryDeepInterface(
-    const ::com::sun::star::uno::Type & rType,
-    Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4, Interface5 * p5,
-    Interface6 * p6, Interface7 * p7, Interface8 * p8 )
-{
-    if (isDerivedFrom(rType, Interface1::static_type()))
-        return ::com::sun::star::uno::Any( &p1, rType );
-    else if (isDerivedFrom(rType, Interface2::static_type()))
-        return ::com::sun::star::uno::Any( &p2, rType );
-    else if (isDerivedFrom(rType, Interface3::static_type()))
-        return ::com::sun::star::uno::Any( &p3, rType );
-    else if (isDerivedFrom(rType, Interface4::static_type()))
-        return ::com::sun::star::uno::Any( &p4, rType );
-    else if (isDerivedFrom(rType, Interface5::static_type()))
-        return ::com::sun::star::uno::Any( &p5, rType );
-    else if (isDerivedFrom(rType, Interface6::static_type()))
-        return ::com::sun::star::uno::Any( &p6, rType );
-    else if (isDerivedFrom(rType, Interface7::static_type()))
-        return ::com::sun::star::uno::Any( &p7, rType );
-    else if (isDerivedFrom(rType, Interface8::static_type()))
-        return ::com::sun::star::uno::Any( &p8, rType );
-    else
-        return ::com::sun::star::uno::Any();
-}
-
-/**
- * Inspect types and choose return proper interface.
- *
    
- * @param       p1      a pointer to an interface.
- * @param       p2      a pointer to an interface.
- * @param       p3      a pointer to an interface.
- * @param       p4      a pointer to an interface.
- * @param       p5      a pointer to an interface.
- * @param       p6      a pointer to an interface.
- * @param       p7      a pointer to an interface.
- * @param       p8      a pointer to an interface.
- * @param       p9      a pointer to an interface.
- */
-template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5,
-          class Interface6, class Interface7, class Interface8, class Interface9 >
-inline ::com::sun::star::uno::Any queryDeepInterface(
-    const ::com::sun::star::uno::Type & rType,
-    Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4, Interface5 * p5,
-    Interface6 * p6, Interface7 * p7, Interface8 * p8, Interface9 * p9 )
-{
-    if (isDerivedFrom(rType, Interface1::static_type()))
-        return ::com::sun::star::uno::Any( &p1, rType );
-    else if (isDerivedFrom(rType, Interface2::static_type()))
-        return ::com::sun::star::uno::Any( &p2, rType );
-    else if (isDerivedFrom(rType, Interface3::static_type()))
-        return ::com::sun::star::uno::Any( &p3, rType );
-    else if (isDerivedFrom(rType, Interface4::static_type()))
-        return ::com::sun::star::uno::Any( &p4, rType );
-    else if (isDerivedFrom(rType, Interface5::static_type()))
-        return ::com::sun::star::uno::Any( &p5, rType );
-    else if (isDerivedFrom(rType, Interface6::static_type()))
-        return ::com::sun::star::uno::Any( &p6, rType );
-    else if (isDerivedFrom(rType, Interface7::static_type()))
-        return ::com::sun::star::uno::Any( &p7, rType );
-    else if (isDerivedFrom(rType, Interface8::static_type()))
-        return ::com::sun::star::uno::Any( &p8, rType );
-    else if (isDerivedFrom(rType, Interface9::static_type()))
-        return ::com::sun::star::uno::Any( &p9, rType );
-    else
-        return ::com::sun::star::uno::Any();
-}
-
-/**
- * Inspect types and choose return proper interface.
- *
    
- * @param       p1      a pointer to an interface.
- * @param       p2      a pointer to an interface.
- * @param       p3      a pointer to an interface.
- * @param       p4      a pointer to an interface.
- * @param       p5      a pointer to an interface.
- * @param       p6      a pointer to an interface.
- * @param       p7      a pointer to an interface.
- * @param       p8      a pointer to an interface.
- * @param       p9      a pointer to an interface.
- * @param       p10     a pointer to an interface.
- */
-template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5,
-          class Interface6, class Interface7, class Interface8, class Interface9, class Interface10 >
-inline ::com::sun::star::uno::Any queryDeepInterface(
-    const ::com::sun::star::uno::Type & rType,
-    Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4, Interface5 * p5,
-    Interface6 * p6, Interface7 * p7, Interface8 * p8, Interface9 * p9, Interface10 * p10 )
-{
-    if (isDerivedFrom(rType, Interface1::static_type()))
-        return ::com::sun::star::uno::Any( &p1, rType );
-    else if (isDerivedFrom(rType, Interface2::static_type()))
-        return ::com::sun::star::uno::Any( &p2, rType );
-    else if (isDerivedFrom(rType, Interface3::static_type()))
-        return ::com::sun::star::uno::Any( &p3, rType );
-    else if (isDerivedFrom(rType, Interface4::static_type()))
-        return ::com::sun::star::uno::Any( &p4, rType );
-    else if (isDerivedFrom(rType, Interface5::static_type()))
-        return ::com::sun::star::uno::Any( &p5, rType );
-    else if (isDerivedFrom(rType, Interface6::static_type()))
-        return ::com::sun::star::uno::Any( &p6, rType );
-    else if (isDerivedFrom(rType, Interface7::static_type()))
-        return ::com::sun::star::uno::Any( &p7, rType );
-    else if (isDerivedFrom(rType, Interface8::static_type()))
-        return ::com::sun::star::uno::Any( &p8, rType );
-    else if (isDerivedFrom(rType, Interface9::static_type()))
-        return ::com::sun::star::uno::Any( &p9, rType );
-    else if (isDerivedFrom(rType, Interface10::static_type()))
-        return ::com::sun::star::uno::Any( &p10, rType );
-    else
-        return ::com::sun::star::uno::Any();
-}
-
-/**
- * Inspect types and choose return proper interface.
- *
    
- * @param       p1      a pointer to an interface.
- * @param       p2      a pointer to an interface.
- * @param       p3      a pointer to an interface.
- * @param       p4      a pointer to an interface.
- * @param       p5      a pointer to an interface.
- * @param       p6      a pointer to an interface.
- * @param       p7      a pointer to an interface.
- * @param       p8      a pointer to an interface.
- * @param       p9      a pointer to an interface.
- * @param       p10     a pointer to an interface.
- * @param       p11     a pointer to an interface.
- */
-template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5,
-          class Interface6, class Interface7, class Interface8, class Interface9, class Interface10,
-          class Interface11 >
-inline ::com::sun::star::uno::Any queryDeepInterface(
-    const ::com::sun::star::uno::Type & rType,
-    Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4, Interface5 * p5,
-    Interface6 * p6, Interface7 * p7, Interface8 * p8, Interface9 * p9, Interface10 * p10,
-    Interface11 * p11 )
-{
-    if (isDerivedFrom(rType, Interface1::static_type()))
-        return ::com::sun::star::uno::Any( &p1, rType );
-    else if (isDerivedFrom(rType, Interface2::static_type()))
-        return ::com::sun::star::uno::Any( &p2, rType );
-    else if (isDerivedFrom(rType, Interface3::static_type()))
-        return ::com::sun::star::uno::Any( &p3, rType );
-    else if (isDerivedFrom(rType, Interface4::static_type()))
-        return ::com::sun::star::uno::Any( &p4, rType );
-    else if (isDerivedFrom(rType, Interface5::static_type()))
-        return ::com::sun::star::uno::Any( &p5, rType );
-    else if (isDerivedFrom(rType, Interface6::static_type()))
-        return ::com::sun::star::uno::Any( &p6, rType );
-    else if (isDerivedFrom(rType, Interface7::static_type()))
-        return ::com::sun::star::uno::Any( &p7, rType );
-    else if (isDerivedFrom(rType, Interface8::static_type()))
-        return ::com::sun::star::uno::Any( &p8, rType );
-    else if (isDerivedFrom(rType, Interface9::static_type()))
-        return ::com::sun::star::uno::Any( &p9, rType );
-    else if (isDerivedFrom(rType, Interface10::static_type()))
-        return ::com::sun::star::uno::Any( &p10, rType );
-    else if (isDerivedFrom(rType, Interface11::static_type()))
-        return ::com::sun::star::uno::Any( &p11, rType );
-    else
-        return ::com::sun::star::uno::Any();
-}
-
-/**
- * Inspect types and choose return proper interface.
- *
    
- * @param       p1      a pointer to an interface.
- * @param       p2      a pointer to an interface.
- * @param       p3      a pointer to an interface.
- * @param       p4      a pointer to an interface.
- * @param       p5      a pointer to an interface.
- * @param       p6      a pointer to an interface.
- * @param       p7      a pointer to an interface.
- * @param       p8      a pointer to an interface.
- * @param       p9      a pointer to an interface.
- * @param       p10     a pointer to an interface.
- * @param       p11     a pointer to an interface.
- * @param       p12     a pointer to an interface.
- */
-template< class Interface1, class Interface2, class Interface3, class Interface4, class Interface5,
-          class Interface6, class Interface7, class Interface8, class Interface9, class Interface10,
-          class Interface11, class Interface12 >
-inline ::com::sun::star::uno::Any queryDeepInterface(
-    const ::com::sun::star::uno::Type & rType,
-    Interface1 * p1, Interface2 * p2, Interface3 * p3, Interface4 * p4, Interface5 * p5,
-    Interface6 * p6, Interface7 * p7, Interface8 * p8, Interface9 * p9, Interface10 * p10,
-    Interface11 * p11, Interface12 * p12 )
-{
-    if (isDerivedFrom(rType, Interface1::static_type()))
-        return ::com::sun::star::uno::Any( &p1, rType );
-    else if (isDerivedFrom(rType, Interface2::static_type()))
-        return ::com::sun::star::uno::Any( &p2, rType );
-    else if (isDerivedFrom(rType, Interface3::static_type()))
-        return ::com::sun::star::uno::Any( &p3, rType );
-    else if (isDerivedFrom(rType, Interface4::static_type()))
-        return ::com::sun::star::uno::Any( &p4, rType );
-    else if (isDerivedFrom(rType, Interface5::static_type()))
-        return ::com::sun::star::uno::Any( &p5, rType );
-    else if (isDerivedFrom(rType, Interface6::static_type()))
-        return ::com::sun::star::uno::Any( &p6, rType );
-    else if (isDerivedFrom(rType, Interface7::static_type()))
-        return ::com::sun::star::uno::Any( &p7, rType );
-    else if (isDerivedFrom(rType, Interface8::static_type()))
-        return ::com::sun::star::uno::Any( &p8, rType );
-    else if (isDerivedFrom(rType, Interface9::static_type()))
-        return ::com::sun::star::uno::Any( &p9, rType );
-    else if (isDerivedFrom(rType, Interface10::static_type()))
-        return ::com::sun::star::uno::Any( &p10, rType );
-    else if (isDerivedFrom(rType, Interface11::static_type()))
-        return ::com::sun::star::uno::Any( &p11, rType );
-    else if (isDerivedFrom(rType, Interface12::static_type()))
-        return ::com::sun::star::uno::Any( &p12, rType );
-    else
-        return ::com::sun::star::uno::Any();
-}
-
-} // namespace comphelper
-
-#endif // _COMPHELPER_QUERYDEEPINTERFACE_HXX
-
diff --git a/comphelper/source/misc/makefile.mk b/comphelper/source/misc/makefile.mk
index cecba554b332..0bb4defb4165 100644
--- a/comphelper/source/misc/makefile.mk
+++ b/comphelper/source/misc/makefile.mk
@@ -74,7 +74,6 @@ SLOFILES=   \
             $(SLO)$/officeresourcebundle.obj \
             $(SLO)$/officerestartmanager.obj \
             $(SLO)$/proxyaggregation.obj \
-            $(SLO)$/querydeep.obj \
             $(SLO)$/regpathhelper.obj \
             $(SLO)$/scopeguard.obj \
             $(SLO)$/SelectionMultiplex.obj \
diff --git a/comphelper/source/misc/querydeep.cxx b/comphelper/source/misc/querydeep.cxx
deleted file mode 100644
index 92e475686783..000000000000
--- a/comphelper/source/misc/querydeep.cxx
+++ /dev/null
@@ -1,76 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * 
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_comphelper.hxx"
-#include 
-#include 
-
-//__________________________________________________________________________________________________
-
-sal_Bool comphelper::isDerivedFrom(
-    const ::com::sun::star::uno::Type & rBaseType,
-    const ::com::sun::star::uno::Type & rType )
-{
-    using namespace ::com::sun::star::uno;
-
-    TypeClass eClass = rBaseType.getTypeClass();
-
-    if (eClass != TypeClass_INTERFACE)
-        return sal_False;
-
-    // supported TypeClass - do the types match ?
-    if (eClass != rType.getTypeClass())
-        return sal_False;
-
-    sal_Bool bRet;
-
-    // shortcut for simple case
-    if (rBaseType == ::getCppuType(static_cast *>(0)))
-    {
-        bRet = sal_True;
-    }
-    else
-    {
-        // now ask in cppu (aka typelib)
-        ::typelib_TypeDescription *pBaseTD = 0, *pTD = 0;
-
-        rBaseType.  getDescription(&pBaseTD);
-        rType.      getDescription(&pTD);
-
-        // interfaces are assignable to a base
-        bRet = ::typelib_typedescription_isAssignableFrom(pBaseTD, pTD);
-
-        ::typelib_typedescription_release(pBaseTD);
-        ::typelib_typedescription_release(pTD);
-    }
-
-    return bRet;
-}
-
-
-
-- 
cgit 


From 36fb328d48684d56329339d59753fa53e4b132ed Mon Sep 17 00:00:00 2001
From: "Frank Schoenheit [fs]" 
Date: Fri, 17 Sep 2010 08:23:35 +0200
Subject: dba34a: remove comphelper/optionalvalue.hxx, and the only client it
 had (replaced with boost/optional.hpp)

---
 comphelper/inc/comphelper/optionalvalue.hxx   | 187 --------------------------
 cppcanvas/inc/cppcanvas/renderer.hxx          |  18 +--
 cppcanvas/source/mtfrenderer/implrenderer.cxx |  46 +++----
 cppcanvas/source/mtfrenderer/textaction.cxx   |  20 +--
 4 files changed, 42 insertions(+), 229 deletions(-)
 delete mode 100644 comphelper/inc/comphelper/optionalvalue.hxx

diff --git a/comphelper/inc/comphelper/optionalvalue.hxx b/comphelper/inc/comphelper/optionalvalue.hxx
deleted file mode 100644
index f63e1cde51aa..000000000000
--- a/comphelper/inc/comphelper/optionalvalue.hxx
+++ /dev/null
@@ -1,187 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * 
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _COMPHELPER_OPTIONALVALUE_HXX
-#define _COMPHELPER_OPTIONALVALUE_HXX
-
-#include 
-
-namespace comphelper
-{
-
-/** @deprecated
-    Use boost/optional.hpp instead.
-*/
-
-
-
-    /* Definition of OptionalValue template */
-
-    /** This template provides 'optionality' for the given value type.
-
-        Especially for PODs, optionality either needs to be achieved
-        by special 'magic' values (i.e. an int value is not set when
-        -1 etc.), or an additional bool denoting value
-        validity. This template encapsulates the latter into an atomic
-        data type.
-
-        @tpl Element
-        The value type that should be made optional
-     */
-    template< typename Element > class OptionalValue
-    {
-    public:
-        typedef Element ValueType;
-
-        /** Default-construct the value.
-
-            A default-constructed value is not valid. You have to
-            explicitely set a value.
-         */
-        OptionalValue() :
-            maValue(),
-            mbValid( false )
-        {
-        }
-
-        /** Construct the value.
-
-            An explicitely constructed value is valid. To create an
-            invalid value, you have to default-construct it.
-         */
-        OptionalValue( const Element& rValue ) :
-            maValue( rValue ),
-            mbValid( true )
-        {
-        }
-
-        // default copy/assignment operators are okay here
-        //OptionalValue(const OptionalValue&);
-        //OptionalValue& operator=( const OptionalValue& );
-
-        /** Query whether the value is valid
-
-            @return true, if this object contains a valid value.
-         */
-        bool isValid() const
-        {
-            return mbValid;
-        }
-
-        /** Set a value.
-
-            After this call, the object contains a valid value.
-         */
-        void setValue( const Element& rValue )
-        {
-            maValue = rValue;
-            mbValid = true;
-        }
-
-        /** Get the value.
-
-            The return value of this method is undefined, if the
-            object does not contain a valid value.
-         */
-        Element getValue() const
-        {
-            return maValue;
-        }
-
-        /** Clear the value.
-
-            After this call, the object no longer contains a valid
-            value.
-         */
-        void clearValue()
-        {
-            mbValid = false;
-        }
-
-        // NOTE: The following two methods would optimally have been
-        // implemented as operator>>=/operator<<=
-        // overloads. Unfortunately, there's already a templatized
-        // version for those two methods, namely for UNO interface
-        // types. Adding a second would lead to ambiguities.
-
-        /** Export the value into an Any.
-
-            This method extracts the value into an Any. If the value
-            is invalid, the Any will be cleared.
-
-            @return true, if the value has been successfully
-            transferred to the Any. Clearing the Any from an invalid
-            object is also considered a successful operation.
-         */
-        bool exportValue( ::com::sun::star::uno::Any& o_rAny )
-        {
-            o_rAny.clear();
-
-            if( isValid() )
-            {
-                if( !(o_rAny <<= getValue()) )
-                    return false;
-            }
-
-            return true;
-        }
-
-        /** Import the value from an Any.
-
-            This method imports the value from an Any. If the Any
-            is invalid, the object will get an invalid value.
-
-            @return true, if the value has been successfully
-            transferred from the Any. Setting the value to invalid
-            from an empty Any is also considered a successful
-            operation.
-         */
-        bool importValue( const ::com::sun::star::uno::Any& rAny )
-        {
-            clearValue();
-
-            if( rAny.hasValue() )
-            {
-                Element tmp;
-
-                if( !(rAny >>= tmp) )
-                    return false;
-
-                setValue( tmp );
-            }
-
-            return true;
-        }
-
-    private:
-        Element     maValue;
-        bool        mbValid;
-    };
-
-}
-
-#endif /* _COMPHELPER_OPTIONALVALUE_HXX */
diff --git a/cppcanvas/inc/cppcanvas/renderer.hxx b/cppcanvas/inc/cppcanvas/renderer.hxx
index 780a27f31503..0b8bb43d7e3e 100644
--- a/cppcanvas/inc/cppcanvas/renderer.hxx
+++ b/cppcanvas/inc/cppcanvas/renderer.hxx
@@ -32,7 +32,7 @@
 #include 
 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -109,16 +109,16 @@ namespace cppcanvas
         struct Parameters
         {
             /// Optionally forces the fill color attribute for all actions
-            ::comphelper::OptionalValue< Color::IntSRGBA >          maFillColor;
+            ::boost::optional< Color::IntSRGBA >            maFillColor;
 
             /// Optionally forces the line color attribute for all actions
-            ::comphelper::OptionalValue< Color::IntSRGBA >          maLineColor;
+            ::boost::optional< Color::IntSRGBA >        maLineColor;
 
             /// Optionally forces the text color attribute for all actions
-            ::comphelper::OptionalValue< Color::IntSRGBA >          maTextColor;
+            ::boost::optional< Color::IntSRGBA >        maTextColor;
 
             /// Optionally forces the given fontname for all text actions
-            ::comphelper::OptionalValue< ::rtl::OUString >          maFontName;
+            ::boost::optional< ::rtl::OUString >        maFontName;
 
             /** Optionally transforms all text output actions with the
                 given matrix (in addition to the overall canvas
@@ -128,16 +128,16 @@ namespace cppcanvas
                 rect coordinate system, i.e. the metafile is assumed
                 to be contained in the unit rect.
              */
-            ::comphelper::OptionalValue< ::basegfx::B2DHomMatrix >  maTextTransformation;
+            ::boost::optional< ::basegfx::B2DHomMatrix >    maTextTransformation;
 
             /// Optionally forces the given font weight for all text actions
-            ::comphelper::OptionalValue< sal_Int8 >                 maFontWeight;
+            ::boost::optional< sal_Int8 >                   maFontWeight;
 
             /// Optionally forces the given font letter form (italics etc.) for all text actions
-            ::comphelper::OptionalValue< sal_Int8 >                 maFontLetterForm;
+            ::boost::optional< sal_Int8 >                   maFontLetterForm;
 
             /// Optionally forces underlining for all text actions
-            ::comphelper::OptionalValue< bool >                     maFontUnderline;
+            ::boost::optional< bool >                       maFontUnderline;
         };
     };
 
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 1423cd42ed93..006d55a01de6 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -831,8 +831,8 @@ namespace cppcanvas
         {
             rendering::FontRequest aFontRequest;
 
-            if( rParms.mrParms.maFontName.isValid() )
-                aFontRequest.FontDescription.FamilyName = rParms.mrParms.maFontName.getValue();
+            if( rParms.mrParms.maFontName.is_initialized() )
+                aFontRequest.FontDescription.FamilyName = *rParms.mrParms.maFontName;
             else
                 aFontRequest.FontDescription.FamilyName = rFont.GetName();
 
@@ -843,12 +843,12 @@ namespace cppcanvas
 
             // TODO(F2): improve vclenum->panose conversion
             aFontRequest.FontDescription.FontDescription.Weight =
-                rParms.mrParms.maFontWeight.isValid() ?
-                rParms.mrParms.maFontWeight.getValue() :
+                rParms.mrParms.maFontWeight.is_initialized() ?
+                *rParms.mrParms.maFontWeight :
                 ::canvas::tools::numeric_cast( ::basegfx::fround( rFont.GetWeight() ) );
             aFontRequest.FontDescription.FontDescription.Letterform =
-                rParms.mrParms.maFontLetterForm.isValid() ?
-                rParms.mrParms.maFontLetterForm.getValue() :
+                rParms.mrParms.maFontLetterForm.is_initialized() ?
+                *rParms.mrParms.maFontLetterForm :
                 (rFont.GetItalic() == ITALIC_NONE) ? 0 : 9;
 
             LanguageType aLang = rFont.GetLanguage();
@@ -1445,7 +1445,7 @@ namespace cppcanvas
                         break;
 
                     case META_LINECOLOR_ACTION:
-                        if( !rParms.maLineColor.isValid() )
+                        if( !rParms.maLineColor.is_initialized() )
                         {
                             setStateColor( static_cast(pCurrAct),
                                            getState( rStates ).isLineColorSet,
@@ -1455,7 +1455,7 @@ namespace cppcanvas
                         break;
 
                     case META_FILLCOLOR_ACTION:
-                        if( !rParms.maFillColor.isValid() )
+                        if( !rParms.maFillColor.is_initialized() )
                         {
                             setStateColor( static_cast(pCurrAct),
                                            getState( rStates ).isFillColorSet,
@@ -1466,7 +1466,7 @@ namespace cppcanvas
 
                     case META_TEXTCOLOR_ACTION:
                     {
-                        if( !rParms.maTextColor.isValid() )
+                        if( !rParms.maTextColor.is_initialized() )
                         {
                             // Text color is set unconditionally, thus, no
                             // use of setStateColor here
@@ -1486,7 +1486,7 @@ namespace cppcanvas
                     break;
 
                     case META_TEXTFILLCOLOR_ACTION:
-                        if( !rParms.maTextColor.isValid() )
+                        if( !rParms.maTextColor.is_initialized() )
                         {
                             setStateColor( static_cast(pCurrAct),
                                            getState( rStates ).isTextFillColorSet,
@@ -1496,7 +1496,7 @@ namespace cppcanvas
                         break;
 
                     case META_TEXTLINECOLOR_ACTION:
-                        if( !rParms.maTextColor.isValid() )
+                        if( !rParms.maTextColor.is_initialized() )
                         {
                             setStateColor( static_cast(pCurrAct),
                                            getState( rStates ).isTextLineColorSet,
@@ -1526,8 +1526,8 @@ namespace cppcanvas
                         // TODO(Q2): define and use appropriate enumeration types
                         rState.textReliefStyle          = (sal_Int8)rFont.GetRelief();
                         rState.textOverlineStyle        = (sal_Int8)rFont.GetOverline();
-                        rState.textUnderlineStyle       = rParms.maFontUnderline.isValid() ?
-                            (rParms.maFontUnderline.getValue() ? (sal_Int8)UNDERLINE_SINGLE : (sal_Int8)UNDERLINE_NONE) :
+                        rState.textUnderlineStyle       = rParms.maFontUnderline.is_initialized() ?
+                            (*rParms.maFontUnderline ? (sal_Int8)UNDERLINE_SINGLE : (sal_Int8)UNDERLINE_NONE) :
                             (sal_Int8)rFont.GetUnderline();
                         rState.textStrikeoutStyle       = (sal_Int8)rFont.GetStrikeout();
                         rState.textEmphasisMarkStyle    = (sal_Int8)rFont.GetEmphasisMark();
@@ -2946,28 +2946,28 @@ namespace cppcanvas
                 getState( aStateStack ).textLineColor = pColor->getDeviceColor( 0x000000FF );
 
             // apply overrides from the Parameters struct
-            if( rParams.maFillColor.isValid() )
+            if( rParams.maFillColor.is_initialized() )
             {
                 getState( aStateStack ).isFillColorSet = true;
-                getState( aStateStack ).fillColor = pColor->getDeviceColor( rParams.maFillColor.getValue() );
+                getState( aStateStack ).fillColor = pColor->getDeviceColor( *rParams.maFillColor );
             }
-            if( rParams.maLineColor.isValid() )
+            if( rParams.maLineColor.is_initialized() )
             {
                 getState( aStateStack ).isLineColorSet = true;
-                getState( aStateStack ).lineColor = pColor->getDeviceColor( rParams.maLineColor.getValue() );
+                getState( aStateStack ).lineColor = pColor->getDeviceColor( *rParams.maLineColor );
             }
-            if( rParams.maTextColor.isValid() )
+            if( rParams.maTextColor.is_initialized() )
             {
                 getState( aStateStack ).isTextFillColorSet = true;
                 getState( aStateStack ).isTextLineColorSet = true;
                 getState( aStateStack ).textColor =
                     getState( aStateStack ).textFillColor =
-                    getState( aStateStack ).textLineColor = pColor->getDeviceColor( rParams.maTextColor.getValue() );
+                    getState( aStateStack ).textLineColor = pColor->getDeviceColor( *rParams.maTextColor );
             }
-            if( rParams.maFontName.isValid() ||
-                rParams.maFontWeight.isValid() ||
-                rParams.maFontLetterForm.isValid() ||
-                rParams.maFontUnderline.isValid() )
+            if( rParams.maFontName.is_initialized() ||
+                rParams.maFontWeight.is_initialized() ||
+                rParams.maFontLetterForm.is_initialized() ||
+                rParams.maFontUnderline.is_initialized() )
             {
                 ::cppcanvas::internal::OutDevState& rState = getState( aStateStack );
 
diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx
index bc4cf6688ca3..56ce197b7e8e 100644
--- a/cppcanvas/source/mtfrenderer/textaction.cxx
+++ b/cppcanvas/source/mtfrenderer/textaction.cxx
@@ -2069,7 +2069,7 @@ namespace cppcanvas
                         rCanvas->getUNOCanvas()->getDevice(),
                         aResultingPolyPolygon ) );
 
-                if( rParms.maTextTransformation.isValid() )
+                if( rParms.maTextTransformation.is_initialized() )
                 {
                     return ActionSharedPtr(
                         new OutlineAction(
@@ -2085,7 +2085,7 @@ namespace cppcanvas
                             rVDev,
                             rCanvas,
                             rState,
-                            rParms.maTextTransformation.getValue() ) );
+                            *rParms.maTextTransformation ) );
                 }
                 else
                 {
@@ -2186,7 +2186,7 @@ namespace cppcanvas
                     rShadowColor == aEmptyColor )
                 {
                     // nope
-                    if( rParms.maTextTransformation.isValid() )
+                    if( rParms.maTextTransformation.is_initialized() )
                     {
                         return ActionSharedPtr( new TextAction(
                                                     aStartPoint,
@@ -2195,7 +2195,7 @@ namespace cppcanvas
                                                     nLen,
                                                     rCanvas,
                                                     rState,
-                                                    rParms.maTextTransformation.getValue() ) );
+                                                    *rParms.maTextTransformation ) );
                     }
                     else
                     {
@@ -2211,7 +2211,7 @@ namespace cppcanvas
                 else
                 {
                     // at least one of the effects requested
-                    if( rParms.maTextTransformation.isValid() )
+                    if( rParms.maTextTransformation.is_initialized() )
                         return ActionSharedPtr( new EffectTextAction(
                                                     aStartPoint,
                                                     aReliefOffset,
@@ -2224,7 +2224,7 @@ namespace cppcanvas
                                                     rVDev,
                                                     rCanvas,
                                                     rState,
-                                                    rParms.maTextTransformation.getValue() ) );
+                                                    *rParms.maTextTransformation ) );
                     else
                         return ActionSharedPtr( new EffectTextAction(
                                                     aStartPoint,
@@ -2250,7 +2250,7 @@ namespace cppcanvas
                     rShadowColor == aEmptyColor )
                 {
                     // nope
-                    if( rParms.maTextTransformation.isValid() )
+                    if( rParms.maTextTransformation.is_initialized() )
                         return ActionSharedPtr( new TextArrayAction(
                                                     aStartPoint,
                                                     rText,
@@ -2259,7 +2259,7 @@ namespace cppcanvas
                                                     aCharWidths,
                                                     rCanvas,
                                                     rState,
-                                                    rParms.maTextTransformation.getValue() ) );
+                                                    *rParms.maTextTransformation ) );
                     else
                         return ActionSharedPtr( new TextArrayAction(
                                                     aStartPoint,
@@ -2273,7 +2273,7 @@ namespace cppcanvas
                 else
                 {
                     // at least one of the effects requested
-                    if( rParms.maTextTransformation.isValid() )
+                    if( rParms.maTextTransformation.is_initialized() )
                         return ActionSharedPtr( new EffectTextArrayAction(
                                                     aStartPoint,
                                                     aReliefOffset,
@@ -2287,7 +2287,7 @@ namespace cppcanvas
                                                     rVDev,
                                                     rCanvas,
                                                     rState,
-                                                    rParms.maTextTransformation.getValue() ) );
+                                                    *rParms.maTextTransformation ) );
                     else
                         return ActionSharedPtr( new EffectTextArrayAction(
                                                     aStartPoint,
-- 
cgit 


From d8def1a38da4259a7cebb61b40ce97245d836822 Mon Sep 17 00:00:00 2001
From: "Frank Schoenheit [fs]" 
Date: Fri, 17 Sep 2010 08:38:22 +0200
Subject: dba34a: added FlagGuard, a specialization of ScopeGuard

---
 comphelper/inc/comphelper/scopeguard.hxx | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/comphelper/inc/comphelper/scopeguard.hxx b/comphelper/inc/comphelper/scopeguard.hxx
index 4841a564ae61..1fdd179404a2 100644
--- a/comphelper/inc/comphelper/scopeguard.hxx
+++ b/comphelper/inc/comphelper/scopeguard.hxx
@@ -33,6 +33,7 @@
 #endif
 #include "boost/function.hpp"
 #include "boost/noncopyable.hpp"
+#include "boost/bind.hpp"
 
 namespace comphelper {
 
@@ -66,6 +67,21 @@ private:
     exc_handling const m_excHandling;
 };
 
+class COMPHELPER_DLLPUBLIC FlagGuard : ScopeGuard
+{
+public:
+    explicit FlagGuard( bool& i_flagRef, exc_handling i_excHandling = IGNORE_EXCEPTIONS )
+        :ScopeGuard( ::boost::bind( ResetFlag, ::boost::ref( i_flagRef ) ), i_excHandling )
+    {
+    }
+
+private:
+    static void ResetFlag( bool& i_flagRef )
+    {
+        i_flagRef = false;
+    }
+};
+
 } // namespace comphelper
 
 #endif // ! defined(INCLUDED_COMPHELPER_SCOPEGUARD_HXX)
-- 
cgit 


From 35f7711566bfa7016ce5f838fe9b3c8e84cd7472 Mon Sep 17 00:00:00 2001
From: Christian Lippka 
Date: Fri, 17 Sep 2010 13:58:19 +0200
Subject: mib19: #163566# do not throw assertion if node is not available

---
 unotools/source/config/viewoptions.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/unotools/source/config/viewoptions.cxx b/unotools/source/config/viewoptions.cxx
index 7f2250c611fc..f76ce48eebdf 100644
--- a/unotools/source/config/viewoptions.cxx
+++ b/unotools/source/config/viewoptions.cxx
@@ -781,7 +781,7 @@ css::uno::Reference< css::uno::XInterface > SvtViewOptionsBase_Impl::impl_getSet
             xNode = ::comphelper::ConfigurationHelper::makeSureSetNodeExists(m_xRoot, m_sListName, sNode);
         else
         {
-            if (m_xSet.is())
+            if (m_xSet.is() && m_xSet->hasByName(sNode) )
                 m_xSet->getByName(sNode) >>= xNode;
         }
     }
-- 
cgit 


From 38fb19d9d30bd0657bec7a7ece8e0b7e1f247381 Mon Sep 17 00:00:00 2001
From: "Frank Schoenheit [fs]" 
Date: Mon, 20 Sep 2010 11:35:13 +0200
Subject: dba34a: #i108357# complement existing PrePaint with new PostPaint

---
 vcl/inc/vcl/window.hxx       | 1 +
 vcl/source/window/window.cxx | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx
index 8264767e59ad..5e581f4e933b 100644
--- a/vcl/inc/vcl/window.hxx
+++ b/vcl/inc/vcl/window.hxx
@@ -599,6 +599,7 @@ public:
     virtual void        KeyUp( const KeyEvent& rKEvt );
     virtual void        PrePaint();
     virtual void        Paint( const Rectangle& rRect );
+    virtual void        PostPaint();
     virtual void        Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags );
     virtual void        Move();
     virtual void        Resize();
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index adedbde4c0f2..41a2fe6a7ba3 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -4875,6 +4875,12 @@ void Window::Paint( const Rectangle& rRect )
 
 // -----------------------------------------------------------------------
 
+void Window::PostPaint()
+{
+}
+
+// -----------------------------------------------------------------------
+
 void Window::Draw( OutputDevice*, const Point&, const Size&, ULONG )
 {
     DBG_CHKTHIS( Window, ImplDbgCheckWindow );
-- 
cgit 


From a4789a0d3867b5026669c3b959963175eeeffca3 Mon Sep 17 00:00:00 2001
From: "Frank Schoenheit [fs]" 
Date: Thu, 23 Sep 2010 12:33:40 +0200
Subject: dba34a: +assign(Any) / +getNames

---
 comphelper/inc/comphelper/namedvaluecollection.hxx | 12 ++++++
 comphelper/source/misc/namedvaluecollection.cxx    | 49 +++++++++++++++-------
 2 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/comphelper/inc/comphelper/namedvaluecollection.hxx b/comphelper/inc/comphelper/namedvaluecollection.hxx
index 72cd0e7cdfbe..e13059361b0a 100644
--- a/comphelper/inc/comphelper/namedvaluecollection.hxx
+++ b/comphelper/inc/comphelper/namedvaluecollection.hxx
@@ -39,6 +39,7 @@
 
 #include 
 #include 
+#include 
 
 //........................................................................
 namespace comphelper
@@ -91,6 +92,11 @@ namespace comphelper
 
         ~NamedValueCollection();
 
+        inline void assign( const ::com::sun::star::uno::Any& i_rWrappedElements )
+        {
+            impl_assign( i_rWrappedElements );
+        }
+
         inline void assign( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& _rArguments )
         {
             impl_assign( _rArguments );
@@ -117,6 +123,11 @@ namespace comphelper
         /// determines whether the collection is empty
         bool    empty() const;
 
+        /** returns the names of all elements in the collection
+        */
+        ::std::vector< ::rtl::OUString >
+                getNames() const;
+
         /** merges the content of another collection into |this|
             @param _rAdditionalValues
                 the collection whose values are to be merged
@@ -312,6 +323,7 @@ namespace comphelper
         }
 
     private:
+        void    impl_assign( const ::com::sun::star::uno::Any& i_rWrappedElements );
         void    impl_assign( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& _rArguments );
         void    impl_assign( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rArguments );
         void    impl_assign( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& _rArguments );
diff --git a/comphelper/source/misc/namedvaluecollection.cxx b/comphelper/source/misc/namedvaluecollection.cxx
index 8bab7fa3d7c7..566e5526019c 100644
--- a/comphelper/source/misc/namedvaluecollection.cxx
+++ b/comphelper/source/misc/namedvaluecollection.cxx
@@ -99,21 +99,7 @@ namespace comphelper
     NamedValueCollection::NamedValueCollection( const Any& _rElements )
         :m_pImpl( new NamedValueCollection_Impl )
     {
-        Sequence< NamedValue > aNamedValues;
-        Sequence< PropertyValue > aPropertyValues;
-        NamedValue aNamedValue;
-        PropertyValue aPropertyValue;
-
-        if ( _rElements >>= aNamedValues )
-            impl_assign( aNamedValues );
-        else if ( _rElements >>= aPropertyValues )
-            impl_assign( aPropertyValues );
-        else if ( _rElements >>= aNamedValue )
-            impl_assign( Sequence< NamedValue >( &aNamedValue, 1 ) );
-        else if ( _rElements >>= aPropertyValue )
-            impl_assign( Sequence< PropertyValue >( &aPropertyValue, 1 ) );
-        else
-            OSL_ENSURE( !_rElements.hasValue(), "NamedValueCollection::NamedValueCollection(Any): unsupported type!" );
+        impl_assign( _rElements );
     }
 
     //--------------------------------------------------------------------
@@ -169,6 +155,39 @@ namespace comphelper
         return m_pImpl->aValues.empty();
     }
 
+    //--------------------------------------------------------------------
+    ::std::vector< ::rtl::OUString > NamedValueCollection::getNames() const
+    {
+        ::std::vector< ::rtl::OUString > aNames( m_pImpl->aValues.size() );
+        ::std::transform(
+            m_pImpl->aValues.begin(),
+            m_pImpl->aValues.end(),
+            aNames.begin(),
+            ::std::select1st< NamedValueRepository::value_type >()
+        );
+        return aNames;
+    }
+
+    //--------------------------------------------------------------------
+    void NamedValueCollection::impl_assign( const Any& i_rWrappedElements )
+    {
+        Sequence< NamedValue > aNamedValues;
+        Sequence< PropertyValue > aPropertyValues;
+        NamedValue aNamedValue;
+        PropertyValue aPropertyValue;
+
+        if ( i_rWrappedElements >>= aNamedValues )
+            impl_assign( aNamedValues );
+        else if ( i_rWrappedElements >>= aPropertyValues )
+            impl_assign( aPropertyValues );
+        else if ( i_rWrappedElements >>= aNamedValue )
+            impl_assign( Sequence< NamedValue >( &aNamedValue, 1 ) );
+        else if ( i_rWrappedElements >>= aPropertyValue )
+            impl_assign( Sequence< PropertyValue >( &aPropertyValue, 1 ) );
+        else
+            OSL_ENSURE( !i_rWrappedElements.hasValue(), "NamedValueCollection::impl_assign(Any): unsupported type!" );
+    }
+
     //--------------------------------------------------------------------
     void NamedValueCollection::impl_assign( const Sequence< Any >& _rArguments )
     {
-- 
cgit 


From 6af5de845541bef97f45a5bab770642c433d1a4c Mon Sep 17 00:00:00 2001
From: os 
Date: Thu, 23 Sep 2010 15:51:45 +0200
Subject: shape properties wzDescription and wzName support added

---
 svtools/inc/rtfkeywd.hxx          | 1 +
 svtools/inc/rtftoken.h            | 2 +-
 svtools/source/svrtf/rtfkey2.cxx  | 1 +
 svtools/source/svrtf/rtfkeywd.cxx | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/svtools/inc/rtfkeywd.hxx b/svtools/inc/rtfkeywd.hxx
index 60963c58abbc..de59e1d8faf9 100644
--- a/svtools/inc/rtfkeywd.hxx
+++ b/svtools/inc/rtfkeywd.hxx
@@ -1121,6 +1121,7 @@
 #define OOO_STRING_SVTOOLS_RTF_SHP "\\shp"
 #define OOO_STRING_SVTOOLS_RTF_SN "\\sn"
 #define OOO_STRING_SVTOOLS_RTF_SV "\\sv"
+#define OOO_STRING_SVTOOLS_RTF_SP "\\sp"
 
 // Support for overline attributes
 #define OOO_STRING_SVTOOLS_RTF_OL "\\ol"
diff --git a/svtools/inc/rtftoken.h b/svtools/inc/rtftoken.h
index e75254487312..f292682a0236 100644
--- a/svtools/inc/rtftoken.h
+++ b/svtools/inc/rtftoken.h
@@ -1258,7 +1258,7 @@ enum RTF_TOKEN_IDS {
     RTF_SOUTLVL,
 
 // shapes
-    RTF_SHP, RTF_SN, RTF_SV
+    RTF_SHP, RTF_SN, RTF_SV, RTF_SP
 /*
     RTF_SHPLEFT,
     RTF_SHPTOP,
diff --git a/svtools/source/svrtf/rtfkey2.cxx b/svtools/source/svrtf/rtfkey2.cxx
index 03a7667f48e2..a4335302f475 100644
--- a/svtools/source/svrtf/rtfkey2.cxx
+++ b/svtools/source/svrtf/rtfkey2.cxx
@@ -1128,6 +1128,7 @@ sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SOUTLVL, "\\soutlvl" );
 sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHP, "\\shp" );
 sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SN, "\\sn" );
 sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SV, "\\sv" );
+sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SP, "\\sp" );
 /*
 sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPLEFT, "\\shpleft" );
 sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPTOP, "\\shptop" );
diff --git a/svtools/source/svrtf/rtfkeywd.cxx b/svtools/source/svrtf/rtfkeywd.cxx
index 27ce3643f8cf..9b29951ddbbf 100644
--- a/svtools/source/svrtf/rtfkeywd.cxx
+++ b/svtools/source/svrtf/rtfkeywd.cxx
@@ -1160,6 +1160,7 @@ static RTF_TokenEntry __FAR_DATA aRTFTokenTab[] = {
         */
         {{OOO_STRING_SVTOOLS_RTF_SN},       RTF_SN},
         {{OOO_STRING_SVTOOLS_RTF_SV},       RTF_SV},
+        {{OOO_STRING_SVTOOLS_RTF_SP},       RTF_SP},
 
 // Support for overline attributes
         {{OOO_STRING_SVTOOLS_RTF_OL},           RTF_OL},
-- 
cgit 


From d3a48ab9c41bd4c7ba6b48fb70ce6b55026c9b20 Mon Sep 17 00:00:00 2001
From: "Frank Schoenheit [fs]" 
Date: Fri, 24 Sep 2010 09:36:58 +0200
Subject: dba34a: #i114698# when a property is present in both the aggregate
 and the delegatee, expose it only once, and route access to it to the
 delegatee

---
 comphelper/source/property/propagg.cxx | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/comphelper/source/property/propagg.cxx b/comphelper/source/property/propagg.cxx
index e796c29eba90..9c2fd868d973 100644
--- a/comphelper/source/property/propagg.cxx
+++ b/comphelper/source/property/propagg.cxx
@@ -87,20 +87,36 @@ OPropertyArrayAggregationHelper::OPropertyArrayAggregationHelper(
     const   Property* pDelegateProps    = _rProperties.getConstArray();
             Property* pMergedProps = m_aProperties.getArray();
 
+    // if properties are present both at the delegatee and the aggregate, then the former are supposed to win.
+    // So, we'll need an existence check.
+    ::std::set< ::rtl::OUString > aDelegatorProps;
+
     // create the map for the delegator properties
     sal_Int32 nMPLoop = 0;
     for ( ; nMPLoop < nDelegatorProps; ++nMPLoop, ++pDelegateProps )
+    {
         m_aPropertyAccessors[ pDelegateProps->Handle ] = OPropertyAccessor( -1, nMPLoop, sal_False );
+        OSL_ENSURE( aDelegatorProps.find( pDelegateProps->Name ) == aDelegatorProps.end(),
+            "OPropertyArrayAggregationHelper::OPropertyArrayAggregationHelper: duplicate delegatee property!" );
+        aDelegatorProps.insert( pDelegateProps->Name );
+    }
 
     // create the map for the aggregate properties
     sal_Int32 nAggregateHandle = _nFirstAggregateId;
     pMergedProps += nDelegatorProps;
-    for ( ; nMPLoop < nMergedProps; ++nMPLoop, ++pMergedProps, ++pAggregateProps )
+    for ( ; nMPLoop < nMergedProps; ++pAggregateProps )
     {
+        // if the aggregate property is present at the delegatee already, ignore it
+        if ( aDelegatorProps.find( pAggregateProps->Name ) != aDelegatorProps.end() )
+        {
+            --nMergedProps;
+            continue;
+        }
+
         // next aggregate property - remember it
         *pMergedProps = *pAggregateProps;
 
-        // determine the handle for the property which we will expose to the ourside world
+        // determine the handle for the property which we will expose to the outside world
         sal_Int32 nHandle = -1;
         // ask the infor service first
         if ( _pInfoService )
@@ -123,7 +139,11 @@ OPropertyArrayAggregationHelper::OPropertyArrayAggregationHelper(
         // remember the accessor for this property
         m_aPropertyAccessors[ nHandle ] = OPropertyAccessor( pMergedProps->Handle, nMPLoop, sal_True );
         pMergedProps->Handle = nHandle;
+
+        ++nMPLoop;
+        ++pMergedProps;
     }
+    m_aProperties.realloc( nMergedProps );
     pMergedProps = m_aProperties.getArray();    // reset, needed again below
 
     // sortieren der Properties nach Namen
-- 
cgit 


From 4d25643942f30ad94b853a65338098d842767ed8 Mon Sep 17 00:00:00 2001
From: "Philipp Lohmann [pl]" 
Date: Fri, 24 Sep 2010 14:28:04 +0200
Subject: step1: put encrpytion parameters into PDFContext

---
 vcl/inc/vcl/pdfwriter.hxx         |  82 ++--
 vcl/source/gdi/pdfwriter.cxx      |  20 +-
 vcl/source/gdi/pdfwriter_impl.cxx | 817 +++++++++++++++++++++++---------------
 vcl/source/gdi/pdfwriter_impl.hxx | 170 +++-----
 4 files changed, 607 insertions(+), 482 deletions(-)

diff --git a/vcl/inc/vcl/pdfwriter.hxx b/vcl/inc/vcl/pdfwriter.hxx
index 419814e5ce97..cbb9c7c2fe93 100644
--- a/vcl/inc/vcl/pdfwriter.hxx
+++ b/vcl/inc/vcl/pdfwriter.hxx
@@ -61,16 +61,6 @@ class Wallpaper;
 namespace vcl
 {
 
-struct PDFDocInfo
-{
-    String          Title;          // document title
-    String          Author;         // document author
-    String          Subject;        // subject
-    String          Keywords;       // keywords
-    String          Creator;        // application that created the original document
-    String          Producer;       // OpenOffice
-};
-
 struct PDFNote
 {
     String          Title;          // optional title for the popup containing the note
@@ -468,7 +458,7 @@ public:
         FitVisible,
         ActionZoom
     };
-// These emuns are treated as integer while reading/writing to configuration
+// These enums are treated as integer while reading/writing to configuration
     enum PDFPageLayout
     {
         DefaultLayout,
@@ -489,20 +479,35 @@ public:
 /*
 The following structure describes the permissions used in PDF security
  */
-    struct PDFSecPermissions
+    struct PDFEncryptionProperties
     {
-//for both 40 and 128 bit security, see 3.5.2 PDF v 1.4 table 3.15, v 1.5 and v 1.6 table 3.20.
-        bool    CanPrintTheDocument;
+
+        bool Security128bit; // true to select 128 bit encryption, false for 40 bit
+        //for both 40 and 128 bit security, see 3.5.2 PDF v 1.4 table 3.15, v 1.5 and v 1.6 table 3.20.
+        bool CanPrintTheDocument;
         bool CanModifyTheContent;
         bool CanCopyOrExtract;
         bool CanAddOrModify;
-//for revision 3 (bit 128 security) only
+        //for revision 3 (bit 128 security) only
         bool CanFillInteractive;
         bool CanExtractForAccessibility;
         bool CanAssemble;
         bool CanPrintFull;
-//permission default set for 128 bit, accessibility only
-        PDFSecPermissions() :
+
+        // encryption will only happen if EncryptionKey is not empty
+        // EncryptionKey is actually a construct out of OValue, UValue and DocumentIdentifier
+        // if these do not match, behavior is undefined, most likely an invalid PDF will be produced
+        // OValue, UValue, EncryptionKey and DocumentIdentifier can be computed from
+        // PDFDocInfo, Owner password and User password usend the InitEncryption method which
+        // implements the algorithms described in the PDF reference chapter 3.5: Encryption
+        std::vector OValue;
+        std::vector UValue;
+        std::vector EncryptionKey;
+        std::vector DocumentIdentifier;
+
+        //permission default set for 128 bit, accessibility only
+        PDFEncryptionProperties() :
+            Security128bit              ( true ),
             CanPrintTheDocument         ( false ),
             CanModifyTheContent         ( false ),
             CanCopyOrExtract            ( false ),
@@ -512,6 +517,20 @@ The following structure describes the permissions used in PDF security
             CanAssemble                 ( false ),
             CanPrintFull                ( false )
             {}
+
+
+        bool Encrypt() const
+        { return ! OValue.empty() && ! UValue.empty() && ! DocumentIdentifier.empty(); }
+    };
+
+    struct PDFDocInfo
+    {
+        String          Title;          // document title
+        String          Author;         // document author
+        String          Subject;        // subject
+        String          Keywords;       // keywords
+        String          Creator;        // application that created the original document
+        String          Producer;       // OpenOffice
     };
 
     struct PDFWriterContext
@@ -570,12 +589,8 @@ The following structure describes the permissions used in PDF security
         sal_Int32                       InitialPage;
         sal_Int32                       OpenBookmarkLevels; // -1 means all levels
 
-        struct PDFSecPermissions        AccessPermissions;
-
-        bool                            Encrypt; // main encryption flag, must be true to encript
-        bool                            Security128bit; // true to select 128 bit encryption, false for 40 bit
-        rtl::OUString                   OwnerPassword; // owner password for PDF, in clear text
-        rtl::OUString                   UserPassword; // user password for PDF, in clear text
+        PDFWriter::PDFEncryptionProperties  Encryption;
+        PDFWriter::PDFDocInfo           DocumentInfo;
 
         com::sun::star::lang::Locale    DocumentLocale; // defines the document default language
 
@@ -604,9 +619,7 @@ The following structure describes the permissions used in PDF security
                 FirstPageLeft( false ),
                 InitialPage( 1 ),
                 OpenBookmarkLevels( -1 ),
-                AccessPermissions( ),
-                Encrypt( false ),
-                Security128bit( true )
+                Encryption()
         {}
     };
 
@@ -636,17 +649,6 @@ The following structure describes the permissions used in PDF security
     */
     sal_Int32 NewPage( sal_Int32 nPageWidth = 0, sal_Int32 nPageHeight = 0, Orientation eOrientation = Inherit );
 
-    /*
-     *  set document info; due to the use of document information in building the PDF document ID, must be called before
-     *  emitting anything.
-     */
-    void SetDocInfo( const PDFDocInfo& rInfo );
-
-    /*
-     *  get currently set document info
-     */
-    const PDFDocInfo& GetDocInfo() const;
-
     /* sets the document locale originally passed with the context to a new value
      * only affects the output if used before calling Emit/code>.
      */
@@ -664,6 +666,12 @@ The following structure describes the permissions used in PDF security
 
     PDFVersion GetVersion() const;
 
+    static bool InitEncryption( PDFWriter::PDFEncryptionProperties& io_rProperties,
+                                const rtl::OUString& i_rOwnerPassword,
+                                const rtl::OUString& i_rUserPassword,
+                                const PDFWriter::PDFDocInfo& i_rDocInfo
+                                );
+
     /* functions for graphics state */
     /* flag values: see vcl/outdev.hxx */
     void                Push( USHORT nFlags = 0xffff );
diff --git a/vcl/source/gdi/pdfwriter.cxx b/vcl/source/gdi/pdfwriter.cxx
index 5dcce25a0315..3b5e70d938a8 100644
--- a/vcl/source/gdi/pdfwriter.cxx
+++ b/vcl/source/gdi/pdfwriter.cxx
@@ -69,16 +69,6 @@ PDFWriter::PDFVersion PDFWriter::GetVersion() const
     return ((PDFWriterImpl*)pImplementation)->getVersion();
 }
 
-void PDFWriter::SetDocInfo( const PDFDocInfo& rInfo )
-{
-    ((PDFWriterImpl*)pImplementation)->setDocInfo( rInfo );
-}
-
-const PDFDocInfo& PDFWriter::GetDocInfo() const
-{
-    return ((PDFWriterImpl*)pImplementation)->getDocInfo();
-}
-
 void PDFWriter::SetDocumentLocale( const com::sun::star::lang::Locale& rLoc )
 {
     ((PDFWriterImpl*)pImplementation)->setDocumentLocale( rLoc );
@@ -569,3 +559,13 @@ std::set< PDFWriter::ErrorCode > PDFWriter::GetErrors()
 {
     return ((PDFWriterImpl*)pImplementation)->getErrors();
 }
+
+bool PDFWriter::InitEncryption( PDFWriter::PDFEncryptionProperties& io_rProperties,
+                                const rtl::OUString& i_rOwnerPassword,
+                                const rtl::OUString& i_rUserPassword,
+                                const PDFWriter::PDFDocInfo& i_rDocInfo
+                                )
+{
+    return PDFWriterImpl::initEncryption( io_rProperties, i_rOwnerPassword, i_rUserPassword, i_rDocInfo );
+}
+
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 09cf1734eb6f..ff415ccfa98c 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -113,12 +113,10 @@ void doTestCode()
     aContext.Version        = PDFWriter::PDF_1_4;
     aContext.Tagged         = true;
     aContext.InitialPage    = 2;
+    aContext.DocumentInfo.Title = OUString( RTL_CONSTASCII_USTRINGPARAM( "PDF export test document" ) );
+    aContext.DocumentInfo.Producer = OUString( RTL_CONSTASCII_USTRINGPARAM( "VCL" ) );
 
     PDFWriter aWriter( aContext );
-    PDFDocInfo aDocInfo;
-    aDocInfo.Title = OUString( RTL_CONSTASCII_USTRINGPARAM( "PDF export test document" ) );
-    aDocInfo.Producer = OUString( RTL_CONSTASCII_USTRINGPARAM( "VCL" ) );
-    aWriter.SetDocInfo( aDocInfo );
     aWriter.NewPage( 595, 842 );
     aWriter.BeginStructureElement( PDFWriter::Document );
     // set duration of 3 sec for first page
@@ -496,6 +494,12 @@ static inline double pixelToPoint( sal_Int32 px ) { return double(px)/fDivisor;
 static inline double pixelToPoint( double px ) { return px/fDivisor; }
 static inline sal_Int32 pointToPixel( double pt ) { return sal_Int32(pt*fDivisor); }
 
+const sal_uInt8 PDFWriterImpl::s_nPadString[32] =
+{
+    0x28, 0xBF, 0x4E, 0x5E, 0x4E, 0x75, 0x8A, 0x41, 0x64, 0x00, 0x4E, 0x56, 0xFF, 0xFA, 0x01, 0x08,
+    0x2E, 0x2E, 0x00, 0xB6, 0xD0, 0x68, 0x3E, 0x80, 0x2F, 0x0C, 0xA9, 0xFE, 0x64, 0x53, 0x69, 0x7A
+};
+
 static void appendHex( sal_Int8 nInt, OStringBuffer& rBuffer )
 {
     static const sal_Char pHexDigits[] = { '0', '1', '2', '3', '4', '5', '6', '7',
@@ -1714,9 +1718,6 @@ PDFWriterImpl::PDFWriterImpl( const PDFWriter::PDFWriterContext& rContext )
         m_aCipher( (rtlCipher)NULL ),
         m_aDigest( NULL ),
         m_bEncryptThisStream( false ),
-        m_aDocID( 32 ),
-        m_aCreationDateString( 64 ),
-        m_aCreationMetaDateString( 64 ),
         m_pEncryptionBuffer( NULL ),
         m_nEncryptionBufferSize( 0 ),
         m_bIsPDF_A1( false )
@@ -1758,14 +1759,32 @@ PDFWriterImpl::PDFWriterImpl( const PDFWriter::PDFWriterContext& rContext )
 
     m_bOpen = true;
 
-/* prepare the cypher engine, can be done in CTOR, free in DTOR */
+    /* prepare the cypher engine, can be done in CTOR, free in DTOR */
 
     m_aCipher = rtl_cipher_createARCFOUR( rtl_Cipher_ModeStream );
     m_aDigest = rtl_digest_createMD5();
 
-/* the size of the Codec default maximum */
+    /* the size of the Codec default maximum */
     checkEncryptionBufferSize( 0x4000 );
 
+    if( m_aContext.Encryption.Encrypt() )
+    {
+        // sanity check
+        if( m_aContext.Encryption.OValue.size() != ENCRYPTED_PWD_SIZE ||
+            m_aContext.Encryption.UValue.size() != ENCRYPTED_PWD_SIZE ||
+            m_aContext.Encryption.EncryptionKey.size() != MAXIMUM_RC4_KEY_LENGTH
+           )
+        {
+            // the field lengths are invalid ? This was not setup by initEncryption.
+            // do not encrypt after all
+            m_aContext.Encryption.OValue.clear();
+            m_aContext.Encryption.UValue.clear();
+            OSL_ENSURE( 0, "encryption data failed sanity check, encryption disabled" );
+        }
+        else // setup key lengths
+            m_nAccessPermissions = computeAccessPermissions( m_aContext.Encryption, m_nKeyLength, m_nRC4KeyLength );
+    }
+
     // write header
     OStringBuffer aBuffer( 20 );
     aBuffer.append( "%PDF-" );
@@ -1811,139 +1830,138 @@ PDFWriterImpl::~PDFWriterImpl()
     rtl_freeMemory( m_pEncryptionBuffer );
 }
 
-void PDFWriterImpl::setDocInfo( const PDFDocInfo& rInfo )
+void PDFWriterImpl::setupDocInfo()
 {
-    m_aDocInfo.Title                = rInfo.Title;
-    m_aDocInfo.Author               = rInfo.Author;
-    m_aDocInfo.Subject              = rInfo.Subject;
-    m_aDocInfo.Keywords             = rInfo.Keywords;
-    m_aDocInfo.Creator              = rInfo.Creator;
-    m_aDocInfo.Producer             = rInfo.Producer;
+    std::vector< sal_uInt8 > aId;
+    computeDocumentIdentifier( aId, m_aContext.DocumentInfo, m_aCreationDateString, m_aCreationMetaDateString );
+    if( m_aContext.Encryption.DocumentIdentifier.empty() )
+        m_aContext.Encryption.DocumentIdentifier = aId;
+}
+
+void PDFWriterImpl::computeDocumentIdentifier( std::vector< sal_uInt8 >& o_rIdentifier,
+                                               const vcl::PDFWriter::PDFDocInfo& i_rDocInfo,
+                                               rtl::OString& o_rCString1,
+                                               rtl::OString& o_rCString2
+                                               )
+{
+    o_rIdentifier.clear();
 
-//build the document id
+    //build the document id
     rtl::OString aInfoValuesOut;
     OStringBuffer aID( 1024 );
-    if( m_aDocInfo.Title.Len() )
-        appendUnicodeTextString( m_aDocInfo.Title, aID );
-    if( m_aDocInfo.Author.Len() )
-        appendUnicodeTextString( m_aDocInfo.Author, aID );
-    if( m_aDocInfo.Subject.Len() )
-        appendUnicodeTextString( m_aDocInfo.Subject, aID );
-    if( m_aDocInfo.Keywords.Len() )
-        appendUnicodeTextString( m_aDocInfo.Keywords, aID );
-    if( m_aDocInfo.Creator.Len() )
-        appendUnicodeTextString( m_aDocInfo.Creator, aID );
-    if( m_aDocInfo.Producer.Len() )
-        appendUnicodeTextString( m_aDocInfo.Producer, aID );
+    if( i_rDocInfo.Title.Len() )
+        appendUnicodeTextString( i_rDocInfo.Title, aID );
+    if( i_rDocInfo.Author.Len() )
+        appendUnicodeTextString( i_rDocInfo.Author, aID );
+    if( i_rDocInfo.Subject.Len() )
+        appendUnicodeTextString( i_rDocInfo.Subject, aID );
+    if( i_rDocInfo.Keywords.Len() )
+        appendUnicodeTextString( i_rDocInfo.Keywords, aID );
+    if( i_rDocInfo.Creator.Len() )
+        appendUnicodeTextString( i_rDocInfo.Creator, aID );
+    if( i_rDocInfo.Producer.Len() )
+        appendUnicodeTextString( i_rDocInfo.Producer, aID );
 
     TimeValue aTVal, aGMT;
     oslDateTime aDT;
     osl_getSystemTime( &aGMT );
     osl_getLocalTimeFromSystemTime( &aGMT, &aTVal );
     osl_getDateTimeFromTimeValue( &aTVal, &aDT );
-    m_aCreationDateString.append( "D:" );
-    m_aCreationDateString.append( (sal_Char)('0' + ((aDT.Year/1000)%10)) );
-    m_aCreationDateString.append( (sal_Char)('0' + ((aDT.Year/100)%10)) );
-    m_aCreationDateString.append( (sal_Char)('0' + ((aDT.Year/10)%10)) );
-    m_aCreationDateString.append( (sal_Char)('0' + ((aDT.Year)%10)) );
-    m_aCreationDateString.append( (sal_Char)('0' + ((aDT.Month/10)%10)) );
-    m_aCreationDateString.append( (sal_Char)('0' + ((aDT.Month)%10)) );
-    m_aCreationDateString.append( (sal_Char)('0' + ((aDT.Day/10)%10)) );
-    m_aCreationDateString.append( (sal_Char)('0' + ((aDT.Day)%10)) );
-    m_aCreationDateString.append( (sal_Char)('0' + ((aDT.Hours/10)%10)) );
-    m_aCreationDateString.append( (sal_Char)('0' + ((aDT.Hours)%10)) );
-    m_aCreationDateString.append( (sal_Char)('0' + ((aDT.Minutes/10)%10)) );
-    m_aCreationDateString.append( (sal_Char)('0' + ((aDT.Minutes)%10)) );
-    m_aCreationDateString.append( (sal_Char)('0' + ((aDT.Seconds/10)%10)) );
-    m_aCreationDateString.append( (sal_Char)('0' + ((aDT.Seconds)%10)) );
-//--> i59651, we fill the Metadata date string as well, if PDF/A is requested
-    if( m_bIsPDF_A1 )
-    {
-// according to ISO 19005-1:2005 6.7.3 the date is corrected for
-// local time zone offset UTC only, whereas Acrobat 8 seems
-// to use the localtime notation only
-// according to a raccomandation in XMP Specification (Jan 2004, page 75)
-// the Acrobat way seems the right approach
-        m_aCreationMetaDateString.append( (sal_Char)('0' + ((aDT.Year/1000)%10)) );
-        m_aCreationMetaDateString.append( (sal_Char)('0' + ((aDT.Year/100)%10)) );
-        m_aCreationMetaDateString.append( (sal_Char)('0' + ((aDT.Year/10)%10)) );
-        m_aCreationMetaDateString.append( (sal_Char)('0' + ((aDT.Year)%10)) );
-        m_aCreationMetaDateString.append( "-" );
-        m_aCreationMetaDateString.append( (sal_Char)('0' + ((aDT.Month/10)%10)) );
-        m_aCreationMetaDateString.append( (sal_Char)('0' + ((aDT.Month)%10)) );
-        m_aCreationMetaDateString.append( "-" );
-        m_aCreationMetaDateString.append( (sal_Char)('0' + ((aDT.Day/10)%10)) );
-        m_aCreationMetaDateString.append( (sal_Char)('0' + ((aDT.Day)%10)) );
-        m_aCreationMetaDateString.append( "T" );
-        m_aCreationMetaDateString.append( (sal_Char)('0' + ((aDT.Hours/10)%10)) );
-        m_aCreationMetaDateString.append( (sal_Char)('0' + ((aDT.Hours)%10)) );
-        m_aCreationMetaDateString.append( ":" );
-        m_aCreationMetaDateString.append( (sal_Char)('0' + ((aDT.Minutes/10)%10)) );
-        m_aCreationMetaDateString.append( (sal_Char)('0' + ((aDT.Minutes)%10)) );
-        m_aCreationMetaDateString.append( ":" );
-        m_aCreationMetaDateString.append( (sal_Char)('0' + ((aDT.Seconds/10)%10)) );
-        m_aCreationMetaDateString.append( (sal_Char)('0' + ((aDT.Seconds)%10)) );
-    }
+    rtl::OStringBuffer aCreationDateString(64), aCreationMetaDateString(64);
+    aCreationDateString.append( "D:" );
+    aCreationDateString.append( (sal_Char)('0' + ((aDT.Year/1000)%10)) );
+    aCreationDateString.append( (sal_Char)('0' + ((aDT.Year/100)%10)) );
+    aCreationDateString.append( (sal_Char)('0' + ((aDT.Year/10)%10)) );
+    aCreationDateString.append( (sal_Char)('0' + ((aDT.Year)%10)) );
+    aCreationDateString.append( (sal_Char)('0' + ((aDT.Month/10)%10)) );
+    aCreationDateString.append( (sal_Char)('0' + ((aDT.Month)%10)) );
+    aCreationDateString.append( (sal_Char)('0' + ((aDT.Day/10)%10)) );
+    aCreationDateString.append( (sal_Char)('0' + ((aDT.Day)%10)) );
+    aCreationDateString.append( (sal_Char)('0' + ((aDT.Hours/10)%10)) );
+    aCreationDateString.append( (sal_Char)('0' + ((aDT.Hours)%10)) );
+    aCreationDateString.append( (sal_Char)('0' + ((aDT.Minutes/10)%10)) );
+    aCreationDateString.append( (sal_Char)('0' + ((aDT.Minutes)%10)) );
+    aCreationDateString.append( (sal_Char)('0' + ((aDT.Seconds/10)%10)) );
+    aCreationDateString.append( (sal_Char)('0' + ((aDT.Seconds)%10)) );
+
+    //--> i59651, we fill the Metadata date string as well, if PDF/A is requested
+    // according to ISO 19005-1:2005 6.7.3 the date is corrected for
+    // local time zone offset UTC only, whereas Acrobat 8 seems
+    // to use the localtime notation only
+    // according to a raccomandation in XMP Specification (Jan 2004, page 75)
+    // the Acrobat way seems the right approach
+    aCreationMetaDateString.append( (sal_Char)('0' + ((aDT.Year/1000)%10)) );
+    aCreationMetaDateString.append( (sal_Char)('0' + ((aDT.Year/100)%10)) );
+    aCreationMetaDateString.append( (sal_Char)('0' + ((aDT.Year/10)%10)) );
+    aCreationMetaDateString.append( (sal_Char)('0' + ((aDT.Year)%10)) );
+    aCreationMetaDateString.append( "-" );
+    aCreationMetaDateString.append( (sal_Char)('0' + ((aDT.Month/10)%10)) );
+    aCreationMetaDateString.append( (sal_Char)('0' + ((aDT.Month)%10)) );
+    aCreationMetaDateString.append( "-" );
+    aCreationMetaDateString.append( (sal_Char)('0' + ((aDT.Day/10)%10)) );
+    aCreationMetaDateString.append( (sal_Char)('0' + ((aDT.Day)%10)) );
+    aCreationMetaDateString.append( "T" );
+    aCreationMetaDateString.append( (sal_Char)('0' + ((aDT.Hours/10)%10)) );
+    aCreationMetaDateString.append( (sal_Char)('0' + ((aDT.Hours)%10)) );
+    aCreationMetaDateString.append( ":" );
+    aCreationMetaDateString.append( (sal_Char)('0' + ((aDT.Minutes/10)%10)) );
+    aCreationMetaDateString.append( (sal_Char)('0' + ((aDT.Minutes)%10)) );
+    aCreationMetaDateString.append( ":" );
+    aCreationMetaDateString.append( (sal_Char)('0' + ((aDT.Seconds/10)%10)) );
+    aCreationMetaDateString.append( (sal_Char)('0' + ((aDT.Seconds)%10)) );
+
     sal_uInt32 nDelta = 0;
     if( aGMT.Seconds > aTVal.Seconds )
     {
-        m_aCreationDateString.append( "-" );
+        aCreationDateString.append( "-" );
         nDelta = aGMT.Seconds-aTVal.Seconds;
-        if( m_bIsPDF_A1 )
-            m_aCreationMetaDateString.append( "-" );
+        aCreationMetaDateString.append( "-" );
     }
     else if( aGMT.Seconds < aTVal.Seconds )
     {
-        m_aCreationDateString.append( "+" );
+        aCreationDateString.append( "+" );
         nDelta = aTVal.Seconds-aGMT.Seconds;
-        if( m_bIsPDF_A1 )
-            m_aCreationMetaDateString.append( "+" );
+        aCreationMetaDateString.append( "+" );
     }
     else
     {
-        m_aCreationDateString.append( "Z" );
-        if( m_bIsPDF_A1 )
-            m_aCreationMetaDateString.append( "Z" );
+        aCreationDateString.append( "Z" );
+        aCreationMetaDateString.append( "Z" );
 
     }
     if( nDelta )
     {
-        m_aCreationDateString.append( (sal_Char)('0' + ((nDelta/36000)%10)) );
-        m_aCreationDateString.append( (sal_Char)('0' + ((nDelta/3600)%10)) );
-        m_aCreationDateString.append( "'" );
-        m_aCreationDateString.append( (sal_Char)('0' + ((nDelta/600)%6)) );
-        m_aCreationDateString.append( (sal_Char)('0' + ((nDelta/60)%10)) );
-        if( m_bIsPDF_A1 )
-        {
-            m_aCreationMetaDateString.append( (sal_Char)('0' + ((nDelta/36000)%10)) );
-            m_aCreationMetaDateString.append( (sal_Char)('0' + ((nDelta/3600)%10)) );
-            m_aCreationMetaDateString.append( ":" );
-            m_aCreationMetaDateString.append( (sal_Char)('0' + ((nDelta/600)%6)) );
-            m_aCreationMetaDateString.append( (sal_Char)('0' + ((nDelta/60)%10)) );
-        }
+        aCreationDateString.append( (sal_Char)('0' + ((nDelta/36000)%10)) );
+        aCreationDateString.append( (sal_Char)('0' + ((nDelta/3600)%10)) );
+        aCreationDateString.append( "'" );
+        aCreationDateString.append( (sal_Char)('0' + ((nDelta/600)%6)) );
+        aCreationDateString.append( (sal_Char)('0' + ((nDelta/60)%10)) );
+
+        aCreationMetaDateString.append( (sal_Char)('0' + ((nDelta/36000)%10)) );
+        aCreationMetaDateString.append( (sal_Char)('0' + ((nDelta/3600)%10)) );
+        aCreationMetaDateString.append( ":" );
+        aCreationMetaDateString.append( (sal_Char)('0' + ((nDelta/600)%6)) );
+        aCreationMetaDateString.append( (sal_Char)('0' + ((nDelta/60)%10)) );
     }
-    m_aCreationDateString.append( "'" );
-    aID.append( m_aCreationDateString.getStr(), m_aCreationDateString.getLength() );
+    aCreationDateString.append( "'" );
+    aID.append( aCreationDateString.getStr(), aCreationDateString.getLength() );
 
     aInfoValuesOut = aID.makeStringAndClear();
+    o_rCString1 = aCreationDateString.makeStringAndClear();
+    o_rCString2 = aCreationMetaDateString.makeStringAndClear();
 
-    DBG_ASSERT( m_aDigest != NULL, "PDFWrite_Impl::setDocInfo: cannot obtain a digest object !" );
-
-    m_aDocID.setLength( 0 );
-    if( m_aDigest )
+    rtlDigest aDigest = rtl_digest_createMD5();
+    OSL_ENSURE( aDigest != NULL, "PDFWriterImpl::computeDocumentIdentifier: cannot obtain a digest object !" );
+    if( aDigest )
     {
-        osl_getSystemTime( &aGMT );
-        rtlDigestError nError = rtl_digest_updateMD5( m_aDigest, &aGMT, sizeof( aGMT ) );
+        rtlDigestError nError = rtl_digest_updateMD5( aDigest, &aGMT, sizeof( aGMT ) );
         if( nError == rtl_Digest_E_None )
-            nError = rtl_digest_updateMD5( m_aDigest, m_aContext.URL.getStr(), m_aContext.URL.getLength()*sizeof(sal_Unicode) );
-        if( nError == rtl_Digest_E_None )
-            nError = rtl_digest_updateMD5( m_aDigest, aInfoValuesOut.getStr(), aInfoValuesOut.getLength() );
+            nError = rtl_digest_updateMD5( aDigest, aInfoValuesOut.getStr(), aInfoValuesOut.getLength() );
         if( nError == rtl_Digest_E_None )
         {
-//the binary form of the doc id is needed for encryption stuff
-            rtl_digest_getMD5( m_aDigest, m_nDocID, 16 );
-            for( unsigned int i = 0; i < 16; i++ )
-                appendHex( m_nDocID[i], m_aDocID );
+            o_rIdentifier = std::vector< sal_uInt8 >( 16, 0 );
+            //the binary form of the doc id is needed for encryption stuff
+            rtl_digest_getMD5( aDigest, &o_rIdentifier[0], 16 );
         }
     }
 }
@@ -1956,7 +1974,7 @@ append the string as unicode hex, encrypted if needed
 inline void PDFWriterImpl::appendUnicodeTextStringEncrypt( const rtl::OUString& rInString, const sal_Int32 nInObjectNumber, OStringBuffer& rOutBuffer )
 {
     rOutBuffer.append( "<" );
-    if( m_aContext.Encrypt )
+    if( m_aContext.Encryption.Encrypt() )
     {
         const sal_Unicode* pStr = rInString.getStr();
         sal_Int32 nLen = rInString.getLength();
@@ -1993,7 +2011,7 @@ inline void PDFWriterImpl::appendLiteralStringEncrypt( rtl::OStringBuffer& rInSt
     rOutBuffer.append( "(" );
     sal_Int32 nChars = rInString.getLength();
 //check for encryption, if ok, encrypt the string, then convert with appndLiteralString
-    if( m_aContext.Encrypt && checkEncryptionBufferSize( nChars ) )
+    if( m_aContext.Encryption.Encrypt() && checkEncryptionBufferSize( nChars ) )
     {
 //encrypt the string in a buffer, then append it
         enableStringEncryption( nInObjectNumber );
@@ -2380,9 +2398,6 @@ SalLayout* PDFWriterImpl::GetTextLayout( ImplLayoutArgs& rArgs, ImplFontSelectDa
 
 sal_Int32 PDFWriterImpl::newPage( sal_Int32 nPageWidth, sal_Int32 nPageHeight, PDFWriter::Orientation eOrientation )
 {
-    if( m_aContext.Encrypt && m_aPages.empty() )
-        initEncryption();
-
     endPage();
     m_nCurrentPage = m_aPages.size();
     m_aPages.push_back( PDFPage(this, nPageWidth, nPageHeight, eOrientation ) );
@@ -5877,7 +5892,7 @@ bool PDFWriterImpl::emitCatalog()
     }
 // viewer preferences, if we had some, then emit
     if( m_aContext.HideViewerToolbar ||
-        ( m_aContext.Version > PDFWriter::PDF_1_3 && m_aDocInfo.Title.Len() && m_aContext.DisplayPDFDocumentTitle ) ||
+        ( m_aContext.Version > PDFWriter::PDF_1_3 && m_aContext.DocumentInfo.Title.Len() && m_aContext.DisplayPDFDocumentTitle ) ||
         m_aContext.HideViewerMenubar ||
         m_aContext.HideViewerWindowControls || m_aContext.FitWindow ||
         m_aContext.CenterWindow || (m_aContext.FirstPageLeft  &&  m_aContext.PageLayout == PDFWriter::ContinuousFacing ) ||
@@ -5894,7 +5909,7 @@ bool PDFWriterImpl::emitCatalog()
             aLine.append( "/FitWindow true\n" );
         if( m_aContext.CenterWindow )
             aLine.append( "/CenterWindow true\n" );
-        if( m_aContext.Version > PDFWriter::PDF_1_3 && m_aDocInfo.Title.Len() && m_aContext.DisplayPDFDocumentTitle )
+        if( m_aContext.Version > PDFWriter::PDF_1_3 && m_aContext.DocumentInfo.Title.Len() && m_aContext.DisplayPDFDocumentTitle )
             aLine.append( "/DisplayDocTitle true\n" );
         if( m_aContext.FirstPageLeft &&  m_aContext.PageLayout == PDFWriter::ContinuousFacing )
             aLine.append( "/Direction/R2L\n" );
@@ -5998,40 +6013,40 @@ sal_Int32 PDFWriterImpl::emitInfoDict( )
         aLine.append( nObject );
         aLine.append( " 0 obj\n"
                       "<<" );
-        if( m_aDocInfo.Title.Len() )
+        if( m_aContext.DocumentInfo.Title.Len() )
         {
             aLine.append( "/Title" );
-            appendUnicodeTextStringEncrypt( m_aDocInfo.Title, nObject, aLine );
+            appendUnicodeTextStringEncrypt( m_aContext.DocumentInfo.Title, nObject, aLine );
             aLine.append( "\n" );
         }
-        if( m_aDocInfo.Author.Len() )
+        if( m_aContext.DocumentInfo.Author.Len() )
         {
             aLine.append( "/Author" );
-            appendUnicodeTextStringEncrypt( m_aDocInfo.Author, nObject, aLine );
+            appendUnicodeTextStringEncrypt( m_aContext.DocumentInfo.Author, nObject, aLine );
             aLine.append( "\n" );
         }
-        if( m_aDocInfo.Subject.Len() )
+        if( m_aContext.DocumentInfo.Subject.Len() )
         {
             aLine.append( "/Subject" );
-            appendUnicodeTextStringEncrypt( m_aDocInfo.Subject, nObject, aLine );
+            appendUnicodeTextStringEncrypt( m_aContext.DocumentInfo.Subject, nObject, aLine );
             aLine.append( "\n" );
         }
-        if( m_aDocInfo.Keywords.Len() )
+        if( m_aContext.DocumentInfo.Keywords.Len() )
         {
             aLine.append( "/Keywords" );
-            appendUnicodeTextStringEncrypt( m_aDocInfo.Keywords, nObject, aLine );
+            appendUnicodeTextStringEncrypt( m_aContext.DocumentInfo.Keywords, nObject, aLine );
             aLine.append( "\n" );
         }
-        if( m_aDocInfo.Creator.Len() )
+        if( m_aContext.DocumentInfo.Creator.Len() )
         {
             aLine.append( "/Creator" );
-            appendUnicodeTextStringEncrypt( m_aDocInfo.Creator, nObject, aLine );
+            appendUnicodeTextStringEncrypt( m_aContext.DocumentInfo.Creator, nObject, aLine );
             aLine.append( "\n" );
         }
-        if( m_aDocInfo.Producer.Len() )
+        if( m_aContext.DocumentInfo.Producer.Len() )
         {
             aLine.append( "/Producer" );
-            appendUnicodeTextStringEncrypt( m_aDocInfo.Producer, nObject, aLine );
+            appendUnicodeTextStringEncrypt( m_aContext.DocumentInfo.Producer, nObject, aLine );
             aLine.append( "\n" );
         }
 
@@ -6277,45 +6292,45 @@ sal_Int32 PDFWriterImpl::emitDocumentMetadata()
         aMetadataStream.append( "   A\n" );
         aMetadataStream.append( "  \n" );
 //... Dublin Core properties go here
-        if( m_aDocInfo.Title.Len() ||
-            m_aDocInfo.Author.Len() ||
-            m_aDocInfo.Subject.Len() )
+        if( m_aContext.DocumentInfo.Title.Len() ||
+            m_aContext.DocumentInfo.Author.Len() ||
+            m_aContext.DocumentInfo.Subject.Len() )
         {
             aMetadataStream.append( "  \n" );
-            if( m_aDocInfo.Title.Len() )
+            if( m_aContext.DocumentInfo.Title.Len() )
             {
 // this is according to PDF/A-1, technical corrigendum 1 (2007-04-01)
                 aMetadataStream.append( "   \n" );
                 aMetadataStream.append( "    \n" );
                 aMetadataStream.append( "     " );
                 rtl::OUString aTitle;
-                escapeStringXML( m_aDocInfo.Title, aTitle );
+                escapeStringXML( m_aContext.DocumentInfo.Title, aTitle );
                 aMetadataStream.append( OUStringToOString( aTitle, RTL_TEXTENCODING_UTF8 )  );
                 aMetadataStream.append( "\n" );
                 aMetadataStream.append( "    \n" );
                 aMetadataStream.append( "   \n" );
             }
-            if( m_aDocInfo.Author.Len() )
+            if( m_aContext.DocumentInfo.Author.Len() )
             {
                 aMetadataStream.append( "   \n" );
                 aMetadataStream.append( "    \n" );
                 aMetadataStream.append( "     " );
                 rtl::OUString aAuthor;
-                escapeStringXML( m_aDocInfo.Author, aAuthor );
+                escapeStringXML( m_aContext.DocumentInfo.Author, aAuthor );
                 aMetadataStream.append( OUStringToOString( aAuthor , RTL_TEXTENCODING_UTF8 )  );
                 aMetadataStream.append( "\n" );
                 aMetadataStream.append( "    \n" );
                 aMetadataStream.append( "   \n" );
             }
-            if( m_aDocInfo.Subject.Len() )
+            if( m_aContext.DocumentInfo.Subject.Len() )
             {
 // this is according to PDF/A-1, technical corrigendum 1 (2007-04-01)
                 aMetadataStream.append( "   \n" );
                 aMetadataStream.append( "    \n" );
                 aMetadataStream.append( "     " );
                 rtl::OUString aSubject;
-                escapeStringXML( m_aDocInfo.Subject, aSubject );
+                escapeStringXML( m_aContext.DocumentInfo.Subject, aSubject );
                 aMetadataStream.append( OUStringToOString( aSubject , RTL_TEXTENCODING_UTF8 )  );
                 aMetadataStream.append( "\n" );
                 aMetadataStream.append( "    \n" );
@@ -6325,24 +6340,24 @@ sal_Int32 PDFWriterImpl::emitDocumentMetadata()
         }
 
 //... PDF properties go here
-        if( m_aDocInfo.Producer.Len() ||
-            m_aDocInfo.Keywords.Len() )
+        if( m_aContext.DocumentInfo.Producer.Len() ||
+            m_aContext.DocumentInfo.Keywords.Len() )
         {
             aMetadataStream.append( "  \n" );
-            if( m_aDocInfo.Producer.Len() )
+            if( m_aContext.DocumentInfo.Producer.Len() )
             {
                 aMetadataStream.append( "   " );
                 rtl::OUString aProducer;
-                escapeStringXML( m_aDocInfo.Producer, aProducer );
+                escapeStringXML( m_aContext.DocumentInfo.Producer, aProducer );
                 aMetadataStream.append( OUStringToOString( aProducer , RTL_TEXTENCODING_UTF8 )  );
                 aMetadataStream.append( "\n" );
             }
-            if( m_aDocInfo.Keywords.Len() )
+            if( m_aContext.DocumentInfo.Keywords.Len() )
             {
                 aMetadataStream.append( "   " );
                 rtl::OUString aKeywords;
-                escapeStringXML( m_aDocInfo.Keywords, aKeywords );
+                escapeStringXML( m_aContext.DocumentInfo.Keywords, aKeywords );
                 aMetadataStream.append( OUStringToOString( aKeywords , RTL_TEXTENCODING_UTF8 )  );
                 aMetadataStream.append( "\n" );
             }
@@ -6351,11 +6366,11 @@ sal_Int32 PDFWriterImpl::emitDocumentMetadata()
 
         aMetadataStream.append( "  \n" );
-        if( m_aDocInfo.Creator.Len() )
+        if( m_aContext.DocumentInfo.Creator.Len() )
         {
             aMetadataStream.append( "   " );
             rtl::OUString aCreator;
-            escapeStringXML( m_aDocInfo.Creator, aCreator );
+            escapeStringXML( m_aContext.DocumentInfo.Creator, aCreator );
             aMetadataStream.append( OUStringToOString( aCreator , RTL_TEXTENCODING_UTF8 )  );
             aMetadataStream.append( "\n" );
         }
@@ -6411,7 +6426,7 @@ bool PDFWriterImpl::emitTrailer()
 
     sal_Int32 nSecObject = 0;
 
-    if( m_aContext.Encrypt == true )
+    if( m_aContext.Encryption.Encrypt() )
     {
 //emit the security information
 //must be emitted as indirect dictionary object, since
@@ -6425,16 +6440,16 @@ bool PDFWriterImpl::emitTrailer()
             aLineS.append( " 0 obj\n"
                            "<>\nendobj\n\n" );
@@ -6500,13 +6515,21 @@ bool PDFWriterImpl::emitTrailer()
         aLine.append( nDocInfoObject );
         aLine.append( " 0 R\n" );
     }
-    if( m_aDocID.getLength() )
+    if( ! m_aContext.Encryption.DocumentIdentifier.empty() )
     {
         aLine.append( "/ID [ <" );
-        aLine.append( m_aDocID.getStr(), m_aDocID.getLength() );
+        for( std::vector< sal_uInt8 >::const_iterator it = m_aContext.Encryption.DocumentIdentifier.begin();
+             it != m_aContext.Encryption.DocumentIdentifier.end(); ++it )
+        {
+            appendHex( sal_Int8(*it), aLine );
+        }
         aLine.append( ">\n"
                       "<" );
-        aLine.append( m_aDocID.getStr(), m_aDocID.getLength() );
+        for( std::vector< sal_uInt8 >::const_iterator it = m_aContext.Encryption.DocumentIdentifier.begin();
+             it != m_aContext.Encryption.DocumentIdentifier.end(); ++it )
+        {
+            appendHex( sal_Int8(*it), aLine );
+        }
         aLine.append( "> ]\n" );
     }
     if( aDocChecksum.getLength() )
@@ -9653,7 +9676,7 @@ bool PDFWriterImpl::writeBitmapObject( BitmapEmit& rObject, bool bMask )
             aLine.append( "[ /Indexed/DeviceRGB " );
             aLine.append( (sal_Int32)(pAccess->GetPaletteEntryCount()-1) );
             aLine.append( "\n<" );
-            if( m_aContext.Encrypt )
+            if( m_aContext.Encryption.Encrypt() )
             {
                 enableStringEncryption( rObject.m_nObject );
                 //check encryption buffer size
@@ -12039,30 +12062,169 @@ void PDFWriterImpl::addStream( const String& rMimeType, PDFOutputStream* pStream
     }
 }
 
+
+sal_Bool PDFWriterImpl::checkEncryptionBufferSize( register sal_Int32 newSize )
+{
+    if( m_nEncryptionBufferSize < newSize )
+    {
+        /* reallocate the buffer, the used function allocate as rtl_allocateMemory
+        if the pointer parameter is NULL */
+        m_pEncryptionBuffer = (sal_uInt8*)rtl_reallocateMemory( m_pEncryptionBuffer, newSize );
+        if( m_pEncryptionBuffer )
+            m_nEncryptionBufferSize = newSize;
+        else
+            m_nEncryptionBufferSize = 0;
+    }
+    return ( m_nEncryptionBufferSize != 0 );
+}
+
+void PDFWriterImpl::checkAndEnableStreamEncryption( register sal_Int32 nObject )
+{
+    if( m_aContext.Encryption.Encrypt() )
+    {
+        m_bEncryptThisStream = true;
+        sal_Int32 i = m_nKeyLength;
+        m_aContext.Encryption.EncryptionKey[i++] = (sal_uInt8)nObject;
+        m_aContext.Encryption.EncryptionKey[i++] = (sal_uInt8)( nObject >> 8 );
+        m_aContext.Encryption.EncryptionKey[i++] = (sal_uInt8)( nObject >> 16 );
+        //the other location of m_nEncryptionKey are already set to 0, our fixed generation number
+        // do the MD5 hash
+        sal_uInt8 nMD5Sum[ RTL_DIGEST_LENGTH_MD5 ];
+        // the i+2 to take into account the generation number, always zero
+        rtl_digest_MD5( &m_aContext.Encryption.EncryptionKey[0], i+2, nMD5Sum, sizeof(nMD5Sum) );
+        // initialize the RC4 with the key
+        // key legth: see algoritm 3.1, step 4: (N+5) max 16
+        rtl_cipher_initARCFOUR( m_aCipher, rtl_Cipher_DirectionEncode, nMD5Sum, m_nRC4KeyLength, NULL, 0 );
+    }
+}
+
+void PDFWriterImpl::enableStringEncryption( register sal_Int32 nObject )
+{
+    if( m_aContext.Encryption.Encrypt() )
+    {
+        sal_Int32 i = m_nKeyLength;
+        m_aContext.Encryption.EncryptionKey[i++] = (sal_uInt8)nObject;
+        m_aContext.Encryption.EncryptionKey[i++] = (sal_uInt8)( nObject >> 8 );
+        m_aContext.Encryption.EncryptionKey[i++] = (sal_uInt8)( nObject >> 16 );
+        //the other location of m_nEncryptionKey are already set to 0, our fixed generation number
+        // do the MD5 hash
+        sal_uInt8 nMD5Sum[ RTL_DIGEST_LENGTH_MD5 ];
+        // the i+2 to take into account the generation number, always zero
+        rtl_digest_MD5( &m_aContext.Encryption.EncryptionKey[0], i+2, nMD5Sum, sizeof(nMD5Sum) );
+        // initialize the RC4 with the key
+        // key legth: see algoritm 3.1, step 4: (N+5) max 16
+        rtl_cipher_initARCFOUR( m_aCipher, rtl_Cipher_DirectionEncode, nMD5Sum, m_nRC4KeyLength, NULL, 0 );
+    }
+}
+
+/* init the encryption engine
+1. init the document id, used both for building the document id and for building the encryption key(s)
+2. build the encryption key following algorithms described in the PDF specification
+ */
+bool PDFWriterImpl::initEncryption( vcl::PDFWriter::PDFEncryptionProperties& io_rProperties,
+                                    const rtl::OUString& i_rOwnerPassword,
+                                    const rtl::OUString& i_rUserPassword,
+                                    const vcl::PDFWriter::PDFDocInfo& i_rDocInfo
+                                    )
+{
+    bool bSuccess = false;
+    rtl::OString aC1, aC2;
+    computeDocumentIdentifier( io_rProperties.DocumentIdentifier, i_rDocInfo, aC1, aC2 );
+    if( i_rOwnerPassword.getLength() || i_rUserPassword.getLength() )
+    {
+        sal_Int32 nKeyLength = 0, nRC4KeyLength = 0;
+        sal_Int32 nAccessPermissions = computeAccessPermissions( io_rProperties, nKeyLength, nRC4KeyLength );
+        // get padded passwords
+        sal_uInt8 aPadUPW[ENCRYPTED_PWD_SIZE], aPadOPW[ENCRYPTED_PWD_SIZE];
+        padPassword( i_rOwnerPassword.getLength() ? i_rOwnerPassword : i_rUserPassword, aPadOPW );
+        padPassword( i_rUserPassword, aPadUPW );
+        bSuccess = computeODictionaryValue( aPadOPW, aPadUPW, io_rProperties, nKeyLength, nRC4KeyLength )
+                && computeUDictionaryValue( aPadOPW, aPadUPW, io_rProperties, nKeyLength, nRC4KeyLength, nAccessPermissions )
+                ;
+
+        // trash temporary padded cleartext PWDs
+        rtl_zeroMemory( aPadOPW, sizeof(aPadOPW) );
+        rtl_zeroMemory( aPadUPW, sizeof(aPadUPW) );
+
+        //clear out exceding key values, prepares for generation number default to 0 as well
+        // see checkAndEnableStreamEncryption in pdfwriter_impl.hxx
+        if( bSuccess )
+        {
+            sal_Int32 i, y;
+            for( i = nKeyLength, y = 0; y < 5 ; y++ )
+                io_rProperties.EncryptionKey[i++] = 0;
+        }
+    }
+    else
+        bSuccess = true;
+
+    if( ! bSuccess ) // something failed, disable encrpytion
+    {
+        io_rProperties.OValue.clear();
+        io_rProperties.UValue.clear();
+        io_rProperties.EncryptionKey.clear();
+    }
+
+    return bSuccess;
+}
+
+sal_Int32 PDFWriterImpl::computeAccessPermissions( const vcl::PDFWriter::PDFEncryptionProperties& i_rProperties,
+                                                   sal_Int32& o_rKeyLength, sal_Int32& o_rRC4KeyLength )
+{
+    /*
+    2) compute the access permissions, in numerical form
+
+    the default value depends on the revision 2 (40 bit) or 3 (128 bit security):
+    - for 40 bit security the unused bit must be set to 1, since they are not used
+    - for 128 bit security the same bit must be preset to 0 and set later if needed
+    according to the table 3.15, pdf v 1.4 */
+    sal_Int32 nAccessPermissions = ( i_rProperties.Security128bit ) ? 0xfffff0c0 : 0xffffffc0 ;
+
+    /* check permissions for 40 bit security case */
+    nAccessPermissions |= ( i_rProperties.CanPrintTheDocument ) ?  1 << 2 : 0;
+    nAccessPermissions |= ( i_rProperties.CanModifyTheContent ) ? 1 << 3 : 0;
+    nAccessPermissions |= ( i_rProperties.CanCopyOrExtract ) ?   1 << 4 : 0;
+    nAccessPermissions |= ( i_rProperties.CanAddOrModify ) ? 1 << 5 : 0;
+    o_rKeyLength = SECUR_40BIT_KEY;
+    o_rRC4KeyLength = SECUR_40BIT_KEY+5; // for this value see PDF spec v 1.4, algorithm 3.1 step 4, where n is 5
+
+    if( i_rProperties.Security128bit )
+    {
+        o_rKeyLength = SECUR_128BIT_KEY;
+        o_rRC4KeyLength = 16; // for this value see PDF spec v 1.4, algorithm 3.1 step 4, where n is 16, thus maximum
+        // permitted value is 16
+        nAccessPermissions |= ( i_rProperties.CanFillInteractive ) ?         1 << 8 : 0;
+        nAccessPermissions |= ( i_rProperties.CanExtractForAccessibility ) ? 1 << 9 : 0;
+        nAccessPermissions |= ( i_rProperties.CanAssemble ) ?                1 << 10 : 0;
+        nAccessPermissions |= ( i_rProperties.CanPrintFull ) ?               1 << 11 : 0;
+    }
+    return nAccessPermissions;
+}
+
 /*************************************************************
 begin i12626 methods
 
 Implements Algorithm 3.2, step 1 only
 */
-void PDFWriterImpl::padPassword( rtl::OUString aPassword, sal_uInt8 *paPasswordTarget )
+void PDFWriterImpl::padPassword( const rtl::OUString& i_rPassword, sal_uInt8* o_pPaddedPW )
 {
-// get ansi-1252 version of the password string CHECKIT ! i12626
-    rtl::OString aString = rtl::OUStringToOString( aPassword, RTL_TEXTENCODING_MS_1252 );
+    // get ansi-1252 version of the password string CHECKIT ! i12626
+    rtl::OString aString( rtl::OUStringToOString( i_rPassword, RTL_TEXTENCODING_MS_1252 ) );
 
-//copy the string to the target
-    sal_Int32 nToCopy = ( aString.getLength() < 32 ) ? aString.getLength() : 32;
+    //copy the string to the target
+    sal_Int32 nToCopy = ( aString.getLength() < ENCRYPTED_PWD_SIZE ) ? aString.getLength() : ENCRYPTED_PWD_SIZE;
     sal_Int32 nCurrentChar;
 
     for( nCurrentChar = 0; nCurrentChar < nToCopy; nCurrentChar++ )
-        paPasswordTarget[nCurrentChar] = (sal_uInt8)( aString.getStr()[nCurrentChar] );
+        o_pPaddedPW[nCurrentChar] = (sal_uInt8)( aString.getStr()[nCurrentChar] );
 
-//pad it
-    if( nCurrentChar < 32 )
-    {//fill with standard byte string
-        sal_Int32 i,y;
-        for( i = nCurrentChar, y = 0 ; i < 32; i++, y++ )
-            paPasswordTarget[i] = m_nPadString[y];
-    }
+    //pad it with standard byte string
+    sal_Int32 i,y;
+    for( i = nCurrentChar, y = 0 ; i < ENCRYPTED_PWD_SIZE; i++, y++ )
+        o_pPaddedPW[i] = s_nPadString[y];
+
+    // trash memory of temporary clear text password
+    rtl_zeroMemory( (sal_Char*)aString.getStr(), aString.getLength() );
 }
 
 /**********************************
@@ -12075,91 +12237,126 @@ it will be 16 byte long for 128 bit security; for 40 bit security only the first
 TODO: in pdf ver 1.5 and 1.6 the step 6 is different, should be implemented. See spec.
 
 */
-void PDFWriterImpl::computeEncryptionKey(sal_uInt8 *paThePaddedPassword, sal_uInt8 *paEncryptionKey )
+bool PDFWriterImpl::computeEncryptionKey( const sal_uInt8* i_pOPW, const sal_uInt8* i_pUPW, vcl::PDFWriter::PDFEncryptionProperties& io_rProperties, sal_Int32 i_nAccessPermissions )
 {
-//step 2
-    if( m_aDigest )
+    bool bSuccess = true;
+    sal_uInt8 nMD5Sum[ RTL_DIGEST_LENGTH_MD5 ];
+
+    rtlDigest aDigest = rtl_digest_createMD5();
+    if( aDigest )
     {
-        rtlDigestError nError = rtl_digest_updateMD5( m_aDigest, paThePaddedPassword, ENCRYPTED_PWD_SIZE );
-//step 3
-        if( nError == rtl_Digest_E_None )
-            nError = rtl_digest_updateMD5( m_aDigest, m_nEncryptedOwnerPassword , sizeof( m_nEncryptedOwnerPassword ) );
-//Step 4
+        //step 2
+        rtlDigestError nError = rtl_digest_updateMD5( aDigest, i_pUPW, ENCRYPTED_PWD_SIZE );
+        //step 3
+        if( nError == rtl_Digest_E_None && ! io_rProperties.OValue.empty() )
+            nError = rtl_digest_updateMD5( aDigest, &io_rProperties.OValue[0] , sal_Int32(io_rProperties.OValue.size()) );
+        else
+            bSuccess = false;
+        //Step 4
         sal_uInt8 nPerm[4];
 
-        nPerm[0] = (sal_uInt8)m_nAccessPermissions;
-        nPerm[1] = (sal_uInt8)( m_nAccessPermissions >> 8 );
-        nPerm[2] = (sal_uInt8)( m_nAccessPermissions >> 16 );
-        nPerm[3] = (sal_uInt8)( m_nAccessPermissions >> 24 );
+        nPerm[0] = (sal_uInt8)i_nAccessPermissions;
+        nPerm[1] = (sal_uInt8)( i_nAccessPermissions >> 8 );
+        nPerm[2] = (sal_uInt8)( i_nAccessPermissions >> 16 );
+        nPerm[3] = (sal_uInt8)( i_nAccessPermissions >> 24 );
 
         if( nError == rtl_Digest_E_None )
-            nError = rtl_digest_updateMD5( m_aDigest, nPerm , sizeof( nPerm ) );
+            nError = rtl_digest_updateMD5( aDigest, nPerm , sizeof( nPerm ) );
 
-//step 5, get the document ID, binary form
+        //step 5, get the document ID, binary form
         if( nError == rtl_Digest_E_None )
-            nError = rtl_digest_updateMD5( m_aDigest, m_nDocID , sizeof( m_nDocID ) );
-//get the digest
-        sal_uInt8 nMD5Sum[ RTL_DIGEST_LENGTH_MD5 ];
+            nError = rtl_digest_updateMD5( aDigest, &io_rProperties.DocumentIdentifier[0], sal_Int32(io_rProperties.DocumentIdentifier.size()) );
+        //get the digest
         if( nError == rtl_Digest_E_None )
         {
-            rtl_digest_getMD5( m_aDigest, nMD5Sum, sizeof( nMD5Sum ) );
+            rtl_digest_getMD5( aDigest, nMD5Sum, sizeof( nMD5Sum ) );
 
-//step 6, only if 128 bit
-            if( m_aContext.Security128bit )
+            //step 6, only if 128 bit
+            if( io_rProperties.Security128bit )
             {
                 for( sal_Int32 i = 0; i < 50; i++ )
                 {
-                    nError = rtl_digest_updateMD5( m_aDigest, &nMD5Sum, sizeof( nMD5Sum ) );
+                    nError = rtl_digest_updateMD5( aDigest, &nMD5Sum, sizeof( nMD5Sum ) );
                     if( nError != rtl_Digest_E_None )
+                    {
+                        bSuccess =  false;
                         break;
-                    rtl_digest_getMD5( m_aDigest, nMD5Sum, sizeof( nMD5Sum ) );
+                    }
+                    rtl_digest_getMD5( aDigest, nMD5Sum, sizeof( nMD5Sum ) );
                 }
             }
         }
-//Step 7
+        rtl_digest_destroyMD5( aDigest );
+    }
+    else
+        bSuccess = false;
+
+    //Step 7
+    if( bSuccess )
+    {
+        io_rProperties.EncryptionKey.resize( MAXIMUM_RC4_KEY_LENGTH );
         for( sal_Int32 i = 0; i < MD5_DIGEST_SIZE; i++ )
-            paEncryptionKey[i] = nMD5Sum[i];
+            io_rProperties.EncryptionKey[i] = nMD5Sum[i];
     }
+    else
+        io_rProperties.EncryptionKey.clear();
+
+    return bSuccess;
 }
 
 /**********************************
 Algorithm 3.3  Compute the encryption dictionary /O value, save into the class data member
 the step numbers down here correspond to the ones in PDF v.1.4 specfication
 */
-void PDFWriterImpl::computeODictionaryValue()
+bool PDFWriterImpl::computeODictionaryValue( const sal_uInt8* i_pPaddedOwnerPassword,
+                                             const sal_uInt8* i_pPaddedUserPassword,
+                                             vcl::PDFWriter::PDFEncryptionProperties& io_rProperties,
+                                             sal_Int32 i_nKeyLength,
+                                             sal_Int32 i_nRC4KeyLength
+                                             )
 {
-//step 1 already done, data is in m_nPaddedOwnerPassword
-//step 2
-    if( m_aDigest )
+    bool bSuccess = true;
+
+    io_rProperties.OValue.resize( ENCRYPTED_PWD_SIZE );
+
+    rtlDigest aDigest = rtl_digest_createMD5();
+    rtlCipher aCipher = rtl_cipher_createARCFOUR( rtl_Cipher_ModeStream );
+    if( aDigest && aCipher)
     {
-        rtlDigestError nError = rtl_digest_updateMD5( m_aDigest, &m_nPaddedOwnerPassword, sizeof( m_nPaddedOwnerPassword ) );
+        //step 1 already done, data is in i_pPaddedOwnerPassword
+        //step 2
+
+        rtlDigestError nError = rtl_digest_updateMD5( aDigest, i_pPaddedOwnerPassword, ENCRYPTED_PWD_SIZE );
         if( nError == rtl_Digest_E_None )
         {
             sal_uInt8 nMD5Sum[ RTL_DIGEST_LENGTH_MD5 ];
 
-            rtl_digest_getMD5( m_aDigest, nMD5Sum, sizeof(nMD5Sum) );
+            rtl_digest_getMD5( aDigest, nMD5Sum, sizeof(nMD5Sum) );
 //step 3, only if 128 bit
-            if( m_aContext.Security128bit )
+            if( io_rProperties.Security128bit )
             {
                 sal_Int32 i;
                 for( i = 0; i < 50; i++ )
                 {
-                    nError = rtl_digest_updateMD5( m_aDigest, nMD5Sum, sizeof( nMD5Sum ) );
+                    nError = rtl_digest_updateMD5( aDigest, nMD5Sum, sizeof( nMD5Sum ) );
                     if( nError != rtl_Digest_E_None )
+                    {
+                        bSuccess = false;
                         break;
-                    rtl_digest_getMD5( m_aDigest, nMD5Sum, sizeof( nMD5Sum ) );
+                    }
+                    rtl_digest_getMD5( aDigest, nMD5Sum, sizeof( nMD5Sum ) );
                 }
             }
-//Step 4, the key is in nMD5Sum
-//step 5 already done, data is in m_nPaddedUserPassword
-//step 6
-            rtl_cipher_initARCFOUR( m_aCipher, rtl_Cipher_DirectionEncode,
-                                    nMD5Sum, m_nKeyLength , NULL, 0 );
-// encrypt the user password using the key set above
-            rtl_cipher_encodeARCFOUR( m_aCipher, m_nPaddedUserPassword, sizeof( m_nPaddedUserPassword ), // the data to be encrypted
-                                      m_nEncryptedOwnerPassword, sizeof( m_nEncryptedOwnerPassword ) ); //encrypted data, stored in class data member
-//Step 7, only if 128 bit
-            if( m_aContext.Security128bit )
+            //Step 4, the key is in nMD5Sum
+            //step 5 already done, data is in i_pPaddedUserPassword
+            //step 6
+            rtl_cipher_initARCFOUR( aCipher, rtl_Cipher_DirectionEncode,
+                                     nMD5Sum, i_nKeyLength , NULL, 0 );
+            // encrypt the user password using the key set above
+            rtl_cipher_encodeARCFOUR( aCipher, i_pPaddedUserPassword, ENCRYPTED_PWD_SIZE, // the data to be encrypted
+                                      &io_rProperties.OValue[0], sal_Int32(io_rProperties.OValue.size()) ); //encrypted data
+            //Step 7, only if 128 bit
+            if( io_rProperties.Security128bit )
             {
                 sal_uInt32 i, y;
                 sal_uInt8 nLocalKey[ SECUR_128BIT_KEY ]; // 16 = 128 bit key
@@ -12169,138 +12366,116 @@ void PDFWriterImpl::computeODictionaryValue()
                     for( y = 0; y < sizeof( nLocalKey ); y++ )
                         nLocalKey[y] = (sal_uInt8)( nMD5Sum[y] ^ i );
 
-                    rtl_cipher_initARCFOUR( m_aCipher, rtl_Cipher_DirectionEncode,
+                    rtl_cipher_initARCFOUR( aCipher, rtl_Cipher_DirectionEncode,
                                             nLocalKey, SECUR_128BIT_KEY, NULL, 0 ); //destination data area, on init can be NULL
-                    rtl_cipher_encodeARCFOUR( m_aCipher, m_nEncryptedOwnerPassword, sizeof( m_nEncryptedOwnerPassword ), // the data to be encrypted
-                                              m_nEncryptedOwnerPassword, sizeof( m_nEncryptedOwnerPassword ) ); // encrypted data, can be the same as the input, encrypt "in place"
-//step 8, store in class data member
+                    rtl_cipher_encodeARCFOUR( aCipher, &io_rProperties.OValue[0], sal_Int32(io_rProperties.OValue.size()), // the data to be encrypted
+                                              &io_rProperties.OValue[0], sal_Int32(io_rProperties.OValue.size()) ); // encrypted data, can be the same as the input, encrypt "in place"
+                    //step 8, store in class data member
                 }
             }
         }
+        else
+            bSuccess = false;
     }
+    else
+        bSuccess = false;
+
+    if( aDigest )
+        rtl_digest_destroyMD5( aDigest );
+    if( aCipher )
+        rtl_cipher_destroyARCFOUR( aCipher );
+
+    if( ! bSuccess )
+        io_rProperties.OValue.clear();
+    return bSuccess;
 }
 
 /**********************************
 Algorithms 3.4 and 3.5  Compute the encryption dictionary /U value, save into the class data member, revision 2 (40 bit) or 3 (128 bit)
 */
-void PDFWriterImpl::computeUDictionaryValue()
+bool PDFWriterImpl::computeUDictionaryValue( const sal_uInt8* i_pPaddedOwnerPassword,
+                                             const sal_uInt8* i_pPaddedUserPassword,
+                                             vcl::PDFWriter::PDFEncryptionProperties& io_rProperties,
+                                             sal_Int32 i_nKeyLength,
+                                             sal_Int32 i_nRC4KeyLength,
+                                             sal_Int32 i_nAccessPermissions
+                                             )
 {
-//step 1, common to both 3.4 and 3.5
-    computeEncryptionKey( m_nPaddedUserPassword , m_nEncryptionKey );
+    bool bSuccess = true;
 
-    if( m_aContext.Security128bit == false )
-    {
-//3.4
-//step 2 and 3
-        rtl_cipher_initARCFOUR( m_aCipher, rtl_Cipher_DirectionEncode,
-                                    m_nEncryptionKey, 5 , // key and key length
-                                    NULL, 0 ); //destination data area
-// encrypt the user password using the key set above, save for later use
-        rtl_cipher_encodeARCFOUR( m_aCipher, m_nPadString, sizeof( m_nPadString ), // the data to be encrypted
-                                  m_nEncryptedUserPassword, sizeof( m_nEncryptedUserPassword ) ); //encrypted data, stored in class data member
-    }
-    else
+    io_rProperties.UValue.resize( ENCRYPTED_PWD_SIZE );
+
+    rtlDigest aDigest = rtl_digest_createMD5();
+    rtlCipher aCipher = rtl_cipher_createARCFOUR( rtl_Cipher_ModeStream );
+    if( aDigest && aCipher )
     {
-//or 3.5, for 128 bit security
-//step6, initilize the last 16 bytes of the encrypted user password to 0
-        for(sal_uInt32 i = MD5_DIGEST_SIZE; i < sizeof( m_nEncryptedUserPassword ); i++)
-            m_nEncryptedUserPassword[i] = 0;
-//step 2
-        if( m_aDigest )
+        //step 1, common to both 3.4 and 3.5
+        if( computeEncryptionKey( i_pPaddedOwnerPassword, i_pPaddedUserPassword, io_rProperties, i_nAccessPermissions ) )
         {
-            rtlDigestError nError = rtl_digest_updateMD5( m_aDigest, m_nPadString, sizeof( m_nPadString ) );
-//step 3
-            if( nError == rtl_Digest_E_None )
-                nError = rtl_digest_updateMD5( m_aDigest, m_nDocID , sizeof(m_nDocID) );
-
-            sal_uInt8 nMD5Sum[ RTL_DIGEST_LENGTH_MD5 ];
-            rtl_digest_getMD5( m_aDigest, nMD5Sum, sizeof(nMD5Sum) );
-//Step 4
-            rtl_cipher_initARCFOUR( m_aCipher, rtl_Cipher_DirectionEncode,
-                                    m_nEncryptionKey, SECUR_128BIT_KEY, NULL, 0 ); //destination data area
-            rtl_cipher_encodeARCFOUR( m_aCipher, nMD5Sum, sizeof( nMD5Sum ), // the data to be encrypted
-                                      m_nEncryptedUserPassword, sizeof( nMD5Sum ) ); //encrypted data, stored in class data member
-//step 5
-            sal_uInt32 i, y;
-            sal_uInt8 nLocalKey[SECUR_128BIT_KEY];
-
-            for( i = 1; i <= 19; i++ ) // do it 19 times, start with 1
+            if( io_rProperties.Security128bit == false )
+            {
+                //3.4
+                //step 2 and 3
+                rtl_cipher_initARCFOUR( aCipher, rtl_Cipher_DirectionEncode,
+                                        &io_rProperties.EncryptionKey[0], 5 , // key and key length
+                                        NULL, 0 ); //destination data area
+                // encrypt the user password using the key set above, save for later use
+                rtl_cipher_encodeARCFOUR( aCipher, s_nPadString, sizeof( s_nPadString ), // the data to be encrypted
+                                          &io_rProperties.UValue[0], sal_Int32(io_rProperties.UValue.size()) ); //encrypted data, stored in class data member
+            }
+            else
             {
-                for( y = 0; y < sizeof( nLocalKey ) ; y++ )
-                    nLocalKey[y] = (sal_uInt8)( m_nEncryptionKey[y] ^ i );
-
-                rtl_cipher_initARCFOUR( m_aCipher, rtl_Cipher_DirectionEncode,
-                                        nLocalKey, SECUR_128BIT_KEY, // key and key length
-                                        NULL, 0 ); //destination data area, on init can be NULL
-                rtl_cipher_encodeARCFOUR( m_aCipher, m_nEncryptedUserPassword, SECUR_128BIT_KEY, // the data to be encrypted
-                                          m_nEncryptedUserPassword, SECUR_128BIT_KEY ); // encrypted data, can be the same as the input, encrypt "in place"
+                //or 3.5, for 128 bit security
+                //step6, initilize the last 16 bytes of the encrypted user password to 0
+                for(sal_uInt32 i = MD5_DIGEST_SIZE; i < sal_uInt32(io_rProperties.UValue.size()); i++)
+                    io_rProperties.UValue[i] = 0;
+                //step 2
+                rtlDigestError nError = rtl_digest_updateMD5( aDigest, s_nPadString, sizeof( s_nPadString ) );
+                //step 3
+                if( nError == rtl_Digest_E_None )
+                    nError = rtl_digest_updateMD5( aDigest, &io_rProperties.DocumentIdentifier[0], sal_Int32(io_rProperties.DocumentIdentifier.size()) );
+                else
+                    bSuccess = false;
+
+                sal_uInt8 nMD5Sum[ RTL_DIGEST_LENGTH_MD5 ];
+                rtl_digest_getMD5( aDigest, nMD5Sum, sizeof(nMD5Sum) );
+                //Step 4
+                rtl_cipher_initARCFOUR( aCipher, rtl_Cipher_DirectionEncode,
+                                        &io_rProperties.EncryptionKey[0], SECUR_128BIT_KEY, NULL, 0 ); //destination data area
+                rtl_cipher_encodeARCFOUR( aCipher, nMD5Sum, sizeof( nMD5Sum ), // the data to be encrypted
+                                          &io_rProperties.UValue[0], sizeof( nMD5Sum ) ); //encrypted data, stored in class data member
+                //step 5
+                sal_uInt32 i, y;
+                sal_uInt8 nLocalKey[SECUR_128BIT_KEY];
+
+                for( i = 1; i <= 19; i++ ) // do it 19 times, start with 1
+                {
+                    for( y = 0; y < sizeof( nLocalKey ) ; y++ )
+                        nLocalKey[y] = (sal_uInt8)( io_rProperties.EncryptionKey[y] ^ i );
+
+                    rtl_cipher_initARCFOUR( aCipher, rtl_Cipher_DirectionEncode,
+                                            nLocalKey, SECUR_128BIT_KEY, // key and key length
+                                            NULL, 0 ); //destination data area, on init can be NULL
+                    rtl_cipher_encodeARCFOUR( aCipher, &io_rProperties.UValue[0], SECUR_128BIT_KEY, // the data to be encrypted
+                                              &io_rProperties.UValue[0], SECUR_128BIT_KEY ); // encrypted data, can be the same as the input, encrypt "in place"
+                }
             }
         }
+        else
+            bSuccess = false;
     }
-}
-
-/* init the encryption engine
-1. init the document id, used both for building the document id and for building the encryption key(s)
-2. build the encryption key following algorithms described in the PDF specification
- */
-void PDFWriterImpl::initEncryption()
-{
-    m_aOwnerPassword = m_aContext.OwnerPassword;
-    m_aUserPassword = m_aContext.UserPassword;
-/* password stuff computing, before sending out anything */
-    DBG_ASSERT( m_aCipher != NULL, "PDFWriterImpl::initEncryption: a cipher (ARCFOUR) object is not available !" );
-    DBG_ASSERT( m_aDigest != NULL, "PDFWriterImpl::initEncryption: a digest (MD5) object is not available !" );
+    else
+        bSuccess = false;
 
-    if( m_aCipher && m_aDigest )
-    {
-//if there is no owner password, force it to the user password
-        if( m_aOwnerPassword.getLength() == 0 )
-            m_aOwnerPassword = m_aUserPassword;
+    if( aDigest )
+        rtl_digest_destroyMD5( aDigest );
+    if( aCipher )
+        rtl_cipher_destroyARCFOUR( aCipher );
 
-        initPadString();
-/*
-1) pad passwords
-*/
-        padPassword( m_aOwnerPassword, m_nPaddedOwnerPassword );
-        padPassword( m_aUserPassword, m_nPaddedUserPassword );
-/*
-2) compute the access permissions, in numerical form
-
-the default value depends on the revision 2 (40 bit) or 3 (128 bit security):
-- for 40 bit security the unused bit must be set to 1, since they are not used
-- for 128 bit security the same bit must be preset to 0 and set later if needed
-according to the table 3.15, pdf v 1.4 */
-        m_nAccessPermissions = ( m_aContext.Security128bit ) ? 0xfffff0c0 : 0xffffffc0 ;
-
-/* check permissions for 40 bit security case */
-        m_nAccessPermissions |= ( m_aContext.AccessPermissions.CanPrintTheDocument ) ?  1 << 2 : 0;
-        m_nAccessPermissions |= ( m_aContext.AccessPermissions.CanModifyTheContent ) ? 1 << 3 : 0;
-        m_nAccessPermissions |= ( m_aContext.AccessPermissions.CanCopyOrExtract ) ?   1 << 4 : 0;
-        m_nAccessPermissions |= ( m_aContext.AccessPermissions.CanAddOrModify ) ? 1 << 5 : 0;
-        m_nKeyLength = SECUR_40BIT_KEY;
-        m_nRC4KeyLength = SECUR_40BIT_KEY+5; // for this value see PDF spec v 1.4, algorithm 3.1 step 4, where n is 5
-
-        if( m_aContext.Security128bit )
-        {
-            m_nKeyLength = SECUR_128BIT_KEY;
-            m_nRC4KeyLength = 16; // for this value see PDF spec v 1.4, algorithm 3.1 step 4, where n is 16, thus maximum
-                                  // permitted value is 16
-            m_nAccessPermissions |= ( m_aContext.AccessPermissions.CanFillInteractive ) ?         1 << 8 : 0;
-            m_nAccessPermissions |= ( m_aContext.AccessPermissions.CanExtractForAccessibility ) ? 1 << 9 : 0;
-            m_nAccessPermissions |= ( m_aContext.AccessPermissions.CanAssemble ) ?                1 << 10 : 0;
-            m_nAccessPermissions |= ( m_aContext.AccessPermissions.CanPrintFull ) ?               1 << 11 : 0;
-        }
-        computeODictionaryValue();
-        computeUDictionaryValue();
-
-//clear out exceding key values, prepares for generation number default to 0 as well
-// see checkAndEnableStreamEncryption in pdfwriter_impl.hxx
-        sal_Int32 i, y;
-        for( i = m_nKeyLength, y = 0; y < 5 ; y++ )
-            m_nEncryptionKey[i++] = 0;
-    }
-    else //either no cipher or no digest or both, something is wrong with memory or something else
-        m_aContext.Encrypt = false; //then turn the encryption off
+    if( ! bSuccess )
+        io_rProperties.UValue.clear();
+    return bSuccess;
 }
+
 /* end i12626 methods */
 
diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx
index 2eacdc215dd8..dd75ca4f1a47 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -595,7 +595,6 @@ private:
 
     MapMode                             m_aMapMode; // PDFWriterImpl scaled units
     std::vector< PDFPage >              m_aPages;
-    PDFDocInfo                          m_aDocInfo;
     /* maps object numbers to file offsets (needed for xref) */
     std::vector< sal_uInt64 >           m_aObjects;
     /* contains Bitmaps until they are written to the
@@ -796,116 +795,37 @@ i12626
 /* used to cipher the stream data and for password management */
     rtlCipher                               m_aCipher;
     rtlDigest                               m_aDigest;
-/* pad string used for password in Standard security handler */
-    sal_uInt8                               m_nPadString[ENCRYPTED_PWD_SIZE];
-/* the owner password, in clear text */
-    rtl::OUString                           m_aOwnerPassword;
-/* the padded owner password */
-    sal_uInt8                               m_nPaddedOwnerPassword[ENCRYPTED_PWD_SIZE];
-/* the encryption dictionary owner password, according to algorithm 3.3 */
-    sal_uInt8                               m_nEncryptedOwnerPassword[ENCRYPTED_PWD_SIZE];
-/* the user password, in clear text */
-    rtl::OUString                           m_aUserPassword;
-/* the padded user password */
-    sal_uInt8                               m_nPaddedUserPassword[ENCRYPTED_PWD_SIZE];
-/* the encryption dictionary user password, according to algorithm 3.4 or 3.5 depending on the
-   security handler revision */
-    sal_uInt8                               m_nEncryptedUserPassword[ENCRYPTED_PWD_SIZE];
-
-/* the encryption key, formed with the user password according to algorithm 3.2, maximum length is 16 bytes + 3 + 2
-   for 128 bit security   */
-    sal_uInt8                               m_nEncryptionKey[MAXIMUM_RC4_KEY_LENGTH];
+    /* pad string used for password in Standard security handler */
+    static const sal_uInt8                  s_nPadString[ENCRYPTED_PWD_SIZE];
+
+    /* the encryption key, formed with the user password according to algorithm 3.2, maximum length is 16 bytes + 3 + 2
+    for 128 bit security   */
     sal_Int32                               m_nKeyLength; // key length, 16 or 5
     sal_Int32                               m_nRC4KeyLength; // key length, 16 or 10, to be input to the algorith 3.1
 
-/* set to true if the following stream must be encrypted, used inside writeBuffer() */
+    /* set to true if the following stream must be encrypted, used inside writeBuffer() */
     sal_Bool                                m_bEncryptThisStream;
 
-/* the numerical value of the access permissions, according to PDF spec, must be signed */
+    /* the numerical value of the access permissions, according to PDF spec, must be signed */
     sal_Int32                               m_nAccessPermissions;
-/* the document ID, the raw MD5 hash */
-    sal_uInt8                               m_nDocID[MD5_DIGEST_SIZE];
-/* string buffer to hold document ID, this is the output string */
-    rtl::OStringBuffer                      m_aDocID;
-/* string to hold the PDF creation date */
-    rtl::OStringBuffer                      m_aCreationDateString;
-/* string to hold the PDF creation date, for PDF/A metadata */
-    rtl::OStringBuffer                      m_aCreationMetaDateString;
-/* the buffer where the data are encrypted, dynamically allocated */
+    /* string to hold the PDF creation date */
+    rtl::OString                            m_aCreationDateString;
+    /* string to hold the PDF creation date, for PDF/A metadata */
+    rtl::OString                            m_aCreationMetaDateString;
+    /* the buffer where the data are encrypted, dynamically allocated */
     sal_uInt8                               *m_pEncryptionBuffer;
-/* size of the buffer */
+    /* size of the buffer */
     sal_Int32                               m_nEncryptionBufferSize;
 
-/* check and reallocate the buffer for encryption */
-    sal_Bool checkEncryptionBufferSize( register sal_Int32 newSize )
-        {
-            if( m_nEncryptionBufferSize < newSize )
-            {
-/* reallocate the buffer, the used function allocate as rtl_allocateMemory
-   if the pointer parameter is NULL */
-                m_pEncryptionBuffer = (sal_uInt8*)rtl_reallocateMemory( m_pEncryptionBuffer, newSize );
-                if( m_pEncryptionBuffer )
-                    m_nEncryptionBufferSize = newSize;
-                else
-                    m_nEncryptionBufferSize = 0;
-            }
-            return ( m_nEncryptionBufferSize != 0 );
-        }
-/* init the internal pad string */
-    void initPadString()
-        {
-            static const sal_uInt8 nPadString[32] =
-                {
-                    0x28, 0xBF, 0x4E, 0x5E, 0x4E, 0x75, 0x8A, 0x41, 0x64, 0x00, 0x4E, 0x56, 0xFF, 0xFA, 0x01, 0x08,
-                    0x2E, 0x2E, 0x00, 0xB6, 0xD0, 0x68, 0x3E, 0x80, 0x2F, 0x0C, 0xA9, 0xFE, 0x64, 0x53, 0x69, 0x7A
-                };
-
-            for(sal_uInt32 i = 0; i < sizeof( nPadString ); i++ )
-                m_nPadString[i] = nPadString[i];
-
-        };
-/* initialize the encryption engine */
-    void initEncryption();
-
-/* this function implements part of the PDF spec algorithm 3.1 in encryption, the rest (the actual encryption) is in PDFWriterImpl::writeBuffer */
-    void checkAndEnableStreamEncryption( register sal_Int32 nObject )
-        {
-            if( m_aContext.Encrypt )
-            {
-                m_bEncryptThisStream = true;
-                register sal_Int32 i = m_nKeyLength;
-                m_nEncryptionKey[i++] = (sal_uInt8)nObject;
-                m_nEncryptionKey[i++] = (sal_uInt8)( nObject >> 8 );
-                m_nEncryptionKey[i++] = (sal_uInt8)( nObject >> 16 );
-//the other location of m_nEncryptionKey are already set to 0, our fixed generation number
-// do the MD5 hash
-                sal_uInt8 nMD5Sum[ RTL_DIGEST_LENGTH_MD5 ];
-                // the i+2 to take into account the generation number, always zero
-                rtl_digest_MD5( &m_nEncryptionKey, i+2, nMD5Sum, sizeof(nMD5Sum) );
-// initialize the RC4 with the key
-// key legth: see algoritm 3.1, step 4: (N+5) max 16
-                rtl_cipher_initARCFOUR( m_aCipher, rtl_Cipher_DirectionEncode, nMD5Sum, m_nRC4KeyLength, NULL, 0 );
-            }
-        };
+    /* check and reallocate the buffer for encryption */
+    sal_Bool checkEncryptionBufferSize( register sal_Int32 newSize );
+    /* this function implements part of the PDF spec algorithm 3.1 in encryption, the rest (the actual encryption) is in PDFWriterImpl::writeBuffer */
+    void checkAndEnableStreamEncryption( register sal_Int32 nObject );
 
     void disableStreamEncryption() { m_bEncryptThisStream = false; };
 
-/* */
-    void enableStringEncryption( register sal_Int32 nObject )
-        {
-            register sal_Int32 i = m_nKeyLength;
-            m_nEncryptionKey[i++] = (sal_uInt8)nObject;
-            m_nEncryptionKey[i++] = (sal_uInt8)( nObject >> 8 );
-            m_nEncryptionKey[i++] = (sal_uInt8)( nObject >> 16 );
-//the other location of m_nEncryptionKey are already set to 0, our fixed generation number
-// do the MD5 hash
-            sal_uInt8 nMD5Sum[ RTL_DIGEST_LENGTH_MD5 ];
-            // the i+2 to take into account the generation number, always zero
-            rtl_digest_MD5( &m_nEncryptionKey, i+2, nMD5Sum, sizeof(nMD5Sum) );
-// initialize the RC4 with the key
-// key legth: see algoritm 3.1, step 4: (N+5) max 16
-            rtl_cipher_initARCFOUR( m_aCipher, rtl_Cipher_DirectionEncode, nMD5Sum, m_nRC4KeyLength, NULL, 0 );
-        };
+    /* */
+    void enableStringEncryption( register sal_Int32 nObject );
 
 // test if the encryption is active, if yes than encrypt the unicode string  and add to the OStringBuffer parameter
     void appendUnicodeTextStringEncrypt( const rtl::OUString& rInString, const sal_Int32 nInObjectNumber, rtl::OStringBuffer& rOutBuffer );
@@ -1096,23 +1016,47 @@ i12626
     /* true if PDF/A-1a or PDF/A-1b is output */
     sal_Bool        m_bIsPDF_A1;
 
-/*
-i12626
-methods for PDF security
-
- pad a password according  algorithm 3.2, step 1 */
-    void padPassword( const rtl::OUString aPassword, sal_uInt8 *paPasswordTarget );
-/* algorithm 3.2: compute an encryption key */
-    void computeEncryptionKey( sal_uInt8 *paThePaddedPassword, sal_uInt8 *paEncryptionKey );
-/* algorithm 3.3: computing the encryption dictionary'ss owner password value ( /O ) */
-    void computeODictionaryValue();
-/* algorithm 3.4 or 3.5: computing the encryption dictionary's user password value ( /U ) revision 2 or 3 of the standard security handler */
-    void computeUDictionaryValue();
-
+    /*
+    i12626
+    methods for PDF security
+
+    pad a password according  algorithm 3.2, step 1 */
+    static void padPassword( const rtl::OUString& i_rPassword, sal_uInt8* o_pPaddedPW );
+    /* algorithm 3.2: compute an encryption key */
+    static bool computeEncryptionKey( const sal_uInt8* i_pOPW, const sal_uInt8* i_pUPW,
+                                      vcl::PDFWriter::PDFEncryptionProperties& io_rProperties,
+                                      sal_Int32 i_nAccessPermissions
+                                     );
+    /* algorithm 3.3: computing the encryption dictionary'ss owner password value ( /O ) */
+    static bool computeODictionaryValue( const sal_uInt8* i_pPaddedOwnerPassword, const sal_uInt8* i_pPaddedUserPassword,
+                                         vcl::PDFWriter::PDFEncryptionProperties& io_rProperties,
+                                         sal_Int32 i_nKeyLength, sal_Int32 i_nRC4KeyLength
+                                        );
+    /* algorithm 3.4 or 3.5: computing the encryption dictionary's user password value ( /U ) revision 2 or 3 of the standard security handler */
+    static bool computeUDictionaryValue( const sal_uInt8* i_pPaddedOwnerPassword, const sal_uInt8* i_pPaddedUserPassword,
+                                         vcl::PDFWriter::PDFEncryptionProperties& io_rProperties,
+                                         sal_Int32 i_nKeyLength, sal_Int32 i_nRC4KeyLength,
+                                         sal_Int32 i_nAccessPermissions
+                                        );
+
+    static void computeDocumentIdentifier( std::vector< sal_uInt8 >& o_rIdentifier,
+                                           const vcl::PDFWriter::PDFDocInfo& i_rDocInfo,
+                                           rtl::OString& o_rCString1,
+                                           rtl::OString& o_rCString2
+                                          );
+    static sal_Int32 computeAccessPermissions( const vcl::PDFWriter::PDFEncryptionProperties& i_rProperties,
+                                               sal_Int32& o_rKeyLength, sal_Int32& o_rRC4KeyLength );
+    void setupDocInfo();
 public:
     PDFWriterImpl( const PDFWriter::PDFWriterContext& rContext );
     ~PDFWriterImpl();
 
+    static bool initEncryption( vcl::PDFWriter::PDFEncryptionProperties& io_rProperties,
+                                const rtl::OUString& i_rOwnerPassword,
+                                const rtl::OUString& i_rUserPassword,
+                                const vcl::PDFWriter::PDFDocInfo& i_rDocInfo
+                                );
+
     /*  for OutputDevice so the reference device can have a list
      *  that contains only suitable fonts (subsettable or builtin)
      *  produces a new font list
@@ -1144,8 +1088,6 @@ public:
     }
 
     PDFWriter::PDFVersion getVersion() const { return m_aContext.Version; }
-    void setDocInfo( const PDFDocInfo& rInfo );
-    const PDFDocInfo& getDocInfo() const { return m_aDocInfo; }
 
     void setDocumentLocale( const com::sun::star::lang::Locale& rLoc )
     { m_aContext.DocumentLocale = rLoc; }
-- 
cgit 


From fc85672befcbbca764c6a082040387fc2d41d8a8 Mon Sep 17 00:00:00 2001
From: "Frank Schoenheit [fs]" 
Date: Fri, 24 Sep 2010 15:14:48 +0200
Subject: dba34a: #i114733# SearchFile: expand vnd.sun.star.expand URLs before
 processing them further

---
 unotools/source/config/pathoptions.cxx | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx
index 2ae6f0c97f0c..3cf43a1f3bc9 100644
--- a/unotools/source/config/pathoptions.cxx
+++ b/unotools/source/config/pathoptions.cxx
@@ -46,12 +46,14 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -998,6 +1000,17 @@ sal_Bool SvtPathOptions::SearchFile( String& rIniFile, Pathes ePath )
                     if ( LocalFileHelper::ConvertPhysicalNameToURL( aPathToken, aURL ) )
                         aObj.SetURL( aURL );
                 }
+                if ( aObj.GetProtocol() == INET_PROT_VND_SUN_STAR_EXPAND )
+                {
+                    ::comphelper::ComponentContext aContext( ::comphelper::getProcessServiceFactory() );
+                    Reference< XMacroExpander > xMacroExpander( aContext.getSingleton( "com.sun.star.util.theMacroExpander" ), UNO_QUERY );
+                    OSL_ENSURE( xMacroExpander.is(), "SvtPathOptions::SearchFile: unable to access the MacroExpander singleton!" );
+                    if ( xMacroExpander.is() )
+                    {
+                        const ::rtl::OUString sExpandedPath = xMacroExpander->expandMacros( aObj.GetURLPath( INetURLObject::DECODE_WITH_CHARSET ) );
+                        aObj.SetURL( sExpandedPath );
+                    }
+                }
 
                 xub_StrLen i, nCount = aIniFile.GetTokenCount( '/' );
                 for ( i = 0; i < nCount; ++i )
-- 
cgit 


From 208de777d5af30720ba212a233283ba4c1ac57cb Mon Sep 17 00:00:00 2001
From: "Philipp Lohmann [pl]" 
Date: Mon, 27 Sep 2010 19:58:20 +0200
Subject: limit password life time

---
 vcl/inc/vcl/pdfwriter.hxx         |  17 +-
 vcl/source/gdi/makefile.mk        |   1 +
 vcl/source/gdi/pdfwriter.cxx      |  16 +-
 vcl/source/gdi/pdfwriter_impl.cxx | 425 +-------------------------------------
 vcl/source/gdi/pdfwriter_impl.hxx |  19 +-
 5 files changed, 36 insertions(+), 442 deletions(-)

diff --git a/vcl/inc/vcl/pdfwriter.hxx b/vcl/inc/vcl/pdfwriter.hxx
index cbb9c7c2fe93..204ddaa9e33c 100644
--- a/vcl/inc/vcl/pdfwriter.hxx
+++ b/vcl/inc/vcl/pdfwriter.hxx
@@ -38,7 +38,8 @@
 #include 
 #include 
 
-#include 
+#include "com/sun/star/io/XOutputStream.hpp"
+#include "com/sun/star/beans/XMaterialHolder.hpp"
 
 #include 
 #include 
@@ -498,7 +499,7 @@ The following structure describes the permissions used in PDF security
         // EncryptionKey is actually a construct out of OValue, UValue and DocumentIdentifier
         // if these do not match, behavior is undefined, most likely an invalid PDF will be produced
         // OValue, UValue, EncryptionKey and DocumentIdentifier can be computed from
-        // PDFDocInfo, Owner password and User password usend the InitEncryption method which
+        // PDFDocInfo, Owner password and User password used the InitEncryption method which
         // implements the algorithms described in the PDF reference chapter 3.5: Encryption
         std::vector OValue;
         std::vector UValue;
@@ -623,7 +624,7 @@ The following structure describes the permissions used in PDF security
         {}
     };
 
-    PDFWriter( const PDFWriterContext& rContext );
+    PDFWriter( const PDFWriterContext& rContext, const com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder >& );
     ~PDFWriter();
 
     /** Returns an OutputDevice for formatting
@@ -666,11 +667,11 @@ The following structure describes the permissions used in PDF security
 
     PDFVersion GetVersion() const;
 
-    static bool InitEncryption( PDFWriter::PDFEncryptionProperties& io_rProperties,
-                                const rtl::OUString& i_rOwnerPassword,
-                                const rtl::OUString& i_rUserPassword,
-                                const PDFWriter::PDFDocInfo& i_rDocInfo
-                                );
+    static com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder >
+           InitEncryption( const rtl::OUString& i_rOwnerPassword,
+                           const rtl::OUString& i_rUserPassword,
+                           bool b128Bit
+                         );
 
     /* functions for graphics state */
     /* flag values: see vcl/outdev.hxx */
diff --git a/vcl/source/gdi/makefile.mk b/vcl/source/gdi/makefile.mk
index 77df20976c73..ac2e586a41cb 100755
--- a/vcl/source/gdi/makefile.mk
+++ b/vcl/source/gdi/makefile.mk
@@ -63,6 +63,7 @@ EXCEPTIONSFILES=	$(SLO)$/salmisc.obj 	\
                     $(SLO)$/impgraph.obj	\
                     $(SLO)$/metric.obj		\
                     $(SLO)$/pdfwriter_impl.obj	\
+                    $(SLO)$/pdfwriter_impl2.obj	\
                     $(SLO)$/pdffontcache.obj\
                     $(SLO)$/bmpconv.obj		\
                     $(SLO)$/pdfextoutdevdata.obj	\
diff --git a/vcl/source/gdi/pdfwriter.cxx b/vcl/source/gdi/pdfwriter.cxx
index 3b5e70d938a8..98627b448aed 100644
--- a/vcl/source/gdi/pdfwriter.cxx
+++ b/vcl/source/gdi/pdfwriter.cxx
@@ -38,9 +38,9 @@ PDFWriter::AnyWidget::~AnyWidget()
 {
 }
 
-PDFWriter::PDFWriter( const PDFWriter::PDFWriterContext& rContext )
+PDFWriter::PDFWriter( const PDFWriter::PDFWriterContext& rContext, const com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder >& xEnc )
         :
-        pImplementation( new PDFWriterImpl( rContext ) )
+        pImplementation( new PDFWriterImpl( rContext, xEnc ) )
 {
 }
 
@@ -560,12 +560,12 @@ std::set< PDFWriter::ErrorCode > PDFWriter::GetErrors()
     return ((PDFWriterImpl*)pImplementation)->getErrors();
 }
 
-bool PDFWriter::InitEncryption( PDFWriter::PDFEncryptionProperties& io_rProperties,
-                                const rtl::OUString& i_rOwnerPassword,
-                                const rtl::OUString& i_rUserPassword,
-                                const PDFWriter::PDFDocInfo& i_rDocInfo
-                                )
+com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder >
+PDFWriter::InitEncryption( const rtl::OUString& i_rOwnerPassword,
+                           const rtl::OUString& i_rUserPassword,
+                           bool b128Bit
+                          )
 {
-    return PDFWriterImpl::initEncryption( io_rProperties, i_rOwnerPassword, i_rUserPassword, i_rDocInfo );
+    return PDFWriterImpl::initEncryption( i_rOwnerPassword, i_rUserPassword, b128Bit );
 }
 
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index ff415ccfa98c..1e39f0e46260 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -1697,7 +1697,8 @@ void PDFWriterImpl::PDFPage::appendWaveLine( sal_Int32 nWidth, sal_Int32 nY, sal
  *  class PDFWriterImpl
  */
 
-PDFWriterImpl::PDFWriterImpl( const PDFWriter::PDFWriterContext& rContext )
+ PDFWriterImpl::PDFWriterImpl( const PDFWriter::PDFWriterContext& rContext,
+                              const com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder >& xEnc )
         :
         m_pReferenceDevice( NULL ),
         m_aMapMode( MAP_POINT, Point(), Fraction( 1L, pointToPixel(1) ), Fraction( 1L, pointToPixel(1) ) ),
@@ -1759,14 +1760,19 @@ PDFWriterImpl::PDFWriterImpl( const PDFWriter::PDFWriterContext& rContext )
 
     m_bOpen = true;
 
-    /* prepare the cypher engine, can be done in CTOR, free in DTOR */
+    // setup DocInfo
+    setupDocInfo();
 
+    /* prepare the cypher engine, can be done in CTOR, free in DTOR */
     m_aCipher = rtl_cipher_createARCFOUR( rtl_Cipher_ModeStream );
     m_aDigest = rtl_digest_createMD5();
 
     /* the size of the Codec default maximum */
     checkEncryptionBufferSize( 0x4000 );
 
+    if( xEnc.is() )
+        prepareEncryption( xEnc );
+
     if( m_aContext.Encryption.Encrypt() )
     {
         // sanity check
@@ -12063,419 +12069,4 @@ void PDFWriterImpl::addStream( const String& rMimeType, PDFOutputStream* pStream
 }
 
 
-sal_Bool PDFWriterImpl::checkEncryptionBufferSize( register sal_Int32 newSize )
-{
-    if( m_nEncryptionBufferSize < newSize )
-    {
-        /* reallocate the buffer, the used function allocate as rtl_allocateMemory
-        if the pointer parameter is NULL */
-        m_pEncryptionBuffer = (sal_uInt8*)rtl_reallocateMemory( m_pEncryptionBuffer, newSize );
-        if( m_pEncryptionBuffer )
-            m_nEncryptionBufferSize = newSize;
-        else
-            m_nEncryptionBufferSize = 0;
-    }
-    return ( m_nEncryptionBufferSize != 0 );
-}
-
-void PDFWriterImpl::checkAndEnableStreamEncryption( register sal_Int32 nObject )
-{
-    if( m_aContext.Encryption.Encrypt() )
-    {
-        m_bEncryptThisStream = true;
-        sal_Int32 i = m_nKeyLength;
-        m_aContext.Encryption.EncryptionKey[i++] = (sal_uInt8)nObject;
-        m_aContext.Encryption.EncryptionKey[i++] = (sal_uInt8)( nObject >> 8 );
-        m_aContext.Encryption.EncryptionKey[i++] = (sal_uInt8)( nObject >> 16 );
-        //the other location of m_nEncryptionKey are already set to 0, our fixed generation number
-        // do the MD5 hash
-        sal_uInt8 nMD5Sum[ RTL_DIGEST_LENGTH_MD5 ];
-        // the i+2 to take into account the generation number, always zero
-        rtl_digest_MD5( &m_aContext.Encryption.EncryptionKey[0], i+2, nMD5Sum, sizeof(nMD5Sum) );
-        // initialize the RC4 with the key
-        // key legth: see algoritm 3.1, step 4: (N+5) max 16
-        rtl_cipher_initARCFOUR( m_aCipher, rtl_Cipher_DirectionEncode, nMD5Sum, m_nRC4KeyLength, NULL, 0 );
-    }
-}
-
-void PDFWriterImpl::enableStringEncryption( register sal_Int32 nObject )
-{
-    if( m_aContext.Encryption.Encrypt() )
-    {
-        sal_Int32 i = m_nKeyLength;
-        m_aContext.Encryption.EncryptionKey[i++] = (sal_uInt8)nObject;
-        m_aContext.Encryption.EncryptionKey[i++] = (sal_uInt8)( nObject >> 8 );
-        m_aContext.Encryption.EncryptionKey[i++] = (sal_uInt8)( nObject >> 16 );
-        //the other location of m_nEncryptionKey are already set to 0, our fixed generation number
-        // do the MD5 hash
-        sal_uInt8 nMD5Sum[ RTL_DIGEST_LENGTH_MD5 ];
-        // the i+2 to take into account the generation number, always zero
-        rtl_digest_MD5( &m_aContext.Encryption.EncryptionKey[0], i+2, nMD5Sum, sizeof(nMD5Sum) );
-        // initialize the RC4 with the key
-        // key legth: see algoritm 3.1, step 4: (N+5) max 16
-        rtl_cipher_initARCFOUR( m_aCipher, rtl_Cipher_DirectionEncode, nMD5Sum, m_nRC4KeyLength, NULL, 0 );
-    }
-}
-
-/* init the encryption engine
-1. init the document id, used both for building the document id and for building the encryption key(s)
-2. build the encryption key following algorithms described in the PDF specification
- */
-bool PDFWriterImpl::initEncryption( vcl::PDFWriter::PDFEncryptionProperties& io_rProperties,
-                                    const rtl::OUString& i_rOwnerPassword,
-                                    const rtl::OUString& i_rUserPassword,
-                                    const vcl::PDFWriter::PDFDocInfo& i_rDocInfo
-                                    )
-{
-    bool bSuccess = false;
-    rtl::OString aC1, aC2;
-    computeDocumentIdentifier( io_rProperties.DocumentIdentifier, i_rDocInfo, aC1, aC2 );
-    if( i_rOwnerPassword.getLength() || i_rUserPassword.getLength() )
-    {
-        sal_Int32 nKeyLength = 0, nRC4KeyLength = 0;
-        sal_Int32 nAccessPermissions = computeAccessPermissions( io_rProperties, nKeyLength, nRC4KeyLength );
-        // get padded passwords
-        sal_uInt8 aPadUPW[ENCRYPTED_PWD_SIZE], aPadOPW[ENCRYPTED_PWD_SIZE];
-        padPassword( i_rOwnerPassword.getLength() ? i_rOwnerPassword : i_rUserPassword, aPadOPW );
-        padPassword( i_rUserPassword, aPadUPW );
-        bSuccess = computeODictionaryValue( aPadOPW, aPadUPW, io_rProperties, nKeyLength, nRC4KeyLength )
-                && computeUDictionaryValue( aPadOPW, aPadUPW, io_rProperties, nKeyLength, nRC4KeyLength, nAccessPermissions )
-                ;
-
-        // trash temporary padded cleartext PWDs
-        rtl_zeroMemory( aPadOPW, sizeof(aPadOPW) );
-        rtl_zeroMemory( aPadUPW, sizeof(aPadUPW) );
-
-        //clear out exceding key values, prepares for generation number default to 0 as well
-        // see checkAndEnableStreamEncryption in pdfwriter_impl.hxx
-        if( bSuccess )
-        {
-            sal_Int32 i, y;
-            for( i = nKeyLength, y = 0; y < 5 ; y++ )
-                io_rProperties.EncryptionKey[i++] = 0;
-        }
-    }
-    else
-        bSuccess = true;
-
-    if( ! bSuccess ) // something failed, disable encrpytion
-    {
-        io_rProperties.OValue.clear();
-        io_rProperties.UValue.clear();
-        io_rProperties.EncryptionKey.clear();
-    }
-
-    return bSuccess;
-}
-
-sal_Int32 PDFWriterImpl::computeAccessPermissions( const vcl::PDFWriter::PDFEncryptionProperties& i_rProperties,
-                                                   sal_Int32& o_rKeyLength, sal_Int32& o_rRC4KeyLength )
-{
-    /*
-    2) compute the access permissions, in numerical form
-
-    the default value depends on the revision 2 (40 bit) or 3 (128 bit security):
-    - for 40 bit security the unused bit must be set to 1, since they are not used
-    - for 128 bit security the same bit must be preset to 0 and set later if needed
-    according to the table 3.15, pdf v 1.4 */
-    sal_Int32 nAccessPermissions = ( i_rProperties.Security128bit ) ? 0xfffff0c0 : 0xffffffc0 ;
-
-    /* check permissions for 40 bit security case */
-    nAccessPermissions |= ( i_rProperties.CanPrintTheDocument ) ?  1 << 2 : 0;
-    nAccessPermissions |= ( i_rProperties.CanModifyTheContent ) ? 1 << 3 : 0;
-    nAccessPermissions |= ( i_rProperties.CanCopyOrExtract ) ?   1 << 4 : 0;
-    nAccessPermissions |= ( i_rProperties.CanAddOrModify ) ? 1 << 5 : 0;
-    o_rKeyLength = SECUR_40BIT_KEY;
-    o_rRC4KeyLength = SECUR_40BIT_KEY+5; // for this value see PDF spec v 1.4, algorithm 3.1 step 4, where n is 5
-
-    if( i_rProperties.Security128bit )
-    {
-        o_rKeyLength = SECUR_128BIT_KEY;
-        o_rRC4KeyLength = 16; // for this value see PDF spec v 1.4, algorithm 3.1 step 4, where n is 16, thus maximum
-        // permitted value is 16
-        nAccessPermissions |= ( i_rProperties.CanFillInteractive ) ?         1 << 8 : 0;
-        nAccessPermissions |= ( i_rProperties.CanExtractForAccessibility ) ? 1 << 9 : 0;
-        nAccessPermissions |= ( i_rProperties.CanAssemble ) ?                1 << 10 : 0;
-        nAccessPermissions |= ( i_rProperties.CanPrintFull ) ?               1 << 11 : 0;
-    }
-    return nAccessPermissions;
-}
-
-/*************************************************************
-begin i12626 methods
-
-Implements Algorithm 3.2, step 1 only
-*/
-void PDFWriterImpl::padPassword( const rtl::OUString& i_rPassword, sal_uInt8* o_pPaddedPW )
-{
-    // get ansi-1252 version of the password string CHECKIT ! i12626
-    rtl::OString aString( rtl::OUStringToOString( i_rPassword, RTL_TEXTENCODING_MS_1252 ) );
-
-    //copy the string to the target
-    sal_Int32 nToCopy = ( aString.getLength() < ENCRYPTED_PWD_SIZE ) ? aString.getLength() : ENCRYPTED_PWD_SIZE;
-    sal_Int32 nCurrentChar;
-
-    for( nCurrentChar = 0; nCurrentChar < nToCopy; nCurrentChar++ )
-        o_pPaddedPW[nCurrentChar] = (sal_uInt8)( aString.getStr()[nCurrentChar] );
-
-    //pad it with standard byte string
-    sal_Int32 i,y;
-    for( i = nCurrentChar, y = 0 ; i < ENCRYPTED_PWD_SIZE; i++, y++ )
-        o_pPaddedPW[i] = s_nPadString[y];
-
-    // trash memory of temporary clear text password
-    rtl_zeroMemory( (sal_Char*)aString.getStr(), aString.getLength() );
-}
-
-/**********************************
-Algorithm 3.2  Compute the encryption key used
-
-step 1 should already be done before calling, the paThePaddedPassword parameter should contain
-the padded password and must be 32 byte long, the encryption key is returned into the paEncryptionKey parameter,
-it will be 16 byte long for 128 bit security; for 40 bit security only the first 5 bytes are used
-
-TODO: in pdf ver 1.5 and 1.6 the step 6 is different, should be implemented. See spec.
-
-*/
-bool PDFWriterImpl::computeEncryptionKey( const sal_uInt8* i_pOPW, const sal_uInt8* i_pUPW, vcl::PDFWriter::PDFEncryptionProperties& io_rProperties, sal_Int32 i_nAccessPermissions )
-{
-    bool bSuccess = true;
-    sal_uInt8 nMD5Sum[ RTL_DIGEST_LENGTH_MD5 ];
-
-    rtlDigest aDigest = rtl_digest_createMD5();
-    if( aDigest )
-    {
-        //step 2
-        rtlDigestError nError = rtl_digest_updateMD5( aDigest, i_pUPW, ENCRYPTED_PWD_SIZE );
-        //step 3
-        if( nError == rtl_Digest_E_None && ! io_rProperties.OValue.empty() )
-            nError = rtl_digest_updateMD5( aDigest, &io_rProperties.OValue[0] , sal_Int32(io_rProperties.OValue.size()) );
-        else
-            bSuccess = false;
-        //Step 4
-        sal_uInt8 nPerm[4];
-
-        nPerm[0] = (sal_uInt8)i_nAccessPermissions;
-        nPerm[1] = (sal_uInt8)( i_nAccessPermissions >> 8 );
-        nPerm[2] = (sal_uInt8)( i_nAccessPermissions >> 16 );
-        nPerm[3] = (sal_uInt8)( i_nAccessPermissions >> 24 );
-
-        if( nError == rtl_Digest_E_None )
-            nError = rtl_digest_updateMD5( aDigest, nPerm , sizeof( nPerm ) );
-
-        //step 5, get the document ID, binary form
-        if( nError == rtl_Digest_E_None )
-            nError = rtl_digest_updateMD5( aDigest, &io_rProperties.DocumentIdentifier[0], sal_Int32(io_rProperties.DocumentIdentifier.size()) );
-        //get the digest
-        if( nError == rtl_Digest_E_None )
-        {
-            rtl_digest_getMD5( aDigest, nMD5Sum, sizeof( nMD5Sum ) );
-
-            //step 6, only if 128 bit
-            if( io_rProperties.Security128bit )
-            {
-                for( sal_Int32 i = 0; i < 50; i++ )
-                {
-                    nError = rtl_digest_updateMD5( aDigest, &nMD5Sum, sizeof( nMD5Sum ) );
-                    if( nError != rtl_Digest_E_None )
-                    {
-                        bSuccess =  false;
-                        break;
-                    }
-                    rtl_digest_getMD5( aDigest, nMD5Sum, sizeof( nMD5Sum ) );
-                }
-            }
-        }
-        rtl_digest_destroyMD5( aDigest );
-    }
-    else
-        bSuccess = false;
-
-    //Step 7
-    if( bSuccess )
-    {
-        io_rProperties.EncryptionKey.resize( MAXIMUM_RC4_KEY_LENGTH );
-        for( sal_Int32 i = 0; i < MD5_DIGEST_SIZE; i++ )
-            io_rProperties.EncryptionKey[i] = nMD5Sum[i];
-    }
-    else
-        io_rProperties.EncryptionKey.clear();
-
-    return bSuccess;
-}
-
-/**********************************
-Algorithm 3.3  Compute the encryption dictionary /O value, save into the class data member
-the step numbers down here correspond to the ones in PDF v.1.4 specfication
-*/
-bool PDFWriterImpl::computeODictionaryValue( const sal_uInt8* i_pPaddedOwnerPassword,
-                                             const sal_uInt8* i_pPaddedUserPassword,
-                                             vcl::PDFWriter::PDFEncryptionProperties& io_rProperties,
-                                             sal_Int32 i_nKeyLength,
-                                             sal_Int32 i_nRC4KeyLength
-                                             )
-{
-    bool bSuccess = true;
-
-    io_rProperties.OValue.resize( ENCRYPTED_PWD_SIZE );
-
-    rtlDigest aDigest = rtl_digest_createMD5();
-    rtlCipher aCipher = rtl_cipher_createARCFOUR( rtl_Cipher_ModeStream );
-    if( aDigest && aCipher)
-    {
-        //step 1 already done, data is in i_pPaddedOwnerPassword
-        //step 2
-
-        rtlDigestError nError = rtl_digest_updateMD5( aDigest, i_pPaddedOwnerPassword, ENCRYPTED_PWD_SIZE );
-        if( nError == rtl_Digest_E_None )
-        {
-            sal_uInt8 nMD5Sum[ RTL_DIGEST_LENGTH_MD5 ];
-
-            rtl_digest_getMD5( aDigest, nMD5Sum, sizeof(nMD5Sum) );
-//step 3, only if 128 bit
-            if( io_rProperties.Security128bit )
-            {
-                sal_Int32 i;
-                for( i = 0; i < 50; i++ )
-                {
-                    nError = rtl_digest_updateMD5( aDigest, nMD5Sum, sizeof( nMD5Sum ) );
-                    if( nError != rtl_Digest_E_None )
-                    {
-                        bSuccess = false;
-                        break;
-                    }
-                    rtl_digest_getMD5( aDigest, nMD5Sum, sizeof( nMD5Sum ) );
-                }
-            }
-            //Step 4, the key is in nMD5Sum
-            //step 5 already done, data is in i_pPaddedUserPassword
-            //step 6
-            rtl_cipher_initARCFOUR( aCipher, rtl_Cipher_DirectionEncode,
-                                     nMD5Sum, i_nKeyLength , NULL, 0 );
-            // encrypt the user password using the key set above
-            rtl_cipher_encodeARCFOUR( aCipher, i_pPaddedUserPassword, ENCRYPTED_PWD_SIZE, // the data to be encrypted
-                                      &io_rProperties.OValue[0], sal_Int32(io_rProperties.OValue.size()) ); //encrypted data
-            //Step 7, only if 128 bit
-            if( io_rProperties.Security128bit )
-            {
-                sal_uInt32 i, y;
-                sal_uInt8 nLocalKey[ SECUR_128BIT_KEY ]; // 16 = 128 bit key
-
-                for( i = 1; i <= 19; i++ ) // do it 19 times, start with 1
-                {
-                    for( y = 0; y < sizeof( nLocalKey ); y++ )
-                        nLocalKey[y] = (sal_uInt8)( nMD5Sum[y] ^ i );
-
-                    rtl_cipher_initARCFOUR( aCipher, rtl_Cipher_DirectionEncode,
-                                            nLocalKey, SECUR_128BIT_KEY, NULL, 0 ); //destination data area, on init can be NULL
-                    rtl_cipher_encodeARCFOUR( aCipher, &io_rProperties.OValue[0], sal_Int32(io_rProperties.OValue.size()), // the data to be encrypted
-                                              &io_rProperties.OValue[0], sal_Int32(io_rProperties.OValue.size()) ); // encrypted data, can be the same as the input, encrypt "in place"
-                    //step 8, store in class data member
-                }
-            }
-        }
-        else
-            bSuccess = false;
-    }
-    else
-        bSuccess = false;
-
-    if( aDigest )
-        rtl_digest_destroyMD5( aDigest );
-    if( aCipher )
-        rtl_cipher_destroyARCFOUR( aCipher );
-
-    if( ! bSuccess )
-        io_rProperties.OValue.clear();
-    return bSuccess;
-}
-
-/**********************************
-Algorithms 3.4 and 3.5  Compute the encryption dictionary /U value, save into the class data member, revision 2 (40 bit) or 3 (128 bit)
-*/
-bool PDFWriterImpl::computeUDictionaryValue( const sal_uInt8* i_pPaddedOwnerPassword,
-                                             const sal_uInt8* i_pPaddedUserPassword,
-                                             vcl::PDFWriter::PDFEncryptionProperties& io_rProperties,
-                                             sal_Int32 i_nKeyLength,
-                                             sal_Int32 i_nRC4KeyLength,
-                                             sal_Int32 i_nAccessPermissions
-                                             )
-{
-    bool bSuccess = true;
-
-    io_rProperties.UValue.resize( ENCRYPTED_PWD_SIZE );
-
-    rtlDigest aDigest = rtl_digest_createMD5();
-    rtlCipher aCipher = rtl_cipher_createARCFOUR( rtl_Cipher_ModeStream );
-    if( aDigest && aCipher )
-    {
-        //step 1, common to both 3.4 and 3.5
-        if( computeEncryptionKey( i_pPaddedOwnerPassword, i_pPaddedUserPassword, io_rProperties, i_nAccessPermissions ) )
-        {
-            if( io_rProperties.Security128bit == false )
-            {
-                //3.4
-                //step 2 and 3
-                rtl_cipher_initARCFOUR( aCipher, rtl_Cipher_DirectionEncode,
-                                        &io_rProperties.EncryptionKey[0], 5 , // key and key length
-                                        NULL, 0 ); //destination data area
-                // encrypt the user password using the key set above, save for later use
-                rtl_cipher_encodeARCFOUR( aCipher, s_nPadString, sizeof( s_nPadString ), // the data to be encrypted
-                                          &io_rProperties.UValue[0], sal_Int32(io_rProperties.UValue.size()) ); //encrypted data, stored in class data member
-            }
-            else
-            {
-                //or 3.5, for 128 bit security
-                //step6, initilize the last 16 bytes of the encrypted user password to 0
-                for(sal_uInt32 i = MD5_DIGEST_SIZE; i < sal_uInt32(io_rProperties.UValue.size()); i++)
-                    io_rProperties.UValue[i] = 0;
-                //step 2
-                rtlDigestError nError = rtl_digest_updateMD5( aDigest, s_nPadString, sizeof( s_nPadString ) );
-                //step 3
-                if( nError == rtl_Digest_E_None )
-                    nError = rtl_digest_updateMD5( aDigest, &io_rProperties.DocumentIdentifier[0], sal_Int32(io_rProperties.DocumentIdentifier.size()) );
-                else
-                    bSuccess = false;
-
-                sal_uInt8 nMD5Sum[ RTL_DIGEST_LENGTH_MD5 ];
-                rtl_digest_getMD5( aDigest, nMD5Sum, sizeof(nMD5Sum) );
-                //Step 4
-                rtl_cipher_initARCFOUR( aCipher, rtl_Cipher_DirectionEncode,
-                                        &io_rProperties.EncryptionKey[0], SECUR_128BIT_KEY, NULL, 0 ); //destination data area
-                rtl_cipher_encodeARCFOUR( aCipher, nMD5Sum, sizeof( nMD5Sum ), // the data to be encrypted
-                                          &io_rProperties.UValue[0], sizeof( nMD5Sum ) ); //encrypted data, stored in class data member
-                //step 5
-                sal_uInt32 i, y;
-                sal_uInt8 nLocalKey[SECUR_128BIT_KEY];
-
-                for( i = 1; i <= 19; i++ ) // do it 19 times, start with 1
-                {
-                    for( y = 0; y < sizeof( nLocalKey ) ; y++ )
-                        nLocalKey[y] = (sal_uInt8)( io_rProperties.EncryptionKey[y] ^ i );
-
-                    rtl_cipher_initARCFOUR( aCipher, rtl_Cipher_DirectionEncode,
-                                            nLocalKey, SECUR_128BIT_KEY, // key and key length
-                                            NULL, 0 ); //destination data area, on init can be NULL
-                    rtl_cipher_encodeARCFOUR( aCipher, &io_rProperties.UValue[0], SECUR_128BIT_KEY, // the data to be encrypted
-                                              &io_rProperties.UValue[0], SECUR_128BIT_KEY ); // encrypted data, can be the same as the input, encrypt "in place"
-                }
-            }
-        }
-        else
-            bSuccess = false;
-    }
-    else
-        bSuccess = false;
-
-    if( aDigest )
-        rtl_digest_destroyMD5( aDigest );
-    if( aCipher )
-        rtl_cipher_destroyARCFOUR( aCipher );
-
-    if( ! bSuccess )
-        io_rProperties.UValue.clear();
-    return bSuccess;
-}
-
-/* end i12626 methods */
 
diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx
index dd75ca4f1a47..9006a104b576 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -58,6 +58,7 @@ class ImplFontSelectData;
 class ImplFontMetricData;
 class FontSubsetInfo;
 class ZCodec;
+class EncHashTransporter;
 
 // the maximum password length
 #define ENCRYPTED_PWD_SIZE     32
@@ -1023,17 +1024,17 @@ i12626
     pad a password according  algorithm 3.2, step 1 */
     static void padPassword( const rtl::OUString& i_rPassword, sal_uInt8* o_pPaddedPW );
     /* algorithm 3.2: compute an encryption key */
-    static bool computeEncryptionKey( const sal_uInt8* i_pOPW, const sal_uInt8* i_pUPW,
+    static bool computeEncryptionKey( EncHashTransporter*,
                                       vcl::PDFWriter::PDFEncryptionProperties& io_rProperties,
                                       sal_Int32 i_nAccessPermissions
                                      );
     /* algorithm 3.3: computing the encryption dictionary'ss owner password value ( /O ) */
     static bool computeODictionaryValue( const sal_uInt8* i_pPaddedOwnerPassword, const sal_uInt8* i_pPaddedUserPassword,
-                                         vcl::PDFWriter::PDFEncryptionProperties& io_rProperties,
+                                         std::vector< sal_uInt8 >& io_rOValue,
                                          sal_Int32 i_nKeyLength, sal_Int32 i_nRC4KeyLength
                                         );
     /* algorithm 3.4 or 3.5: computing the encryption dictionary's user password value ( /U ) revision 2 or 3 of the standard security handler */
-    static bool computeUDictionaryValue( const sal_uInt8* i_pPaddedOwnerPassword, const sal_uInt8* i_pPaddedUserPassword,
+    static bool computeUDictionaryValue( EncHashTransporter* i_pTransporter,
                                          vcl::PDFWriter::PDFEncryptionProperties& io_rProperties,
                                          sal_Int32 i_nKeyLength, sal_Int32 i_nRC4KeyLength,
                                          sal_Int32 i_nAccessPermissions
@@ -1047,15 +1048,15 @@ i12626
     static sal_Int32 computeAccessPermissions( const vcl::PDFWriter::PDFEncryptionProperties& i_rProperties,
                                                sal_Int32& o_rKeyLength, sal_Int32& o_rRC4KeyLength );
     void setupDocInfo();
+    bool prepareEncryption( const com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder >& );
 public:
-    PDFWriterImpl( const PDFWriter::PDFWriterContext& rContext );
+    PDFWriterImpl( const PDFWriter::PDFWriterContext& rContext, const com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder >& );
     ~PDFWriterImpl();
 
-    static bool initEncryption( vcl::PDFWriter::PDFEncryptionProperties& io_rProperties,
-                                const rtl::OUString& i_rOwnerPassword,
-                                const rtl::OUString& i_rUserPassword,
-                                const vcl::PDFWriter::PDFDocInfo& i_rDocInfo
-                                );
+    static com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder >
+           initEncryption( const rtl::OUString& i_rOwnerPassword,
+                           const rtl::OUString& i_rUserPassword,
+                           bool b128Bit );
 
     /*  for OutputDevice so the reference device can have a list
      *  that contains only suitable fonts (subsettable or builtin)
-- 
cgit 


From 2768b48ed3ad36fd31c38b2cbb5b0b7c37afebf2 Mon Sep 17 00:00:00 2001
From: "Frank Schoenheit [fs]" 
Date: Mon, 27 Sep 2010 23:21:07 +0200
Subject: dba34a: #i31275# allow 'select as you type' aka 'quick selection' for
 tree list boxes (SvLBox derivees, to be precise), and enable this for Base
 main window, and the stylist

---
 svtools/inc/svtools/svlbox.hxx              |  29 +++--
 svtools/source/contnr/svicnvw.cxx           |   1 +
 svtools/source/contnr/svimpbox.cxx          |  25 ++--
 svtools/source/contnr/svlbox.cxx            |  71 +++++++++--
 tools/inc/tools/wintypes.hxx                |  16 +--
 vcl/inc/vcl/ilstbox.hxx                     |  16 ++-
 vcl/inc/vcl/mnemonicengine.hxx              |   6 +-
 vcl/inc/vcl/quickselectionengine.hxx        |  95 +++++++++++++++
 vcl/prj/d.lst                               |   1 +
 vcl/source/control/ilstbox.cxx              | 145 +++++++++++++---------
 vcl/source/control/makefile.mk              |   3 +-
 vcl/source/control/quickselectionengine.cxx | 181 ++++++++++++++++++++++++++++
 12 files changed, 487 insertions(+), 102 deletions(-)
 create mode 100644 vcl/inc/vcl/quickselectionengine.hxx
 create mode 100644 vcl/source/control/quickselectionengine.cxx

diff --git a/svtools/inc/svtools/svlbox.hxx b/svtools/inc/svtools/svlbox.hxx
index 5b1f13120756..95fbd9f014d1 100644
--- a/svtools/inc/svtools/svlbox.hxx
+++ b/svtools/inc/svtools/svlbox.hxx
@@ -47,6 +47,7 @@
 #include 
 #endif
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -253,10 +254,12 @@ DECLARE_SVTREELIST(SvLBoxTreeList, SvLBoxEntry*)
 class SvLBox;
 struct SvLBox_Impl
 {
-    bool                    m_bIsEmptyTextAllowed;
-    bool                    m_bEntryMnemonicsEnabled;
-    Link*                   m_pLink;
-    ::vcl::MnemonicEngine   m_aMnemonicEngine;
+    bool                        m_bIsEmptyTextAllowed;
+    bool                        m_bEntryMnemonicsEnabled;
+    bool                        m_bDoingQuickSelection;
+    Link*                       m_pLink;
+    ::vcl::MnemonicEngine       m_aMnemonicEngine;
+    ::vcl::QuickSelectionEngine m_aQuickSelectionEngine;
 
     SvLBox_Impl( SvLBox& _rBox );
 };
@@ -267,6 +270,7 @@ class SVT_DLLPUBLIC SvLBox
                 ,public DropTargetHelper
                 ,public DragSourceHelper
                 ,public ::vcl::IMnemonicEntryList
+                ,public ::vcl::ISearchableStringList
 {
     friend class SvLBoxEntry;
 
@@ -375,11 +379,18 @@ protected:
     // for asynchronous D&D
     sal_Int8        ExecuteDrop( const ExecuteDropEvent& rEvt, SvLBox* pSourceView );
 
-     // IMnemonicEntryList
-     virtual const void* FirstSearchEntry( String& _rEntryText );
-     virtual const void* NextSearchEntry( const void* _pCurrentSearchEntry, String& _rEntryText );
-     virtual void        SelectSearchEntry( const void* _pEntry );
-     virtual void        ExecuteSearchEntry( const void* _pEntry );
+    void            OnCurrentEntryChanged();
+
+    // IMnemonicEntryList
+    virtual const void* FirstSearchEntry( String& _rEntryText ) const;
+    virtual const void* NextSearchEntry( const void* _pCurrentSearchEntry, String& _rEntryText ) const;
+    virtual void        SelectSearchEntry( const void* _pEntry );
+    virtual void        ExecuteSearchEntry( const void* _pEntry ) const;
+
+    // ISearchableStringList
+    virtual ::vcl::StringEntryIdentifier    CurrentEntry( String& _out_entryText ) const;
+    virtual ::vcl::StringEntryIdentifier    NextEntry( ::vcl::StringEntryIdentifier _currentEntry, String& _out_entryText ) const;
+    virtual void                            SelectEntry( ::vcl::StringEntryIdentifier _entry );
 
 public:
 
diff --git a/svtools/source/contnr/svicnvw.cxx b/svtools/source/contnr/svicnvw.cxx
index 5556d299b2c2..6fd0f5bf0c9c 100644
--- a/svtools/source/contnr/svicnvw.cxx
+++ b/svtools/source/contnr/svicnvw.cxx
@@ -467,6 +467,7 @@ void SvIconView::SelectAll( BOOL bSelect, BOOL )
 void SvIconView::SetCurEntry( SvLBoxEntry* _pEntry )
 {
     pImp->SetCursor( _pEntry );
+    OnCurrentEntryChanged();
 }
 
 SvLBoxEntry* SvIconView::GetCurEntry() const
diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index 7de5f38fab69..c251903d02bd 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -684,6 +684,8 @@ void SvImpLBox::SetCursor( SvLBoxEntry* pEntry, BOOL bForceNoSelect )
         }
     }
     nFlags &= (~F_DESEL_ALL);
+
+    pView->OnCurrentEntryChanged();
 }
 
 void SvImpLBox::ShowCursor( BOOL bShow )
@@ -2484,13 +2486,17 @@ BOOL SvImpLBox::KeyInput( const KeyEvent& rKEvt)
                 else if ( !bShift /*&& !bMod1*/ )
                 {
                     if ( aSelEng.IsAddMode() )
+                    {
                         // toggle selection
                         pView->Select( pCursor, !pView->IsSelected( pCursor ) );
-                    else
+                    }
+                    else if ( !pView->IsSelected( pCursor ) )
                     {
                         SelAllDestrAnch( FALSE );
                         pView->Select( pCursor, TRUE );
                     }
+                    else
+                        bKeyUsed = FALSE;
                 }
                 else
                     bKeyUsed = FALSE;
@@ -2571,8 +2577,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;
             break;
 
         case KEY_SUBTRACT:
@@ -2683,10 +2689,15 @@ BOOL SvImpLBox::KeyInput( const KeyEvent& rKEvt)
             break;
 
         default:
-            if( bMod1 || rKeyCode.GetGroup() == KEYGROUP_FKEYS )
-                // #105907# CTRL or Function key is pressed, assume user don't want to use quicksearch...
-                // if there are groups of keys which should not be handled, they can be added here
-                bKeyUsed = FALSE;
+            // is there any reason why we should eat the events here? The only place where this is called
+            // is from SvTreeListBox::KeyInput. If we set bKeyUsed to TRUE here, then the key input
+            // is just silenced. However, we want SvLBox::KeyInput to get a chance, to do the QuickSelection
+            // handling.
+            // (The old code here which intentionally set bKeyUsed to TRUE said this was because of "quick search"
+            // handling, but actually there was no quick search handling anymore. We just re-implemented it.)
+            // #i31275# / 2009-06-16 / frank.schoenheit@sun.com
+            bKeyUsed = FALSE;
+            break;
     }
     return bKeyUsed;
 }
diff --git a/svtools/source/contnr/svlbox.cxx b/svtools/source/contnr/svlbox.cxx
index a8bb6055768e..11e19c6bab3c 100644
--- a/svtools/source/contnr/svlbox.cxx
+++ b/svtools/source/contnr/svlbox.cxx
@@ -685,6 +685,7 @@ SvLBox_Impl::SvLBox_Impl( SvLBox& _rBox )
     ,m_bEntryMnemonicsEnabled( false )
     ,m_pLink( NULL )
     ,m_aMnemonicEngine( _rBox )
+    ,m_aQuickSelectionEngine( _rBox )
 {
 }
 
@@ -1249,6 +1250,12 @@ ULONG SvLBox::SelectChilds( SvLBoxEntry* , BOOL  )
     return 0;
 }
 
+void SvLBox::OnCurrentEntryChanged()
+{
+    if ( !pLBoxImpl->m_bDoingQuickSelection )
+        pLBoxImpl->m_aQuickSelectionEngine.Reset();
+}
+
 void SvLBox::SelectAll( BOOL /* bSelect */ , BOOL /* bPaint */ )
 {
     DBG_CHKTHIS(SvLBox,0);
@@ -1533,15 +1540,14 @@ void SvLBox::KeyInput( const KeyEvent& rKEvt )
         Control::KeyInput( rKEvt );
 }
 
-const void* SvLBox::FirstSearchEntry( String& _rEntryText )
+const void* SvLBox::FirstSearchEntry( String& _rEntryText ) const
 {
     SvLBoxEntry* pEntry = GetCurEntry();
     if ( pEntry )
         pEntry = const_cast< SvLBoxEntry* >( static_cast< const SvLBoxEntry* >( NextSearchEntry( pEntry, _rEntryText ) ) );
     else
     {
-        if ( !pEntry )
-            pEntry = FirstSelected();
+        pEntry = FirstSelected();
         if ( !pEntry )
             pEntry = First();
     }
@@ -1552,11 +1558,23 @@ const void* SvLBox::FirstSearchEntry( String& _rEntryText )
     return pEntry;
 }
 
-const void* SvLBox::NextSearchEntry( const void* _pCurrentSearchEntry, String& _rEntryText )
+const void* SvLBox::NextSearchEntry( const void* _pCurrentSearchEntry, String& _rEntryText ) const
 {
     SvLBoxEntry* pEntry = const_cast< SvLBoxEntry* >( static_cast< const SvLBoxEntry* >( _pCurrentSearchEntry ) );
 
-    pEntry = Next( pEntry );
+    if  (   (   ( GetChildCount( pEntry ) > 0 )
+            ||  ( pEntry->HasChildsOnDemand() )
+            )
+        &&  !IsExpanded( pEntry )
+        )
+    {
+        pEntry = NextSibling( pEntry );
+    }
+    else
+    {
+        pEntry = Next( pEntry );
+    }
+
     if ( !pEntry )
         pEntry = First();
 
@@ -1570,7 +1588,7 @@ void SvLBox::SelectSearchEntry( const void* _pEntry )
 {
     SvLBoxEntry* pEntry = const_cast< SvLBoxEntry* >( static_cast< const SvLBoxEntry* >( _pEntry ) );
     DBG_ASSERT( pEntry, "SvLBox::SelectSearchEntry: invalid entry!" );
-    if ( pEntry )
+    if ( !pEntry )
         return;
 
     SelectAll( FALSE );
@@ -1578,17 +1596,50 @@ void SvLBox::SelectSearchEntry( const void* _pEntry )
     Select( pEntry );
 }
 
-void SvLBox::ExecuteSearchEntry( const void* /*_pEntry*/ )
+void SvLBox::ExecuteSearchEntry( const void* /*_pEntry*/ ) const
 {
     // nothing to do here, we have no "execution"
 }
 
+::vcl::StringEntryIdentifier SvLBox::CurrentEntry( String& _out_entryText ) const
+{
+    // always accept the current entry if there is one
+    SvLBoxEntry* pCurrentEntry( GetCurEntry() );
+    if ( pCurrentEntry )
+    {
+        _out_entryText = GetEntryText( pCurrentEntry );
+        return pCurrentEntry;
+    }
+    return FirstSearchEntry( _out_entryText );
+}
+
+::vcl::StringEntryIdentifier SvLBox::NextEntry( ::vcl::StringEntryIdentifier _currentEntry, String& _out_entryText ) const
+{
+    return NextSearchEntry( _currentEntry, _out_entryText );
+}
+
+void SvLBox::SelectEntry( ::vcl::StringEntryIdentifier _entry )
+{
+    SelectSearchEntry( _entry );
+}
+
 bool SvLBox::HandleKeyInput( const KeyEvent& _rKEvt )
 {
-    if ( !IsEntryMnemonicsEnabled() )
-        return false;
+    if  (   IsEntryMnemonicsEnabled()
+        &&  pLBoxImpl->m_aMnemonicEngine.HandleKeyEvent( _rKEvt )
+        )
+        return true;
+
+    if ( ( GetStyle() & WB_QUICK_SEARCH ) != 0 )
+    {
+        pLBoxImpl->m_bDoingQuickSelection = true;
+        const bool bHandled = pLBoxImpl->m_aQuickSelectionEngine.HandleKeyEvent( _rKEvt );
+        pLBoxImpl->m_bDoingQuickSelection = false;
+        if ( bHandled )
+            return true;
+    }
 
-    return pLBoxImpl->m_aMnemonicEngine.HandleKeyEvent( _rKEvt );
+    return false;
 }
 
 SvLBoxEntry* SvLBox::GetEntry( const Point&, BOOL ) const
diff --git a/tools/inc/tools/wintypes.hxx b/tools/inc/tools/wintypes.hxx
index ae90392c7034..9c7052e22d77 100644
--- a/tools/inc/tools/wintypes.hxx
+++ b/tools/inc/tools/wintypes.hxx
@@ -274,13 +274,15 @@ typedef sal_Int64 WinBits;
 #define WB_STDTABCONTROL        0
 
 // For TreeListBox
-#define WB_HASBUTTONS           ((WinBits)SAL_CONST_INT64(0x0100000000))
-#define WB_HASLINES             ((WinBits)SAL_CONST_INT64(0x0200000000))
-#define WB_HASLINESATROOT       ((WinBits)SAL_CONST_INT64(0x0400000000))
-#define WB_HASBUTTONSATROOT     ((WinBits)SAL_CONST_INT64(0x0800000000))
-#define WB_NOINITIALSELECTION   ((WinBits)SAL_CONST_INT64(0x1000000000))
-#define WB_HIDESELECTION        ((WinBits)SAL_CONST_INT64(0x2000000000))
-#define WB_FORCE_MAKEVISIBLE    ((WinBits)SAL_CONST_INT64(0x4000000000))
+#define WB_HASBUTTONS           ((WinBits)SAL_CONST_INT64(0x000100000000))
+#define WB_HASLINES             ((WinBits)SAL_CONST_INT64(0x000200000000))
+#define WB_HASLINESATROOT       ((WinBits)SAL_CONST_INT64(0x000400000000))
+#define WB_HASBUTTONSATROOT     ((WinBits)SAL_CONST_INT64(0x000800000000))
+#define WB_NOINITIALSELECTION   ((WinBits)SAL_CONST_INT64(0x001000000000))
+#define WB_HIDESELECTION        ((WinBits)SAL_CONST_INT64(0x002000000000))
+#define WB_FORCE_MAKEVISIBLE    ((WinBits)SAL_CONST_INT64(0x004000000000))
+// DO NOT USE: 0x008000000000, that's WB_SYSTEMCHILDWINDOW
+#define WB_QUICK_SEARCH         ((WinBits)SAL_CONST_INT64(0x010000000000))
 
 
 // For FileOpen Dialog
diff --git a/vcl/inc/vcl/ilstbox.hxx b/vcl/inc/vcl/ilstbox.hxx
index ac278f76f65b..6580538f5d10 100644
--- a/vcl/inc/vcl/ilstbox.hxx
+++ b/vcl/inc/vcl/ilstbox.hxx
@@ -36,6 +36,7 @@
 #include 
 #include 
 
+#include "vcl/quickselectionengine.hxx"
 
 class ScrollBar;
 class ScrollBarBox;
@@ -193,13 +194,11 @@ public:
 // - ImplListBoxWindow -
 // ---------------------
 
-class ImplListBoxWindow : public Control
+class ImplListBoxWindow : public Control, public ::vcl::ISearchableStringList
 {
 private:
     ImplEntryList*  mpEntryList;     // EntryListe
     Rectangle       maFocusRect;
-    String          maSearchStr;
-    Timer           maSearchTimeout;
 
     Size            maUserItemSize;
 
@@ -254,9 +253,10 @@ private:
     Link            maUserDrawHdl;
     Link            maMRUChangedHdl;
 
-protected:
-    DECL_LINK(      SearchStringTimeout, Timer* );
+    ::vcl::QuickSelectionEngine
+                    maQuickSelectionEngine;
 
+protected:
     virtual void    KeyInput( const KeyEvent& rKEvt );
     virtual void    MouseButtonDown( const MouseEvent& rMEvt );
     virtual void    MouseMove( const MouseEvent& rMEvt );
@@ -379,6 +379,12 @@ public:
     // pb: #106948# explicit mirroring for calc
     inline void     EnableMirroring()       { mbMirroring = TRUE; }
     inline BOOL     IsMirroring() const { return mbMirroring; }
+
+protected:
+    // ISearchableStringList
+    virtual ::vcl::StringEntryIdentifier    CurrentEntry( String& _out_entryText ) const;
+    virtual ::vcl::StringEntryIdentifier    NextEntry( ::vcl::StringEntryIdentifier _currentEntry, String& _out_entryText ) const;
+    virtual void                            SelectEntry( ::vcl::StringEntryIdentifier _entry );
 };
 
 // ---------------
diff --git a/vcl/inc/vcl/mnemonicengine.hxx b/vcl/inc/vcl/mnemonicengine.hxx
index d12b3db2417e..fcd303510203 100644
--- a/vcl/inc/vcl/mnemonicengine.hxx
+++ b/vcl/inc/vcl/mnemonicengine.hxx
@@ -59,7 +59,7 @@ namespace vcl
 
                 If this value is , searching stops.
         */
-        virtual const void* FirstSearchEntry( String& _rEntryText ) = 0;
+        virtual const void* FirstSearchEntry( String& _rEntryText ) const = 0;
 
         /** returns the next list entry for the mnemonic search
 
@@ -74,7 +74,7 @@ namespace vcl
                 to FirstSearchEntry (i.e. you cycled
                 around), then searching stops, too.
         */
-        virtual const void* NextSearchEntry( const void* _pCurrentSearchEntry, String& _rEntryText ) = 0;
+        virtual const void* NextSearchEntry( const void* _pCurrentSearchEntry, String& _rEntryText ) const = 0;
 
         /** "selects" a given entry.
 
@@ -117,7 +117,7 @@ namespace vcl
                 the entry to select. This is the return value of a previous call
                 to FirstSearchEntry or NextSearchEntry.
         */
-        virtual void    ExecuteSearchEntry( const void* _pEntry ) = 0;
+        virtual void    ExecuteSearchEntry( const void* _pEntry ) const = 0;
     };
 
     //====================================================================
diff --git a/vcl/inc/vcl/quickselectionengine.hxx b/vcl/inc/vcl/quickselectionengine.hxx
new file mode 100644
index 000000000000..f70736428010
--- /dev/null
+++ b/vcl/inc/vcl/quickselectionengine.hxx
@@ -0,0 +1,95 @@
+/*************************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2009 by Sun Microsystems, Inc.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* 
+* for a copy of the LGPLv3 License.
+************************************************************************/
+
+#ifndef VCL_QUICKSELECTIONENGINE_HXX
+#define VCL_QUICKSELECTIONENGINE_HXX
+
+#include "dllapi.h"
+
+#include 
+
+#include 
+
+class KeyEvent;
+
+//........................................................................
+namespace vcl
+{
+//........................................................................
+
+    typedef const void* StringEntryIdentifier;
+
+    //====================================================================
+    //= ISearchableStringList
+    //====================================================================
+    // TODO: consolidate this with ::vcl::IMnemonicEntryList
+    class SAL_NO_VTABLE VCL_DLLPUBLIC ISearchableStringList
+    {
+    public:
+        /** returns the current entry in the list of searchable strings.
+
+            Search operations will start with this entry.
+        */
+        virtual StringEntryIdentifier   CurrentEntry( String& _out_entryText ) const = 0;
+
+        /** returns the next entry in the list.
+
+            The implementation is expected to wrap around. That is, if the given entry denotes the last
+            entry in the list, then NextEntry should return the first entry.
+        */
+        virtual StringEntryIdentifier   NextEntry( StringEntryIdentifier _currentEntry, String& _out_entryText ) const = 0;
+
+        /** selects a given entry
+        */
+        virtual void                    SelectEntry( StringEntryIdentifier _entry ) = 0;
+    };
+
+    //====================================================================
+    //= QuickSelectionEngine
+    //====================================================================
+    struct QuickSelectionEngine_Data;
+    class VCL_DLLPUBLIC QuickSelectionEngine
+    {
+    public:
+        QuickSelectionEngine( ISearchableStringList& _entryList );
+        ~QuickSelectionEngine();
+
+        bool    HandleKeyEvent( const KeyEvent& _rKEvt );
+        void    Reset();
+
+    private:
+        ::std::auto_ptr< QuickSelectionEngine_Data >    m_pData;
+
+    private:
+        QuickSelectionEngine();                                         // never implemented
+        QuickSelectionEngine( const QuickSelectionEngine& );            // never implemented
+        QuickSelectionEngine& operator=( const QuickSelectionEngine& ); // never implemented
+    };
+
+//........................................................................
+} // namespace vcl
+//........................................................................
+
+#endif // VCL_QUICKSELECTIONENGINE_HXX
diff --git a/vcl/prj/d.lst b/vcl/prj/d.lst
index d0baec53b720..d3aff731d0b6 100644
--- a/vcl/prj/d.lst
+++ b/vcl/prj/d.lst
@@ -78,6 +78,7 @@ mkdir: %_DEST%\inc%_EXT%\vcl
 ..\inc\vcl\metric.hxx %_DEST%\inc%_EXT%\vcl\metric.hxx
 ..\inc\vcl\mnemonic.hxx %_DEST%\inc%_EXT%\vcl\mnemonic.hxx
 ..\inc\vcl\mnemonicengine.hxx %_DEST%\inc%_EXT%\vcl\mnemonicengine.hxx
+..\inc\vcl\quickselectionengine.hxx %_DEST%\inc%_EXT%\vcl\quickselectionengine.hxx
 ..\inc\vcl\morebtn.hxx %_DEST%\inc%_EXT%\vcl\morebtn.hxx
 ..\inc\vcl\msgbox.hxx %_DEST%\inc%_EXT%\vcl\msgbox.hxx
 ..\inc\vcl\octree.hxx %_DEST%\inc%_EXT%\vcl\octree.hxx
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index 02c8d2b5fcb3..505f3ae779ed 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -529,7 +529,8 @@ USHORT ImplEntryList::FindFirstSelectable( USHORT nPos, bool bForward /* = true
 // =======================================================================
 
 ImplListBoxWindow::ImplListBoxWindow( Window* pParent, WinBits nWinStyle ) :
-    Control( pParent, 0 )
+    Control( pParent, 0 ),
+    maQuickSelectionEngine( *this )
 {
     mpEntryList         = new ImplEntryList( this );
 
@@ -568,9 +569,6 @@ ImplListBoxWindow::ImplListBoxWindow( Window* pParent, WinBits nWinStyle ) :
     SetTextFillColor();
     SetBackground( Wallpaper( GetSettings().GetStyleSettings().GetFieldColor() ) );
 
-    maSearchTimeout.SetTimeout( 2500 );
-    maSearchTimeout.SetTimeoutHdl( LINK( this, ImplListBoxWindow, SearchStringTimeout ) );
-
     ImplInitSettings( TRUE, TRUE, TRUE );
     ImplCalcMetrics();
 }
@@ -579,7 +577,6 @@ ImplListBoxWindow::ImplListBoxWindow( Window* pParent, WinBits nWinStyle ) :
 
 ImplListBoxWindow::~ImplListBoxWindow()
 {
-    maSearchTimeout.Stop();
     delete mpEntryList;
 }
 
@@ -624,14 +621,6 @@ void ImplListBoxWindow::ImplCalcMetrics()
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( ImplListBoxWindow, SearchStringTimeout, Timer*, EMPTYARG )
-{
-    maSearchStr.Erase();
-    return 1;
-}
-
-// -----------------------------------------------------------------------
-
 void ImplListBoxWindow::Clear()
 {
     mpEntryList->Clear();
@@ -648,6 +637,7 @@ void ImplListBoxWindow::Clear()
     ImplClearLayoutData();
 
     mnCurrentPos = LISTBOX_ENTRY_NOTFOUND;
+    maQuickSelectionEngine.Reset();
 
     Invalidate();
 }
@@ -918,7 +908,7 @@ USHORT ImplListBoxWindow::GetLastVisibleEntry() const
 void ImplListBoxWindow::MouseButtonDown( const MouseEvent& rMEvt )
 {
     mbMouseMoveSelect = FALSE;  // Nur bis zum ersten MouseButtonDown
-    maSearchStr.Erase();
+    maQuickSelectionEngine.Reset();
 
     if ( !IsReadOnly() )
     {
@@ -1465,7 +1455,7 @@ BOOL ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt )
 
                 bDone = TRUE;
             }
-            maSearchStr.Erase();
+            maQuickSelectionEngine.Reset();
         }
         break;
 
@@ -1492,7 +1482,7 @@ BOOL ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt )
 
                 bDone = TRUE;
             }
-            maSearchStr.Erase();
+            maQuickSelectionEngine.Reset();
         }
         break;
 
@@ -1523,7 +1513,7 @@ BOOL ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt )
                 }
                 bDone = TRUE;
             }
-            maSearchStr.Erase();
+            maQuickSelectionEngine.Reset();
         }
         break;
 
@@ -1557,7 +1547,7 @@ BOOL ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt )
                 }
                 bDone = TRUE;
             }
-            maSearchStr.Erase();
+            maQuickSelectionEngine.Reset();
         }
         break;
 
@@ -1578,7 +1568,7 @@ BOOL ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt )
                     bDone = TRUE;
                 }
             }
-            maSearchStr.Erase();
+            maQuickSelectionEngine.Reset();
         }
         break;
 
@@ -1604,7 +1594,7 @@ BOOL ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt )
                 }
                 bDone = TRUE;
             }
-            maSearchStr.Erase();
+            maQuickSelectionEngine.Reset();
         }
         break;
 
@@ -1615,7 +1605,7 @@ BOOL ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt )
                 ScrollHorz( -HORZ_SCROLL );
                 bDone = TRUE;
             }
-            maSearchStr.Erase();
+            maQuickSelectionEngine.Reset();
         }
         break;
 
@@ -1626,7 +1616,7 @@ BOOL ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt )
                 ScrollHorz( HORZ_SCROLL );
                 bDone = TRUE;
             }
-            maSearchStr.Erase();
+            maQuickSelectionEngine.Reset();
         }
         break;
 
@@ -1638,7 +1628,7 @@ BOOL ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt )
                 ImplCallSelect();
                 bDone = FALSE;  // RETURN nicht abfangen.
             }
-            maSearchStr.Erase();
+            maQuickSelectionEngine.Reset();
         }
         break;
 
@@ -1653,7 +1643,7 @@ BOOL ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt )
                 }
                 bDone = TRUE;
             }
-            maSearchStr.Erase();
+            maQuickSelectionEngine.Reset();
         }
         break;
 
@@ -1673,7 +1663,7 @@ BOOL ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt )
                 SetUpdateMode( bUpdates );
                 Invalidate();
 
-                maSearchStr.Erase();
+                maQuickSelectionEngine.Reset();
 
                 bDone = TRUE;
                 break;
@@ -1682,43 +1672,12 @@ BOOL ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt )
         // fall through intentional
         default:
         {
-            xub_Unicode c = rKEvt.GetCharCode();
-
-            if ( !IsReadOnly() && (c >= 32) && (c != 127) && !rKEvt.GetKeyCode().IsMod2() )
+            if ( !IsReadOnly() )
             {
-                maSearchStr += c;
-                XubString aTmpSearch( maSearchStr );
-
-                nSelect = mpEntryList->FindMatchingEntry( aTmpSearch, mnCurrentPos );
-                if ( (nSelect == LISTBOX_ENTRY_NOTFOUND) && (aTmpSearch.Len() > 1) )
-                {
-                    // Wenn alles die gleichen Buchstaben, dann anderer Such-Modus
-                    BOOL bAllEqual = TRUE;
-                    for ( USHORT n = aTmpSearch.Len(); n && bAllEqual; )
-                        bAllEqual = aTmpSearch.GetChar( --n ) == c;
-                    if ( bAllEqual )
-                    {
-                        aTmpSearch = c;
-                        nSelect = mpEntryList->FindMatchingEntry( aTmpSearch, mnCurrentPos+1 );
-                    }
-                }
-                if ( nSelect == LISTBOX_ENTRY_NOTFOUND )
-                    nSelect = mpEntryList->FindMatchingEntry( aTmpSearch, 0 );
-
-                if ( nSelect != LISTBOX_ENTRY_NOTFOUND )
-                {
-                    ShowProminentEntry( nSelect );
-
-                    if ( mpEntryList->IsEntryPosSelected( nSelect ) )
-                        nSelect = LISTBOX_ENTRY_NOTFOUND;
-
-                    maSearchTimeout.Start();
-                }
-                else
-                    maSearchStr.Erase();
-                bDone = TRUE;
+                bDone = maQuickSelectionEngine.HandleKeyEvent( rKEvt );
             }
-        }
+          }
+        break;
     }
 
     if  (   ( nSelect != LISTBOX_ENTRY_NOTFOUND )
@@ -1743,6 +1702,72 @@ BOOL ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt )
     return bDone;
 }
 
+// -----------------------------------------------------------------------
+namespace
+{
+    static ::vcl::StringEntryIdentifier lcl_getEntry( const ImplEntryList& _rList, USHORT _nPos, String& _out_entryText )
+    {
+        OSL_PRECOND( ( _nPos != LISTBOX_ENTRY_NOTFOUND ) && ( _nPos >= 0 ), "lcl_getEntry: invalid position!" );
+        USHORT nEntryCount( _rList.GetEntryCount() );
+        if ( _nPos >= nEntryCount )
+            _nPos = 0;
+        _out_entryText = _rList.GetEntryText( _nPos );
+
+        // ::vcl::StringEntryIdentifier does not allow for 0 values, but our position is 0-based
+        // => normalize
+        return reinterpret_cast< ::vcl::StringEntryIdentifier >( _nPos + 1 );
+    }
+
+    static USHORT lcl_getEntryPos( ::vcl::StringEntryIdentifier _entry )
+    {
+        // our pos is 0-based, but StringEntryIdentifier does not allow for a NULL
+        return static_cast< USHORT >( reinterpret_cast< sal_Int64 >( _entry ) ) - 1;
+    }
+}
+
+// -----------------------------------------------------------------------
+::vcl::StringEntryIdentifier ImplListBoxWindow::CurrentEntry( String& _out_entryText ) const
+{
+    return lcl_getEntry( *GetEntryList(), ( mnCurrentPos == LISTBOX_ENTRY_NOTFOUND ) ? 0 : mnCurrentPos + 1, _out_entryText );
+}
+
+// -----------------------------------------------------------------------
+::vcl::StringEntryIdentifier ImplListBoxWindow::NextEntry( ::vcl::StringEntryIdentifier _currentEntry, String& _out_entryText ) const
+{
+    USHORT nNextPos = lcl_getEntryPos( _currentEntry ) + 1;
+    return lcl_getEntry( *GetEntryList(), nNextPos, _out_entryText );
+}
+
+// -----------------------------------------------------------------------
+void ImplListBoxWindow::SelectEntry( ::vcl::StringEntryIdentifier _entry )
+{
+    USHORT nSelect = lcl_getEntryPos( _entry );
+    if ( mpEntryList->IsEntryPosSelected( nSelect ) )
+    {
+        // ignore that. This method is a callback from the QuickSelectionEngine, which means the user attempted
+        // to select the given entry by typing its starting letters. No need to act.
+        return;
+    }
+
+    // normalize
+    OSL_ENSURE( nSelect < mpEntryList->GetEntryCount(), "ImplListBoxWindow::SelectEntry: how that?" );
+    if( nSelect >= mpEntryList->GetEntryCount() )
+        nSelect = mpEntryList->GetEntryCount()-1;
+
+    // make visible
+    ShowProminentEntry( nSelect );
+
+    // actually select
+    mnCurrentPos = nSelect;
+    if ( SelectEntries( nSelect, LET_KEYMOVE, FALSE, FALSE ) )
+    {
+        mbTravelSelect = TRUE;
+        mnSelectModifier = 0;
+        ImplCallSelect();
+        mbTravelSelect = FALSE;
+    }
+}
+
 // -----------------------------------------------------------------------
 
 void ImplListBoxWindow::ImplPaint( USHORT nPos, BOOL bErase, bool bLayout )
diff --git a/vcl/source/control/makefile.mk b/vcl/source/control/makefile.mk
index a2553333246d..b1644e58ccd9 100644
--- a/vcl/source/control/makefile.mk
+++ b/vcl/source/control/makefile.mk
@@ -62,7 +62,8 @@ SLOFILES=	$(SLO)$/button.obj		\
             $(SLO)$/slider.obj		\
             $(SLO)$/spinfld.obj 	\
             $(SLO)$/spinbtn.obj 	\
-            $(SLO)$/tabctrl.obj
+            $(SLO)$/tabctrl.obj     \
+            $(SLO)$/quickselectionengine.obj
 
 EXCEPTIONSFILES=					\
             $(SLO)$/button.obj		\
diff --git a/vcl/source/control/quickselectionengine.cxx b/vcl/source/control/quickselectionengine.cxx
new file mode 100644
index 000000000000..beb6e499794c
--- /dev/null
+++ b/vcl/source/control/quickselectionengine.cxx
@@ -0,0 +1,181 @@
+/*************************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2009 by Sun Microsystems, Inc.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* 
+* for a copy of the LGPLv3 License.
+************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_vcl.hxx"
+
+#include "vcl/quickselectionengine.hxx"
+#include "vcl/event.hxx"
+#include "vcl/timer.hxx"
+#include "vcl/i18nhelp.hxx"
+#include "vcl/svapp.hxx"
+
+#include 
+
+//........................................................................
+namespace vcl
+{
+//........................................................................
+
+    //====================================================================
+    //= QuickSelectionEngine_Data
+    //====================================================================
+    struct QuickSelectionEngine_Data
+    {
+        ISearchableStringList&              rEntryList;
+        String                              sCurrentSearchString;
+        ::boost::optional< sal_Unicode >    aSingleSearchChar;
+        Timer                               aSearchTimeout;
+
+        QuickSelectionEngine_Data( ISearchableStringList& _entryList )
+            :rEntryList( _entryList )
+            ,sCurrentSearchString()
+            ,aSingleSearchChar()
+            ,aSearchTimeout()
+        {
+            aSearchTimeout.SetTimeout( 2500 );
+            aSearchTimeout.SetTimeoutHdl( LINK( this, QuickSelectionEngine_Data, SearchStringTimeout ) );
+        }
+
+        ~QuickSelectionEngine_Data()
+        {
+            aSearchTimeout.Stop();
+        }
+
+        DECL_LINK( SearchStringTimeout, Timer* );
+    };
+
+    //--------------------------------------------------------------------
+    namespace
+    {
+        static void lcl_reset( QuickSelectionEngine_Data& _data )
+        {
+            _data.sCurrentSearchString.Erase();
+            _data.aSingleSearchChar.reset();
+            _data.aSearchTimeout.Stop();
+        }
+    }
+
+    //--------------------------------------------------------------------
+    IMPL_LINK( QuickSelectionEngine_Data, SearchStringTimeout, Timer*, /*EMPTYARG*/ )
+    {
+        lcl_reset( *this );
+        return 1;
+    }
+
+    //--------------------------------------------------------------------
+    static StringEntryIdentifier findMatchingEntry( const String& _searchString, QuickSelectionEngine_Data& _engineData )
+    {
+        StringEntryIdentifier foundEntry( NULL );
+
+        const vcl::I18nHelper& rI18nHelper = Application::GetSettings().GetLocaleI18nHelper();
+            // TODO: do we really need the Window's settings here? The original code used it ...
+
+        String sEntryText;
+        StringEntryIdentifier pSearchEntry = _engineData.rEntryList.CurrentEntry( sEntryText );
+        StringEntryIdentifier pStartedWith = pSearchEntry;
+        while ( pSearchEntry )
+        {
+            if ( rI18nHelper.MatchString( _searchString, sEntryText ) != 0 )
+                break;
+
+            pSearchEntry = _engineData.rEntryList.NextEntry( pSearchEntry, sEntryText );
+            if ( pSearchEntry == pStartedWith )
+                pSearchEntry = NULL;
+        }
+
+        return pSearchEntry;
+    }
+
+    //====================================================================
+    //= QuickSelectionEngine
+    //====================================================================
+    //--------------------------------------------------------------------
+    QuickSelectionEngine::QuickSelectionEngine( ISearchableStringList& _entryList )
+        :m_pData( new QuickSelectionEngine_Data( _entryList ) )
+    {
+    }
+
+    //--------------------------------------------------------------------
+    QuickSelectionEngine::~QuickSelectionEngine()
+    {
+    }
+
+    //--------------------------------------------------------------------
+    bool QuickSelectionEngine::HandleKeyEvent( const KeyEvent& _keyEvent )
+    {
+        xub_Unicode c = _keyEvent.GetCharCode();
+
+        if ( ( c >= 32 ) && ( c != 127 ) && !_keyEvent.GetKeyCode().IsMod2() )
+        {
+            m_pData->sCurrentSearchString += c;
+            OSL_TRACE( "QuickSelectionEngine::HandleKeyEvent: searching for %s", ByteString( m_pData->sCurrentSearchString, RTL_TEXTENCODING_UTF8 ).GetBuffer() );
+
+            if ( m_pData->sCurrentSearchString.Len() == 1 )
+            {   // first character in the search -> remmeber
+                m_pData->aSingleSearchChar.reset( c );
+            }
+            else if ( m_pData->sCurrentSearchString.Len() > 1 )
+            {
+                if ( !!m_pData->aSingleSearchChar && ( *m_pData->aSingleSearchChar != c ) )
+                    // we already have a "single char", but the current one is different -> reset
+                    m_pData->aSingleSearchChar.reset();
+            }
+
+            XubString aSearchTemp( m_pData->sCurrentSearchString );
+
+            StringEntryIdentifier pMatchingEntry = findMatchingEntry( aSearchTemp, *m_pData );
+            OSL_TRACE( "QuickSelectionEngine::HandleKeyEvent: found %p", pMatchingEntry );
+            if ( !pMatchingEntry && ( aSearchTemp.Len() > 1 ) && !!m_pData->aSingleSearchChar )
+            {
+                // if there's only one letter in the search string, use a different search mode
+                aSearchTemp = *m_pData->aSingleSearchChar;
+                pMatchingEntry = findMatchingEntry( aSearchTemp, *m_pData );
+            }
+
+            if ( pMatchingEntry )
+            {
+                m_pData->rEntryList.SelectEntry( pMatchingEntry );
+                m_pData->aSearchTimeout.Start();
+            }
+            else
+            {
+                lcl_reset( *m_pData );
+            }
+
+            return true;
+        }
+        return false;
+    }
+
+    //--------------------------------------------------------------------
+    void QuickSelectionEngine::Reset()
+    {
+        lcl_reset( *m_pData );
+    }
+
+//........................................................................
+} // namespace vcl
+//........................................................................
-- 
cgit 


From 7f4c6d8e6ebb503638acb3325a0a414543258d10 Mon Sep 17 00:00:00 2001
From: "Frank Schoenheit [fs]" 
Date: Tue, 28 Sep 2010 11:01:07 +0200
Subject: dba34a: GCC WaE

---
 vcl/source/control/ilstbox.cxx              | 2 +-
 vcl/source/control/quickselectionengine.cxx | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index 505f3ae779ed..3aea77bbbc66 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -1707,7 +1707,7 @@ namespace
 {
     static ::vcl::StringEntryIdentifier lcl_getEntry( const ImplEntryList& _rList, USHORT _nPos, String& _out_entryText )
     {
-        OSL_PRECOND( ( _nPos != LISTBOX_ENTRY_NOTFOUND ) && ( _nPos >= 0 ), "lcl_getEntry: invalid position!" );
+        OSL_PRECOND( ( _nPos != LISTBOX_ENTRY_NOTFOUND ), "lcl_getEntry: invalid position!" );
         USHORT nEntryCount( _rList.GetEntryCount() );
         if ( _nPos >= nEntryCount )
             _nPos = 0;
diff --git a/vcl/source/control/quickselectionengine.cxx b/vcl/source/control/quickselectionengine.cxx
index beb6e499794c..2881a0650646 100644
--- a/vcl/source/control/quickselectionengine.cxx
+++ b/vcl/source/control/quickselectionengine.cxx
@@ -88,8 +88,6 @@ namespace vcl
     //--------------------------------------------------------------------
     static StringEntryIdentifier findMatchingEntry( const String& _searchString, QuickSelectionEngine_Data& _engineData )
     {
-        StringEntryIdentifier foundEntry( NULL );
-
         const vcl::I18nHelper& rI18nHelper = Application::GetSettings().GetLocaleI18nHelper();
             // TODO: do we really need the Window's settings here? The original code used it ...
 
-- 
cgit 


From 622f4846bb6e48873cbb00dc8a167a650b880f31 Mon Sep 17 00:00:00 2001
From: Mikhail Voytenko 
Date: Tue, 28 Sep 2010 16:11:29 +0200
Subject: fwk149: #i105142# avoid the crash in case of broken file

---
 sot/source/sdstor/stgdir.cxx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sot/source/sdstor/stgdir.cxx b/sot/source/sdstor/stgdir.cxx
index f093dc60cbe7..039a29fd2683 100644
--- a/sot/source/sdstor/stgdir.cxx
+++ b/sot/source/sdstor/stgdir.cxx
@@ -936,8 +936,11 @@ BOOL StgDirStrm::Store()
 
 void* StgDirStrm::GetEntry( INT32 n, BOOL bDirty )
 {
+    if( n < 0 )
+        return NULL;
+
     n *= STGENTRY_SIZE;
-    if( n >= nSize )
+    if( n < 0 && n >= nSize )
         return NULL;
     return GetPtr( n, TRUE, bDirty );
 }
-- 
cgit 


From 40d960cbdba0dbd445d624f62a523b7e78d5f5c9 Mon Sep 17 00:00:00 2001
From: "Philipp Lohmann [pl]" 
Date: Tue, 28 Sep 2010 16:18:13 +0200
Subject: divide pdfwriter_impl.cxx

---
 vcl/source/gdi/pdfwriter_impl2.cxx | 544 +++++++++++++++++++++++++++++++++++++
 1 file changed, 544 insertions(+)
 create mode 100644 vcl/source/gdi/pdfwriter_impl2.cxx

diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx
new file mode 100644
index 000000000000..c7996e3935b8
--- /dev/null
+++ b/vcl/source/gdi/pdfwriter_impl2.cxx
@@ -0,0 +1,544 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * 
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_vcl.hxx"
+
+#include "pdfwriter_impl.hxx"
+
+#include "cppuhelper/implbase1.hxx"
+
+#include 
+
+using namespace vcl;
+using namespace rtl;
+using namespace com::sun::star;
+
+/* a crutch to transport an rtlDigest safely though UNO API
+   this is needed for the PDF export dialog, which otherwise would have to pass
+   clear text passwords down till they can be used in PDFWriter. Unfortunately
+   the MD5 sum of the password (which is needed to create the PDF encryption key)
+   is not sufficient, since an rtl MD5 digest cannot be created in an arbitrary state
+   which would be needed in PDFWriterImpl::computeEncryptionKey.
+*/
+class EncHashTransporter : public cppu::WeakImplHelper1 < com::sun::star::beans::XMaterialHolder >
+{
+    rtlDigest                   maUDigest;
+    sal_IntPtr                  maID;
+    std::vector< sal_uInt8 >    maOValue;
+
+    static std::map< sal_IntPtr, EncHashTransporter* >      sTransporters;
+public:
+    EncHashTransporter()
+    : maUDigest( rtl_digest_createMD5() )
+    {
+        maID = reinterpret_cast< sal_IntPtr >(this);
+        while( sTransporters.find( maID ) != sTransporters.end() ) // paranoia mode
+            maID++;
+        sTransporters[ maID ] = this;
+    }
+
+    virtual ~EncHashTransporter()
+    {
+        sTransporters.erase( maID );
+        if( maUDigest )
+            rtl_digest_destroyMD5( maUDigest );
+        OSL_TRACE( "EncHashTransporter freed\n" );
+    }
+
+    rtlDigest getUDigest() const { return maUDigest; };
+    std::vector< sal_uInt8 >& getOValue() { return maOValue; }
+    void invalidate()
+    {
+        if( maUDigest )
+        {
+            rtl_digest_destroyMD5( maUDigest );
+            maUDigest = NULL;
+        }
+    }
+
+    // XMaterialHolder
+    virtual uno::Any SAL_CALL getMaterial() throw()
+    {
+        return uno::makeAny( sal_Int64(maID) );
+    }
+
+    static EncHashTransporter* getEncHashTransporter( const uno::Reference< beans::XMaterialHolder >& );
+
+};
+
+std::map< sal_IntPtr, EncHashTransporter* > EncHashTransporter::sTransporters;
+
+EncHashTransporter* EncHashTransporter::getEncHashTransporter( const uno::Reference< beans::XMaterialHolder >& xRef )
+{
+    EncHashTransporter* pResult = NULL;
+    if( xRef.is() )
+    {
+        uno::Any aMat( xRef->getMaterial() );
+        sal_Int64 nMat = 0;
+        if( aMat >>= nMat )
+        {
+            std::map< sal_IntPtr, EncHashTransporter* >::iterator it = sTransporters.find( static_cast(nMat) );
+            if( it != sTransporters.end() )
+                pResult = it->second;
+        }
+    }
+    return pResult;
+}
+
+sal_Bool PDFWriterImpl::checkEncryptionBufferSize( register sal_Int32 newSize )
+{
+    if( m_nEncryptionBufferSize < newSize )
+    {
+        /* reallocate the buffer, the used function allocate as rtl_allocateMemory
+        if the pointer parameter is NULL */
+        m_pEncryptionBuffer = (sal_uInt8*)rtl_reallocateMemory( m_pEncryptionBuffer, newSize );
+        if( m_pEncryptionBuffer )
+            m_nEncryptionBufferSize = newSize;
+        else
+            m_nEncryptionBufferSize = 0;
+    }
+    return ( m_nEncryptionBufferSize != 0 );
+}
+
+void PDFWriterImpl::checkAndEnableStreamEncryption( register sal_Int32 nObject )
+{
+    if( m_aContext.Encryption.Encrypt() )
+    {
+        m_bEncryptThisStream = true;
+        sal_Int32 i = m_nKeyLength;
+        m_aContext.Encryption.EncryptionKey[i++] = (sal_uInt8)nObject;
+        m_aContext.Encryption.EncryptionKey[i++] = (sal_uInt8)( nObject >> 8 );
+        m_aContext.Encryption.EncryptionKey[i++] = (sal_uInt8)( nObject >> 16 );
+        //the other location of m_nEncryptionKey are already set to 0, our fixed generation number
+        // do the MD5 hash
+        sal_uInt8 nMD5Sum[ RTL_DIGEST_LENGTH_MD5 ];
+        // the i+2 to take into account the generation number, always zero
+        rtl_digest_MD5( &m_aContext.Encryption.EncryptionKey[0], i+2, nMD5Sum, sizeof(nMD5Sum) );
+        // initialize the RC4 with the key
+        // key legth: see algoritm 3.1, step 4: (N+5) max 16
+        rtl_cipher_initARCFOUR( m_aCipher, rtl_Cipher_DirectionEncode, nMD5Sum, m_nRC4KeyLength, NULL, 0 );
+    }
+}
+
+void PDFWriterImpl::enableStringEncryption( register sal_Int32 nObject )
+{
+    if( m_aContext.Encryption.Encrypt() )
+    {
+        sal_Int32 i = m_nKeyLength;
+        m_aContext.Encryption.EncryptionKey[i++] = (sal_uInt8)nObject;
+        m_aContext.Encryption.EncryptionKey[i++] = (sal_uInt8)( nObject >> 8 );
+        m_aContext.Encryption.EncryptionKey[i++] = (sal_uInt8)( nObject >> 16 );
+        //the other location of m_nEncryptionKey are already set to 0, our fixed generation number
+        // do the MD5 hash
+        sal_uInt8 nMD5Sum[ RTL_DIGEST_LENGTH_MD5 ];
+        // the i+2 to take into account the generation number, always zero
+        rtl_digest_MD5( &m_aContext.Encryption.EncryptionKey[0], i+2, nMD5Sum, sizeof(nMD5Sum) );
+        // initialize the RC4 with the key
+        // key legth: see algoritm 3.1, step 4: (N+5) max 16
+        rtl_cipher_initARCFOUR( m_aCipher, rtl_Cipher_DirectionEncode, nMD5Sum, m_nRC4KeyLength, NULL, 0 );
+    }
+}
+
+/* init the encryption engine
+1. init the document id, used both for building the document id and for building the encryption key(s)
+2. build the encryption key following algorithms described in the PDF specification
+ */
+uno::Reference< beans::XMaterialHolder > PDFWriterImpl::initEncryption( const rtl::OUString& i_rOwnerPassword,
+                                                                        const rtl::OUString& i_rUserPassword,
+                                                                        bool b128Bit
+                                                                        )
+{
+    uno::Reference< beans::XMaterialHolder > xResult;
+    if( i_rOwnerPassword.getLength() || i_rUserPassword.getLength() )
+    {
+        EncHashTransporter* pTransporter = new EncHashTransporter;
+        xResult = pTransporter;
+
+        // get padded passwords
+        sal_uInt8 aPadUPW[ENCRYPTED_PWD_SIZE], aPadOPW[ENCRYPTED_PWD_SIZE];
+        padPassword( i_rOwnerPassword.getLength() ? i_rOwnerPassword : i_rUserPassword, aPadOPW );
+        padPassword( i_rUserPassword, aPadUPW );
+        sal_Int32 nKeyLength = SECUR_40BIT_KEY, nRC4KeyLength = SECUR_40BIT_KEY+5;
+        if( b128Bit )
+        {
+            nKeyLength = SECUR_128BIT_KEY;
+            nRC4KeyLength = 16;
+        }
+
+        if( computeODictionaryValue( aPadOPW, aPadUPW, pTransporter->getOValue(), nKeyLength, nRC4KeyLength ) )
+        {
+            rtlDigest aDig = pTransporter->getUDigest();
+            if( rtl_digest_updateMD5( aDig, aPadUPW, ENCRYPTED_PWD_SIZE ) != rtl_Digest_E_None )
+                xResult.clear();
+        }
+        else
+            xResult.clear();
+
+        // trash temporary padded cleartext PWDs
+        rtl_zeroMemory( aPadOPW, sizeof(aPadOPW) );
+        rtl_zeroMemory( aPadUPW, sizeof(aPadUPW) );
+
+    }
+    return xResult;
+}
+
+bool PDFWriterImpl::prepareEncryption( const uno::Reference< beans::XMaterialHolder >& xEnc )
+{
+    bool bSuccess = false;
+    EncHashTransporter* pTransporter = EncHashTransporter::getEncHashTransporter( xEnc );
+    if( pTransporter )
+    {
+        sal_Int32 nKeyLength = 0, nRC4KeyLength = 0;
+        sal_Int32 nAccessPermissions = computeAccessPermissions( m_aContext.Encryption, nKeyLength, nRC4KeyLength );
+        m_aContext.Encryption.OValue = pTransporter->getOValue();
+        bSuccess = computeUDictionaryValue( pTransporter, m_aContext.Encryption, nKeyLength, nRC4KeyLength, nAccessPermissions );
+    }
+    if( ! bSuccess )
+    {
+        m_aContext.Encryption.OValue.clear();
+        m_aContext.Encryption.UValue.clear();
+        m_aContext.Encryption.EncryptionKey.clear();
+    }
+    return bSuccess;
+}
+
+sal_Int32 PDFWriterImpl::computeAccessPermissions( const vcl::PDFWriter::PDFEncryptionProperties& i_rProperties,
+                                                   sal_Int32& o_rKeyLength, sal_Int32& o_rRC4KeyLength )
+{
+    /*
+    2) compute the access permissions, in numerical form
+
+    the default value depends on the revision 2 (40 bit) or 3 (128 bit security):
+    - for 40 bit security the unused bit must be set to 1, since they are not used
+    - for 128 bit security the same bit must be preset to 0 and set later if needed
+    according to the table 3.15, pdf v 1.4 */
+    sal_Int32 nAccessPermissions = ( i_rProperties.Security128bit ) ? 0xfffff0c0 : 0xffffffc0 ;
+
+    /* check permissions for 40 bit security case */
+    nAccessPermissions |= ( i_rProperties.CanPrintTheDocument ) ?  1 << 2 : 0;
+    nAccessPermissions |= ( i_rProperties.CanModifyTheContent ) ? 1 << 3 : 0;
+    nAccessPermissions |= ( i_rProperties.CanCopyOrExtract ) ?   1 << 4 : 0;
+    nAccessPermissions |= ( i_rProperties.CanAddOrModify ) ? 1 << 5 : 0;
+    o_rKeyLength = SECUR_40BIT_KEY;
+    o_rRC4KeyLength = SECUR_40BIT_KEY+5; // for this value see PDF spec v 1.4, algorithm 3.1 step 4, where n is 5
+
+    if( i_rProperties.Security128bit )
+    {
+        o_rKeyLength = SECUR_128BIT_KEY;
+        o_rRC4KeyLength = 16; // for this value see PDF spec v 1.4, algorithm 3.1 step 4, where n is 16, thus maximum
+        // permitted value is 16
+        nAccessPermissions |= ( i_rProperties.CanFillInteractive ) ?         1 << 8 : 0;
+        nAccessPermissions |= ( i_rProperties.CanExtractForAccessibility ) ? 1 << 9 : 0;
+        nAccessPermissions |= ( i_rProperties.CanAssemble ) ?                1 << 10 : 0;
+        nAccessPermissions |= ( i_rProperties.CanPrintFull ) ?               1 << 11 : 0;
+    }
+    return nAccessPermissions;
+}
+
+/*************************************************************
+begin i12626 methods
+
+Implements Algorithm 3.2, step 1 only
+*/
+void PDFWriterImpl::padPassword( const rtl::OUString& i_rPassword, sal_uInt8* o_pPaddedPW )
+{
+    // get ansi-1252 version of the password string CHECKIT ! i12626
+    rtl::OString aString( rtl::OUStringToOString( i_rPassword, RTL_TEXTENCODING_MS_1252 ) );
+
+    //copy the string to the target
+    sal_Int32 nToCopy = ( aString.getLength() < ENCRYPTED_PWD_SIZE ) ? aString.getLength() : ENCRYPTED_PWD_SIZE;
+    sal_Int32 nCurrentChar;
+
+    for( nCurrentChar = 0; nCurrentChar < nToCopy; nCurrentChar++ )
+        o_pPaddedPW[nCurrentChar] = (sal_uInt8)( aString.getStr()[nCurrentChar] );
+
+    //pad it with standard byte string
+    sal_Int32 i,y;
+    for( i = nCurrentChar, y = 0 ; i < ENCRYPTED_PWD_SIZE; i++, y++ )
+        o_pPaddedPW[i] = s_nPadString[y];
+
+    // trash memory of temporary clear text password
+    rtl_zeroMemory( (sal_Char*)aString.getStr(), aString.getLength() );
+}
+
+/**********************************
+Algorithm 3.2  Compute the encryption key used
+
+step 1 should already be done before calling, the paThePaddedPassword parameter should contain
+the padded password and must be 32 byte long, the encryption key is returned into the paEncryptionKey parameter,
+it will be 16 byte long for 128 bit security; for 40 bit security only the first 5 bytes are used
+
+TODO: in pdf ver 1.5 and 1.6 the step 6 is different, should be implemented. See spec.
+
+*/
+bool PDFWriterImpl::computeEncryptionKey( EncHashTransporter* i_pTransporter, vcl::PDFWriter::PDFEncryptionProperties& io_rProperties, sal_Int32 i_nAccessPermissions )
+{
+    bool bSuccess = true;
+    sal_uInt8 nMD5Sum[ RTL_DIGEST_LENGTH_MD5 ];
+
+    // transporter contains an MD5 digest with the padded user password already
+    rtlDigest aDigest = i_pTransporter->getUDigest();
+    rtlDigestError nError = rtl_Digest_E_None;
+    if( aDigest )
+    {
+        //step 3
+        if( ! io_rProperties.OValue.empty() )
+            nError = rtl_digest_updateMD5( aDigest, &io_rProperties.OValue[0] , sal_Int32(io_rProperties.OValue.size()) );
+        else
+            bSuccess = false;
+        //Step 4
+        sal_uInt8 nPerm[4];
+
+        nPerm[0] = (sal_uInt8)i_nAccessPermissions;
+        nPerm[1] = (sal_uInt8)( i_nAccessPermissions >> 8 );
+        nPerm[2] = (sal_uInt8)( i_nAccessPermissions >> 16 );
+        nPerm[3] = (sal_uInt8)( i_nAccessPermissions >> 24 );
+
+        if( nError == rtl_Digest_E_None )
+            nError = rtl_digest_updateMD5( aDigest, nPerm , sizeof( nPerm ) );
+
+        //step 5, get the document ID, binary form
+        if( nError == rtl_Digest_E_None )
+            nError = rtl_digest_updateMD5( aDigest, &io_rProperties.DocumentIdentifier[0], sal_Int32(io_rProperties.DocumentIdentifier.size()) );
+        //get the digest
+        if( nError == rtl_Digest_E_None )
+        {
+            rtl_digest_getMD5( aDigest, nMD5Sum, sizeof( nMD5Sum ) );
+
+            //step 6, only if 128 bit
+            if( io_rProperties.Security128bit )
+            {
+                for( sal_Int32 i = 0; i < 50; i++ )
+                {
+                    nError = rtl_digest_updateMD5( aDigest, &nMD5Sum, sizeof( nMD5Sum ) );
+                    if( nError != rtl_Digest_E_None )
+                    {
+                        bSuccess =  false;
+                        break;
+                    }
+                    rtl_digest_getMD5( aDigest, nMD5Sum, sizeof( nMD5Sum ) );
+                }
+            }
+        }
+    }
+    else
+        bSuccess = false;
+
+    i_pTransporter->invalidate();
+
+    //Step 7
+    if( bSuccess )
+    {
+        io_rProperties.EncryptionKey.resize( MAXIMUM_RC4_KEY_LENGTH );
+        for( sal_Int32 i = 0; i < MD5_DIGEST_SIZE; i++ )
+            io_rProperties.EncryptionKey[i] = nMD5Sum[i];
+    }
+    else
+        io_rProperties.EncryptionKey.clear();
+
+    return bSuccess;
+}
+
+/**********************************
+Algorithm 3.3  Compute the encryption dictionary /O value, save into the class data member
+the step numbers down here correspond to the ones in PDF v.1.4 specfication
+*/
+bool PDFWriterImpl::computeODictionaryValue( const sal_uInt8* i_pPaddedOwnerPassword,
+                                             const sal_uInt8* i_pPaddedUserPassword,
+                                             std::vector< sal_uInt8 >& io_rOValue,
+                                             sal_Int32 i_nKeyLength,
+                                             sal_Int32 i_nRC4KeyLength
+                                             )
+{
+    bool bSuccess = true;
+
+    io_rOValue.resize( ENCRYPTED_PWD_SIZE );
+
+    rtlDigest aDigest = rtl_digest_createMD5();
+    rtlCipher aCipher = rtl_cipher_createARCFOUR( rtl_Cipher_ModeStream );
+    if( aDigest && aCipher)
+    {
+        //step 1 already done, data is in i_pPaddedOwnerPassword
+        //step 2
+
+        rtlDigestError nError = rtl_digest_updateMD5( aDigest, i_pPaddedOwnerPassword, ENCRYPTED_PWD_SIZE );
+        if( nError == rtl_Digest_E_None )
+        {
+            sal_uInt8 nMD5Sum[ RTL_DIGEST_LENGTH_MD5 ];
+
+            rtl_digest_getMD5( aDigest, nMD5Sum, sizeof(nMD5Sum) );
+//step 3, only if 128 bit
+            if( i_nKeyLength == SECUR_128BIT_KEY )
+            {
+                sal_Int32 i;
+                for( i = 0; i < 50; i++ )
+                {
+                    nError = rtl_digest_updateMD5( aDigest, nMD5Sum, sizeof( nMD5Sum ) );
+                    if( nError != rtl_Digest_E_None )
+                    {
+                        bSuccess = false;
+                        break;
+                    }
+                    rtl_digest_getMD5( aDigest, nMD5Sum, sizeof( nMD5Sum ) );
+                }
+            }
+            //Step 4, the key is in nMD5Sum
+            //step 5 already done, data is in i_pPaddedUserPassword
+            //step 6
+            rtl_cipher_initARCFOUR( aCipher, rtl_Cipher_DirectionEncode,
+                                     nMD5Sum, i_nKeyLength , NULL, 0 );
+            // encrypt the user password using the key set above
+            rtl_cipher_encodeARCFOUR( aCipher, i_pPaddedUserPassword, ENCRYPTED_PWD_SIZE, // the data to be encrypted
+                                      &io_rOValue[0], sal_Int32(io_rOValue.size()) ); //encrypted data
+            //Step 7, only if 128 bit
+            if( i_nKeyLength == SECUR_128BIT_KEY )
+            {
+                sal_uInt32 i, y;
+                sal_uInt8 nLocalKey[ SECUR_128BIT_KEY ]; // 16 = 128 bit key
+
+                for( i = 1; i <= 19; i++ ) // do it 19 times, start with 1
+                {
+                    for( y = 0; y < sizeof( nLocalKey ); y++ )
+                        nLocalKey[y] = (sal_uInt8)( nMD5Sum[y] ^ i );
+
+                    rtl_cipher_initARCFOUR( aCipher, rtl_Cipher_DirectionEncode,
+                                            nLocalKey, SECUR_128BIT_KEY, NULL, 0 ); //destination data area, on init can be NULL
+                    rtl_cipher_encodeARCFOUR( aCipher, &io_rOValue[0], sal_Int32(io_rOValue.size()), // the data to be encrypted
+                                              &io_rOValue[0], sal_Int32(io_rOValue.size()) ); // encrypted data, can be the same as the input, encrypt "in place"
+                    //step 8, store in class data member
+                }
+            }
+        }
+        else
+            bSuccess = false;
+    }
+    else
+        bSuccess = false;
+
+    if( aDigest )
+        rtl_digest_destroyMD5( aDigest );
+    if( aCipher )
+        rtl_cipher_destroyARCFOUR( aCipher );
+
+    if( ! bSuccess )
+        io_rOValue.clear();
+    return bSuccess;
+}
+
+/**********************************
+Algorithms 3.4 and 3.5  Compute the encryption dictionary /U value, save into the class data member, revision 2 (40 bit) or 3 (128 bit)
+*/
+bool PDFWriterImpl::computeUDictionaryValue( EncHashTransporter* i_pTransporter,
+                                             vcl::PDFWriter::PDFEncryptionProperties& io_rProperties,
+                                             sal_Int32 i_nKeyLength,
+                                             sal_Int32 i_nRC4KeyLength,
+                                             sal_Int32 i_nAccessPermissions
+                                             )
+{
+    bool bSuccess = true;
+
+    io_rProperties.UValue.resize( ENCRYPTED_PWD_SIZE );
+
+    rtlDigest aDigest = rtl_digest_createMD5();
+    rtlCipher aCipher = rtl_cipher_createARCFOUR( rtl_Cipher_ModeStream );
+    if( aDigest && aCipher )
+    {
+        //step 1, common to both 3.4 and 3.5
+        if( computeEncryptionKey( i_pTransporter, io_rProperties, i_nAccessPermissions ) )
+        {
+            // prepare encryption key for object
+            for( sal_Int32 i = i_nKeyLength, y = 0; y < 5 ; y++ )
+                io_rProperties.EncryptionKey[i++] = 0;
+
+            if( io_rProperties.Security128bit == false )
+            {
+                //3.4
+                //step 2 and 3
+                rtl_cipher_initARCFOUR( aCipher, rtl_Cipher_DirectionEncode,
+                                        &io_rProperties.EncryptionKey[0], 5 , // key and key length
+                                        NULL, 0 ); //destination data area
+                // encrypt the user password using the key set above, save for later use
+                rtl_cipher_encodeARCFOUR( aCipher, s_nPadString, sizeof( s_nPadString ), // the data to be encrypted
+                                          &io_rProperties.UValue[0], sal_Int32(io_rProperties.UValue.size()) ); //encrypted data, stored in class data member
+            }
+            else
+            {
+                //or 3.5, for 128 bit security
+                //step6, initilize the last 16 bytes of the encrypted user password to 0
+                for(sal_uInt32 i = MD5_DIGEST_SIZE; i < sal_uInt32(io_rProperties.UValue.size()); i++)
+                    io_rProperties.UValue[i] = 0;
+                //step 2
+                rtlDigestError nError = rtl_digest_updateMD5( aDigest, s_nPadString, sizeof( s_nPadString ) );
+                //step 3
+                if( nError == rtl_Digest_E_None )
+                    nError = rtl_digest_updateMD5( aDigest, &io_rProperties.DocumentIdentifier[0], sal_Int32(io_rProperties.DocumentIdentifier.size()) );
+                else
+                    bSuccess = false;
+
+                sal_uInt8 nMD5Sum[ RTL_DIGEST_LENGTH_MD5 ];
+                rtl_digest_getMD5( aDigest, nMD5Sum, sizeof(nMD5Sum) );
+                //Step 4
+                rtl_cipher_initARCFOUR( aCipher, rtl_Cipher_DirectionEncode,
+                                        &io_rProperties.EncryptionKey[0], SECUR_128BIT_KEY, NULL, 0 ); //destination data area
+                rtl_cipher_encodeARCFOUR( aCipher, nMD5Sum, sizeof( nMD5Sum ), // the data to be encrypted
+                                          &io_rProperties.UValue[0], sizeof( nMD5Sum ) ); //encrypted data, stored in class data member
+                //step 5
+                sal_uInt32 i, y;
+                sal_uInt8 nLocalKey[SECUR_128BIT_KEY];
+
+                for( i = 1; i <= 19; i++ ) // do it 19 times, start with 1
+                {
+                    for( y = 0; y < sizeof( nLocalKey ) ; y++ )
+                        nLocalKey[y] = (sal_uInt8)( io_rProperties.EncryptionKey[y] ^ i );
+
+                    rtl_cipher_initARCFOUR( aCipher, rtl_Cipher_DirectionEncode,
+                                            nLocalKey, SECUR_128BIT_KEY, // key and key length
+                                            NULL, 0 ); //destination data area, on init can be NULL
+                    rtl_cipher_encodeARCFOUR( aCipher, &io_rProperties.UValue[0], SECUR_128BIT_KEY, // the data to be encrypted
+                                              &io_rProperties.UValue[0], SECUR_128BIT_KEY ); // encrypted data, can be the same as the input, encrypt "in place"
+                }
+            }
+        }
+        else
+            bSuccess = false;
+    }
+    else
+        bSuccess = false;
+
+    if( aDigest )
+        rtl_digest_destroyMD5( aDigest );
+    if( aCipher )
+        rtl_cipher_destroyARCFOUR( aCipher );
+
+    if( ! bSuccess )
+        io_rProperties.UValue.clear();
+    return bSuccess;
+}
+
+/* end i12626 methods */
+
-- 
cgit 


From b42596ac9af6a3c7b33c8ad67acd94fab33fe4da Mon Sep 17 00:00:00 2001
From: Mikhail Voytenko 
Date: Tue, 28 Sep 2010 17:06:57 +0200
Subject: fwk149: #i114668# check whether the directory can be opened

---
 vcl/unx/source/printer/ppdparser.cxx | 62 +++++++++++++++++++-----------------
 1 file changed, 32 insertions(+), 30 deletions(-)

diff --git a/vcl/unx/source/printer/ppdparser.cxx b/vcl/unx/source/printer/ppdparser.cxx
index b2549573d099..587e58be5bc7 100644
--- a/vcl/unx/source/printer/ppdparser.cxx
+++ b/vcl/unx/source/printer/ppdparser.cxx
@@ -405,51 +405,53 @@ void PPDParser::scanPPDDir( const String& rDir )
     const int nSuffixes = sizeof(pSuffixes)/sizeof(pSuffixes[0]);
 
     osl::Directory aDir( rDir );
-    aDir.open();
-    osl::DirectoryItem aItem;
-
-    INetURLObject aPPDDir(rDir);
-    while( aDir.getNextItem( aItem ) == osl::FileBase::E_None )
+    if ( aDir.open() == osl::FileBase::E_None )
     {
-        osl::FileStatus aStatus( FileStatusMask_FileName );
-        if( aItem.getFileStatus( aStatus ) == osl::FileBase::E_None )
+        osl::DirectoryItem aItem;
+
+        INetURLObject aPPDDir(rDir);
+        while( aDir.getNextItem( aItem ) == osl::FileBase::E_None )
         {
-            rtl::OUStringBuffer aURLBuf( rDir.Len() + 64 );
-            aURLBuf.append( rDir );
-            aURLBuf.append( sal_Unicode( '/' ) );
-            aURLBuf.append( aStatus.getFileName() );
+            osl::FileStatus aStatus( FileStatusMask_FileName );
+            if( aItem.getFileStatus( aStatus ) == osl::FileBase::E_None )
+            {
+                rtl::OUStringBuffer aURLBuf( rDir.Len() + 64 );
+                aURLBuf.append( rDir );
+                aURLBuf.append( sal_Unicode( '/' ) );
+                aURLBuf.append( aStatus.getFileName() );
 
-            rtl::OUString aFileURL, aFileName;
-            osl::FileStatus::Type eType = osl::FileStatus::Unknown;
+                rtl::OUString aFileURL, aFileName;
+                osl::FileStatus::Type eType = osl::FileStatus::Unknown;
 
-            if( resolveLink( aURLBuf.makeStringAndClear(), aFileURL, aFileName, eType ) == osl::FileBase::E_None )
-            {
-                if( eType == osl::FileStatus::Regular )
+                if( resolveLink( aURLBuf.makeStringAndClear(), aFileURL, aFileName, eType ) == osl::FileBase::E_None )
                 {
-                    INetURLObject aPPDFile = aPPDDir;
-                    aPPDFile.Append( aFileName );
-
-                    // match extension
-                    for( int nSuffix = 0; nSuffix < nSuffixes; nSuffix++ )
+                    if( eType == osl::FileStatus::Regular )
                     {
-                        if( aFileName.getLength() > pSuffixes[nSuffix].nSuffixLen )
+                        INetURLObject aPPDFile = aPPDDir;
+                        aPPDFile.Append( aFileName );
+
+                        // match extension
+                        for( int nSuffix = 0; nSuffix < nSuffixes; nSuffix++ )
                         {
-                            if( aFileName.endsWithIgnoreAsciiCaseAsciiL( pSuffixes[nSuffix].pSuffix, pSuffixes[nSuffix].nSuffixLen ) )
+                            if( aFileName.getLength() > pSuffixes[nSuffix].nSuffixLen )
                             {
-                                (*pAllPPDFiles)[ aFileName.copy( 0, aFileName.getLength() - pSuffixes[nSuffix].nSuffixLen ) ] = aPPDFile.PathToFileName();
-                                break;
+                                if( aFileName.endsWithIgnoreAsciiCaseAsciiL( pSuffixes[nSuffix].pSuffix, pSuffixes[nSuffix].nSuffixLen ) )
+                                {
+                                    (*pAllPPDFiles)[ aFileName.copy( 0, aFileName.getLength() - pSuffixes[nSuffix].nSuffixLen ) ] = aPPDFile.PathToFileName();
+                                    break;
+                                }
                             }
                         }
                     }
-                }
-                else if( eType == osl::FileStatus::Directory )
-                {
-                    scanPPDDir( aFileURL );
+                    else if( eType == osl::FileStatus::Directory )
+                    {
+                        scanPPDDir( aFileURL );
+                    }
                 }
             }
         }
+        aDir.close();
     }
-    aDir.close();
 }
 
 void PPDParser::initPPDFiles()
-- 
cgit 


From ffa480fecf420f2a667538950defa87b2e562185 Mon Sep 17 00:00:00 2001
From: "Philipp Lohmann [pl]" 
Date: Tue, 28 Sep 2010 18:39:54 +0200
Subject: remove warning

---
 vcl/source/gdi/pdfwriter_impl.hxx  |  4 ++--
 vcl/source/gdi/pdfwriter_impl2.cxx | 13 ++++---------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx
index 9006a104b576..212a45c77033 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -1031,12 +1031,12 @@ i12626
     /* algorithm 3.3: computing the encryption dictionary'ss owner password value ( /O ) */
     static bool computeODictionaryValue( const sal_uInt8* i_pPaddedOwnerPassword, const sal_uInt8* i_pPaddedUserPassword,
                                          std::vector< sal_uInt8 >& io_rOValue,
-                                         sal_Int32 i_nKeyLength, sal_Int32 i_nRC4KeyLength
+                                         sal_Int32 i_nKeyLength
                                         );
     /* algorithm 3.4 or 3.5: computing the encryption dictionary's user password value ( /U ) revision 2 or 3 of the standard security handler */
     static bool computeUDictionaryValue( EncHashTransporter* i_pTransporter,
                                          vcl::PDFWriter::PDFEncryptionProperties& io_rProperties,
-                                         sal_Int32 i_nKeyLength, sal_Int32 i_nRC4KeyLength,
+                                         sal_Int32 i_nKeyLength,
                                          sal_Int32 i_nAccessPermissions
                                         );
 
diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx
index c7996e3935b8..c0e9d905db3b 100644
--- a/vcl/source/gdi/pdfwriter_impl2.cxx
+++ b/vcl/source/gdi/pdfwriter_impl2.cxx
@@ -183,14 +183,11 @@ uno::Reference< beans::XMaterialHolder > PDFWriterImpl::initEncryption( const rt
         sal_uInt8 aPadUPW[ENCRYPTED_PWD_SIZE], aPadOPW[ENCRYPTED_PWD_SIZE];
         padPassword( i_rOwnerPassword.getLength() ? i_rOwnerPassword : i_rUserPassword, aPadOPW );
         padPassword( i_rUserPassword, aPadUPW );
-        sal_Int32 nKeyLength = SECUR_40BIT_KEY, nRC4KeyLength = SECUR_40BIT_KEY+5;
+        sal_Int32 nKeyLength = SECUR_40BIT_KEY;
         if( b128Bit )
-        {
             nKeyLength = SECUR_128BIT_KEY;
-            nRC4KeyLength = 16;
-        }
 
-        if( computeODictionaryValue( aPadOPW, aPadUPW, pTransporter->getOValue(), nKeyLength, nRC4KeyLength ) )
+        if( computeODictionaryValue( aPadOPW, aPadUPW, pTransporter->getOValue(), nKeyLength ) )
         {
             rtlDigest aDig = pTransporter->getUDigest();
             if( rtl_digest_updateMD5( aDig, aPadUPW, ENCRYPTED_PWD_SIZE ) != rtl_Digest_E_None )
@@ -216,7 +213,7 @@ bool PDFWriterImpl::prepareEncryption( const uno::Reference< beans::XMaterialHol
         sal_Int32 nKeyLength = 0, nRC4KeyLength = 0;
         sal_Int32 nAccessPermissions = computeAccessPermissions( m_aContext.Encryption, nKeyLength, nRC4KeyLength );
         m_aContext.Encryption.OValue = pTransporter->getOValue();
-        bSuccess = computeUDictionaryValue( pTransporter, m_aContext.Encryption, nKeyLength, nRC4KeyLength, nAccessPermissions );
+        bSuccess = computeUDictionaryValue( pTransporter, m_aContext.Encryption, nKeyLength, nAccessPermissions );
     }
     if( ! bSuccess )
     {
@@ -371,8 +368,7 @@ the step numbers down here correspond to the ones in PDF v.1.4 specfication
 bool PDFWriterImpl::computeODictionaryValue( const sal_uInt8* i_pPaddedOwnerPassword,
                                              const sal_uInt8* i_pPaddedUserPassword,
                                              std::vector< sal_uInt8 >& io_rOValue,
-                                             sal_Int32 i_nKeyLength,
-                                             sal_Int32 i_nRC4KeyLength
+                                             sal_Int32 i_nKeyLength
                                              )
 {
     bool bSuccess = true;
@@ -456,7 +452,6 @@ Algorithms 3.4 and 3.5  Compute the encryption dictionary /U value, save into th
 bool PDFWriterImpl::computeUDictionaryValue( EncHashTransporter* i_pTransporter,
                                              vcl::PDFWriter::PDFEncryptionProperties& io_rProperties,
                                              sal_Int32 i_nKeyLength,
-                                             sal_Int32 i_nRC4KeyLength,
                                              sal_Int32 i_nAccessPermissions
                                              )
 {
-- 
cgit 


From ed7ea296b2f7338477806e25666a1f85e8e8ace2 Mon Sep 17 00:00:00 2001
From: "Philipp Lohmann [pl]" 
Date: Tue, 28 Sep 2010 19:34:49 +0200
Subject: fix a warning

---
 vcl/source/window/wpropset.cxx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vcl/source/window/wpropset.cxx b/vcl/source/window/wpropset.cxx
index 98c8a5b1dcfb..4aaa3f987b77 100644
--- a/vcl/source/window/wpropset.cxx
+++ b/vcl/source/window/wpropset.cxx
@@ -73,6 +73,7 @@ public:
     {
     }
 
+    using cppu::WeakComponentImplHelperBase::disposing;
     virtual void SAL_CALL disposing( const lang::EventObject& ) throw()
     {
     }
-- 
cgit 


From 9a6a8627c6b9ae98b5773d9791c75582cf1dc043 Mon Sep 17 00:00:00 2001
From: "Frank Schoenheit [fs]" 
Date: Wed, 29 Sep 2010 11:22:36 +0200
Subject: dba34a: #i31275# findMatchingEntry: start with the 'current + 1st'
 entry

---
 vcl/source/control/quickselectionengine.cxx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/vcl/source/control/quickselectionengine.cxx b/vcl/source/control/quickselectionengine.cxx
index 2881a0650646..2d32393bf79a 100644
--- a/vcl/source/control/quickselectionengine.cxx
+++ b/vcl/source/control/quickselectionengine.cxx
@@ -92,7 +92,11 @@ namespace vcl
             // TODO: do we really need the Window's settings here? The original code used it ...
 
         String sEntryText;
+        // get the "current + 1" entry
         StringEntryIdentifier pSearchEntry = _engineData.rEntryList.CurrentEntry( sEntryText );
+        if ( pSearchEntry )
+            pSearchEntry = _engineData.rEntryList.NextEntry( pSearchEntry, sEntryText );
+        // loop 'til we find another matching entry
         StringEntryIdentifier pStartedWith = pSearchEntry;
         while ( pSearchEntry )
         {
-- 
cgit 


From 9c90c77200562328c226f35cb14ee6ae9a135b71 Mon Sep 17 00:00:00 2001
From: "Philipp Lohmann [pl]" 
Date: Wed, 29 Sep 2010 14:35:52 +0200
Subject: fix a warning

---
 vcl/inc/vcl/window.hxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100644 => 100755 vcl/inc/vcl/window.hxx

diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx
old mode 100644
new mode 100755
index d3f2ec901cf4..be783f5457c4
--- a/vcl/inc/vcl/window.hxx
+++ b/vcl/inc/vcl/window.hxx
@@ -97,7 +97,7 @@ namespace com {
 namespace sun {
 namespace star {
 namespace beans {
-    class PropertyValue;
+    struct PropertyValue;
 }}}}
 
 namespace com {
-- 
cgit 


From eb61f9d1ec810d7156298f4840f70c9370ac97a0 Mon Sep 17 00:00:00 2001
From: Kai Sommerfeld 
Date: Mon, 11 Oct 2010 14:43:36 +0200
Subject: #i98699# - Now works with 3 layer office.

---
 comphelper/source/officeinstdir/officeinstallationdirectories.cxx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
index 3ce0d4de865a..b262a14bb73f 100644
--- a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
+++ b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
@@ -101,7 +101,7 @@ static bool makeCanonicalFileURL( rtl::OUString & rURL )
 
 OfficeInstallationDirectories::OfficeInstallationDirectories(
         const uno::Reference< uno::XComponentContext > & xCtx )
-: m_aOfficeDirMacro( RTL_CONSTASCII_USTRINGPARAM( "$(baseinsturl)" ) ),
+: m_aOfficeDirMacro( RTL_CONSTASCII_USTRINGPARAM( "$(brandbaseurl)" ) ),
   m_aUserDirMacro( RTL_CONSTASCII_USTRINGPARAM( "$(userdataurl)" ) ),
   m_xCtx( xCtx ),
   m_pOfficeDir( 0 ),
@@ -322,8 +322,7 @@ void OfficeInstallationDirectories::initDirs()
             {
                 *m_pOfficeDir =
                     xExpander->expandMacros(
-                        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
-                            "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap" ) ":BaseInstallation}" ) ) );
+                         rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "$BRAND_BASE_DIR" ) ) );
 
                 OSL_ENSURE( m_pOfficeDir->getLength() > 0,
                         "Unable to obtain office installation directory!" );
-- 
cgit 


From 1221208c94ca01895fe3d7dd7ec5dfca4bec2f8e Mon Sep 17 00:00:00 2001
From: Kai Sommerfeld 
Date: Tue, 12 Oct 2010 09:48:34 +0200
Subject: #i98699# - Reintroduced support for base installation directory.

---
 .../officeinstallationdirectories.cxx              | 93 +++++++++++++++-------
 .../officeinstallationdirectories.hxx              |  6 +-
 2 files changed, 68 insertions(+), 31 deletions(-)

diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
index b262a14bb73f..ebeedc92839d 100644
--- a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
+++ b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
@@ -101,10 +101,12 @@ static bool makeCanonicalFileURL( rtl::OUString & rURL )
 
 OfficeInstallationDirectories::OfficeInstallationDirectories(
         const uno::Reference< uno::XComponentContext > & xCtx )
-: m_aOfficeDirMacro( RTL_CONSTASCII_USTRINGPARAM( "$(brandbaseurl)" ) ),
+: m_aOfficeBrandDirMacro( RTL_CONSTASCII_USTRINGPARAM( "$(brandbaseurl)" ) ),
+  m_aOfficeBaseDirMacro( RTL_CONSTASCII_USTRINGPARAM( "$(baseinsturl)" ) ),
   m_aUserDirMacro( RTL_CONSTASCII_USTRINGPARAM( "$(userdataurl)" ) ),
   m_xCtx( xCtx ),
-  m_pOfficeDir( 0 ),
+  m_pOfficeBrandDir( 0 ),
+  m_pOfficeBaseDir( 0 ),
   m_pUserDir( 0 )
 {
 }
@@ -113,6 +115,9 @@ OfficeInstallationDirectories::OfficeInstallationDirectories(
 // virtual
 OfficeInstallationDirectories::~OfficeInstallationDirectories()
 {
+    delete m_pOfficeBrandDir;
+    delete m_pOfficeBaseDir;
+    delete m_pUserDir;
 }
 
 //=========================================================================
@@ -124,9 +129,8 @@ rtl::OUString SAL_CALL
 OfficeInstallationDirectories::getOfficeInstallationDirectoryURL()
     throw ( uno::RuntimeException )
 {
-    // late init m_pOfficeDir and m_pUserDir
     initDirs();
-    return rtl::OUString( *m_pOfficeDir );
+    return rtl::OUString( *m_pOfficeBrandDir );
 }
 
 //=========================================================================
@@ -135,7 +139,6 @@ rtl::OUString SAL_CALL
 OfficeInstallationDirectories::getOfficeUserDataDirectoryURL()
     throw ( uno::RuntimeException )
 {
-    // late init m_pOfficeDir and m_pUserDir
     initDirs();
     return rtl::OUString( *m_pUserDir );
 }
@@ -149,29 +152,39 @@ OfficeInstallationDirectories::makeRelocatableURL( const rtl::OUString& URL )
 {
     if ( URL.getLength() > 0 )
     {
-        // late init m_pOfficeDir and m_pUserDir
         initDirs();
 
         rtl::OUString aCanonicalURL( URL );
         makeCanonicalFileURL( aCanonicalURL );
 
-        sal_Int32 nIndex = aCanonicalURL.indexOf( *m_pOfficeDir );
+        sal_Int32 nIndex = aCanonicalURL.indexOf( *m_pOfficeBrandDir );
         if ( nIndex  != -1 )
         {
             return rtl::OUString(
                 URL.replaceAt( nIndex,
-                               m_pOfficeDir->getLength(),
-                               m_aOfficeDirMacro ) );
+                               m_pOfficeBrandDir->getLength(),
+                               m_aOfficeBrandDirMacro ) );
         }
         else
         {
-            nIndex = aCanonicalURL.indexOf( *m_pUserDir );
+            nIndex = aCanonicalURL.indexOf( *m_pOfficeBaseDir );
             if ( nIndex  != -1 )
             {
                 return rtl::OUString(
                     URL.replaceAt( nIndex,
-                                   m_pUserDir->getLength(),
-                                   m_aUserDirMacro ) );
+                                   m_pOfficeBaseDir->getLength(),
+                                   m_aOfficeBaseDirMacro ) );
+            }
+            else
+            {
+                nIndex = aCanonicalURL.indexOf( *m_pUserDir );
+                if ( nIndex  != -1 )
+                {
+                    return rtl::OUString(
+                        URL.replaceAt( nIndex,
+                                       m_pUserDir->getLength(),
+                                       m_aUserDirMacro ) );
+                }
             }
         }
     }
@@ -186,29 +199,40 @@ OfficeInstallationDirectories::makeAbsoluteURL( const rtl::OUString& URL )
 {
     if ( URL.getLength() > 0 )
     {
-        sal_Int32 nIndex = URL.indexOf( m_aOfficeDirMacro );
+        sal_Int32 nIndex = URL.indexOf( m_aOfficeBrandDirMacro );
         if ( nIndex != -1 )
         {
-            // late init m_pOfficeDir and m_pUserDir
             initDirs();
 
             return rtl::OUString(
                 URL.replaceAt( nIndex,
-                               m_aOfficeDirMacro.getLength(),
-                               *m_pOfficeDir ) );
+                               m_aOfficeBrandDirMacro.getLength(),
+                               *m_pOfficeBrandDir ) );
         }
         else
         {
-            nIndex = URL.indexOf( m_aUserDirMacro );
+            nIndex = URL.indexOf( m_aOfficeBaseDirMacro );
             if ( nIndex != -1 )
             {
-                // late init m_pOfficeDir and m_pUserDir
                 initDirs();
 
                 return rtl::OUString(
                     URL.replaceAt( nIndex,
-                                   m_aUserDirMacro.getLength(),
-                                   *m_pUserDir ) );
+                                   m_aOfficeBaseDirMacro.getLength(),
+                                   *m_pOfficeBaseDir ) );
+            }
+            else
+            {
+                nIndex = URL.indexOf( m_aUserDirMacro );
+                if ( nIndex != -1 )
+                {
+                    initDirs();
+
+                    return rtl::OUString(
+                        URL.replaceAt( nIndex,
+                                       m_aUserDirMacro.getLength(),
+                                       *m_pUserDir ) );
+                }
             }
         }
     }
@@ -300,13 +324,14 @@ OfficeInstallationDirectories::Create(
 
 void OfficeInstallationDirectories::initDirs()
 {
-    if ( m_pOfficeDir == 0 )
+    if ( m_pOfficeBrandDir == 0 )
     {
         osl::MutexGuard aGuard( m_aMutex );
-        if ( m_pOfficeDir == 0 )
+        if ( m_pOfficeBrandDir == 0 )
         {
-            m_pOfficeDir = new rtl::OUString;
-            m_pUserDir   = new rtl::OUString;
+            m_pOfficeBrandDir = new rtl::OUString;
+            m_pOfficeBaseDir  = new rtl::OUString;
+            m_pUserDir        = new rtl::OUString;
 
             uno::Reference< util::XMacroExpander > xExpander;
 
@@ -320,14 +345,24 @@ void OfficeInstallationDirectories::initDirs()
 
             if ( xExpander.is() )
             {
-                *m_pOfficeDir =
+                *m_pOfficeBrandDir =
                     xExpander->expandMacros(
                          rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "$BRAND_BASE_DIR" ) ) );
 
-                OSL_ENSURE( m_pOfficeDir->getLength() > 0,
-                        "Unable to obtain office installation directory!" );
+                OSL_ENSURE( m_pOfficeBrandDir->getLength() > 0,
+                            "Unable to obtain office brand installation directory!" );
+
+                makeCanonicalFileURL( *m_pOfficeBrandDir );
+
+                *m_pOfficeBaseDir =
+                    xExpander->expandMacros(
+                        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
+                            "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap" ) ":BaseInstallation}" ) ) );
+
+                OSL_ENSURE( m_pOfficeBaseDir->getLength() > 0,
+                            "Unable to obtain office base installation directory!" );
 
-                makeCanonicalFileURL( *m_pOfficeDir );
+                makeCanonicalFileURL( *m_pOfficeBaseDir );
 
                 *m_pUserDir =
                     xExpander->expandMacros(
@@ -335,7 +370,7 @@ void OfficeInstallationDirectories::initDirs()
                             "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap" ) ":UserInstallation}" ) ) );
 
                 OSL_ENSURE( m_pUserDir->getLength() > 0,
-                        "Unable to obtain office user data directory!" );
+                            "Unable to obtain office user data directory!" );
 
                 makeCanonicalFileURL( *m_pUserDir );
             }
diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.hxx b/comphelper/source/officeinstdir/officeinstallationdirectories.hxx
index 2ffb3582718a..9c56f7ce80fd 100644
--- a/comphelper/source/officeinstdir/officeinstallationdirectories.hxx
+++ b/comphelper/source/officeinstdir/officeinstallationdirectories.hxx
@@ -94,11 +94,13 @@ public:
 private:
     void initDirs();
 
-    rtl::OUString                                   m_aOfficeDirMacro;
+    rtl::OUString                                   m_aOfficeBrandDirMacro;
+    rtl::OUString                                   m_aOfficeBaseDirMacro;
     rtl::OUString                                   m_aUserDirMacro;
     com::sun::star::uno::Reference<
         com::sun::star::uno::XComponentContext >    m_xCtx;
-    rtl::OUString *                                 m_pOfficeDir;
+    rtl::OUString *                                 m_pOfficeBrandDir;
+    rtl::OUString *                                 m_pOfficeBaseDir;
     rtl::OUString *                                 m_pUserDir;
 };
 
-- 
cgit 


From 140317980aa8b885cb5cb7a2b24bb155d5cb514a Mon Sep 17 00:00:00 2001
From: "Herbert Duerr [hdu]" 
Date: Wed, 13 Oct 2010 11:23:08 +0200
Subject: #i114938# fix extremum parameter calculation

---
 basegfx/source/curve/b2dcubicbezier.cxx | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/basegfx/source/curve/b2dcubicbezier.cxx b/basegfx/source/curve/b2dcubicbezier.cxx
index adf819a214a1..adec8a2ac6ca 100644
--- a/basegfx/source/curve/b2dcubicbezier.cxx
+++ b/basegfx/source/curve/b2dcubicbezier.cxx
@@ -978,10 +978,10 @@ namespace basegfx
         // calculate the x-extrema parameters by zeroing first x-derivative
         // of the cubic bezier's parametric formula, which results in a
         // quadratic equation: dBezier/dt = t*t*fAX - 2*t*fBX + fCX
-        const B2DPoint aRelativeEndPoint(maEndPoint-maStartPoint);
-        const double fAX = 3 * (maControlPointA.getX() - maControlPointB.getX()) + aRelativeEndPoint.getX();
-        const double fBX = 2 * maControlPointA.getX() - maControlPointB.getX() - maStartPoint.getX();
-        double fCX(maControlPointA.getX() - maStartPoint.getX());
+        const B2DPoint aControlDiff( maControlPointA - maControlPointB );
+        double fCX = maControlPointA.getX() - maStartPoint.getX();
+        const double fBX = fCX + aControlDiff.getX();
+        const double fAX = 3 * aControlDiff.getX() + (maEndPoint.getX() - maStartPoint.getX());
 
         if(fTools::equalZero(fCX))
         {
@@ -997,9 +997,9 @@ namespace basegfx
             {
                 const double fS = sqrt(fD);
                 // calculate both roots (avoiding a numerically unstable subtraction)
-                const double fQ = -(fBX + ((fBX >= 0) ? +fS : -fS));
+                const double fQ = fBX + ((fBX >= 0) ? +fS : -fS);
                 impCheckExtremumResult(fQ / fAX, rResults);
-                if( fD > 0.0 ) // ignore root multiplicity
+                if( !fTools::equalZero(fS) ) // ignore root multiplicity
                     impCheckExtremumResult(fCX / fQ, rResults);
             }
         }
@@ -1010,9 +1010,9 @@ namespace basegfx
         }
 
         // calculate the y-extrema parameters by zeroing first y-derivative
-        const double fAY = 3 * (maControlPointA.getY() - maControlPointB.getY()) + aRelativeEndPoint.getY();
-        const double fBY = 2 * maControlPointA.getY() - maControlPointB.getY() - maStartPoint.getY();
-        double fCY(maControlPointA.getY() - maStartPoint.getY());
+        double fCY = maControlPointA.getY() - maStartPoint.getY();
+        const double fBY = fCY + aControlDiff.getY();
+        const double fAY = 3 * aControlDiff.getY() + (maEndPoint.getY() - maStartPoint.getY());
 
         if(fTools::equalZero(fCY))
         {
@@ -1024,13 +1024,13 @@ namespace basegfx
         {
             // derivative is polynomial of order 2 => use binomial formula
             const double fD = fBY*fBY - fAY*fCY;
-            if( fD >= 0 )
+            if( fD >= 0.0 )
             {
                 const double fS = sqrt(fD);
                 // calculate both roots (avoiding a numerically unstable subtraction)
-                const double fQ = -(fBY + ((fBY >= 0) ? +fS : -fS));
+                const double fQ = fBY + ((fBY >= 0) ? +fS : -fS);
                 impCheckExtremumResult(fQ / fAY, rResults);
-                if( fD > 0.0 ) // ignore root multiplicity, TODO: use equalZero() instead?
+                if( !fTools::equalZero(fS) ) // ignore root multiplicity
                     impCheckExtremumResult(fCY / fQ, rResults);
             }
         }
-- 
cgit 


From d4202f9887e5eaf0de0acc59e5e7f7b961ed58a8 Mon Sep 17 00:00:00 2001
From: Kai Sommerfeld 
Date: Wed, 20 Oct 2010 12:14:49 +0200
Subject: whitespace cleanup.

---
 l10ntools/source/help/HelpLinker.cxx | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/l10ntools/source/help/HelpLinker.cxx b/l10ntools/source/help/HelpLinker.cxx
index 411859bfe994..739350e21bd3 100644
--- a/l10ntools/source/help/HelpLinker.cxx
+++ b/l10ntools/source/help/HelpLinker.cxx
@@ -46,17 +46,16 @@
 
 #define DBHELP_ONLY
 
-
 class IndexerPreProcessor
 {
 private:
-    std::string             m_aModuleName;
-    fs::path                m_fsIndexBaseDir;
-    fs::path                m_fsCaptionFilesDirName;
-    fs::path                m_fsContentFilesDirName;
+    std::string       m_aModuleName;
+    fs::path          m_fsIndexBaseDir;
+    fs::path          m_fsCaptionFilesDirName;
+    fs::path          m_fsContentFilesDirName;
 
-    xsltStylesheetPtr       m_xsltStylesheetPtrCaption;
-    xsltStylesheetPtr       m_xsltStylesheetPtrContent;
+    xsltStylesheetPtr m_xsltStylesheetPtrCaption;
+    xsltStylesheetPtr m_xsltStylesheetPtrContent;
 
 public:
     IndexerPreProcessor( const std::string& aModuleName, const fs::path& fsIndexBaseDir,
@@ -245,7 +244,6 @@ class HelpLinker
 {
 public:
     void main(std::vector &args,
-//      std::string* pExtensionPath = NULL, const rtl::OUString* pOfficeHelpPath = NULL )
               std::string* pExtensionPath = NULL,
               std::string* pDestination = NULL,
               const rtl::OUString* pOfficeHelpPath = NULL )
@@ -697,7 +695,7 @@ void HelpLinker::link() throw( HelpProcessingException )
     if( !bExtensionMode )
         std::cout << std::endl;
 
-    }   // try
+    } // try
     catch( HelpProcessingException& )
     {
         // catch HelpProcessingException to avoid locking data bases
@@ -1145,7 +1143,7 @@ HelpProcessingErrorInfo& HelpProcessingErrorInfo::operator=( const struct HelpPr
 // Returns true in case of success, false in case of error
 HELPLINKER_DLLPUBLIC bool compileExtensionHelp
 (
-     const rtl::OUString& aOfficeHelpPath,
+    const rtl::OUString& aOfficeHelpPath,
     const rtl::OUString& aExtensionName,
     const rtl::OUString& aExtensionLanguageRoot,
     sal_Int32 nXhpFileCount, const rtl::OUString* pXhpFiles,
@@ -1249,6 +1247,3 @@ HELPLINKER_DLLPUBLIC bool compileExtensionHelp
     return bSuccess;
 }
 
-// vnd.sun.star.help://swriter/52821?Language=en-US&System=UNIX
-/* vi:set tabstop=4 shiftwidth=4 expandtab: */
-
-- 
cgit 


From b7a83f057a3b3b9b7c256a6ecfb0eb9b4ea1ec74 Mon Sep 17 00:00:00 2001
From: Kai Sommerfeld 
Date: Wed, 20 Oct 2010 12:19:56 +0200
Subject: #i111756# - optimized compileExtensionHelp() (patch contributed by
 dtardon).

---
 l10ntools/source/help/HelpLinker.cxx | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/l10ntools/source/help/HelpLinker.cxx b/l10ntools/source/help/HelpLinker.cxx
index 739350e21bd3..348ca046d16c 100644
--- a/l10ntools/source/help/HelpLinker.cxx
+++ b/l10ntools/source/help/HelpLinker.cxx
@@ -696,7 +696,7 @@ void HelpLinker::link() throw( HelpProcessingException )
         std::cout << std::endl;
 
     } // try
-    catch( HelpProcessingException& )
+    catch( const HelpProcessingException& )
     {
         // catch HelpProcessingException to avoid locking data bases
 #ifndef DBHELP_ONLY
@@ -1153,31 +1153,20 @@ HELPLINKER_DLLPUBLIC bool compileExtensionHelp
 {
     bool bSuccess = true;
 
-    sal_Int32 argc = nXhpFileCount + 3;
-    const char** argv = new const char*[argc];
-    argv[0] = "";
-    argv[1] = "-mod";
+    std::vector args;
+    args.reserve(nXhpFileCount + 2);
+    args.push_back(std::string("-mod"));
     rtl::OString aOExtensionName = rtl::OUStringToOString( aExtensionName, fs::getThreadTextEncoding() );
-    argv[2] = aOExtensionName.getStr();
+    args.push_back(std::string(aOExtensionName.getStr()));
 
     for( sal_Int32 iXhp = 0 ; iXhp < nXhpFileCount ; ++iXhp )
     {
         rtl::OUString aXhpFile = pXhpFiles[iXhp];
 
         rtl::OString aOXhpFile = rtl::OUStringToOString( aXhpFile, fs::getThreadTextEncoding() );
-        char* pArgStr = new char[aOXhpFile.getLength() + 1];
-        strcpy( pArgStr, aOXhpFile.getStr() );
-        argv[iXhp + 3] = pArgStr;
+        args.push_back(std::string(aOXhpFile.getStr()));
     }
 
-    std::vector args;
-    for( sal_Int32 i = 1; i < argc; ++i )
-        args.push_back(std::string( argv[i]) );
-
-    for( sal_Int32 iXhp = 0 ; iXhp < nXhpFileCount ; ++iXhp )
-        delete[] argv[iXhp + 3];
-    delete[] argv;
-
     rtl::OString aOExtensionLanguageRoot = rtl::OUStringToOString( aExtensionLanguageRoot, fs::getThreadTextEncoding() );
     const char* pExtensionPath = aOExtensionLanguageRoot.getStr();
     std::string aStdStrExtensionPath = pExtensionPath;
-- 
cgit 


From 056f830614e0642c8abc0cd036fdd7d0c4ca9770 Mon Sep 17 00:00:00 2001
From: "Philipp Lohmann [pl]" 
Date: Thu, 21 Oct 2010 18:21:46 +0200
Subject: fix a merge conflict

---
 vcl/source/gdi/pdfwriter.cxx | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/vcl/source/gdi/pdfwriter.cxx b/vcl/source/gdi/pdfwriter.cxx
index 2d9412cc93b4..23ce1dfa6169 100644
--- a/vcl/source/gdi/pdfwriter.cxx
+++ b/vcl/source/gdi/pdfwriter.cxx
@@ -560,23 +560,17 @@ std::set< PDFWriter::ErrorCode > PDFWriter::GetErrors()
     return ((PDFWriterImpl*)pImplementation)->getErrors();
 }
 
-<<<<<<< local
 com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder >
 PDFWriter::InitEncryption( const rtl::OUString& i_rOwnerPassword,
                            const rtl::OUString& i_rUserPassword,
                            bool b128Bit
                           )
-=======
-void PDFWriter::PlayMetafile( const GDIMetaFile& i_rMTF, const vcl::PDFWriter::PlayMetafileContext& i_rPlayContext, PDFExtOutDevData* i_pData )
->>>>>>> other
 {
-<<<<<<< local
     return PDFWriterImpl::initEncryption( i_rOwnerPassword, i_rUserPassword, b128Bit );
-=======
+}
+
+void PDFWriter::PlayMetafile( const GDIMetaFile& i_rMTF, const vcl::PDFWriter::PlayMetafileContext& i_rPlayContext, PDFExtOutDevData* i_pData )
+{
     ((PDFWriterImpl*)pImplementation)->playMetafile( i_rMTF, i_pData, i_rPlayContext, NULL);
->>>>>>> other
 }
-<<<<<<< local
 
-=======
->>>>>>> other
-- 
cgit 


From 955e88c80e9abce3f15aa55d434dae6ae17d7d43 Mon Sep 17 00:00:00 2001
From: sb 
Date: Fri, 22 Oct 2010 10:37:46 +0200
Subject: sb131: #i115124# $(XSLTPROC) implies LIBXSLT:libxslt

---
 canvas/prj/build.lst     | 2 +-
 comphelper/prj/build.lst | 2 +-
 dtrans/prj/build.lst     | 2 +-
 i18npool/prj/build.lst   | 2 +-
 sax/prj/build.lst        | 2 +-
 sot/prj/build.lst        | 2 +-
 svl/prj/build.lst        | 2 +-
 svtools/prj/build.lst    | 2 +-
 toolkit/prj/build.lst    | 2 +-
 unotools/prj/build.lst   | 2 +-
 vcl/prj/build.lst        | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/canvas/prj/build.lst b/canvas/prj/build.lst
index cacbdb5bb894..2adfe155e0b1 100644
--- a/canvas/prj/build.lst
+++ b/canvas/prj/build.lst
@@ -1,4 +1,4 @@
-cv	canvas	:	javaunohelper comphelper cppuhelper offuh unoil tools svtools vcl AGG:agg basegfx CAIRO:cairo NULL
+cv	canvas	:	javaunohelper comphelper cppuhelper offuh unoil tools svtools vcl AGG:agg basegfx CAIRO:cairo LIBXSLT:libxslt NULL
 cv	canvas											 usr1	-	all	cv_mkout NULL
 cv	canvas\inc										 nmake	-	all	cv_inc NULL
 cv	canvas\source\tools								 nmake	-	all cv_tools cv_inc NULL
diff --git a/comphelper/prj/build.lst b/comphelper/prj/build.lst
index 793d8bf30e09..91e836cabd68 100644
--- a/comphelper/prj/build.lst
+++ b/comphelper/prj/build.lst
@@ -1,4 +1,4 @@
-ph	comphelper	:	cppuhelper ucbhelper offuh vos salhelper NULL
+ph	comphelper	:	cppuhelper ucbhelper offuh vos salhelper LIBXSLT:libxslt NULL
 ph	comphelper								usr1	-	all	ph_mkout NULL
 ph	comphelper\inc							nmake	-	all	ph_inc NULL
 ph	comphelper\source\container				nmake	-	all	ph_container ph_inc NULL
diff --git a/dtrans/prj/build.lst b/dtrans/prj/build.lst
index bd9c73582361..e30eccd59d7e 100644
--- a/dtrans/prj/build.lst
+++ b/dtrans/prj/build.lst
@@ -1,4 +1,4 @@
-dr	dtrans	:	unotools offapi offuh rdbmaker vos stoc NULL
+dr	dtrans	:	unotools offapi offuh rdbmaker vos stoc LIBXSLT:libxslt NULL
 dr	dtrans									usr1	-	all	dr_mkout NULL
 dr	dtrans\inc								nmake	-	all	dr_inc NULL
 dr	dtrans\source\cnttype					nmake	-	all	dr_cnttype dr_generic dr_inc NULL
diff --git a/i18npool/prj/build.lst b/i18npool/prj/build.lst
index 24e9607596ac..22609becbe86 100644
--- a/i18npool/prj/build.lst
+++ b/i18npool/prj/build.lst
@@ -1,4 +1,4 @@
-inp  i18npool    :   bridges sax stoc comphelper ICU:icu i18nutil regexp NULL
+inp  i18npool    :   bridges sax stoc comphelper ICU:icu i18nutil regexp LIBXSLT:libxslt NULL
 inp  i18npool                                   usr1    -   all inp_mkout NULL
 inp  i18npool\inc                               nmake   -   all inp_inc NULL
 inp  i18npool\source\registerservices           nmake   -   all inp_rserv inp_inc NULL
diff --git a/sax/prj/build.lst b/sax/prj/build.lst
index 653d77ce9e25..849700087ae7 100644
--- a/sax/prj/build.lst
+++ b/sax/prj/build.lst
@@ -1,4 +1,4 @@
-ax	sax	:	offapi cppuhelper EXPAT:expat comphelper NULL
+ax	sax	:	offapi cppuhelper EXPAT:expat comphelper LIBXSLT:libxslt NULL
 ax	sax										usr1	-	all	ax_mkout NULL
 ax	sax\source\expatwrap					nmake	-	all	ax_expatwrap NULL
 ax	sax\source\tools						nmake	-	all ax_tools  NULL
diff --git a/sot/prj/build.lst b/sot/prj/build.lst
index a5ebff311e9c..9d6e785898a5 100644
--- a/sot/prj/build.lst
+++ b/sot/prj/build.lst
@@ -1,4 +1,4 @@
-to	sot	:	tools ucbhelper unotools NULL
+to	sot	: LIBXSLT:libxslt tools ucbhelper unotools NULL
 to	sot						usr1	-	all	sot_mkout NULL
 to	sot\inc						nmake	-	all	sot_inc NULL
 to	sot\prj						get	-	all	sot_prj NULL
diff --git a/svl/prj/build.lst b/svl/prj/build.lst
index d5897d9e9883..6761837fa8f3 100644
--- a/svl/prj/build.lst
+++ b/svl/prj/build.lst
@@ -1,4 +1,4 @@
-sl	svl	:	l10n rsc offuh ucbhelper unotools cppu cppuhelper comphelper sal sot NULL
+sl	svl	:	l10n rsc offuh ucbhelper unotools cppu cppuhelper comphelper sal sot LIBXSLT:libxslt NULL
 sl	svl								usr1	-	all	svl_mkout NULL
 sl	svl\inc							nmake	-	all	svl_inc NULL
 sl	svl\unx\source\svdde			nmake	-	u	svl_usdde svl_inc NULL
diff --git a/svtools/prj/build.lst b/svtools/prj/build.lst
index a7d8569de301..a48983013d73 100644
--- a/svtools/prj/build.lst
+++ b/svtools/prj/build.lst
@@ -1,4 +1,4 @@
-st	svtools	:	l10n svl offuh toolkit ucbhelper unotools JPEG:jpeg cppu cppuhelper comphelper sal sot jvmfwk NULL
+st	svtools	:	l10n svl offuh toolkit ucbhelper unotools JPEG:jpeg cppu cppuhelper comphelper sal sot jvmfwk LIBXSLT:libxslt NULL
 st	svtools								usr1	-	all	st_mkout NULL
 st	svtools\inc							nmake	-	all	st_inc NULL
 st	svtools\bmpmaker					nmake	-	all	st_bmp st_inc NULL
diff --git a/toolkit/prj/build.lst b/toolkit/prj/build.lst
index f4854de8e0c4..36ece64d544a 100644
--- a/toolkit/prj/build.lst
+++ b/toolkit/prj/build.lst
@@ -1,4 +1,4 @@
-ti	toolkit	:	vcl NULL
+ti	toolkit	: LIBXSLT:libxslt vcl NULL
 ti	toolkit									usr1	-	all	ti_mkout NULL
 ti	toolkit\prj								get		-	all	ti_prj NULL
 ti	toolkit\inc								nmake	-	all	ti_inc NULL
diff --git a/unotools/prj/build.lst b/unotools/prj/build.lst
index 70402fb3dbd5..d6f10335c254 100644
--- a/unotools/prj/build.lst
+++ b/unotools/prj/build.lst
@@ -1,4 +1,4 @@
-ut	unotools	:	comphelper cppuhelper offuh tools ucbhelper NULL
+ut	unotools	: LIBXSLT:libxslt comphelper cppuhelper offuh tools ucbhelper NULL
 ut	unotools								usr1	-	all	ut_mkout NULL
 ut	unotools\inc							nmake	-	all	ut_inc NULL
 ut	unotools\source\misc					nmake	-	all	ut_misc ut_config ut_inc NULL
diff --git a/vcl/prj/build.lst b/vcl/prj/build.lst
index 0a6f6a95f605..af15ad73e19d 100644
--- a/vcl/prj/build.lst
+++ b/vcl/prj/build.lst
@@ -1,4 +1,4 @@
-vc	vcl	:	l10n apple_remote BOOST:boost rsc sot ucbhelper unotools ICU:icu GRAPHITE:graphite i18npool i18nutil unoil ridljar X11_EXTENSIONS:x11_extensions offuh basegfx basebmp tools l10ntools icc SO:print_header cpputools shell svl NULL
+vc	vcl	:	l10n apple_remote BOOST:boost rsc sot ucbhelper unotools ICU:icu GRAPHITE:graphite i18npool i18nutil unoil ridljar X11_EXTENSIONS:x11_extensions offuh basegfx basebmp tools l10ntools icc SO:print_header cpputools shell svl LIBXSLT:libxslt NULL
 vc	vcl										usr1	-	all	vc_mkout NULL
 vc	vcl\inc									nmake	-	all	vc_inc NULL
 vc	vcl\source\glyphs						nmake	-	all	vc_glyphs vc_inc NULL
-- 
cgit 


From 91e34e4ccc6c61d0b64d250817af7f0d2263b89e Mon Sep 17 00:00:00 2001
From: Mathias Bauer 
Date: Fri, 29 Oct 2010 15:36:30 +0200
Subject: CWS gnumake2: resolve conflicts and make sources buildable on Linux

---
 rsc/source/parser/rscdb.cxx         |   5 +-
 rsc/source/rsc/rsc.cxx              |  12 +--
 svl/Library_svl.mk                  |   2 -
 svl/Package_inc.mk                  |   1 -
 svl/prj/build.lst                   |   2 +-
 svl/source/misc/lngmisc.cxx         |   6 --
 svtools/AllLangResTarget_svt.mk     |   4 -
 svtools/Library_svt.mk              |   7 +-
 svtools/inc/svtools/svtdata.hxx     |  16 ----
 svtools/source/dialogs/printdlg.cxx |   4 -
 toolkit/Library_tk.mk               |   1 +
 toolkit/prj/build.lst               |  18 +---
 tools/Package_inc.mk                |   6 --
 tools/inc/bootstrp/prj.hxx          | 184 ------------------------------------
 tools/prj/d.lst                     |  99 -------------------
 vcl/prj/d.lst                       |   4 +-
 16 files changed, 7 insertions(+), 364 deletions(-)

diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx
index a8a9bff6aee2..af176fe24934 100644
--- a/rsc/source/parser/rscdb.cxx
+++ b/rsc/source/parser/rscdb.cxx
@@ -126,11 +126,7 @@ static sal_uInt32 getLangIdAndShortenLocale( RscTypCont* pTypCont,
     else
         rLang = rtl::OString();
 #if OSL_DEBUG_LEVEL > 1
-<<<<<<< local
-        fprintf( stderr, " %s (0x%" SAL_PRIxUINT32 ")", aL.getStr(), nRet );
-=======
         fprintf( stderr, " %s (0x%hx)", aL.getStr(), (int)nRet );
->>>>>>> other
 #endif
     return nRet;
 }
@@ -1117,3 +1113,4 @@ sal_uInt32 RscTypCont::PutTranslatorKey( sal_uInt64 nKey )
     aIdTranslator[ nKey ] = nFilePos;
     return nPMId++;
 }
+
diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx
index 25677c982c23..54073563403d 100644
--- a/rsc/source/rsc/rsc.cxx
+++ b/rsc/source/rsc/rsc.cxx
@@ -474,23 +474,12 @@ ERRTYPE RscCompiler::Start()
     ByteString*     pString;
     RscFile*        pFName;
 
-<<<<<<< local
-    if( PRINTSYNTAX_FLAG & pCL->nCommands )
-    {
-#ifndef W30
-        pTC->WriteSyntax( stdout );
-printf( "khg\n" );
-#endif
-        return ERR_OK;
-    }
-=======
     if( PRINTSYNTAX_FLAG & pCL->nCommands )
     {
         pTC->WriteSyntax( stdout );
         printf( "khg\n" );
         return ERR_OK;
     }
->>>>>>> other
 
     // Kein Parameter, dann Hilfe
     pString = pCL->aInputList.First();
@@ -1378,3 +1367,4 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile,
     if( pSysListFile )
         fclose( pSysListFile );
 }
+
diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk
index bfa5cfaa96ee..e872c1cfec5b 100644
--- a/svl/Library_svl.mk
+++ b/svl/Library_svl.mk
@@ -80,7 +80,6 @@ $(eval $(call gb_Library_add_exception_objects,svl,\
     svl/source/config/itemholder2 \
     svl/source/config/languageoptions \
     svl/source/config/srchcfg \
-    svl/source/filepicker/pickerhelper \
     svl/source/filepicker/pickerhistory \
     svl/source/filerec/filerec \
     svl/source/items/aeitem \
@@ -144,7 +143,6 @@ $(eval $(call gb_Library_add_exception_objects,svl,\
     svl/source/notify/listeneriter \
     svl/source/notify/lstner \
     svl/source/notify/smplhint \
-    svl/source/numbers/nbdll \
     svl/source/numbers/numfmuno \
     svl/source/numbers/numhead \
     svl/source/numbers/numuno \
diff --git a/svl/Package_inc.mk b/svl/Package_inc.mk
index e0f4b1835f95..e2f8473d46aa 100644
--- a/svl/Package_inc.mk
+++ b/svl/Package_inc.mk
@@ -109,7 +109,6 @@ $(eval $(call gb_Package_add_file,svl_inc,inc/svl/memberid.hrc,svl/memberid.hrc)
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/nfsymbol.hxx,svl/nfsymbol.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/numuno.hxx,svl/numuno.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/outstrm.hxx,svl/outstrm.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/pickerhelper.hxx,svl/pickerhelper.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/pickerhistory.hxx,svl/pickerhistory.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/pickerhistoryaccess.hxx,svl/pickerhistoryaccess.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/poolcach.hxx,svl/poolcach.hxx))
diff --git a/svl/prj/build.lst b/svl/prj/build.lst
index 54eb363e906d..10b9cfe432f2 100644
--- a/svl/prj/build.lst
+++ b/svl/prj/build.lst
@@ -5,5 +5,5 @@ sl	svl\prj	nmake	-	all	svl_prj NULL
 # complex test for ConfigItems are marked as defect
 # sl	svl\qa\complex\ConfigItems\helper       nmake	-	all	svl_qa_complex_help svl_util svl_passcont NULL
 # sl	svl\qa\complex\ConfigItems	        nmake	-	all	svl_qa_complex svl_qa_complex_help svl_util svl_passcont NULL
-sl	svl\qa\complex\passwordcontainer	nmake	-	all	svl_qa_complex svl_util svl_passcont NULL
+sl	svl\qa\complex\passwordcontainer	nmake	-	all	svl_qa_complex svl_prj NULL
 
diff --git a/svl/source/misc/lngmisc.cxx b/svl/source/misc/lngmisc.cxx
index c0866b21e785..1324a8fa842c 100644
--- a/svl/source/misc/lngmisc.cxx
+++ b/svl/source/misc/lngmisc.cxx
@@ -27,19 +27,13 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svl.hxx"
-<<<<<<< local
 #include 
-=======
-
-#include 
->>>>>>> other
 #include 
 #include 
 #include 
 #include 
 #include 
 
-
 using namespace rtl;
 
 namespace linguistic
diff --git a/svtools/AllLangResTarget_svt.mk b/svtools/AllLangResTarget_svt.mk
index c198601f3ca7..3574b2e6c9ec 100644
--- a/svtools/AllLangResTarget_svt.mk
+++ b/svtools/AllLangResTarget_svt.mk
@@ -61,10 +61,6 @@ $(eval $(call gb_SrsTarget_add_files,svt/res,\
     svtools/source/dialogs/prnsetup.src \
     svtools/source/dialogs/so3res.src \
     svtools/source/dialogs/wizardmachine.src \
-    svtools/source/filter.vcl/filter/dlgejpg.src \
-    svtools/source/filter.vcl/filter/dlgepng.src \
-    svtools/source/filter.vcl/filter/dlgexpor.src \
-    svtools/source/filter.vcl/filter/strings.src \
     svtools/source/java/javaerror.src \
     svtools/source/misc/ehdl.src \
     svtools/source/misc/helpagent.src \
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index f8415a98b922..8fb07c2d8f49 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -105,7 +105,6 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
     svtools/source/config/optionsdrawinglayer \
     svtools/source/config/printoptions \
     svtools/source/contnr/contentenumeration \
-    svtools/source/contnr/ctrdll \
     svtools/source/contnr/fileview \
     svtools/source/contnr/imivctl1 \
     svtools/source/contnr/imivctl2 \
@@ -124,7 +123,6 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
     svtools/source/control/calendar \
     svtools/source/control/collatorres \
     svtools/source/control/ctrlbox \
-    svtools/source/control/ctrldll \
     svtools/source/control/ctrltool \
     svtools/source/control/filectrl \
     svtools/source/control/filectrl2 \
@@ -178,15 +176,12 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
     svtools/source/edit/textwindowpeer \
     svtools/source/edit/txtattr \
     svtools/source/edit/xtextedt \
+    svtools/source/filter.vcl/filter/exportdialog \
     svtools/source/filter.vcl/filter/FilterConfigCache \
     svtools/source/filter.vcl/filter/FilterConfigItem \
     svtools/source/filter.vcl/filter/SvFilterOptionsDialog \
-    svtools/source/filter.vcl/filter/dlgejpg \
-    svtools/source/filter.vcl/filter/dlgepng \
-    svtools/source/filter.vcl/filter/dlgexpor \
     svtools/source/filter.vcl/filter/filter \
     svtools/source/filter.vcl/filter/filter2 \
-    svtools/source/filter.vcl/filter/fldll \
     svtools/source/filter.vcl/filter/sgfbram \
     svtools/source/filter.vcl/filter/sgvmain \
     svtools/source/filter.vcl/filter/sgvspln \
diff --git a/svtools/inc/svtools/svtdata.hxx b/svtools/inc/svtools/svtdata.hxx
index 91a50a15c666..ad7b60b3f2b7 100644
--- a/svtools/inc/svtools/svtdata.hxx
+++ b/svtools/inc/svtools/svtdata.hxx
@@ -57,23 +57,7 @@ public:
 };
 
 //============================================================================
-<<<<<<< local
-
-class SvpResId: public ResId
-{
-public:
-    SvpResId( USHORT nId, const ::com::sun::star::lang::Locale aLocale ):
-        ResId( nId, *ImpSvtData::GetSvtData().GetResMgr( aLocale ) ) {}
-
-     // VCL dependant, only available in SVT, not in SVL!
-    SvpResId( USHORT nId );
-};
-
-
 class SVT_DLLPUBLIC SvtResId: public ResId
-=======
-class SvtResId: public ResId
->>>>>>> other
 {
 public:
     SvtResId(USHORT nId, const ::com::sun::star::lang::Locale aLocale);
diff --git a/svtools/source/dialogs/printdlg.cxx b/svtools/source/dialogs/printdlg.cxx
index 779ff1da903b..ab8b69fdcda1 100644
--- a/svtools/source/dialogs/printdlg.cxx
+++ b/svtools/source/dialogs/printdlg.cxx
@@ -38,12 +38,8 @@
 #include 
 #include 
 #include 
-<<<<<<< local
 #include 
 #include "svl/pickerhelper.hxx"
-=======
-#include 
->>>>>>> other
 #include 
 #include 
 #include 
diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk
index 60d13418fa5b..7fe38ac64dc7 100644
--- a/toolkit/Library_tk.mk
+++ b/toolkit/Library_tk.mk
@@ -84,6 +84,7 @@ $(eval $(call gb_Library_add_exception_objects,tk,\
     toolkit/source/awt/vclxwindow \
     toolkit/source/awt/vclxwindow1 \
     toolkit/source/awt/vclxwindows \
+    toolkit/source/awt/stylesettings \
     toolkit/source/awt/xsimpleanimation \
     toolkit/source/awt/xthrobber \
     toolkit/source/controls/accessiblecontrolcontext \
diff --git a/toolkit/prj/build.lst b/toolkit/prj/build.lst
index e1e9b370628f..7abd412d1103 100644
--- a/toolkit/prj/build.lst
+++ b/toolkit/prj/build.lst
@@ -1,28 +1,12 @@
-<<<<<<< local
 ti toolkit : vcl NULL
 ti toolkit     usr1  - all ti_mkout NULL
 ti toolkit\prj nmake - all ti_prj NULL
-=======
-ti	toolkit	:	vcl NULL
-ti	toolkit									usr1	-	all	ti_mkout NULL
-ti	toolkit\prj								get		-	all	ti_prj NULL
-ti	toolkit\inc								nmake	-	all	ti_inc NULL
-ti	toolkit\uiconfig\layout									nmake	-	all	ti_uiconfig_layout NULL
-ti	toolkit\source\helper					nmake	-	all	ti_helper  ti_inc NULL
-ti	toolkit\source\awt						nmake	-	all	ti_awt  ti_inc NULL
-ti	toolkit\source\controls					nmake	-	all	ti_controls  ti_inc NULL
-ti	toolkit\source\controls\tree			nmake	-	all	ti_tree  NULL
-ti	toolkit\source\controls\grid			nmake	-	all	ti_grid  NULL
-ti	toolkit\source\layout\core			nmake	-	all	ti_layout_core  NULL
-ti	toolkit\source\layout\vcl			nmake	-	all	ti_layout_vcl  NULL
-ti	toolkit\util							nmake	-	all	ti_util ti_awt ti_controls ti_layout_core ti_helper ti_tree ti_grid ti_layout_vcl NULL
 
 ti      toolkit\qa\unoapi nmake - all ti_qa_unoapi NULL
 
-
 # fail on unxsoli4
 #ti      toolkit\qa\complex\xunitconversion nmake - all ti_complex_conv ti_util NULL
 
 # fails
 # ti      toolkit\qa\complex\toolkit                   nmake - all ti_complex_ti ti_qa_complex_toolkit_interface_tests ti_util NULL
->>>>>>> other
+
diff --git a/tools/Package_inc.mk b/tools/Package_inc.mk
index 5deb59a7b0da..27088fd06a48 100644
--- a/tools/Package_inc.mk
+++ b/tools/Package_inc.mk
@@ -27,12 +27,9 @@
 
 $(eval $(call gb_Package_Package,tools_inc,$(SRCDIR)/tools/inc))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/StringListResource.hxx,tools/StringListResource.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/agapi.hxx,tools/agapi.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/agitem.hxx,tools/agitem.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/appendunixshellword.hxx,tools/appendunixshellword.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/bigint.hxx,tools/bigint.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/cachestr.hxx,tools/cachestr.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/chapi.hxx,tools/chapi.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/color.hxx,tools/color.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/config.hxx,tools/config.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/contnr.hxx,tools/contnr.hxx))
@@ -40,9 +37,7 @@ $(eval $(call gb_Package_add_file,tools_inc,inc/tools/date.hxx,tools/date.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/datetime.hxx,tools/datetime.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/debug.hxx,tools/debug.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/diagnose_ex.h,tools/diagnose_ex.h))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/download.hxx,tools/download.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/dynary.hxx,tools/dynary.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/eacopier.hxx,tools/eacopier.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/errcode.hxx,tools/errcode.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/errinf.hxx,tools/errinf.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/extendapplicationenvironment.hxx,tools/extendapplicationenvironment.hxx))
@@ -103,7 +98,6 @@ $(eval $(call gb_Package_add_file,tools_inc,inc/tools/tools.h,tools/tools.h))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/toolsdllapi.h,tools/toolsdllapi.h))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/unqid.hxx,tools/unqid.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/unqidx.hxx,tools/unqidx.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/urlkeys.hxx,tools/urlkeys.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/urlobj.hxx,tools/urlobj.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/vcompat.hxx,tools/vcompat.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/vector2d.hxx,tools/vector2d.hxx))
diff --git a/tools/inc/bootstrp/prj.hxx b/tools/inc/bootstrp/prj.hxx
index a6ef7338472b..4b1ff91feb7b 100644
--- a/tools/inc/bootstrp/prj.hxx
+++ b/tools/inc/bootstrp/prj.hxx
@@ -55,188 +55,4 @@ public:
     ByteString          GetCleanedNextLine( BOOL bReadComments = FALSE );
 };
 
-<<<<<<< local
-=======
-#define ENV_GUI     0x00000000
-#define ENV_OS      0x00000001
-#define ENV_UPD     0x00000002
-#define ENV_UPDMIN  0x00000004
-#define ENV_INPATH  0x00000008
-#define ENV_OUTPATH 0x00000010
-#define ENV_GUIBASE 0x00000020
-#define ENV_CVER    0x00000040
-#define ENV_GVER    0x00000080
-#define ENV_GUIENV  0x00000100
-#define ENV_CPU     0x00000200
-#define ENV_CPUNAME 0x00000400
-#define ENV_DLLSUFF 0x00000800
-#define ENV_COMEX   0x00001000
-#define ENV_COMPATH 0x00002000
-#define ENV_INCLUDE 0x00004000
-#define ENV_LIB     0x00008000
-#define ENV_PATH    0x00010000
-#define ENV_SOLVER  0x00020000
-#define ENV_SOLENV  0x00040000
-#define ENV_SOLROOT 0x00080000
-#define ENV_DEVROOT 0x00100000
-#define ENV_EMERG   0x00200000
-#define ENV_STAND   0x00400000
-
-/*********************************************************************
-*
-*   class Prj
-*   alle Daten eines Projektes werden hier gehalten
-*
-*********************************************************************/
-
-DECL_DEST_LIST ( PrjList_tmp, PrjList, CommandData * )
-
-class Star;
-class Prj : public PrjList
-{
-friend class Star;
-private:
-    BOOL            bVisited;
-
-    ByteString          aPrjPath;
-    ByteString          aProjectName;
-    ByteString          aProjectPrefix;     // max. 2-buchstabige Abk.
-    SByteStringList*    pPrjInitialDepList;
-    SByteStringList*    pPrjDepList;
-    BOOL            bHardDependencies;
-    BOOL            bSorted;
-
-public:
-                    Prj();
-                    Prj( ByteString aName );
-                    ~Prj();
-    void            SetPreFix( ByteString aPre ){aProjectPrefix = aPre;}
-    ByteString          GetPreFix(){return aProjectPrefix;}
-    ByteString          GetProjectName()
-                            {return aProjectName;}
-    void            SetProjectName(ByteString aName)
-                            {aProjectName = aName;}
-    BOOL            InsertDirectory( ByteString aDirName , USHORT aWhat,
-                                    USHORT aWhatOS, ByteString aLogFileName,
-                                    const ByteString &rClientRestriction );
-    CommandData*    RemoveDirectory( ByteString aLogFileName );
-    CommandData*    GetDirectoryList ( USHORT nWhatOs, USHORT nCommand );
-    CommandData*    GetDirectoryData( ByteString aLogFileName );
-    inline CommandData* GetData( ByteString aLogFileName )
-                            { return GetDirectoryData( aLogFileName ); };
-
-    SByteStringList*    GetDependencies( BOOL bExpanded = TRUE );
-    void            AddDependencies( ByteString aStr );
-    void            HasHardDependencies( BOOL bHard ) { bHardDependencies = bHard; }
-    BOOL            HasHardDependencies() { return bHardDependencies; }
-};
-
-/*********************************************************************
-*
-*   class Star
-*   Diese Klasse liest die Projectstruktur aller StarDivision Projekte
-*   aus \\dev\data1\upenv\data\config\solar.lst aus
-*
-*********************************************************************/
-
-DECL_DEST_LIST ( StarList_tmp, StarList, Prj* )
-DECLARE_LIST ( SolarFileList, String* )
-
-class StarFile
-{
-private:
-    String aFileName;
-    Date aDate;
-    Time aTime;
-
-    BOOL bExists;
-
-public:
-    StarFile( const String &rFile );
-    const String &GetName() { return aFileName; }
-    Date GetDate() { return aDate; }
-    Time GetTime() { return aTime; }
-
-    BOOL NeedsUpdate();
-    BOOL Exists() { return bExists; }
-};
-
-DECLARE_LIST( StarFileList, StarFile * )
-
-#define STAR_MODE_SINGLE_PARSE          0x0000
-#define STAR_MODE_RECURSIVE_PARSE       0x0001
-#define STAR_MODE_MULTIPLE_PARSE        0x0002
-
-class Star : public StarList
-{
-private:
-    ByteString      aStarName;
-
-    static Link aDBNotFoundHdl;
-protected:
-    vos:: OMutex  aMutex;
-
-    USHORT          nStarMode;
-    SolarFileList   aFileList;
-    StarFileList    aLoadedFilesList;
-    String          sSourceRoot;
-
-    void InsertSolarList( String sProject );
-    String CreateFileName( String sProject );
-
-    void            Expand_Impl();
-    void            ExpandPrj_Impl( Prj *pPrj, Prj *pDepPrj );
-
-private:
-    void            Read( String &rFileName );
-    void            Read( SolarFileList *pSOlarFiles );
-
-public:
-                    Star();
-                    Star( String aFileName, USHORT nMode = STAR_MODE_SINGLE_PARSE );
-                    Star( SolarFileList *pSolarFiles );
-                    Star( GenericInformationList *pStandLst, ByteString &rVersion, BOOL bLocal = FALSE,
-                        const char *pSourceRoot = NULL  );
-
-                    ~Star();
-
-    static          void SetDBNotFoundHdl( const Link &rLink ) { aDBNotFoundHdl = rLink; }
-
-    ByteString      GetName(){ return aStarName; };
-
-    BOOL            HasProject( ByteString aProjectName );
-    Prj*            GetPrj( ByteString aProjectName );
-    ByteString          GetPrjName( DirEntry &rPath );
-
-    void            InsertToken( char *pChar );
-    BOOL            NeedsUpdate();
-
-    USHORT          GetMode() { return nStarMode; }
-};
-
-class StarWriter : public Star
-{
-private:
-    USHORT          WritePrj( Prj *pPrj, SvFileStream& rStream );
-
-public:
-                    StarWriter( String aFileName, BOOL bReadComments = FALSE, USHORT nMode = STAR_MODE_SINGLE_PARSE );
-                    StarWriter( SolarFileList *pSolarFiles, BOOL bReadComments = FALSE );
-                    StarWriter( GenericInformationList *pStandLst, ByteString &rVersion, BOOL bLocal = FALSE,
-                        const char *pSourceRoot = NULL );
-
-    void            CleanUp();
-
-    BOOL            InsertProject ( Prj* pNewPrj );
-    Prj*            RemoveProject ( ByteString aProjectName );
-
-    USHORT          Read( String aFileName, BOOL bReadComments = FALSE, USHORT nMode = STAR_MODE_SINGLE_PARSE  );
-       USHORT           Read( SolarFileList *pSolarFiles, BOOL bReadComments = FALSE );
-    USHORT          Write( String aFileName );
-    USHORT          WriteMultiple( String rSourceRoot );
-
-    void            InsertTokenLine( ByteString& rString );
-};
-
->>>>>>> other
 #endif
diff --git a/tools/prj/d.lst b/tools/prj/d.lst
index a8e08784f199..1c0b5271071d 100644
--- a/tools/prj/d.lst
+++ b/tools/prj/d.lst
@@ -8,107 +8,8 @@ mkdir: %_DEST%\inc%_EXT%\tools
 ..\%__SRC%\lib\lib*.so.* %_DEST%\lib%_EXT%\lib*.so.*
 ..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%\lib*.dylib
 
-<<<<<<< local
 ..\inc\tools\*.h %_DEST%\inc%_EXT%\tools\*.h
 ..\inc\tools\*.hxx %_DEST%\inc%_EXT%\tools\*.hxx
-=======
-..\inc\bootstrp\command.hxx %_DEST%\inc%_EXT%\bootstrp\command.hxx
-..\inc\bootstrp\inimgr.hxx %_DEST%\inc%_EXT%\bootstrp\inimgr.hxx
-..\inc\bootstrp\listmacr.hxx %_DEST%\inc%_EXT%\bootstrp\listmacr.hxx
-..\inc\bootstrp\mkcreate.hxx %_DEST%\inc%_EXT%\bootstrp\mkcreate.hxx
-..\inc\bootstrp\prj.hxx %_DEST%\inc%_EXT%\bootstrp\prj.hxx
-..\inc\bootstrp\sstring.hxx %_DEST%\inc%_EXT%\bootstrp\sstring.hxx
-
-..\inc\tools\toolsdllapi.h %_DEST%\inc%_EXT%\tools\toolsdllapi.h
-..\inc\tools\weakbase.hxx %_DEST%\inc%_EXT%\tools\weakbase.hxx
-..\inc\tools\weakbase.h %_DEST%\inc%_EXT%\tools\weakbase.h
-
-..\inc\tools\postwin.h %_DEST%\inc%_EXT%\tools\postwin.h
-..\inc\tools\prewin.h %_DEST%\inc%_EXT%\tools\prewin.h
-
-..\inc\tools\postx.h %_DEST%\inc%_EXT%\tools\postx.h
-..\inc\tools\prex.h %_DEST%\inc%_EXT%\tools\prex.h
-
-..\inc\tools\svlibrary.hxx %_DEST%\inc%_EXT%\tools\svlibrary.hxx
-..\inc\tools\solarmutex.hxx %_DEST%\inc%_EXT%\tools\solarmutex.hxx
-..\inc\tools\wintypes.hxx %_DEST%\inc%_EXT%\tools\wintypes.hxx
-..\inc\tools\mapunit.hxx %_DEST%\inc%_EXT%\tools\mapunit.hxx
-..\inc\tools\fldunit.hxx %_DEST%\inc%_EXT%\tools\fldunit.hxx
-..\inc\tools\fontenum.hxx %_DEST%\inc%_EXT%\tools\fontenum.hxx
-..\inc\tools\agapi.hxx %_DEST%\inc%_EXT%\tools\agapi.hxx
-..\inc\tools\agitem.hxx %_DEST%\inc%_EXT%\tools\agitem.hxx
-..\inc\tools\appendunixshellword.hxx %_DEST%\inc%_EXT%\tools\appendunixshellword.hxx
-..\inc\tools\bigint.hxx %_DEST%\inc%_EXT%\tools\bigint.hxx
-..\inc\tools\cachestr.hxx %_DEST%\inc%_EXT%\tools\cachestr.hxx
-..\inc\tools\color.hxx %_DEST%\inc%_EXT%\tools\color.hxx
-..\inc\tools\contnr.hxx %_DEST%\inc%_EXT%\tools\contnr.hxx
-..\inc\tools\date.hxx %_DEST%\inc%_EXT%\tools\date.hxx
-..\inc\tools\datetime.hxx %_DEST%\inc%_EXT%\tools\datetime.hxx
-..\inc\tools\debug.hxx %_DEST%\inc%_EXT%\tools\debug.hxx
-..\inc\tools\diagnose_ex.h %_DEST%\inc%_EXT%\tools\diagnose_ex.h
-..\inc\tools\download.hxx %_DEST%\inc%_EXT%\tools\download.hxx
-..\inc\tools\dynary.hxx %_DEST%\inc%_EXT%\tools\dynary.hxx
-..\inc\tools\errcode.hxx %_DEST%\inc%_EXT%\tools\errcode.hxx
-..\inc\tools\errinf.hxx %_DEST%\inc%_EXT%\tools\errinf.hxx
-..\inc\tools\extendapplicationenvironment.hxx %_DEST%\inc%_EXT%\tools\extendapplicationenvironment.hxx
-..\inc\tools\fract.hxx %_DEST%\inc%_EXT%\tools\fract.hxx
-..\inc\tools\fsys.hxx %_DEST%\inc%_EXT%\tools\fsys.hxx
-..\inc\tools\eacopier.hxx %_DEST%\inc%_EXT%\tools\eacopier.hxx
-..\inc\tools\gen.hxx %_DEST%\inc%_EXT%\tools\gen.hxx
-..\inc\tools\globname.hxx %_DEST%\inc%_EXT%\tools\globname.hxx
-..\inc\tools\inetdef.hxx %_DEST%\inc%_EXT%\tools\inetdef.hxx
-..\inc\tools\inetmime.hxx %_DEST%\inc%_EXT%\tools\inetmime.hxx
-..\inc\tools\inetmsg.hxx %_DEST%\inc%_EXT%\tools\inetmsg.hxx
-..\inc\tools\inetstrm.hxx %_DEST%\inc%_EXT%\tools\inetstrm.hxx
-..\inc\tools\link.hxx %_DEST%\inc%_EXT%\tools\link.hxx
-..\inc\tools\list.hxx %_DEST%\inc%_EXT%\tools\list.hxx
-..\inc\tools\mempool.hxx %_DEST%\inc%_EXT%\tools\mempool.hxx
-..\inc\tools\multisel.hxx %_DEST%\inc%_EXT%\tools\multisel.hxx
-..\inc\tools\ownlist.hxx %_DEST%\inc%_EXT%\tools\ownlist.hxx
-..\inc\tools\postsys.h %_DEST%\inc%_EXT%\tools\postsys.h
-..\inc\tools\presys.h %_DEST%\inc%_EXT%\tools\presys.h
-..\inc\tools\pstm.hxx %_DEST%\inc%_EXT%\tools\pstm.hxx
-..\inc\tools\queue.hxx %_DEST%\inc%_EXT%\tools\queue.hxx
-..\inc\tools\rc.h %_DEST%\inc%_EXT%\tools\rc.h
-..\inc\tools\rc.hxx %_DEST%\inc%_EXT%\tools\rc.hxx
-..\inc\tools\rcid.h %_DEST%\inc%_EXT%\tools\rcid.h
-..\inc\tools\ref.hxx %_DEST%\inc%_EXT%\tools\ref.hxx
-..\inc\tools\resid.hxx %_DEST%\inc%_EXT%\tools\resid.hxx
-..\inc\tools\resmgr.hxx %_DEST%\inc%_EXT%\tools\resmgr.hxx
-..\inc\tools\StringListResource.hxx %_DEST%\inc%_EXT%\tools\StringListResource.hxx
-..\inc\tools\isofallback.hxx %_DEST%\inc%_EXT%\tools\isofallback.hxx
-..\inc\tools\rtti.hxx %_DEST%\inc%_EXT%\tools\rtti.hxx
-..\inc\tools\shl.hxx %_DEST%\inc%_EXT%\tools\shl.hxx
-..\inc\tools\simplerm.hxx %_DEST%\inc%_EXT%\tools\simplerm.hxx
-..\inc\tools\solar.h %_DEST%\inc%_EXT%\tools\solar.h
-..\inc\tools\stack.hxx %_DEST%\inc%_EXT%\tools\stack.hxx
-..\inc\tools\stream.hxx %_DEST%\inc%_EXT%\tools\stream.hxx
-..\inc\tools\string.hxx %_DEST%\inc%_EXT%\tools\string.hxx
-..\inc\tools\svwin.h %_DEST%\inc%_EXT%\tools\svwin.h
-..\inc\tools\table.hxx %_DEST%\inc%_EXT%\tools\table.hxx
-..\inc\tools\tenccvt.hxx %_DEST%\inc%_EXT%\tools\tenccvt.hxx
-..\inc\tools\time.hxx %_DEST%\inc%_EXT%\tools\time.hxx
-..\inc\tools\tools.h %_DEST%\inc%_EXT%\tools\tools.h
-..\inc\tools\unqid.hxx %_DEST%\inc%_EXT%\tools\unqid.hxx
-..\inc\tools\unqidx.hxx %_DEST%\inc%_EXT%\tools\unqidx.hxx
-..\inc\tools\urlkeys.hxx %_DEST%\inc%_EXT%\tools\urlkeys.hxx
-..\inc\tools\urlobj.hxx %_DEST%\inc%_EXT%\tools\urlobj.hxx
-..\inc\tools\vcompat.hxx %_DEST%\inc%_EXT%\tools\vcompat.hxx
-..\inc\tools\wldcrd.hxx %_DEST%\inc%_EXT%\tools\wldcrd.hxx
-..\inc\tools\zcodec.hxx %_DEST%\inc%_EXT%\tools\zcodec.hxx
-..\inc\tools\tempfile.hxx %_DEST%\inc%_EXT%\tools\tempfile.hxx
-..\inc\tools\geninfo.hxx %_DEST%\inc%_EXT%\tools\geninfo.hxx
-..\inc\tools\iparser.hxx %_DEST%\inc%_EXT%\tools\iparser.hxx
-..\inc\tools\config.hxx %_DEST%\inc%_EXT%\tools\config.hxx
-..\inc\tools\resary.hxx %_DEST%\inc%_EXT%\tools\resary.hxx
-..\inc\tools\poly.hxx %_DEST%\inc%_EXT%\tools\poly.hxx
-..\inc\tools\line.hxx %_DEST%\inc%_EXT%\tools\line.hxx
-..\inc\tools\vector2d.hxx %_DEST%\inc%_EXT%\tools\vector2d.hxx
-..\inc\tools\testtoolloader.hxx %_DEST%\inc%_EXT%\tools\testtoolloader.hxx
-..\inc\tools\svborder.hxx %_DEST%\inc%_EXT%\tools\svborder.hxx
-..\inc\tools\getprocessworkingdir.hxx %_DEST%\inc%_EXT%\tools\getprocessworkingdir.hxx
-..\inc\tools\b3dtrans.hxx %_DEST%\inc%_EXT%\tools\b3dtrans.hxx
->>>>>>> other
 
 ..\%__SRC%\bin\rscdep.exe %_DEST%\bin%_EXT%\rscdep.exe
 ..\%__SRC%\bin\rscdep %_DEST%\bin%_EXT%\rscdep
diff --git a/vcl/prj/d.lst b/vcl/prj/d.lst
index ae9c0364c895..bf6b36a7eaf7 100644
--- a/vcl/prj/d.lst
+++ b/vcl/prj/d.lst
@@ -152,7 +152,5 @@ mkdir: %_DEST%\inc%_EXT%\vcl
 ..\inc\vcl\helper.hxx %_DEST%\inc%_EXT%\vcl\helper.hxx
 ..\inc\vcl\strhelper.hxx %_DEST%\inc%_EXT%\vcl\strhelper.hxx
 ..\inc\vcl\lazydelete.hxx %_DEST%\inc%_EXT%\vcl\lazydelete.hxx
-<<<<<<< local
-=======
 ..\%__SRC%\misc\vcl.component %_DEST%\xml%_EXT%\vcl.component
->>>>>>> other
+
-- 
cgit 


From 2ce6a123f867943205e26c2976159fd4a23da9f7 Mon Sep 17 00:00:00 2001
From: "Philipp Lohmann [pl]" 
Date: Tue, 2 Nov 2010 15:47:47 +0100
Subject: fix a merge problem

---
 vcl/unx/source/gdi/salprnpsp.cxx | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/vcl/unx/source/gdi/salprnpsp.cxx b/vcl/unx/source/gdi/salprnpsp.cxx
index 417704eb3b69..ece724d717cb 100644
--- a/vcl/unx/source/gdi/salprnpsp.cxx
+++ b/vcl/unx/source/gdi/salprnpsp.cxx
@@ -1187,14 +1187,12 @@ BOOL PspSalPrinter::StartJob( const String* i_pFileName, const String& i_rJobNam
     aContext.Version            = vcl::PDFWriter::PDF_1_4;
     aContext.Tagged             = false;
     aContext.EmbedStandardFonts = true;
-    aContext.Encrypt            = false;
     aContext.DocumentLocale     = Application::GetSettings().GetLocale();
 
     // prepare doc info
-    vcl::PDFDocInfo aDocInfo;
-    aDocInfo.Title              = i_rJobName;
-    aDocInfo.Creator            = i_rAppName;
-    aDocInfo.Producer           = i_rAppName;
+    aContext.DocumentInfo.Title              = i_rJobName;
+    aContext.DocumentInfo.Creator            = i_rAppName;
+    aContext.DocumentInfo.Producer           = i_rAppName;
 
     // define how we handle metafiles in PDFWriter
     vcl::PDFWriter::PlayMetafileContext aMtfContext;
@@ -1271,11 +1269,10 @@ BOOL PspSalPrinter::StartJob( const String* i_pFileName, const String& i_rJobNam
                 #if defined __SUNPRO_CC
                 #pragma disable_warn
                 #endif
-                pWriter.reset( new vcl::PDFWriter( aContext ) );
+                pWriter.reset( new vcl::PDFWriter( aContext, uno::Reference< beans::XMaterialHolder >() ) );
                 #if defined __SUNPRO_CC
                 #pragma enable_warn
                 #endif
-                pWriter->SetDocInfo( aDocInfo );
             }
 
             pWriter->NewPage( TenMuToPt( aNewParm.maPageSize.Width() ),
-- 
cgit 


From 9ba9a27d921c28488444b3cd016dd5eb12c7525a Mon Sep 17 00:00:00 2001
From: Mikhail Voytenko 
Date: Thu, 4 Nov 2010 17:56:39 +0100
Subject: pl08: #163778# use EncryptionData from MediaDescriptor

---
 comphelper/inc/comphelper/docpasswordhelper.hxx |  63 +++++++++-
 comphelper/inc/comphelper/mediadescriptor.hxx   |   1 +
 comphelper/inc/comphelper/storagehelper.hxx     |  11 +-
 comphelper/source/misc/docpasswordhelper.cxx    | 152 +++++++++++++++++++-----
 comphelper/source/misc/mediadescriptor.cxx      |   6 +
 comphelper/source/misc/storagehelper.cxx        |  52 +++++++-
 6 files changed, 244 insertions(+), 41 deletions(-)

diff --git a/comphelper/inc/comphelper/docpasswordhelper.hxx b/comphelper/inc/comphelper/docpasswordhelper.hxx
index dbbb68372a07..7e9f06318a26 100644
--- a/comphelper/inc/comphelper/docpasswordhelper.hxx
+++ b/comphelper/inc/comphelper/docpasswordhelper.hxx
@@ -28,6 +28,7 @@
 #ifndef COMPHELPER_DOCPASSWORDHELPR_HXX
 #define COMPHELPER_DOCPASSWORDHELPR_HXX
 
+#include 
 #include "comphelper/comphelperdllapi.h"
 #include 
 #include "comphelper/docpasswordrequest.hxx"
@@ -53,7 +54,7 @@ enum DocPasswordVerifierResult
 /** Base class for a password verifier used by the DocPasswordHelper class
     below.
 
-    Users have to implement the virtual function and pass an instance of the
+    Users have to implement the virtual functions and pass an instance of the
     verifier to one of the password request functions.
  */
 class COMPHELPER_DLLPUBLIC IDocPasswordVerifier
@@ -63,6 +64,14 @@ public:
 
     /** Will be called everytime a password needs to be verified.
 
+        @param rPassword
+            The password to be verified
+
+        @param o_rEncryptionData
+            Output parameter, that is filled with the EncryptionData generated
+            from the password. The data is filled only if the validation was
+            successful.
+
         @return  The result of the verification.
             - DocPasswordVerifierResult_OK, if and only if the passed password
               is valid and can be used to process the related document.
@@ -72,7 +81,23 @@ public:
               occured while password verification. The password request loop
               will be aborted.
      */
-    virtual DocPasswordVerifierResult verifyPassword( const ::rtl::OUString& rPassword ) = 0;
+    virtual DocPasswordVerifierResult verifyPassword( const ::rtl::OUString& rPassword, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ) = 0;
+
+    /** Will be called everytime an encryption data needs to be verified.
+
+        @param rEncryptionData
+            The data will be validated
+
+        @return  The result of the verification.
+            - DocPasswordVerifierResult_OK, if and only if the passed encryption data
+              is valid and can be used to process the related document.
+            - DocPasswordVerifierResult_WRONG_PASSWORD, if the encryption data is
+              wrong.
+            - DocPasswordVerifierResult_ABORT, if an unrecoverable error
+              occured while data verification. The password request loop
+              will be aborted.
+     */
+    virtual DocPasswordVerifierResult verifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ) = 0;
 
 };
 
@@ -195,6 +220,35 @@ public:
 
     // ------------------------------------------------------------------------
 
+    /** This helper function generates a random sequence of bytes of
+        requested length.
+      */
+
+    static ::com::sun::star::uno::Sequence< sal_Int8 > GenerateRandomByteSequence(
+                sal_Int32 nLength );
+
+    // ------------------------------------------------------------------------
+
+    /** This helper function generates a byte sequence representing the
+        key digest value used by MSCodec_Std97 codec.
+      */
+
+    static ::com::sun::star::uno::Sequence< sal_Int8 > GenerateStd97Key(
+                const ::rtl::OUString& aPassword,
+                const ::com::sun::star::uno::Sequence< sal_Int8 >& aDocId );
+
+    // ------------------------------------------------------------------------
+
+    /** This helper function generates a byte sequence representing the
+        key digest value used by MSCodec_Std97 codec.
+      */
+
+    static ::com::sun::star::uno::Sequence< sal_Int8 > GenerateStd97Key(
+                const sal_uInt16 pPassData[16],
+                const ::com::sun::star::uno::Sequence< sal_Int8 >& aDocId );
+
+    // ------------------------------------------------------------------------
+
     /** This helper function tries to request and verify a password to load a
         protected document.
 
@@ -248,8 +302,9 @@ public:
             passed password verifier. If empty, no valid password has been
             found, or the user has chossen to cancel password input.
      */
-    static ::rtl::OUString requestAndVerifyDocPassword(
+    static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > requestAndVerifyDocPassword(
                             IDocPasswordVerifier& rVerifier,
+                            const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rMediaEncData,
                             const ::rtl::OUString& rMediaPassword,
                             const ::com::sun::star::uno::Reference<
                                 ::com::sun::star::task::XInteractionHandler >& rxInteractHandler,
@@ -300,7 +355,7 @@ public:
             passed password verifier. If empty, no valid password has been
             found, or the user has chossen to cancel password input.
      */
-    static ::rtl::OUString requestAndVerifyDocPassword(
+    static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > requestAndVerifyDocPassword(
                             IDocPasswordVerifier& rVerifier,
                             MediaDescriptor& rMediaDesc,
                             DocPasswordRequestType eRequestType,
diff --git a/comphelper/inc/comphelper/mediadescriptor.hxx b/comphelper/inc/comphelper/mediadescriptor.hxx
index 7d2333045390..01fa8059b284 100644
--- a/comphelper/inc/comphelper/mediadescriptor.hxx
+++ b/comphelper/inc/comphelper/mediadescriptor.hxx
@@ -78,6 +78,7 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap
         static const ::rtl::OUString& PROP_DEEPDETECTION();
         static const ::rtl::OUString& PROP_DETECTSERVICE();
         static const ::rtl::OUString& PROP_DOCUMENTSERVICE();
+        static const ::rtl::OUString& PROP_ENCRYPTIONDATA();
         static const ::rtl::OUString& PROP_EXTENSION();
         static const ::rtl::OUString& PROP_FILENAME();
         static const ::rtl::OUString& PROP_FILTERNAME();
diff --git a/comphelper/inc/comphelper/storagehelper.hxx b/comphelper/inc/comphelper/storagehelper.hxx
index b7e5704c4d68..9d44b42e9514 100644
--- a/comphelper/inc/comphelper/storagehelper.hxx
+++ b/comphelper/inc/comphelper/storagehelper.hxx
@@ -33,6 +33,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -43,6 +44,9 @@
 #define ZIP_STORAGE_FORMAT_STRING       ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ZipFormat" ) )
 #define OFOPXML_STORAGE_FORMAT_STRING   ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OFOPXMLFormat" ) )
 
+#define PACKAGE_ENCRYPTIONDATA_SHA1UTF8   ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PackageSHA1UTF8EncryptionKey" ) )
+#define PACKAGE_ENCRYPTIONDATA_SHA1MS1252 ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PackageSHA1MS1252EncryptionKey" ) )
+
 namespace comphelper {
 
 class COMPHELPER_DLLPUBLIC OStorageHelper
@@ -112,9 +116,9 @@ public:
                             = ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >() )
         throw ( ::com::sun::star::uno::Exception );
 
-    static void SetCommonStoragePassword(
+    static void SetCommonStorageEncryptionData(
             const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage,
-            const ::rtl::OUString& aPass )
+            const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aEncryptionData )
         throw ( ::com::sun::star::uno::Exception );
 
     // the following method supports only storages of OOo formats
@@ -159,6 +163,9 @@ public:
             sal_Bool bRepairStorage = sal_False )
         throw ( ::com::sun::star::uno::Exception );
 
+    static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >
+        CreatePackageEncryptionData( const ::rtl::OUString& aPassword );
+
     static sal_Bool IsValidZipEntryFileName( const ::rtl::OUString& aName, sal_Bool bSlashAllowed );
     static sal_Bool IsValidZipEntryFileName( const sal_Unicode *pChar, sal_Int32 nLength, sal_Bool bSlashAllowed );
 
diff --git a/comphelper/source/misc/docpasswordhelper.cxx b/comphelper/source/misc/docpasswordhelper.cxx
index 37941352ae28..697f221d9c80 100644
--- a/comphelper/source/misc/docpasswordhelper.cxx
+++ b/comphelper/source/misc/docpasswordhelper.cxx
@@ -84,16 +84,9 @@ uno::Sequence< beans::PropertyValue > DocPasswordHelper::GenerateNewModifyPasswo
 {
     uno::Sequence< beans::PropertyValue > aResult;
 
-    uno::Sequence< sal_Int8 > aSalt( 16 );
+    uno::Sequence< sal_Int8 > aSalt = GenerateRandomByteSequence( 16 );
     sal_Int32 nCount = 1024;
 
-    TimeValue aTime;
-    osl_getSystemTime( &aTime );
-    rtlRandomPool aRandomPool = rtl_random_createPool ();
-    rtl_random_addBytes ( aRandomPool, &aTime, 8 );
-
-    rtl_random_getBytes ( aRandomPool, aSalt.getArray(), 16 );
-
     uno::Sequence< sal_Int8 > aNewHash = GeneratePBKDF2Hash( aPassword, aSalt, nCount, 16 );
     if ( aNewHash.getLength() )
     {
@@ -108,9 +101,6 @@ uno::Sequence< beans::PropertyValue > DocPasswordHelper::GenerateNewModifyPasswo
         aResult[3].Value <<= aNewHash;
     }
 
-    // Clean up random pool memory
-    rtl_random_destroyPool ( aRandomPool );
-
     return aResult;
 }
 
@@ -282,9 +272,98 @@ Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence(
 }
 
 // ============================================================================
+/*static*/ uno::Sequence< sal_Int8 > DocPasswordHelper::GenerateRandomByteSequence( sal_Int32 nLength )
+{
+    uno::Sequence< sal_Int8 > aResult( nLength );
+
+    TimeValue aTime;
+    osl_getSystemTime( &aTime );
+    rtlRandomPool aRandomPool = rtl_random_createPool ();
+    rtl_random_addBytes ( aRandomPool, &aTime, 8 );
+    rtl_random_getBytes ( aRandomPool, aResult.getArray(), nLength );
+    rtl_random_destroyPool ( aRandomPool );
 
-/*static*/ OUString DocPasswordHelper::requestAndVerifyDocPassword(
+    return aResult;
+}
+
+
+// ============================================================================
+/*static*/ uno::Sequence< sal_Int8 > DocPasswordHelper::GenerateStd97Key( const ::rtl::OUString& aPassword, const uno::Sequence< sal_Int8 >& aDocId )
+{
+    uno::Sequence< sal_Int8 > aResultKey;
+    if ( aPassword.getLength() && aDocId.getLength() == 16 )
+    {
+        sal_uInt16 pPassData[16];
+        memset( pPassData, 0, sizeof(pPassData) );
+
+        sal_Int32 nPassLen = ::std::min< sal_Int32 >( aPassword.getLength(), 15 );
+        (void)memcpy( pPassData, aPassword.getStr(), nPassLen * sizeof(pPassData[0]) );
+
+        aResultKey = GenerateStd97Key( pPassData, aDocId );
+    }
+
+    return aResultKey;
+}
+
+// ============================================================================
+/*static*/ uno::Sequence< sal_Int8 > DocPasswordHelper::GenerateStd97Key( const sal_uInt16 pPassData[16], const uno::Sequence< sal_Int8 >& aDocId )
+{
+    uno::Sequence< sal_Int8 > aResultKey;
+    if ( pPassData[0] && aDocId.getLength() == 16 )
+    {
+        sal_uInt8 pKeyData[64];
+        (void)memset( pKeyData, 0, sizeof(pKeyData) );
+
+        sal_Int32 nInd = 0;
+
+        // Fill PassData into KeyData.
+        for ( nInd = 0; nInd < 16 && pPassData[nInd]; nInd++)
+        {
+            pKeyData[2*nInd] = sal::static_int_cast< sal_uInt8 >( (pPassData[nInd] >> 0) & 0xff );
+            pKeyData[2*nInd + 1] = sal::static_int_cast< sal_uInt8 >( (pPassData[nInd] >> 8) & 0xff );
+        }
+
+        pKeyData[2*nInd] = 0x80;
+        pKeyData[56] = sal::static_int_cast< sal_uInt8 >( nInd << 4 );
+
+        // Fill raw digest of KeyData into KeyData.
+        rtlDigest hDigest = rtl_digest_create ( rtl_Digest_AlgorithmMD5 );
+        (void)rtl_digest_updateMD5 (
+            hDigest, pKeyData, sizeof(pKeyData));
+        (void)rtl_digest_rawMD5 (
+            hDigest, pKeyData, RTL_DIGEST_LENGTH_MD5);
+
+        // Update digest with KeyData and Unique.
+        for ( nInd = 0; nInd < 16; nInd++ )
+        {
+            rtl_digest_updateMD5( hDigest, pKeyData, 5 );
+            rtl_digest_updateMD5( hDigest, (const sal_uInt8*)aDocId.getConstArray(), aDocId.getLength() );
+        }
+
+        // Update digest with padding.
+        pKeyData[16] = 0x80;
+        (void)memset (pKeyData + 17, 0, sizeof(pKeyData) - 17);
+        pKeyData[56] = 0x80;
+        pKeyData[57] = 0x0a;
+
+        rtl_digest_updateMD5( hDigest, &(pKeyData[16]), sizeof(pKeyData) - 16 );
+
+        // Fill raw digest of above updates
+        aResultKey.realloc( RTL_DIGEST_LENGTH_MD5 );
+        rtl_digest_rawMD5 ( hDigest, (sal_uInt8*)aResultKey.getArray(), aResultKey.getLength() );
+
+        // Erase KeyData array and leave.
+        (void)memset (pKeyData, 0, sizeof(pKeyData));
+    }
+
+    return aResultKey;
+}
+
+// ============================================================================
+
+/*static*/ ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > DocPasswordHelper::requestAndVerifyDocPassword(
         IDocPasswordVerifier& rVerifier,
+        const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rMediaEncData,
         const OUString& rMediaPassword,
         const Reference< XInteractionHandler >& rxInteractHandler,
         const OUString& rDocumentName,
@@ -292,7 +371,7 @@ Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence(
         const ::std::vector< OUString >* pDefaultPasswords,
         bool* pbIsDefaultPassword )
 {
-    OUString aPassword;
+    ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > aEncData;
     DocPasswordVerifierResult eResult = DocPasswordVerifierResult_WRONG_PASSWORD;
 
     // first, try provided default passwords
@@ -302,23 +381,32 @@ Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence(
     {
         for( ::std::vector< OUString >::const_iterator aIt = pDefaultPasswords->begin(), aEnd = pDefaultPasswords->end(); (eResult == DocPasswordVerifierResult_WRONG_PASSWORD) && (aIt != aEnd); ++aIt )
         {
-            aPassword = *aIt;
-            OSL_ENSURE( aPassword.getLength() > 0, "DocPasswordHelper::requestAndVerifyDocPassword - unexpected empty default password" );
-            if( aPassword.getLength() > 0 )
+            OSL_ENSURE( aIt->getLength() > 0, "DocPasswordHelper::requestAndVerifyDocPassword - unexpected empty default password" );
+            if( aIt->getLength() > 0 )
             {
-                eResult = rVerifier.verifyPassword( aPassword );
+                eResult = rVerifier.verifyPassword( *aIt, aEncData );
                 if( pbIsDefaultPassword )
                     *pbIsDefaultPassword = eResult == DocPasswordVerifierResult_OK;
             }
         }
     }
 
+    // try media encryption data (skip, if result is OK or ABORT)
+    if( eResult == DocPasswordVerifierResult_WRONG_PASSWORD )
+    {
+        if( rMediaEncData.getLength() > 0 )
+        {
+            eResult = rVerifier.verifyEncryptionData( rMediaEncData );
+            if( eResult == DocPasswordVerifierResult_OK )
+                aEncData = rMediaEncData;
+        }
+    }
+
     // try media password (skip, if result is OK or ABORT)
     if( eResult == DocPasswordVerifierResult_WRONG_PASSWORD )
     {
-        aPassword = rMediaPassword;
-        if( aPassword.getLength() > 0 )
-            eResult = rVerifier.verifyPassword( aPassword );
+        if( rMediaPassword.getLength() > 0 )
+            eResult = rVerifier.verifyPassword( rMediaPassword, aEncData );
     }
 
     // request a password (skip, if result is OK or ABORT)
@@ -332,9 +420,8 @@ Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence(
             rxInteractHandler->handle( xRequest );
             if( pRequest->isPassword() )
             {
-                aPassword = pRequest->getPassword();
-                if( aPassword.getLength() > 0 )
-                    eResult = rVerifier.verifyPassword( aPassword );
+                if( pRequest->getPassword().getLength() > 0 )
+                    eResult = rVerifier.verifyPassword( pRequest->getPassword(), aEncData );
             }
             else
             {
@@ -347,15 +434,17 @@ Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence(
     {
     }
 
-    return (eResult == DocPasswordVerifierResult_OK) ? aPassword : OUString();
+    return (eResult == DocPasswordVerifierResult_OK) ? aEncData : uno::Sequence< beans::NamedValue >();
 }
 
-/*static*/ OUString DocPasswordHelper::requestAndVerifyDocPassword(
+/*static*/ ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > DocPasswordHelper::requestAndVerifyDocPassword(
         IDocPasswordVerifier& rVerifier,
         MediaDescriptor& rMediaDesc,
         DocPasswordRequestType eRequestType,
         const ::std::vector< OUString >* pDefaultPasswords )
 {
+    uno::Sequence< beans::NamedValue > aMediaEncData = rMediaDesc.getUnpackedValueOrDefault(
+        MediaDescriptor::PROP_ENCRYPTIONDATA(), uno::Sequence< beans::NamedValue >() );
     OUString aMediaPassword = rMediaDesc.getUnpackedValueOrDefault(
         MediaDescriptor::PROP_PASSWORD(), OUString() );
     Reference< XInteractionHandler > xInteractHandler = rMediaDesc.getUnpackedValueOrDefault(
@@ -364,14 +453,17 @@ Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence(
         MediaDescriptor::PROP_URL(), OUString() );
 
     bool bIsDefaultPassword = false;
-    OUString aPassword = requestAndVerifyDocPassword(
-        rVerifier, aMediaPassword, xInteractHandler, aDocumentName, eRequestType, pDefaultPasswords, &bIsDefaultPassword );
+    uno::Sequence< beans::NamedValue > aEncryptionData = requestAndVerifyDocPassword(
+        rVerifier, aMediaEncData, aMediaPassword, xInteractHandler, aDocumentName, eRequestType, pDefaultPasswords, &bIsDefaultPassword );
+
+    rMediaDesc.erase( MediaDescriptor::PROP_PASSWORD() );
+    rMediaDesc.erase( MediaDescriptor::PROP_ENCRYPTIONDATA() );
 
     // insert valid password into media descriptor (but not a default password)
-    if( (aPassword.getLength() > 0) && !bIsDefaultPassword )
-        rMediaDesc[ MediaDescriptor::PROP_PASSWORD() ] <<= aPassword;
+    if( (aEncryptionData.getLength() > 0) && !bIsDefaultPassword )
+        rMediaDesc[ MediaDescriptor::PROP_ENCRYPTIONDATA() ] <<= aEncryptionData;
 
-    return aPassword;
+    return aEncryptionData;
 }
 
 // ============================================================================
diff --git a/comphelper/source/misc/mediadescriptor.cxx b/comphelper/source/misc/mediadescriptor.cxx
index 9e02afe8c56c..143f8ba4dfa2 100644
--- a/comphelper/source/misc/mediadescriptor.cxx
+++ b/comphelper/source/misc/mediadescriptor.cxx
@@ -112,6 +112,12 @@ const ::rtl::OUString& MediaDescriptor::PROP_DOCUMENTSERVICE()
     return sProp;
 }
 
+const ::rtl::OUString& MediaDescriptor::PROP_ENCRYPTIONDATA()
+{
+    static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("EncryptionData"));
+    return sProp;
+}
+
 const ::rtl::OUString& MediaDescriptor::PROP_EXTENSION()
 {
     static const ::rtl::OUString sProp(RTL_CONSTASCII_USTRINGPARAM("Extension"));
diff --git a/comphelper/source/misc/storagehelper.cxx b/comphelper/source/misc/storagehelper.cxx
index db5ba71cd876..60ffa965fcf1 100644
--- a/comphelper/source/misc/storagehelper.cxx
+++ b/comphelper/source/misc/storagehelper.cxx
@@ -28,12 +28,15 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_comphelper.hxx"
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
+#include 
 #include 
 
+#include 
+
 #include 
 
 #include 
@@ -236,16 +239,16 @@ uno::Reference< io::XInputStream > OStorageHelper::GetInputStreamFromURL(
 }
 
 // ----------------------------------------------------------------------
-void OStorageHelper::SetCommonStoragePassword(
+void OStorageHelper::SetCommonStorageEncryptionData(
             const uno::Reference< embed::XStorage >& xStorage,
-            const ::rtl::OUString& aPass )
+            const uno::Sequence< beans::NamedValue >& aEncryptionData )
     throw ( uno::Exception )
 {
-    uno::Reference< embed::XEncryptionProtectedSource > xEncrSet( xStorage, uno::UNO_QUERY );
+    uno::Reference< embed::XEncryptionProtectedSource2 > xEncrSet( xStorage, uno::UNO_QUERY );
     if ( !xEncrSet.is() )
         throw io::IOException(); // TODO
 
-    xEncrSet->setEncryptionPassword( aPass );
+    xEncrSet->setEncryptionData( aEncryptionData );
 }
 
 // ----------------------------------------------------------------------
@@ -418,6 +421,45 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageOfFormatFromStream(
     return xTempStorage;
 }
 
+// ----------------------------------------------------------------------
+uno::Sequence< beans::NamedValue > OStorageHelper::CreatePackageEncryptionData( const ::rtl::OUString& aPassword )
+{
+    // TODO/LATER: Should not the method be part of DocPasswordHelper?
+    uno::Sequence< beans::NamedValue > aEncryptionData;
+    if ( aPassword.getLength() )
+    {
+        // MS_1252 encoding was used for SO60 document format password encoding,
+        // this encoding supports only a minor subset of nonascii characters,
+        // but for compatibility reasons it has to be used for old document formats
+        aEncryptionData.realloc( 2 );
+        aEncryptionData[0].Name = PACKAGE_ENCRYPTIONDATA_SHA1UTF8;
+        aEncryptionData[1].Name = PACKAGE_ENCRYPTIONDATA_SHA1MS1252;
+
+        rtl_TextEncoding pEncoding[2] = { RTL_TEXTENCODING_UTF8, RTL_TEXTENCODING_MS_1252 };
+
+        for ( sal_Int32 nInd = 0; nInd < 2; nInd++ )
+        {
+            ::rtl::OString aByteStrPass = ::rtl::OUStringToOString( aPassword, pEncoding[nInd] );
+
+            sal_uInt8 pBuffer[RTL_DIGEST_LENGTH_SHA1];
+            rtlDigestError nError = rtl_digest_SHA1( aByteStrPass.getStr(),
+                                                    aByteStrPass.getLength(),
+                                                    pBuffer,
+                                                    RTL_DIGEST_LENGTH_SHA1 );
+
+            if ( nError != rtl_Digest_E_None )
+            {
+                aEncryptionData.realloc( 0 );
+                break;
+            }
+
+            aEncryptionData[nInd].Value <<= uno::Sequence< sal_Int8 >( (sal_Int8*)pBuffer, RTL_DIGEST_LENGTH_SHA1 );
+        }
+    }
+
+    return aEncryptionData;
+}
+
 // ----------------------------------------------------------------------
 sal_Bool OStorageHelper::IsValidZipEntryFileName( const ::rtl::OUString& aName, sal_Bool bSlashAllowed )
 {
-- 
cgit 


From 245e3ab75fd3aa3dd557dab37e9691f33bd023b1 Mon Sep 17 00:00:00 2001
From: Bjoern Michaelsen 
Date: Sat, 6 Nov 2010 15:58:44 +0100
Subject: gnumake2: added component registration

---
 svl/Library_fsstorage.mk               | 2 ++
 svl/Library_passwordcontainer.mk       | 2 ++
 svl/Library_svl.mk                     | 2 ++
 svtools/Library_hatchwindowfactory.mk  | 2 ++
 svtools/Library_productregistration.mk | 2 ++
 svtools/Library_svt.mk                 | 2 ++
 toolkit/Library_tk.mk                  | 2 ++
 7 files changed, 14 insertions(+)

diff --git a/svl/Library_fsstorage.mk b/svl/Library_fsstorage.mk
index 6db23b4ae547..379ea9697c0a 100644
--- a/svl/Library_fsstorage.mk
+++ b/svl/Library_fsstorage.mk
@@ -27,6 +27,8 @@
 
 $(eval $(call gb_Library_Library,fsstorage))
 
+$(eval $(call gb_Library_set_componentfile,fsstorage,svl/source/fsstor/fsstorage))
+
 $(eval $(call gb_Library_set_include,fsstorage,\
     $$(SOLARINC) \
     -I$(WORKDIR)/inc/svl \
diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk
index 4285efa53a0b..fc602ef048ad 100644
--- a/svl/Library_passwordcontainer.mk
+++ b/svl/Library_passwordcontainer.mk
@@ -27,6 +27,8 @@
 
 $(eval $(call gb_Library_Library,passwordcontainer))
 
+$(eval $(call gb_Library_set_componentfile,passwordcontainer,svl/source/passwordcontainer/passwordcontainer))
+
 $(eval $(call gb_Library_set_include,passwordcontainer,\
     $$(SOLARINC) \
     -I$(WORKDIR)/inc/svl \
diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk
index e872c1cfec5b..eb839abf4f94 100644
--- a/svl/Library_svl.mk
+++ b/svl/Library_svl.mk
@@ -31,6 +31,8 @@ $(eval $(call gb_Library_add_package_headers,svl,svl_inc))
 
 $(eval $(call gb_Library_add_precompiled_header,svl,$(SRCDIR)/svl/inc/pch/precompiled_svl))
 
+$(eval $(call gb_Library_set_componentfile,svl,svl/util/svl))
+
 $(eval $(call gb_Library_set_include,svl,\
     $$(SOLARINC) \
     -I$(WORKDIR)/inc/svl \
diff --git a/svtools/Library_hatchwindowfactory.mk b/svtools/Library_hatchwindowfactory.mk
index 448517271e19..67f6f8d95ba8 100644
--- a/svtools/Library_hatchwindowfactory.mk
+++ b/svtools/Library_hatchwindowfactory.mk
@@ -27,6 +27,8 @@
 
 $(eval $(call gb_Library_Library,hatchwindowfactory))
 
+$(eval $(call gb_Library_set_componentfile,hatchwindowfactory,svtools/source/hatchwindow/hatchwindowfactory))
+
 $(eval $(call gb_Library_set_include,hatchwindowfactory,\
     $$(INCLUDE) \
     -I$(WORKDIR)/inc/svtools \
diff --git a/svtools/Library_productregistration.mk b/svtools/Library_productregistration.mk
index 7dc480c8ea5a..670e06c5f1bd 100644
--- a/svtools/Library_productregistration.mk
+++ b/svtools/Library_productregistration.mk
@@ -27,6 +27,8 @@
 
 $(eval $(call gb_Library_Library,productregistration))
 
+$(eval $(call gb_Library_set_componentfile,productregistration,svtools/source/productregistration/productregistration.uno))
+
 $(eval $(call gb_Library_set_include,productregistration,\
     $$(SOLARINC) \
     -I$(WORKDIR)/inc/svtools \
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index 8fb07c2d8f49..816c4ad4466c 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -31,6 +31,8 @@ $(eval $(call gb_Library_add_package_headers,svt,svtools_inc))
 
 $(eval $(call gb_Library_add_precompiled_header,svt,$(SRCDIR)/svtools/inc/pch/precompiled_svtools))
 
+$(eval $(call gb_Library_set_componentfile,svt,svtools/util/svt))
+
 $(eval $(call gb_Library_set_include,svt,\
     $$(INCLUDE) \
     -I$(WORKDIR)/inc/svtools \
diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk
index 7fe38ac64dc7..eadd87b77322 100644
--- a/toolkit/Library_tk.mk
+++ b/toolkit/Library_tk.mk
@@ -27,6 +27,8 @@
 
 $(eval $(call gb_Library_Library,tk))
 
+$(eval $(call gb_Library_set_componentfile,tk,toolkit/util/tk))
+
 $(eval $(call gb_Library_add_package_headers,tk,toolkit_inc))
 
 #$(eval $(call gb_Library_add_precompiled_header,tk,$(SRCDIR)/toolkit/inc/pch/precompiled_toolkit))
-- 
cgit 


From 05b9f3f8c98a9d31527a837bae44a908a4f6b2c5 Mon Sep 17 00:00:00 2001
From: Oliver-Rainer Wittmann 
Date: Wed, 10 Nov 2010 14:04:55 +0100
Subject: sw33bf12: #i115437# method  - correct
 initialisation of LineColor Pen for fat or dashed lines - patch provided by
 AW

---
 vcl/source/gdi/outdev.cxx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx
index a011e4ee4a92..847a8d7a299a 100644
--- a/vcl/source/gdi/outdev.cxx
+++ b/vcl/source/gdi/outdev.cxx
@@ -2495,6 +2495,9 @@ void OutputDevice::DrawLine( const Point& rStartPt, const Point& rEndPt,
     const bool bDashUsed(LINE_DASH == aInfo.GetStyle());
     const bool bLineWidthUsed(aInfo.GetWidth() > 1);
 
+    if ( mbInitLineColor )
+        ImplInitLineColor();
+
     if(bDashUsed || bLineWidthUsed)
     {
         basegfx::B2DPolygon aLinePolygon;
@@ -2505,9 +2508,6 @@ void OutputDevice::DrawLine( const Point& rStartPt, const Point& rEndPt,
     }
     else
     {
-        if ( mbInitLineColor )
-            ImplInitLineColor();
-
         mpGraphics->DrawLine( aStartPt.X(), aStartPt.Y(), aEndPt.X(), aEndPt.Y(), this );
     }
 
-- 
cgit 


From 43f3c543a5421b6e8db127818088433ac34a87bc Mon Sep 17 00:00:00 2001
From: Bjoern Michaelsen 
Date: Wed, 10 Nov 2010 15:26:03 +0100
Subject: gnumake2: first try at local build dirs

---
 svl/Makefile            | 1 +
 svl/prj/makefile.mk     | 2 +-
 svtools/Makefile        | 1 +
 svtools/prj/makefile.mk | 2 +-
 toolkit/Makefile        | 1 +
 toolkit/prj/makefile.mk | 2 +-
 tools/Makefile          | 1 +
 tools/prj/makefile.mk   | 2 +-
 8 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/svl/Makefile b/svl/Makefile
index c19100ee9a5b..45de5eecabc0 100644
--- a/svl/Makefile
+++ b/svl/Makefile
@@ -29,6 +29,7 @@ ifeq ($(strip $(SOLARENV)),)
 $(error No environment set!)
 endif
 
+gb_PARTITIALBUILD := T
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../SourcePath.mk
 GBUILDDIR := $(SOLARENV)/gbuild
 include $(GBUILDDIR)/gbuild.mk
diff --git a/svl/prj/makefile.mk b/svl/prj/makefile.mk
index 3b1b54d4357f..3d495209d74a 100644
--- a/svl/prj/makefile.mk
+++ b/svl/prj/makefile.mk
@@ -37,4 +37,4 @@ VERBOSEFLAG := -s
 .ENDIF
 
 all:
-    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS)
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) install
diff --git a/svtools/Makefile b/svtools/Makefile
index c19100ee9a5b..45de5eecabc0 100644
--- a/svtools/Makefile
+++ b/svtools/Makefile
@@ -29,6 +29,7 @@ ifeq ($(strip $(SOLARENV)),)
 $(error No environment set!)
 endif
 
+gb_PARTITIALBUILD := T
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../SourcePath.mk
 GBUILDDIR := $(SOLARENV)/gbuild
 include $(GBUILDDIR)/gbuild.mk
diff --git a/svtools/prj/makefile.mk b/svtools/prj/makefile.mk
index 3b1b54d4357f..3d495209d74a 100644
--- a/svtools/prj/makefile.mk
+++ b/svtools/prj/makefile.mk
@@ -37,4 +37,4 @@ VERBOSEFLAG := -s
 .ENDIF
 
 all:
-    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS)
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) install
diff --git a/toolkit/Makefile b/toolkit/Makefile
index c19100ee9a5b..45de5eecabc0 100644
--- a/toolkit/Makefile
+++ b/toolkit/Makefile
@@ -29,6 +29,7 @@ ifeq ($(strip $(SOLARENV)),)
 $(error No environment set!)
 endif
 
+gb_PARTITIALBUILD := T
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../SourcePath.mk
 GBUILDDIR := $(SOLARENV)/gbuild
 include $(GBUILDDIR)/gbuild.mk
diff --git a/toolkit/prj/makefile.mk b/toolkit/prj/makefile.mk
index 3b1b54d4357f..3d495209d74a 100644
--- a/toolkit/prj/makefile.mk
+++ b/toolkit/prj/makefile.mk
@@ -37,4 +37,4 @@ VERBOSEFLAG := -s
 .ENDIF
 
 all:
-    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS)
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) install
diff --git a/tools/Makefile b/tools/Makefile
index c19100ee9a5b..45de5eecabc0 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -29,6 +29,7 @@ ifeq ($(strip $(SOLARENV)),)
 $(error No environment set!)
 endif
 
+gb_PARTITIALBUILD := T
 include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../SourcePath.mk
 GBUILDDIR := $(SOLARENV)/gbuild
 include $(GBUILDDIR)/gbuild.mk
diff --git a/tools/prj/makefile.mk b/tools/prj/makefile.mk
index 3b1b54d4357f..3d495209d74a 100644
--- a/tools/prj/makefile.mk
+++ b/tools/prj/makefile.mk
@@ -37,4 +37,4 @@ VERBOSEFLAG := -s
 .ENDIF
 
 all:
-    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS)
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) install
-- 
cgit 


From 7db4aad0c12b0a5646d0c5d3be6ebaed942a1bb9 Mon Sep 17 00:00:00 2001
From: Bjoern Michaelsen 
Date: Thu, 11 Nov 2010 00:37:05 +0100
Subject: gnumake2: fixing module makefile

---
 tools/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/Makefile b/tools/Makefile
index 45de5eecabc0..b7391a8db240 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -30,10 +30,9 @@ $(error No environment set!)
 endif
 
 gb_PARTITIALBUILD := T
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../SourcePath.mk
 GBUILDDIR := $(SOLARENV)/gbuild
 include $(GBUILDDIR)/gbuild.mk
 
-$(eval $(call gb_Module_make_global_targets,$(foreach module,$(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))),$(CURRENTREPO)/$(module)/Module_$(module).mk)))
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
 
 # vim: set noet sw=4 ts=4:
-- 
cgit 


From 89bcc72a5baba299b311deb2fb58ce06998662bf Mon Sep 17 00:00:00 2001
From: "Philipp Lohmann [pl]" 
Date: Thu, 11 Nov 2010 13:57:44 +0100
Subject: calc63: #i115504# cleanup image tree to prevent static destructor
 troubles

---
 vcl/aqua/source/app/vclnsapp.mm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/vcl/aqua/source/app/vclnsapp.mm b/vcl/aqua/source/app/vclnsapp.mm
index f33599fa086e..4264f8802126 100755
--- a/vcl/aqua/source/app/vclnsapp.mm
+++ b/vcl/aqua/source/app/vclnsapp.mm
@@ -39,6 +39,8 @@
 #include "vcl/cmdevt.hxx"
 #include "rtl/ustrbuf.hxx"
 
+#include "vcl/impimagetree.hxx"
+
 #include "premac.h"
 #import "Carbon/Carbon.h"
 #import "apple_remote/RemoteControl.h"
@@ -416,6 +418,7 @@
     #else // the clean version follows
     return pSalData->maFrames.front()->CallCallback( SALEVENT_SHUTDOWN, NULL ) ? NSTerminateCancel : NSTerminateNow;
     #endif
+    ImplImageTreeSingletonRef()->shutDown();
     return NSTerminateNow;
 }
 
-- 
cgit 


From 0fb5c9ef69c9913f2a610437f7244da1a2f36cbc Mon Sep 17 00:00:00 2001
From: Bjoern Michaelsen 
Date: Thu, 11 Nov 2010 15:46:29 +0100
Subject: gnumake2: fix naming for partial build vars

---
 svl/Makefile     | 2 +-
 svtools/Makefile | 2 +-
 toolkit/Makefile | 2 +-
 tools/Makefile   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/svl/Makefile b/svl/Makefile
index b7391a8db240..5002d3f122a1 100644
--- a/svl/Makefile
+++ b/svl/Makefile
@@ -29,7 +29,7 @@ ifeq ($(strip $(SOLARENV)),)
 $(error No environment set!)
 endif
 
-gb_PARTITIALBUILD := T
+gb_PARTIALBUILD := T
 GBUILDDIR := $(SOLARENV)/gbuild
 include $(GBUILDDIR)/gbuild.mk
 
diff --git a/svtools/Makefile b/svtools/Makefile
index b7391a8db240..5002d3f122a1 100644
--- a/svtools/Makefile
+++ b/svtools/Makefile
@@ -29,7 +29,7 @@ ifeq ($(strip $(SOLARENV)),)
 $(error No environment set!)
 endif
 
-gb_PARTITIALBUILD := T
+gb_PARTIALBUILD := T
 GBUILDDIR := $(SOLARENV)/gbuild
 include $(GBUILDDIR)/gbuild.mk
 
diff --git a/toolkit/Makefile b/toolkit/Makefile
index b7391a8db240..5002d3f122a1 100644
--- a/toolkit/Makefile
+++ b/toolkit/Makefile
@@ -29,7 +29,7 @@ ifeq ($(strip $(SOLARENV)),)
 $(error No environment set!)
 endif
 
-gb_PARTITIALBUILD := T
+gb_PARTIALBUILD := T
 GBUILDDIR := $(SOLARENV)/gbuild
 include $(GBUILDDIR)/gbuild.mk
 
diff --git a/tools/Makefile b/tools/Makefile
index b7391a8db240..5002d3f122a1 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -29,7 +29,7 @@ ifeq ($(strip $(SOLARENV)),)
 $(error No environment set!)
 endif
 
-gb_PARTITIALBUILD := T
+gb_PARTIALBUILD := T
 GBUILDDIR := $(SOLARENV)/gbuild
 include $(GBUILDDIR)/gbuild.mk
 
-- 
cgit 


From 831bb211b6d19b21848908114ced092fec5bd343 Mon Sep 17 00:00:00 2001
From: "Philipp Lohmann [pl]" 
Date: Fri, 12 Nov 2010 16:14:48 +0100
Subject: pl08: #i115553# fix a PDF/A and transparencies again

---
 vcl/source/gdi/print2.cxx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx
index 25ba80003fd7..5c2a742a10ba 100644
--- a/vcl/source/gdi/print2.cxx
+++ b/vcl/source/gdi/print2.cxx
@@ -407,6 +407,7 @@ static Rectangle ImplCalcActionBounds( const MetaAction& rAct, const OutputDevic
         {
             const MetaLineAction& rMetaLineAction = static_cast(rAct);
             aActionBounds = Rectangle( rMetaLineAction.GetStartPoint(),  rMetaLineAction.GetEndPoint() );
+            aActionBounds.Justify();
             const long nLineWidth(rMetaLineAction.GetLineInfo().GetWidth());
             if(nLineWidth)
             {
-- 
cgit 


From 5b1c7dddef338c0240530eb383b195a6cde996db Mon Sep 17 00:00:00 2001
From: Bjoern Michaelsen 
Date: Sat, 13 Nov 2010 00:06:22 +0100
Subject: gnumake2: #i115558# svl needs to depend on libxslt for xsltproc

---
 svl/prj/build.lst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/svl/prj/build.lst b/svl/prj/build.lst
index 10b9cfe432f2..17a26dd2a6c7 100644
--- a/svl/prj/build.lst
+++ b/svl/prj/build.lst
@@ -1,4 +1,4 @@
-sl	svl	:	l10n rsc offuh ucbhelper unotools cppu cppuhelper comphelper sal sot NULL
+sl	svl	:	l10n rsc offuh ucbhelper unotools cppu cppuhelper comphelper sal sot libxslt NULL
 sl	svl								usr1	-	all	svl_mkout NULL
 sl	svl\prj	nmake	-	all	svl_prj NULL
 
-- 
cgit 


From 11f43434c412bd3b507f1cdb1da192891e1288df Mon Sep 17 00:00:00 2001
From: Bjoern Michaelsen 
Date: Mon, 15 Nov 2010 13:19:43 +0100
Subject: gnumake2: fixes for solaris

---
 svtools/Executable_g2g.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/svtools/Executable_g2g.mk b/svtools/Executable_g2g.mk
index 4bba4dc2644f..b1cf99546513 100644
--- a/svtools/Executable_g2g.mk
+++ b/svtools/Executable_g2g.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_Executable_set_include,g2g,\
 ))
 
 $(eval $(call gb_Executable_add_linked_libs,g2g,\
+    jvmfwk \
     stl \
     vcl \
     tl \
-- 
cgit 


From 61c3e02187368b2dfcc91fa9a443f4fc2270300a Mon Sep 17 00:00:00 2001
From: Bjoern Michaelsen 
Date: Wed, 17 Nov 2010 14:33:18 +0100
Subject: gnumake2: updated license headers

---
 svl/Makefile     | 2 +-
 svtools/Makefile | 2 +-
 toolkit/Makefile | 2 +-
 tools/Makefile   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/svl/Makefile b/svl/Makefile
index 5002d3f122a1..a79aff831024 100644
--- a/svl/Makefile
+++ b/svl/Makefile
@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2009 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
diff --git a/svtools/Makefile b/svtools/Makefile
index 5002d3f122a1..a79aff831024 100644
--- a/svtools/Makefile
+++ b/svtools/Makefile
@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2009 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
diff --git a/toolkit/Makefile b/toolkit/Makefile
index 5002d3f122a1..a79aff831024 100644
--- a/toolkit/Makefile
+++ b/toolkit/Makefile
@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2009 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
diff --git a/tools/Makefile b/tools/Makefile
index 5002d3f122a1..a79aff831024 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2009 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-- 
cgit 


From caaac3582b0c20195ca80d989105dc11a4908425 Mon Sep 17 00:00:00 2001
From: Bjoern Michaelsen 
Date: Wed, 17 Nov 2010 14:43:40 +0100
Subject: gnumake2: updated license headers

---
 tools/Module_tools.mk | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/tools/Module_tools.mk b/tools/Module_tools.mk
index bba1d8240cdf..9e233408b317 100644
--- a/tools/Module_tools.mk
+++ b/tools/Module_tools.mk
@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2009 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -14,17 +14,18 @@
 #
 # OpenOffice.org is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Lesser General Public License version 3 for more details
 # (a copy is included in the LICENSE file that accompanied this code).
 #
 # You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.	If not, see
+# version 3 along with OpenOffice.org.  If not, see
 # 
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
 
+
 $(eval $(call gb_Module_Module,tools))
 
 $(eval $(call gb_Module_add_targets,tools,\
@@ -37,17 +38,4 @@ $(eval $(call gb_Module_add_targets,tools,\
     StaticLibrary_ooopathutils \
 ))
 
-# TODO:
-#COPY tools/unxlngx6.pro/lib/atools.lib unxlngx6.pro/lib/atools.lib
-#COPY tools/unxlngx6.pro/lib/bootstrp2.lib unxlngx6.pro/lib/bootstrp2.lib
-#COPY tools/unxlngx6.pro/lib/btstrp.lib unxlngx6.pro/lib/btstrp.lib
-#COPY tools/unxlngx6.pro/lib/libatools.a unxlngx6.pro/lib/libatools.a
-#COPY tools/unxlngx6.pro/lib/libbootstrp2.a unxlngx6.pro/lib/libbootstrp2.a
-#COPY tools/unxlngx6.pro/lib/libbtstrp.a unxlngx6.pro/lib/libbtstrp.a
-#COPY tools/unxlngx6.pro/lib/libstdstrm.a unxlngx6.pro/lib/libstdstrm.a
-#COPY tools/unxlngx6.pro/lib/stdstrm.lib unxlngx6.pro/lib/stdstrm.lib
-
-#todo: link tools dynamically everywhere
-#todo: ALWAYSDBGFLAG etc.
-
 # vim: set noet sw=4 ts=4:
-- 
cgit 


From bcb92b923a2bc7656c5fb0d9f261385c0cf94907 Mon Sep 17 00:00:00 2001
From: Bjoern Michaelsen 
Date: Wed, 17 Nov 2010 14:55:19 +0100
Subject: gnumake2: updated license headers

---
 tools/Executable_mkunroll.mk        | 2 +-
 tools/Executable_rscdep.mk          | 2 +-
 tools/Executable_so_checksum.mk     | 2 +-
 tools/Executable_sspretty.mk        | 2 +-
 tools/Library_tl.mk                 | 2 +-
 tools/Package_inc.mk                | 2 +-
 tools/StaticLibrary_ooopathutils.mk | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tools/Executable_mkunroll.mk b/tools/Executable_mkunroll.mk
index 4ee724d8ffc0..e08a83bb651c 100644
--- a/tools/Executable_mkunroll.mk
+++ b/tools/Executable_mkunroll.mk
@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2009 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
diff --git a/tools/Executable_rscdep.mk b/tools/Executable_rscdep.mk
index 3f3a283da65b..244e5fdc9bd7 100644
--- a/tools/Executable_rscdep.mk
+++ b/tools/Executable_rscdep.mk
@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2009 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
diff --git a/tools/Executable_so_checksum.mk b/tools/Executable_so_checksum.mk
index d852c22ef5de..4498f3e29abc 100644
--- a/tools/Executable_so_checksum.mk
+++ b/tools/Executable_so_checksum.mk
@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2009 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
diff --git a/tools/Executable_sspretty.mk b/tools/Executable_sspretty.mk
index 5b8c83977dcd..5f5ab4e98f4f 100644
--- a/tools/Executable_sspretty.mk
+++ b/tools/Executable_sspretty.mk
@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2009 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index 48abccd4bf85..0e327527bef0 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2009 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
diff --git a/tools/Package_inc.mk b/tools/Package_inc.mk
index 27088fd06a48..bd1b72d9908a 100644
--- a/tools/Package_inc.mk
+++ b/tools/Package_inc.mk
@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2009 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
diff --git a/tools/StaticLibrary_ooopathutils.mk b/tools/StaticLibrary_ooopathutils.mk
index 914b478345d7..5eac00c4193c 100755
--- a/tools/StaticLibrary_ooopathutils.mk
+++ b/tools/StaticLibrary_ooopathutils.mk
@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2009 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-- 
cgit 


From 7a2d252ecfb4503de90388f938145e96aa41e3f5 Mon Sep 17 00:00:00 2001
From: Mikhail Voytenko 
Date: Thu, 18 Nov 2010 15:48:20 +0100
Subject: fwk160: #i107511# do not lock the file without necessity

---
 unotools/source/ucbhelper/tempfile.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/unotools/source/ucbhelper/tempfile.cxx b/unotools/source/ucbhelper/tempfile.cxx
index 87fddc0c65cd..26742151ee3d 100644
--- a/unotools/source/ucbhelper/tempfile.cxx
+++ b/unotools/source/ucbhelper/tempfile.cxx
@@ -237,7 +237,7 @@ void CreateTempName_Impl( String& rName, sal_Bool bKeep, sal_Bool bDir = sal_Tru
 /* RW permission for the user only! */
  mode_t old_mode = umask(077);
 #endif
-            FileBase::RC err = aFile.open(osl_File_OpenFlag_Create);
+            FileBase::RC err = aFile.open( osl_File_OpenFlag_Create | osl_File_OpenFlag_NoLock );
 #ifdef UNX
 umask(old_mode);
 #endif
-- 
cgit 


From 0a33b085ad71bbd5df1b89f6fd852c601bf79f26 Mon Sep 17 00:00:00 2001
From: Hans-Joachim Lankenau 
Date: Fri, 19 Nov 2010 11:47:42 +0100
Subject: gnumake2: clean up d.lst of switched modules; fix svl/Package_inc.mk

---
 svl/Package_inc.mk |  1 +
 svl/prj/d.lst      | 25 ---------------------
 svtools/prj/d.lst  | 43 -----------------------------------
 toolkit/prj/d.lst  | 66 ------------------------------------------------------
 tools/prj/d.lst    | 20 -----------------
 5 files changed, 1 insertion(+), 154 deletions(-)

diff --git a/svl/Package_inc.mk b/svl/Package_inc.mk
index e2f8473d46aa..0944d0a491d6 100644
--- a/svl/Package_inc.mk
+++ b/svl/Package_inc.mk
@@ -111,6 +111,7 @@ $(eval $(call gb_Package_add_file,svl_inc,inc/svl/numuno.hxx,svl/numuno.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/outstrm.hxx,svl/outstrm.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/pickerhistory.hxx,svl/pickerhistory.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/pickerhistoryaccess.hxx,svl/pickerhistoryaccess.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/pickerhelper.hxx,svl/pickerhelper.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/poolcach.hxx,svl/poolcach.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/strmadpt.hxx,svl/strmadpt.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/stylepool.hxx,svl/stylepool.hxx))
diff --git a/svl/prj/d.lst b/svl/prj/d.lst
index d79346c16087..e69de29bb2d1 100644
--- a/svl/prj/d.lst
+++ b/svl/prj/d.lst
@@ -1,25 +0,0 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-mkdir: %COMMON_DEST%\res%_EXT%
-mkdir: %_DEST%\inc%_EXT%\svl
-
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%__SRC%\lib\isvl.lib %_DEST%\lib%_EXT%\isvl.lib
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*
-..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*
-..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\*
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*
-
-..\inc\svl\*.hrc %_DEST%\inc%_EXT%\svl\*.hrc
-..\inc\svl\*.hxx %_DEST%\inc%_EXT%\svl\*.hxx
-..\inc\svl\*.h %_DEST%\inc%_EXT%\svl\*.h
-..\inc\*.hrc %_DEST%\inc%_EXT%\svl\*.hrc
-..\inc\*.hxx %_DEST%\inc%_EXT%\svl\*.hxx
-..\inc\*.h %_DEST%\inc%_EXT%\svl\*.h
-
-dos: sh -c "if test %OS% = MACOSX; then macosx-create-bundle %_DEST%\bin%_EXT%\bmp=%__PRJROOT%\%__SRC%\bin%_EXT%; fi"
-
-*.xml %_DEST%\xml%_EXT%\*.xml
-
-..\%__SRC%\misc\fsstorage.component %_DEST%\xml%_EXT%\fsstorage.component
-..\%__SRC%\misc\passwordcontainer.component %_DEST%\xml%_EXT%\passwordcontainer.component
-..\%__SRC%\misc\svl.component %_DEST%\xml%_EXT%\svl.component
diff --git a/svtools/prj/d.lst b/svtools/prj/d.lst
index 7b9c6a1957e3..e69de29bb2d1 100644
--- a/svtools/prj/d.lst
+++ b/svtools/prj/d.lst
@@ -1,43 +0,0 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-mkdir: %COMMON_DEST%\res%_EXT%
-mkdir: %_DEST%\inc%_EXT%\svtools
-mkdir: %_DEST%\inc%_EXT%\svtools\toolpanel
-mkdir: %_DEST%\inc%_EXT%\svtools\table
-
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%__SRC%\srs\ehdl.srs %_DEST%\res%_EXT%\svtools.srs
-..\%COMMON_OUTDIR%\srs\ehdl_srs.hid %COMMON_DEST%\res%_EXT%\svtools_srs.hid
-..\%__SRC%\lib\svtool.lib %_DEST%\lib%_EXT%\svtool.lib
-..\%__SRC%\slb\svt.lib %_DEST%\lib%_EXT%\xsvtool.lib
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*
-..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*
-..\%__SRC%\bin\bmp.* %_DEST%\bin%_EXT%\bmp.*
-..\%__SRC%\bin\bmpsum.* %_DEST%\bin%_EXT%\bmpsum.*
-..\%__SRC%\bin\bmpgui.* %_DEST%\bin%_EXT%\bmpgui.*
-..\%__SRC%\bin\g2g.* %_DEST%\bin%_EXT%\g2g.*
-..\%__SRC%\bin\bmp %_DEST%\bin%_EXT%\bmp
-..\%__SRC%\bin\bmpsum %_DEST%\bin%_EXT%\bmpsum
-..\%__SRC%\bin\bmpgui %_DEST%\bin%_EXT%\bmpgui
-..\%__SRC%\bin\g2g %_DEST%\bin%_EXT%\g2g
-..\%__SRC%\res\bmp.* %_DEST%\bin%_EXT%\bmp.*
-..\%__SRC%\res\bmpgui.* %_DEST%\bin%_EXT%\bmpgui.*
-..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\*
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*
-
-..\inc\svtools\*.hxx %_DEST%\inc%_EXT%\svtools\*.hxx
-..\inc\svtools\*.h %_DEST%\inc%_EXT%\svtools\*.h
-..\inc\svtools\*.hrc %_DEST%\inc%_EXT%\svtools\*.hrc
-..\inc\svtools\table\*.hxx %_DEST%\inc%_EXT%\svtools\table\*.hxx
-..\inc\*.hxx %_DEST%\inc%_EXT%\svtools\*.hxx
-..\inc\*.h %_DEST%\inc%_EXT%\svtools\*.h
-..\inc\*.hrc %_DEST%\inc%_EXT%\svtools\*.hrc
-
-..\inc\svtools\toolpanel\*.* %_DEST%\inc%_EXT%\svtools\toolpanel\*.hrc
-
-dos: sh -c "if test %OS% = MACOSX; then macosx-create-bundle %_DEST%\bin%_EXT%\bmp=%__PRJROOT%\%__SRC%\bin%_EXT%; fi"
-
-*.xml %_DEST%\xml%_EXT%\*.xml
-
-..\%__SRC%\misc\hatchwindowfactory.component %_DEST%\xml%_EXT%\hatchwindowfactory.component
-..\%__SRC%\misc\productregistration.uno.component %_DEST%\xml%_EXT%\productregistration.uno.component
-..\%__SRC%\misc\svt.component %_DEST%\xml%_EXT%\svt.component
diff --git a/toolkit/prj/d.lst b/toolkit/prj/d.lst
index 01eb5026e401..e69de29bb2d1 100644
--- a/toolkit/prj/d.lst
+++ b/toolkit/prj/d.lst
@@ -1,66 +0,0 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-mkdir: %_DEST%\inc%_EXT%\toolkit
-mkdir: %_DEST%\inc%_EXT%\toolkit\helper
-mkdir: %_DEST%\inc%_EXT%\toolkit\awt
-mkdir: %_DEST%\inc%_EXT%\toolkit\controls
-
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%__SRC%\lib\itk.lib %_DEST%\lib%_EXT%\itk.lib
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
-..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl
-..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\bin\tk*.res %_DEST%\bin%_EXT%\tk*res
-..\%__SRC%\bin\tk?????.sym %_DEST%\bin%_EXT%\tk?????.sym
-..\%__SRC%\bin\tk?????.dll %_DEST%\bin%_EXT%\tk?????.dll
-..\%__SRC%\misc\tk?????.map %_DEST%\bin%_EXT%\tk?????.map
-
-..\util\toolkit.xml %_DEST%\xml%_EXT%\toolkit.xml
-
-..\inc\toolkit\awt\vclxaccessiblecomponent.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxaccessiblecomponent.hxx
-..\inc\toolkit\awt\vclxcontainer.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxcontainer.hxx
-..\inc\toolkit\awt\vclxdevice.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxdevice.hxx
-..\inc\toolkit\awt\vclxfont.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxfont.hxx
-..\inc\toolkit\awt\vclxtopwindow.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxtopwindow.hxx
-..\inc\toolkit\awt\vclxtoolkit.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxtoolkit.hxx
-..\inc\toolkit\awt\vclxwindow.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxwindow.hxx
-..\inc\toolkit\awt\vclxsystemdependentwindow.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxsystemdependentwindow.hxx
-..\source\awt\vclxdialog.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxdialog.hxx
-..\inc\toolkit\awt\vclxwindows.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxwindows.hxx
-..\inc\toolkit\awt\vclxmenu.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxmenu.hxx
-
-..\inc\toolkit\controls\unocontrol.hxx %_DEST%\inc%_EXT%\toolkit\controls\unocontrol.hxx
-..\inc\toolkit\controls\unocontrols.hxx %_DEST%\inc%_EXT%\toolkit\controls\unocontrols.hxx
-..\inc\toolkit\controls\unocontrolmodel.hxx %_DEST%\inc%_EXT%\toolkit\controls\unocontrolmodel.hxx
-..\inc\toolkit\controls\unocontrolbase.hxx %_DEST%\inc%_EXT%\toolkit\controls\unocontrolbase.hxx
-..\inc\toolkit\helper\servicenames.hxx %_DEST%\inc%_EXT%\toolkit\helper\servicenames.hxx
-
-..\inc\toolkit\helper\emptyfontdescriptor.hxx %_DEST%\inc%_EXT%\toolkit\helper\emptyfontdescriptor.hxx
-..\inc\toolkit\helper\vclunohelper.hxx %_DEST%\inc%_EXT%\toolkit\helper\vclunohelper.hxx
-..\inc\toolkit\helper\convert.hxx %_DEST%\inc%_EXT%\toolkit\helper\convert.hxx
-..\inc\toolkit\helper\property.hxx %_DEST%\inc%_EXT%\toolkit\helper\property.hxx
-..\inc\toolkit\helper\macros.hxx %_DEST%\inc%_EXT%\toolkit\helper\macros.hxx
-..\inc\toolkit\helper\mutexhelper.hxx %_DEST%\inc%_EXT%\toolkit\helper\mutexhelper.hxx
-..\inc\toolkit\helper\mutexandbroadcasthelper.hxx %_DEST%\inc%_EXT%\toolkit\helper\mutexandbroadcasthelper.hxx
-..\inc\toolkit\helper\listenermultiplexer.hxx %_DEST%\inc%_EXT%\toolkit\helper\listenermultiplexer.hxx
-..\inc\toolkit\helper\unowrapper.hxx %_DEST%\inc%_EXT%\toolkit\helper\unowrapper.hxx
-..\inc\toolkit\helper\externallock.hxx %_DEST%\inc%_EXT%\toolkit\helper\externallock.hxx
-..\inc\toolkit\helper\formpdfexport.hxx %_DEST%\inc%_EXT%\toolkit\helper/formpdfexport.hxx
-..\inc\toolkit\helper\accessiblefactory.hxx %_DEST%\inc%_EXT%\toolkit\helper\accessiblefactory.hxx
-..\inc\toolkit\helper\fixedhyperbase.hxx %_DEST%\inc%_EXT%\toolkit\helper\fixedhyperbase.hxx
-..\inc\toolkit\helper\unopropertyarrayhelper.hxx %_DEST%\inc%_EXT%\toolkit\helper\unopropertyarrayhelper.hxx
-
-..\inc\toolkit\helper\vclunohelper.hxx %_DEST%\inc%_EXT%\toolkit\unohlp.hxx
-..\inc\toolkit\dllapi.h %_DEST%\inc%_EXT%\toolkit\dllapi.h
-
-mkdir: %_DEST%\inc%_EXT%\layout
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-
-..\inc\layout\*.hxx %_DEST%\inc%_EXT%\layout\*.hxx
-mkdir: %_DEST%\inc%_EXT%\layout\core
-..\source\layout\core\*.hxx  %_DEST%\inc%_EXT%\layout\core\*.hxx
-mkdir: %_DEST%\inc%_EXT%\layout\vcl
-..\source\layout\vcl\*.hxx  %_DEST%\inc%_EXT%\layout\vcl\*.hxx
-
-..\%__SRC%\bin\*-layout.zip %_DEST%\pck%_EXT%\*.*
-..\%__SRC%\misc\tk.component %_DEST%\xml%_EXT%\tk.component
diff --git a/tools/prj/d.lst b/tools/prj/d.lst
index 1c0b5271071d..e69de29bb2d1 100644
--- a/tools/prj/d.lst
+++ b/tools/prj/d.lst
@@ -1,20 +0,0 @@
-mkdir: %_DEST%\inc%_EXT%\tools
-
-..\%__SRC%\bin\mkunroll* %_DEST%\bin%_EXT%
-..\%__SRC%\bin\tl?????.dll %_DEST%\bin%_EXT%\tl?????.dll
-..\%__SRC%\bin\tl?????.sym %_DEST%\bin%_EXT%\tl?????.sym
-..\%__SRC%\lib\itools.lib %_DEST%\lib%_EXT%\itools.lib
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so
-..\%__SRC%\lib\lib*.so.* %_DEST%\lib%_EXT%\lib*.so.*
-..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%\lib*.dylib
-
-..\inc\tools\*.h %_DEST%\inc%_EXT%\tools\*.h
-..\inc\tools\*.hxx %_DEST%\inc%_EXT%\tools\*.hxx
-
-..\%__SRC%\bin\rscdep.exe %_DEST%\bin%_EXT%\rscdep.exe
-..\%__SRC%\bin\rscdep %_DEST%\bin%_EXT%\rscdep
-..\%__SRC%\bin\so_checksum.exe %_DEST%\bin%_EXT%\so_checksum.exe
-..\%__SRC%\bin\so_checksum %_DEST%\bin%_EXT%\so_checksum
-
-..\%__SRC%\obj\pathutils.obj %_DEST%\lib%_EXT%\pathutils-obj.obj
-..\%__SRC%\slo\pathutils.obj %_DEST%\lib%_EXT%\pathutils-slo.obj
-- 
cgit 


From fc986d6ff7dfae18ffae81aecc6eb249980017cf Mon Sep 17 00:00:00 2001
From: Hans-Joachim Lankenau 
Date: Fri, 19 Nov 2010 12:46:04 +0100
Subject: gnumake2: move svtools toolpanel header

---
 svtools/Package_inc.mk                           |   9 ++
 svtools/inc/svtools/decklayouter.hxx             | 104 ++++++++++++
 svtools/inc/svtools/drawerlayouter.hxx           | 102 ++++++++++++
 svtools/inc/svtools/paneltabbar.hxx              | 102 ++++++++++++
 svtools/inc/svtools/refbase.hxx                  |  80 ++++++++++
 svtools/inc/svtools/tabalignment.hxx             |  47 ++++++
 svtools/inc/svtools/tabitemcontent.hxx           |  48 ++++++
 svtools/inc/svtools/tablayouter.hxx              | 112 +++++++++++++
 svtools/inc/svtools/toolpanel.hxx                | 146 +++++++++++++++++
 svtools/inc/svtools/toolpanel/decklayouter.hxx   | 104 ------------
 svtools/inc/svtools/toolpanel/drawerlayouter.hxx | 102 ------------
 svtools/inc/svtools/toolpanel/paneltabbar.hxx    | 102 ------------
 svtools/inc/svtools/toolpanel/refbase.hxx        |  80 ----------
 svtools/inc/svtools/toolpanel/tabalignment.hxx   |  47 ------
 svtools/inc/svtools/toolpanel/tabitemcontent.hxx |  48 ------
 svtools/inc/svtools/toolpanel/tablayouter.hxx    | 112 -------------
 svtools/inc/svtools/toolpanel/toolpanel.hxx      | 146 -----------------
 svtools/inc/svtools/toolpanel/toolpaneldeck.hxx  | 193 -----------------------
 svtools/inc/svtools/toolpaneldeck.hxx            | 193 +++++++++++++++++++++++
 svtools/source/toolpanel/drawerlayouter.cxx      |   2 +-
 svtools/source/toolpanel/dummypanel.hxx          |   4 +-
 svtools/source/toolpanel/paneldecklisteners.cxx  |   2 +-
 svtools/source/toolpanel/paneldecklisteners.hxx  |   2 +-
 svtools/source/toolpanel/paneltabbar.cxx         |   4 +-
 svtools/source/toolpanel/paneltabbarpeer.cxx     |   2 +-
 svtools/source/toolpanel/refbase.cxx             |   2 +-
 svtools/source/toolpanel/tabbargeometry.hxx      |   2 +-
 svtools/source/toolpanel/tabitemdescriptor.hxx   |   4 +-
 svtools/source/toolpanel/tablayouter.cxx         |   6 +-
 svtools/source/toolpanel/toolpanel.cxx           |   2 +-
 svtools/source/toolpanel/toolpanelcollection.hxx |   2 +-
 svtools/source/toolpanel/toolpaneldeck.cxx       |   6 +-
 svtools/source/toolpanel/toolpaneldeckpeer.cxx   |   2 +-
 33 files changed, 964 insertions(+), 955 deletions(-)
 create mode 100755 svtools/inc/svtools/decklayouter.hxx
 create mode 100644 svtools/inc/svtools/drawerlayouter.hxx
 create mode 100644 svtools/inc/svtools/paneltabbar.hxx
 create mode 100644 svtools/inc/svtools/refbase.hxx
 create mode 100644 svtools/inc/svtools/tabalignment.hxx
 create mode 100644 svtools/inc/svtools/tabitemcontent.hxx
 create mode 100755 svtools/inc/svtools/tablayouter.hxx
 create mode 100644 svtools/inc/svtools/toolpanel.hxx
 delete mode 100755 svtools/inc/svtools/toolpanel/decklayouter.hxx
 delete mode 100644 svtools/inc/svtools/toolpanel/drawerlayouter.hxx
 delete mode 100644 svtools/inc/svtools/toolpanel/paneltabbar.hxx
 delete mode 100644 svtools/inc/svtools/toolpanel/refbase.hxx
 delete mode 100644 svtools/inc/svtools/toolpanel/tabalignment.hxx
 delete mode 100644 svtools/inc/svtools/toolpanel/tabitemcontent.hxx
 delete mode 100755 svtools/inc/svtools/toolpanel/tablayouter.hxx
 delete mode 100644 svtools/inc/svtools/toolpanel/toolpanel.hxx
 delete mode 100755 svtools/inc/svtools/toolpanel/toolpaneldeck.hxx
 create mode 100755 svtools/inc/svtools/toolpaneldeck.hxx

diff --git a/svtools/Package_inc.mk b/svtools/Package_inc.mk
index cc767b803ede..38cd74c74a6f 100644
--- a/svtools/Package_inc.mk
+++ b/svtools/Package_inc.mk
@@ -178,3 +178,12 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wizdlg.hxx,svtools/wiz
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wmf.hxx,svtools/wmf.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/xtextedt.hxx,svtools/xtextedt.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtools.hrc,svtools/svtools.hrc))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/decklayouter.hxx,svtools/decklayouter.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/refbase.hxx,svtools/refbase.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/tablayouter.hxx,svtools/tablayouter.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/drawerlayouter.hxx,svtools/drawerlayouter.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/tabalignment.hxx,svtools/tabalignment.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpaneldeck.hxx,svtools/toolpaneldeck.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/paneltabbar.hxx,svtools/paneltabbar.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/tabitemcontent.hxx,svtools/tabitemcontent.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel.hxx,svtools/toolpanel.hxx))
diff --git a/svtools/inc/svtools/decklayouter.hxx b/svtools/inc/svtools/decklayouter.hxx
new file mode 100755
index 000000000000..da03d7c6c3aa
--- /dev/null
+++ b/svtools/inc/svtools/decklayouter.hxx
@@ -0,0 +1,104 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * 
+ * for a copy of the LGPLv3 License.
+ *
+************************************************************************/
+
+#ifndef SVT_DECKLAYOUTER_HXX
+#define SVT_DECKLAYOUTER_HXX
+
+#include 
+
+#include 
+
+#include 
+
+namespace com { namespace sun { namespace star { namespace accessibility {
+    class XAccessible;
+} } } }
+class Rectangle;
+class Point;
+
+//........................................................................
+namespace svt
+{
+//........................................................................
+
+    //====================================================================
+    //= IDeckLayouter
+    //====================================================================
+    class IDeckLayouter : public ::rtl::IReference
+    {
+    public:
+        /** re-arranges the elements of the tool deck, taking into account the
+            available space for the complete deck.
+
+            @param i_rDeckPlayground
+                the playground for the complete tool panel deck
+            @return
+                the content area for a single tool panel
+        */
+        virtual ::Rectangle Layout( const ::Rectangle& i_rDeckPlayground ) = 0;
+
+        /** destroys the instance
+
+            Since the layouter is ref-counted, but might keep references to non-ref-counted objects
+            (in particular, the ToolPanelDeck, which is a VCL-Window, and thus cannot be ref-counted),
+            Destroy is the definitive way to dispose the instance. Technically, it's still alive afterwards,
+            but non-functional.
+        */
+        virtual void        Destroy() = 0;
+
+        /** assuming that a layouter neesds to provide some kind of panel selector control, this method
+            requests to set the focus to this control.
+        */
+        virtual void        SetFocusToPanelSelector() = 0;
+
+        /** returns the number of components in the XAccessible hierarchy which are needed to represent all elements
+            the layouter is responsible form.
+
+            Note that the implementation must guarantee that the count is fixed over the life time of the layouter.
+        */
+        virtual size_t      GetAccessibleChildCount() const = 0;
+
+        /** retrieves the XAccessible implementation for the i_nChildIndex'th child in the XAccessible
+            hierarchy.
+        */
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+                            GetAccessibleChild(
+                                const size_t i_nChildIndex,
+                                const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rParentAccessible
+                            ) = 0;
+
+        virtual ~IDeckLayouter()
+        {
+        }
+    };
+
+    typedef ::rtl::Reference< IDeckLayouter >   PDeckLayouter;
+
+//........................................................................
+} // namespace svt
+//........................................................................
+
+#endif // SVT_DECKLAYOUTER_HXX
diff --git a/svtools/inc/svtools/drawerlayouter.hxx b/svtools/inc/svtools/drawerlayouter.hxx
new file mode 100644
index 000000000000..5174fa613697
--- /dev/null
+++ b/svtools/inc/svtools/drawerlayouter.hxx
@@ -0,0 +1,102 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * 
+ * for a copy of the LGPLv3 License.
+ *
+************************************************************************/
+
+#ifndef SVT_DRAWERLAYOUTER_HXX
+#define SVT_DRAWERLAYOUTER_HXX
+
+#include "svtools/svtdllapi.h"
+#include "svtools/refbase.hxx"
+#include "svtools/toolpaneldeck.hxx"
+#include "svtools/decklayouter.hxx"
+
+#include 
+
+//......................................................................................................................
+namespace svt
+{
+//......................................................................................................................
+
+    class ToolPanelViewShell;
+    class ToolPanelDrawer;
+    typedef ::boost::shared_ptr< ToolPanelDrawer >  PToolPanelDrawer;
+
+    //==================================================================================================================
+    //= ToolPanelDrawer
+    //==================================================================================================================
+    /** a class which implements a tool panel selector in the form of the classical drawers
+    */
+    class SVT_DLLPUBLIC DrawerDeckLayouter  :public RefBase
+                                            ,public IDeckLayouter
+                                            ,public IToolPanelDeckListener
+    {
+    public:
+        DrawerDeckLayouter(
+            ::Window& i_rParentWindow,
+            IToolPanelDeck& i_rPanels
+        );
+        ~DrawerDeckLayouter();
+
+        // IReference
+        DECLARE_IREFERENCE()
+
+        // IDeckLayouter
+        virtual Rectangle   Layout( const Rectangle& i_rDeckPlayground );
+        virtual void        Destroy();
+        virtual void        SetFocusToPanelSelector();
+        virtual size_t      GetAccessibleChildCount() const;
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+                            GetAccessibleChild(
+                                const size_t i_nChildIndex,
+                                const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rParentAccessible
+                            );
+
+        // IToolPanelDeckListener
+        virtual void PanelInserted( const PToolPanel& i_pPanel, const size_t i_nPosition );
+        virtual void PanelRemoved( const size_t i_nPosition );
+        virtual void ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive );
+        virtual void LayouterChanged( const PDeckLayouter& i_rNewLayouter );
+        virtual void Dying();
+
+    private:
+        // triggers a re-arrance of the panel deck elements
+        void    impl_triggerRearrange() const;
+        size_t  impl_getPanelPositionFromWindow( const Window* i_pDrawerWindow ) const;
+        void    impl_removeDrawer( const size_t i_nPosition );
+
+        DECL_LINK( OnWindowEvent, VclSimpleEvent* );
+
+private:
+        Window&                             m_rParentWindow;
+        IToolPanelDeck&                     m_rPanelDeck;
+        ::std::vector< PToolPanelDrawer >   m_aDrawers;
+        ::boost::optional< size_t >         m_aLastKnownActivePanel;
+    };
+
+//......................................................................................................................
+} // namespace svt
+//......................................................................................................................
+
+#endif // SVT_DRAWERLAYOUTER_HXX
diff --git a/svtools/inc/svtools/paneltabbar.hxx b/svtools/inc/svtools/paneltabbar.hxx
new file mode 100644
index 000000000000..e499ce70ff6c
--- /dev/null
+++ b/svtools/inc/svtools/paneltabbar.hxx
@@ -0,0 +1,102 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * 
+ * for a copy of the LGPLv3 License.
+ *
+************************************************************************/
+
+#ifndef SVT_PANELTABBAR_HXX
+#define SVT_PANELTABBAR_HXX
+
+#include "svtools/svtdllapi.h"
+#include "svtools/tabalignment.hxx"
+#include "svtools/tabitemcontent.hxx"
+
+#include 
+
+#include 
+#include 
+
+class PushButton;
+
+//........................................................................
+namespace svt
+{
+//........................................................................
+
+    class PanelTabBar_Impl;
+    class IToolPanelDeck;
+
+    //====================================================================
+    //= PanelTabBar
+    //====================================================================
+    /** a tab bar for selecting panels
+
+        At the moment, this control aligns the tabs vertically, this might be extended to also support a horizontal
+        layout in the future.
+    */
+    class SVT_DLLPUBLIC PanelTabBar : public Control
+    {
+    public:
+        PanelTabBar( Window& i_rParentWindow, IToolPanelDeck& i_rPanelDeck, const TabAlignment i_eAlignment, const TabItemContent i_eItemContent );
+        ~PanelTabBar();
+
+        // attribute access
+        TabItemContent  GetTabItemContent() const;
+        void            SetTabItemContent( const TabItemContent& i_eItemContent );
+
+        ::boost::optional< size_t > GetFocusedPanelItem() const;
+        void                        FocusPanelItem( const size_t i_nItemPos );
+        Rectangle                   GetItemScreenRect( const size_t i_nItemPos ) const;
+        bool                        IsVertical() const;
+        IToolPanelDeck&             GetPanelDeck() const;
+        PushButton&                 GetScrollButton( const bool i_bForward );
+
+        // Window overridables
+        virtual Size    GetOptimalSize( WindowSizeType i_eType ) const;
+
+    protected:
+        // Window overridables
+        virtual void    Paint( const Rectangle& i_rRect );
+        virtual void    Resize();
+        virtual void    MouseMove( const MouseEvent& i_rMouseEvent );
+        virtual void    MouseButtonDown( const MouseEvent& i_rMouseEvent );
+        virtual void    MouseButtonUp( const MouseEvent& i_rMouseEvent );
+        virtual void    RequestHelp( const HelpEvent& i_rHelpEvent );
+        virtual void    GetFocus();
+        virtual void    LoseFocus();
+        virtual void    KeyInput( const KeyEvent& i_rKeyEvent );
+        virtual void    DataChanged( const DataChangedEvent& i_rDataChanedEvent );
+
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >
+                        GetComponentInterface( BOOL i_bCreate );
+
+    private:
+        ::std::auto_ptr< PanelTabBar_Impl > m_pImpl;
+    };
+
+//........................................................................
+} // namespace svt
+//........................................................................
+
+#endif // SVT_PANELTABBAR_HXX
+
diff --git a/svtools/inc/svtools/refbase.hxx b/svtools/inc/svtools/refbase.hxx
new file mode 100644
index 000000000000..991d6e619090
--- /dev/null
+++ b/svtools/inc/svtools/refbase.hxx
@@ -0,0 +1,80 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * 
+ * for a copy of the LGPLv3 License.
+ *
+************************************************************************/
+
+#ifndef SVT_REFBASE_HXX
+#define SVT_REFBASE_HXX
+
+#include "svtools/svtdllapi.h"
+
+#include 
+
+//........................................................................
+namespace svt
+{
+//........................................................................
+
+    //====================================================================
+    //= RefBase
+    //====================================================================
+    class SVT_DLLPUBLIC RefBase : public ::rtl::IReference
+    {
+    protected:
+        RefBase()
+            :m_refCount( 0 )
+        {
+        }
+
+        virtual ~RefBase()
+        {
+        }
+
+        virtual oslInterlockedCount SAL_CALL acquire();
+        virtual oslInterlockedCount SAL_CALL release();
+
+    private:
+        oslInterlockedCount m_refCount;
+    };
+
+#define DECLARE_IREFERENCE()    \
+    virtual oslInterlockedCount SAL_CALL acquire(); \
+    virtual oslInterlockedCount SAL_CALL release();
+
+
+#define IMPLEMENT_IREFERENCE( classname )   \
+    oslInterlockedCount classname::acquire()    \
+    {   \
+        return RefBase::acquire();  \
+    }   \
+    oslInterlockedCount classname::release()    \
+    {   \
+        return RefBase::release();  \
+    }
+
+//........................................................................
+} // namespace svt
+//........................................................................
+
+#endif // SVT_REFBASE_HXX
diff --git a/svtools/inc/svtools/tabalignment.hxx b/svtools/inc/svtools/tabalignment.hxx
new file mode 100644
index 000000000000..cc3f17469ffe
--- /dev/null
+++ b/svtools/inc/svtools/tabalignment.hxx
@@ -0,0 +1,47 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * 
+ * for a copy of the LGPLv3 License.
+ *
+************************************************************************/
+
+#ifndef SVT_TABALIGNMENT_HXX
+#define SVT_TABALIGNMENT_HXX
+
+//........................................................................
+namespace svt
+{
+//........................................................................
+
+    enum TabAlignment
+    {
+        TABS_LEFT,
+        TABS_RIGHT,
+        TABS_TOP,
+        TABS_BOTTOM
+    };
+
+//........................................................................
+} // namespace svt
+//........................................................................
+
+#endif // SVT_TABALIGNMENT_HXX
diff --git a/svtools/inc/svtools/tabitemcontent.hxx b/svtools/inc/svtools/tabitemcontent.hxx
new file mode 100644
index 000000000000..a1cf9deae9f4
--- /dev/null
+++ b/svtools/inc/svtools/tabitemcontent.hxx
@@ -0,0 +1,48 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * 
+ * for a copy of the LGPLv3 License.
+ *
+************************************************************************/
+
+#ifndef SVT_TABITEMCONTENT_HXX
+#define SVT_TABITEMCONTENT_HXX
+
+//........................................................................
+namespace svt
+{
+//........................................................................
+
+    enum TabItemContent
+    {
+        TABITEM_IMAGE_AND_TEXT,
+        TABITEM_IMAGE_ONLY,
+        TABITEM_TEXT_ONLY,
+
+        TABITEM_AUTO
+    };
+
+//........................................................................
+} // namespace svt
+//........................................................................
+
+#endif // SVT_TABITEMCONTENT_HXX
diff --git a/svtools/inc/svtools/tablayouter.hxx b/svtools/inc/svtools/tablayouter.hxx
new file mode 100755
index 000000000000..2cd20bc7fcda
--- /dev/null
+++ b/svtools/inc/svtools/tablayouter.hxx
@@ -0,0 +1,112 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * 
+ * for a copy of the LGPLv3 License.
+ *
+************************************************************************/
+
+#ifndef SVT_TABLAYOUTER_HXX
+#define SVT_TABLAYOUTER_HXX
+
+#include "svtools/svtdllapi.h"
+#include "svtools/decklayouter.hxx"
+#include "svtools/tabalignment.hxx"
+#include "svtools/tabitemcontent.hxx"
+#include "svtools/refbase.hxx"
+
+#include 
+
+#include 
+
+class Window;
+
+//........................................................................
+namespace svt
+{
+//........................................................................
+
+    class IToolPanelDeck;
+
+    struct TabDeckLayouter_Data;
+
+    //====================================================================
+    //= TabDeckLayouter
+    //====================================================================
+    class SVT_DLLPUBLIC TabDeckLayouter :public RefBase
+                                        ,public IDeckLayouter
+                                        ,public ::boost::noncopyable
+    {
+    public:
+        /** creates a new layouter
+            @param i_rParent
+                is the parent window for any VCL windows the layouter needs to create.
+            @param i_rPanels
+                is the panel deck which the layouter is responsible for.
+            @param i_eAlignment
+                specifies the alignment of the panel selector
+            @param TabItemContent
+                specifies the content to show on the tab items
+        */
+        TabDeckLayouter(
+            Window& i_rParent,
+            IToolPanelDeck& i_rPanels,
+            const TabAlignment i_eAlignment,
+            const TabItemContent i_eItemContent
+        );
+        ~TabDeckLayouter();
+
+        // attribute access
+        TabItemContent  GetTabItemContent() const;
+        void            SetTabItemContent( const TabItemContent& i_eItemContent );
+        TabAlignment    GetTabAlignment() const;
+
+        // helpers for the A11Y implementation
+        ::boost::optional< size_t >
+                        GetFocusedPanelItem() const;
+        void            FocusPanelItem( const size_t i_nItemPos );
+        bool            IsPanelSelectorEnabled() const;
+        bool            IsPanelSelectorVisible() const;
+        Rectangle       GetItemScreenRect( const size_t i_nItemPos ) const;
+
+        // IDeckLayouter
+        virtual Rectangle   Layout( const Rectangle& i_rDeckPlayground );
+        virtual void        Destroy();
+        virtual void        SetFocusToPanelSelector();
+        virtual size_t      GetAccessibleChildCount() const;
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+                            GetAccessibleChild(
+                                const size_t i_nChildIndex,
+                                const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rParentAccessible
+                            );
+
+        // IReference
+        DECLARE_IREFERENCE()
+
+    private:
+        ::std::auto_ptr< TabDeckLayouter_Data > m_pData;
+    };
+
+//........................................................................
+} // namespace svt
+//........................................................................
+
+#endif // SVT_TABLAYOUTER_HXX
diff --git a/svtools/inc/svtools/toolpanel.hxx b/svtools/inc/svtools/toolpanel.hxx
new file mode 100644
index 000000000000..084182231480
--- /dev/null
+++ b/svtools/inc/svtools/toolpanel.hxx
@@ -0,0 +1,146 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * 
+ * for a copy of the LGPLv3 License.
+ *
+************************************************************************/
+
+#ifndef SVT_TOOLPANEL_HXX
+#define SVT_TOOLPANEL_HXX
+
+#include "svtools/svtdllapi.h"
+#include "svtools/refbase.hxx"
+
+#include 
+#include 
+
+#include 
+
+class Rectangle;
+class Window;
+namespace com { namespace sun { namespace star { namespace accessibility {
+    class XAccessible;
+} } } }
+
+//........................................................................
+namespace svt
+{
+//........................................................................
+
+    //====================================================================
+    //= IToolPanel
+    //====================================================================
+    /** abstract interface for a single tool panel
+    */
+    class SVT_DLLPUBLIC IToolPanel : public ::rtl::IReference
+    {
+    public:
+        /// retrieves the display name of the panel
+        virtual ::rtl::OUString GetDisplayName() const = 0;
+
+        /// retrieves the image associated with the panel, if any
+        virtual Image GetImage() const = 0;
+
+        /// retrieves the help ID associated with the panel, if any.
+        virtual rtl::OString GetHelpID() const = 0;
+
+        /** activates the panel
+
+            Usually, this means the panel's Window is created (if not previosly done so) and shown.
+
+            @param i_rParentWindow
+                the parent window to anchor the panel window at. Subsequent calls to the Activate
+                method will always get the same parent window. The complete area of this window is
+                available, and should be used, for the panel window.
+        */
+        virtual void Activate( Window& i_rParentWindow ) = 0;
+
+        /** deactivates the panel
+
+            There are different ways how an implementation could deactivate a panel. The easiest way
+            would be to simply hide the associated Window. Alternatively, you could completely destroy it,
+            or decide to cache it by re-parenting it to another (temporary, invisible) window.
+        */
+        virtual void Deactivate() = 0;
+
+        /** sets a new size for the panel's Window
+
+            The panel window is always expected to be positioned at (0,0), relative to the parent window
+            which was passed to the Activate member. Resizing the panel window is necessary when the size of
+            this parent window changes. Effectively, this method is a means of convenience, to relief panel
+            implementations from reacting on size changes of their parent window themselves.
+        */
+        virtual void SetSizePixel( const Size& i_rPanelWindowSize ) = 0;
+
+        /// sets the focus to the panel window
+        virtual void GrabFocus() = 0;
+
+        /** release any resources associated with the panel.
+
+            In particular, implementations should ultimately destroy the VCL window which implements the panel
+            window. No subsequent calls to any other method will happen after Destroy has been called.
+        */
+        virtual void Dispose() = 0;
+
+        /** creates an XAccessible for the tool panel
+
+            Implementations are allowed to create a new instance each time this method is called, the caller
+            is responsible for caching the XAccessible implementation, if this is desired.
+        */
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+                    CreatePanelAccessible(
+                        const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rParentAccessible
+                    ) = 0;
+
+        virtual ~IToolPanel()
+        {
+        }
+    };
+
+    typedef ::rtl::Reference< IToolPanel >  PToolPanel;
+
+    //====================================================================
+    //= ToolPanelBase
+    //====================================================================
+    /** base class for tool panel implementations, adding ref count implementation to the IToolPanel interface,
+        but still being abstract
+    */
+    class SVT_DLLPUBLIC ToolPanelBase   :public IToolPanel
+                                        ,public RefBase
+                                        ,public ::boost::noncopyable
+    {
+    protected:
+        ToolPanelBase();
+        ~ToolPanelBase();
+
+    public:
+        DECLARE_IREFERENCE()
+
+    private:
+        oslInterlockedCount m_refCount;
+    };
+
+//........................................................................
+} // namespace svt
+//........................................................................
+
+#endif // SVT_TOOLPANEL_HXX
diff --git a/svtools/inc/svtools/toolpanel/decklayouter.hxx b/svtools/inc/svtools/toolpanel/decklayouter.hxx
deleted file mode 100755
index da03d7c6c3aa..000000000000
--- a/svtools/inc/svtools/toolpanel/decklayouter.hxx
+++ /dev/null
@@ -1,104 +0,0 @@
-/*************************************************************************
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * 
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#ifndef SVT_DECKLAYOUTER_HXX
-#define SVT_DECKLAYOUTER_HXX
-
-#include 
-
-#include 
-
-#include 
-
-namespace com { namespace sun { namespace star { namespace accessibility {
-    class XAccessible;
-} } } }
-class Rectangle;
-class Point;
-
-//........................................................................
-namespace svt
-{
-//........................................................................
-
-    //====================================================================
-    //= IDeckLayouter
-    //====================================================================
-    class IDeckLayouter : public ::rtl::IReference
-    {
-    public:
-        /** re-arranges the elements of the tool deck, taking into account the
-            available space for the complete deck.
-
-            @param i_rDeckPlayground
-                the playground for the complete tool panel deck
-            @return
-                the content area for a single tool panel
-        */
-        virtual ::Rectangle Layout( const ::Rectangle& i_rDeckPlayground ) = 0;
-
-        /** destroys the instance
-
-            Since the layouter is ref-counted, but might keep references to non-ref-counted objects
-            (in particular, the ToolPanelDeck, which is a VCL-Window, and thus cannot be ref-counted),
-            Destroy is the definitive way to dispose the instance. Technically, it's still alive afterwards,
-            but non-functional.
-        */
-        virtual void        Destroy() = 0;
-
-        /** assuming that a layouter neesds to provide some kind of panel selector control, this method
-            requests to set the focus to this control.
-        */
-        virtual void        SetFocusToPanelSelector() = 0;
-
-        /** returns the number of components in the XAccessible hierarchy which are needed to represent all elements
-            the layouter is responsible form.
-
-            Note that the implementation must guarantee that the count is fixed over the life time of the layouter.
-        */
-        virtual size_t      GetAccessibleChildCount() const = 0;
-
-        /** retrieves the XAccessible implementation for the i_nChildIndex'th child in the XAccessible
-            hierarchy.
-        */
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
-                            GetAccessibleChild(
-                                const size_t i_nChildIndex,
-                                const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rParentAccessible
-                            ) = 0;
-
-        virtual ~IDeckLayouter()
-        {
-        }
-    };
-
-    typedef ::rtl::Reference< IDeckLayouter >   PDeckLayouter;
-
-//........................................................................
-} // namespace svt
-//........................................................................
-
-#endif // SVT_DECKLAYOUTER_HXX
diff --git a/svtools/inc/svtools/toolpanel/drawerlayouter.hxx b/svtools/inc/svtools/toolpanel/drawerlayouter.hxx
deleted file mode 100644
index 0ecf493d0e98..000000000000
--- a/svtools/inc/svtools/toolpanel/drawerlayouter.hxx
+++ /dev/null
@@ -1,102 +0,0 @@
-/*************************************************************************
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * 
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#ifndef SVT_DRAWERLAYOUTER_HXX
-#define SVT_DRAWERLAYOUTER_HXX
-
-#include "svtools/svtdllapi.h"
-#include "svtools/toolpanel/refbase.hxx"
-#include "svtools/toolpanel/toolpaneldeck.hxx"
-#include "svtools/toolpanel/decklayouter.hxx"
-
-#include 
-
-//......................................................................................................................
-namespace svt
-{
-//......................................................................................................................
-
-    class ToolPanelViewShell;
-    class ToolPanelDrawer;
-    typedef ::boost::shared_ptr< ToolPanelDrawer >  PToolPanelDrawer;
-
-    //==================================================================================================================
-    //= ToolPanelDrawer
-    //==================================================================================================================
-    /** a class which implements a tool panel selector in the form of the classical drawers
-    */
-    class SVT_DLLPUBLIC DrawerDeckLayouter  :public RefBase
-                                            ,public IDeckLayouter
-                                            ,public IToolPanelDeckListener
-    {
-    public:
-        DrawerDeckLayouter(
-            ::Window& i_rParentWindow,
-            IToolPanelDeck& i_rPanels
-        );
-        ~DrawerDeckLayouter();
-
-        // IReference
-        DECLARE_IREFERENCE()
-
-        // IDeckLayouter
-        virtual Rectangle   Layout( const Rectangle& i_rDeckPlayground );
-        virtual void        Destroy();
-        virtual void        SetFocusToPanelSelector();
-        virtual size_t      GetAccessibleChildCount() const;
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
-                            GetAccessibleChild(
-                                const size_t i_nChildIndex,
-                                const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rParentAccessible
-                            );
-
-        // IToolPanelDeckListener
-        virtual void PanelInserted( const PToolPanel& i_pPanel, const size_t i_nPosition );
-        virtual void PanelRemoved( const size_t i_nPosition );
-        virtual void ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive );
-        virtual void LayouterChanged( const PDeckLayouter& i_rNewLayouter );
-        virtual void Dying();
-
-    private:
-        // triggers a re-arrance of the panel deck elements
-        void    impl_triggerRearrange() const;
-        size_t  impl_getPanelPositionFromWindow( const Window* i_pDrawerWindow ) const;
-        void    impl_removeDrawer( const size_t i_nPosition );
-
-        DECL_LINK( OnWindowEvent, VclSimpleEvent* );
-
-private:
-        Window&                             m_rParentWindow;
-        IToolPanelDeck&                     m_rPanelDeck;
-        ::std::vector< PToolPanelDrawer >   m_aDrawers;
-        ::boost::optional< size_t >         m_aLastKnownActivePanel;
-    };
-
-//......................................................................................................................
-} // namespace svt
-//......................................................................................................................
-
-#endif // SVT_DRAWERLAYOUTER_HXX
diff --git a/svtools/inc/svtools/toolpanel/paneltabbar.hxx b/svtools/inc/svtools/toolpanel/paneltabbar.hxx
deleted file mode 100644
index 668935d8a739..000000000000
--- a/svtools/inc/svtools/toolpanel/paneltabbar.hxx
+++ /dev/null
@@ -1,102 +0,0 @@
-/*************************************************************************
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * 
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#ifndef SVT_PANELTABBAR_HXX
-#define SVT_PANELTABBAR_HXX
-
-#include "svtools/svtdllapi.h"
-#include "svtools/toolpanel/tabalignment.hxx"
-#include "svtools/toolpanel/tabitemcontent.hxx"
-
-#include 
-
-#include 
-#include 
-
-class PushButton;
-
-//........................................................................
-namespace svt
-{
-//........................................................................
-
-    class PanelTabBar_Impl;
-    class IToolPanelDeck;
-
-    //====================================================================
-    //= PanelTabBar
-    //====================================================================
-    /** a tab bar for selecting panels
-
-        At the moment, this control aligns the tabs vertically, this might be extended to also support a horizontal
-        layout in the future.
-    */
-    class SVT_DLLPUBLIC PanelTabBar : public Control
-    {
-    public:
-        PanelTabBar( Window& i_rParentWindow, IToolPanelDeck& i_rPanelDeck, const TabAlignment i_eAlignment, const TabItemContent i_eItemContent );
-        ~PanelTabBar();
-
-        // attribute access
-        TabItemContent  GetTabItemContent() const;
-        void            SetTabItemContent( const TabItemContent& i_eItemContent );
-
-        ::boost::optional< size_t > GetFocusedPanelItem() const;
-        void                        FocusPanelItem( const size_t i_nItemPos );
-        Rectangle                   GetItemScreenRect( const size_t i_nItemPos ) const;
-        bool                        IsVertical() const;
-        IToolPanelDeck&             GetPanelDeck() const;
-        PushButton&                 GetScrollButton( const bool i_bForward );
-
-        // Window overridables
-        virtual Size    GetOptimalSize( WindowSizeType i_eType ) const;
-
-    protected:
-        // Window overridables
-        virtual void    Paint( const Rectangle& i_rRect );
-        virtual void    Resize();
-        virtual void    MouseMove( const MouseEvent& i_rMouseEvent );
-        virtual void    MouseButtonDown( const MouseEvent& i_rMouseEvent );
-        virtual void    MouseButtonUp( const MouseEvent& i_rMouseEvent );
-        virtual void    RequestHelp( const HelpEvent& i_rHelpEvent );
-        virtual void    GetFocus();
-        virtual void    LoseFocus();
-        virtual void    KeyInput( const KeyEvent& i_rKeyEvent );
-        virtual void    DataChanged( const DataChangedEvent& i_rDataChanedEvent );
-
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >
-                        GetComponentInterface( BOOL i_bCreate );
-
-    private:
-        ::std::auto_ptr< PanelTabBar_Impl > m_pImpl;
-    };
-
-//........................................................................
-} // namespace svt
-//........................................................................
-
-#endif // SVT_PANELTABBAR_HXX
-
diff --git a/svtools/inc/svtools/toolpanel/refbase.hxx b/svtools/inc/svtools/toolpanel/refbase.hxx
deleted file mode 100644
index 991d6e619090..000000000000
--- a/svtools/inc/svtools/toolpanel/refbase.hxx
+++ /dev/null
@@ -1,80 +0,0 @@
-/*************************************************************************
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * 
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#ifndef SVT_REFBASE_HXX
-#define SVT_REFBASE_HXX
-
-#include "svtools/svtdllapi.h"
-
-#include 
-
-//........................................................................
-namespace svt
-{
-//........................................................................
-
-    //====================================================================
-    //= RefBase
-    //====================================================================
-    class SVT_DLLPUBLIC RefBase : public ::rtl::IReference
-    {
-    protected:
-        RefBase()
-            :m_refCount( 0 )
-        {
-        }
-
-        virtual ~RefBase()
-        {
-        }
-
-        virtual oslInterlockedCount SAL_CALL acquire();
-        virtual oslInterlockedCount SAL_CALL release();
-
-    private:
-        oslInterlockedCount m_refCount;
-    };
-
-#define DECLARE_IREFERENCE()    \
-    virtual oslInterlockedCount SAL_CALL acquire(); \
-    virtual oslInterlockedCount SAL_CALL release();
-
-
-#define IMPLEMENT_IREFERENCE( classname )   \
-    oslInterlockedCount classname::acquire()    \
-    {   \
-        return RefBase::acquire();  \
-    }   \
-    oslInterlockedCount classname::release()    \
-    {   \
-        return RefBase::release();  \
-    }
-
-//........................................................................
-} // namespace svt
-//........................................................................
-
-#endif // SVT_REFBASE_HXX
diff --git a/svtools/inc/svtools/toolpanel/tabalignment.hxx b/svtools/inc/svtools/toolpanel/tabalignment.hxx
deleted file mode 100644
index cc3f17469ffe..000000000000
--- a/svtools/inc/svtools/toolpanel/tabalignment.hxx
+++ /dev/null
@@ -1,47 +0,0 @@
-/*************************************************************************
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * 
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#ifndef SVT_TABALIGNMENT_HXX
-#define SVT_TABALIGNMENT_HXX
-
-//........................................................................
-namespace svt
-{
-//........................................................................
-
-    enum TabAlignment
-    {
-        TABS_LEFT,
-        TABS_RIGHT,
-        TABS_TOP,
-        TABS_BOTTOM
-    };
-
-//........................................................................
-} // namespace svt
-//........................................................................
-
-#endif // SVT_TABALIGNMENT_HXX
diff --git a/svtools/inc/svtools/toolpanel/tabitemcontent.hxx b/svtools/inc/svtools/toolpanel/tabitemcontent.hxx
deleted file mode 100644
index a1cf9deae9f4..000000000000
--- a/svtools/inc/svtools/toolpanel/tabitemcontent.hxx
+++ /dev/null
@@ -1,48 +0,0 @@
-/*************************************************************************
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * 
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#ifndef SVT_TABITEMCONTENT_HXX
-#define SVT_TABITEMCONTENT_HXX
-
-//........................................................................
-namespace svt
-{
-//........................................................................
-
-    enum TabItemContent
-    {
-        TABITEM_IMAGE_AND_TEXT,
-        TABITEM_IMAGE_ONLY,
-        TABITEM_TEXT_ONLY,
-
-        TABITEM_AUTO
-    };
-
-//........................................................................
-} // namespace svt
-//........................................................................
-
-#endif // SVT_TABITEMCONTENT_HXX
diff --git a/svtools/inc/svtools/toolpanel/tablayouter.hxx b/svtools/inc/svtools/toolpanel/tablayouter.hxx
deleted file mode 100755
index 92b36acf9114..000000000000
--- a/svtools/inc/svtools/toolpanel/tablayouter.hxx
+++ /dev/null
@@ -1,112 +0,0 @@
-/*************************************************************************
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * 
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#ifndef SVT_TABLAYOUTER_HXX
-#define SVT_TABLAYOUTER_HXX
-
-#include "svtools/svtdllapi.h"
-#include "svtools/toolpanel/decklayouter.hxx"
-#include "svtools/toolpanel/tabalignment.hxx"
-#include "svtools/toolpanel/tabitemcontent.hxx"
-#include "svtools/toolpanel/refbase.hxx"
-
-#include 
-
-#include 
-
-class Window;
-
-//........................................................................
-namespace svt
-{
-//........................................................................
-
-    class IToolPanelDeck;
-
-    struct TabDeckLayouter_Data;
-
-    //====================================================================
-    //= TabDeckLayouter
-    //====================================================================
-    class SVT_DLLPUBLIC TabDeckLayouter :public RefBase
-                                        ,public IDeckLayouter
-                                        ,public ::boost::noncopyable
-    {
-    public:
-        /** creates a new layouter
-            @param i_rParent
-                is the parent window for any VCL windows the layouter needs to create.
-            @param i_rPanels
-                is the panel deck which the layouter is responsible for.
-            @param i_eAlignment
-                specifies the alignment of the panel selector
-            @param TabItemContent
-                specifies the content to show on the tab items
-        */
-        TabDeckLayouter(
-            Window& i_rParent,
-            IToolPanelDeck& i_rPanels,
-            const TabAlignment i_eAlignment,
-            const TabItemContent i_eItemContent
-        );
-        ~TabDeckLayouter();
-
-        // attribute access
-        TabItemContent  GetTabItemContent() const;
-        void            SetTabItemContent( const TabItemContent& i_eItemContent );
-        TabAlignment    GetTabAlignment() const;
-
-        // helpers for the A11Y implementation
-        ::boost::optional< size_t >
-                        GetFocusedPanelItem() const;
-        void            FocusPanelItem( const size_t i_nItemPos );
-        bool            IsPanelSelectorEnabled() const;
-        bool            IsPanelSelectorVisible() const;
-        Rectangle       GetItemScreenRect( const size_t i_nItemPos ) const;
-
-        // IDeckLayouter
-        virtual Rectangle   Layout( const Rectangle& i_rDeckPlayground );
-        virtual void        Destroy();
-        virtual void        SetFocusToPanelSelector();
-        virtual size_t      GetAccessibleChildCount() const;
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
-                            GetAccessibleChild(
-                                const size_t i_nChildIndex,
-                                const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rParentAccessible
-                            );
-
-        // IReference
-        DECLARE_IREFERENCE()
-
-    private:
-        ::std::auto_ptr< TabDeckLayouter_Data > m_pData;
-    };
-
-//........................................................................
-} // namespace svt
-//........................................................................
-
-#endif // SVT_TABLAYOUTER_HXX
diff --git a/svtools/inc/svtools/toolpanel/toolpanel.hxx b/svtools/inc/svtools/toolpanel/toolpanel.hxx
deleted file mode 100644
index d38d8e7d257d..000000000000
--- a/svtools/inc/svtools/toolpanel/toolpanel.hxx
+++ /dev/null
@@ -1,146 +0,0 @@
-/*************************************************************************
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * 
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#ifndef SVT_TOOLPANEL_HXX
-#define SVT_TOOLPANEL_HXX
-
-#include "svtools/svtdllapi.h"
-#include "svtools/toolpanel/refbase.hxx"
-
-#include 
-#include 
-
-#include 
-
-class Rectangle;
-class Window;
-namespace com { namespace sun { namespace star { namespace accessibility {
-    class XAccessible;
-} } } }
-
-//........................................................................
-namespace svt
-{
-//........................................................................
-
-    //====================================================================
-    //= IToolPanel
-    //====================================================================
-    /** abstract interface for a single tool panel
-    */
-    class SVT_DLLPUBLIC IToolPanel : public ::rtl::IReference
-    {
-    public:
-        /// retrieves the display name of the panel
-        virtual ::rtl::OUString GetDisplayName() const = 0;
-
-        /// retrieves the image associated with the panel, if any
-        virtual Image GetImage() const = 0;
-
-        /// retrieves the help ID associated with the panel, if any.
-        virtual rtl::OString GetHelpID() const = 0;
-
-        /** activates the panel
-
-            Usually, this means the panel's Window is created (if not previosly done so) and shown.
-
-            @param i_rParentWindow
-                the parent window to anchor the panel window at. Subsequent calls to the Activate
-                method will always get the same parent window. The complete area of this window is
-                available, and should be used, for the panel window.
-        */
-        virtual void Activate( Window& i_rParentWindow ) = 0;
-
-        /** deactivates the panel
-
-            There are different ways how an implementation could deactivate a panel. The easiest way
-            would be to simply hide the associated Window. Alternatively, you could completely destroy it,
-            or decide to cache it by re-parenting it to another (temporary, invisible) window.
-        */
-        virtual void Deactivate() = 0;
-
-        /** sets a new size for the panel's Window
-
-            The panel window is always expected to be positioned at (0,0), relative to the parent window
-            which was passed to the Activate member. Resizing the panel window is necessary when the size of
-            this parent window changes. Effectively, this method is a means of convenience, to relief panel
-            implementations from reacting on size changes of their parent window themselves.
-        */
-        virtual void SetSizePixel( const Size& i_rPanelWindowSize ) = 0;
-
-        /// sets the focus to the panel window
-        virtual void GrabFocus() = 0;
-
-        /** release any resources associated with the panel.
-
-            In particular, implementations should ultimately destroy the VCL window which implements the panel
-            window. No subsequent calls to any other method will happen after Destroy has been called.
-        */
-        virtual void Dispose() = 0;
-
-        /** creates an XAccessible for the tool panel
-
-            Implementations are allowed to create a new instance each time this method is called, the caller
-            is responsible for caching the XAccessible implementation, if this is desired.
-        */
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
-                    CreatePanelAccessible(
-                        const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rParentAccessible
-                    ) = 0;
-
-        virtual ~IToolPanel()
-        {
-        }
-    };
-
-    typedef ::rtl::Reference< IToolPanel >  PToolPanel;
-
-    //====================================================================
-    //= ToolPanelBase
-    //====================================================================
-    /** base class for tool panel implementations, adding ref count implementation to the IToolPanel interface,
-        but still being abstract
-    */
-    class SVT_DLLPUBLIC ToolPanelBase   :public IToolPanel
-                                        ,public RefBase
-                                        ,public ::boost::noncopyable
-    {
-    protected:
-        ToolPanelBase();
-        ~ToolPanelBase();
-
-    public:
-        DECLARE_IREFERENCE()
-
-    private:
-        oslInterlockedCount m_refCount;
-    };
-
-//........................................................................
-} // namespace svt
-//........................................................................
-
-#endif // SVT_TOOLPANEL_HXX
diff --git a/svtools/inc/svtools/toolpanel/toolpaneldeck.hxx b/svtools/inc/svtools/toolpanel/toolpaneldeck.hxx
deleted file mode 100755
index a1009591ffba..000000000000
--- a/svtools/inc/svtools/toolpanel/toolpaneldeck.hxx
+++ /dev/null
@@ -1,193 +0,0 @@
-/*************************************************************************
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * 
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#ifndef SVT_TOOLPANELDECK_HXX
-#define SVT_TOOLPANELDECK_HXX
-
-#include "svtools/svtdllapi.h"
-#include "svtools/toolpanel/toolpanel.hxx"
-#include "svtools/toolpanel/decklayouter.hxx"
-
-#include 
-
-#include 
-#include 
-
-//........................................................................
-namespace svt
-{
-//........................................................................
-
-    class ToolPanelCollection;
-    class ToolPanelDeck_Impl;
-
-    //====================================================================
-    //= IToolPanelDeckListener
-    //====================================================================
-    class SAL_NO_VTABLE IToolPanelDeckListener
-    {
-    public:
-        /** called when a panel has been inserted into the deck
-        */
-        virtual void PanelInserted( const PToolPanel& i_pPanel, const size_t i_nPosition ) = 0;
-
-        /** called when a panel has been removed from the deck
-        */
-        virtual void PanelRemoved( const size_t i_nPosition ) = 0;
-
-        /** called when the active panel of the deck changed
-        */
-        virtual void ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive ) = 0;
-
-        /** called when a new layouter has been set at a tool panel deck.
-
-            The method is called after the old layouter has been disposed (i.e. its Destroy method has been
-            invoked), and after the complete deck has been re-layouter.
-        */
-        virtual void LayouterChanged( const PDeckLayouter& i_rNewLayouter ) = 0;
-
-        /** called when the tool panel deck which the listener registered at is dying. The listener is required to
-            release all references to the deck then.
-        */
-        virtual void Dying() = 0;
-    };
-
-    //====================================================================
-    //= IToolPanelDeck
-    //====================================================================
-    class SVT_DLLPUBLIC IToolPanelDeck
-    {
-    public:
-        /** returns the number of panels in the container
-        */
-        virtual size_t      GetPanelCount() const = 0;
-
-        /** retrieves the panel with the given index. Invalid indexes will be reported via an assertion in the
-            non-product version, and silently ignored in the product version, with a NULL panel being returned.
-        */
-        virtual PToolPanel  GetPanel( const size_t i_nPos ) const = 0;
-
-        /** returns the number of the currently active panel.
-        */
-        virtual ::boost::optional< size_t >
-                            GetActivePanel() const = 0;
-
-        /** activates the panel with the given number. If the given number is larger or equal to the number of panels
-            in the deck, this will be reported via an assertion in non-product builds, and otherwise ignored.
-            @param i_rPanel
-                the number of the panel to activate. If this is not set, the currently active panel is de-activated,
-                and no new panel is activated at all. Whether or not this makes sense for your application is at
-                your own discretion.
-        */
-        virtual void        ActivatePanel( const ::boost::optional< size_t >& i_rPanel ) = 0;
-
-        /** inserts a new panel into the container. NULL panels are not allowed, as are positions greater than the
-            current panel count. Violations of this will be reported via an assertion in the non-product version, and
-            silently ignored in the product version.
-        */
-        virtual size_t      InsertPanel( const PToolPanel& i_pPanel, const size_t i_nPosition ) = 0;
-
-        /** removes a panel specified by its position.
-
-            Note: It is the responsibility of the caller to ensure that the panel is destroyed appropriately. That is,
-            the tool panel deck will not invoke IToolPanel::Dispose on the removed panel.
-            The advantage is that the panel might be re-used later, with the disadvantage that the owner of the panel
-            deck must know whether Dispose must be invoked after removal, or whether the panel will properly
-            dispose itself when its ref count drops to 0.
-        */
-        virtual PToolPanel  RemovePanel( const size_t i_nPosition ) = 0;
-
-        /** adds a new listener to be notified when the container content changes. The caller is responsible
-            for life time control, i.e. removing the listener before it actually dies.
-        */
-        virtual void        AddListener( IToolPanelDeckListener& i_rListener ) = 0;
-
-        /** removes a container listener previously added via addListener.
-        */
-        virtual void        RemoveListener( IToolPanelDeckListener& i_rListener ) = 0;
-    };
-
-    //====================================================================
-    //= ToolPanelDeck
-    //====================================================================
-    class SVT_DLLPUBLIC ToolPanelDeck   :public Control
-                                        ,public IToolPanelDeck
-    {
-    public:
-        ToolPanelDeck( Window& i_rParent, const WinBits i_nStyle = WB_DIALOGCONTROL );
-        ~ToolPanelDeck();
-
-        // attributes
-        PDeckLayouter       GetLayouter() const;
-        void                SetLayouter( const PDeckLayouter& i_pNewLayouter );
-
-        /** returns the window which acts as anchor for the panel windows.
-
-            This is a single dedicated window, which is passed to the IToolPanel::ActivatePanel method
-            whenever a panel is activated, to act as parent window for the panel's VCL-Window.
-        */
-        ::Window&           GetPanelWindowAnchor();
-        const ::Window&     GetPanelWindowAnchor() const;
-
-        /** sets the window which should act as parent in the A11Y object hierarchy.
-
-            Calling this method has no effect if CreateAccessible had always been called.
-        */
-        void                SetAccessibleParentWindow( ::Window* i_pAccessibleParent );
-        ::Window*           GetAccessibleParentWindow() const;
-
-        // IToolPanelDeck
-        virtual size_t      GetPanelCount() const;
-        virtual PToolPanel  GetPanel( const size_t i_nPos ) const;
-        virtual ::boost::optional< size_t >
-                            GetActivePanel() const;
-        virtual void        ActivatePanel( const ::boost::optional< size_t >& i_rPanel );
-        virtual size_t      InsertPanel( const PToolPanel& i_pPanel, const size_t i_nPosition );
-        virtual PToolPanel  RemovePanel( const size_t i_nPosition );
-        virtual void        AddListener( IToolPanelDeckListener& i_rListener );
-        virtual void        RemoveListener( IToolPanelDeckListener& i_rListener );
-
-    protected:
-        // Window overridables
-        virtual void Resize();
-        virtual long Notify( NotifyEvent& i_rNotifyEvent );
-        virtual void GetFocus();
-
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >
-                     GetComponentInterface( BOOL i_bCreate );
-
-    private:
-        ::std::auto_ptr< ToolPanelDeck_Impl >   m_pImpl;
-
-    private:
-        using Window::GetAccessibleParentWindow;
-    };
-
-//........................................................................
-} // namespace svt
-//........................................................................
-
-#endif // SVT_TOOLPANELDECK_HXX
diff --git a/svtools/inc/svtools/toolpaneldeck.hxx b/svtools/inc/svtools/toolpaneldeck.hxx
new file mode 100755
index 000000000000..75d210c5ad2a
--- /dev/null
+++ b/svtools/inc/svtools/toolpaneldeck.hxx
@@ -0,0 +1,193 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * 
+ * for a copy of the LGPLv3 License.
+ *
+************************************************************************/
+
+#ifndef SVT_TOOLPANELDECK_HXX
+#define SVT_TOOLPANELDECK_HXX
+
+#include "svtools/svtdllapi.h"
+#include "svtools/toolpanel.hxx"
+#include "svtools/decklayouter.hxx"
+
+#include 
+
+#include 
+#include 
+
+//........................................................................
+namespace svt
+{
+//........................................................................
+
+    class ToolPanelCollection;
+    class ToolPanelDeck_Impl;
+
+    //====================================================================
+    //= IToolPanelDeckListener
+    //====================================================================
+    class SAL_NO_VTABLE IToolPanelDeckListener
+    {
+    public:
+        /** called when a panel has been inserted into the deck
+        */
+        virtual void PanelInserted( const PToolPanel& i_pPanel, const size_t i_nPosition ) = 0;
+
+        /** called when a panel has been removed from the deck
+        */
+        virtual void PanelRemoved( const size_t i_nPosition ) = 0;
+
+        /** called when the active panel of the deck changed
+        */
+        virtual void ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive ) = 0;
+
+        /** called when a new layouter has been set at a tool panel deck.
+
+            The method is called after the old layouter has been disposed (i.e. its Destroy method has been
+            invoked), and after the complete deck has been re-layouter.
+        */
+        virtual void LayouterChanged( const PDeckLayouter& i_rNewLayouter ) = 0;
+
+        /** called when the tool panel deck which the listener registered at is dying. The listener is required to
+            release all references to the deck then.
+        */
+        virtual void Dying() = 0;
+    };
+
+    //====================================================================
+    //= IToolPanelDeck
+    //====================================================================
+    class SVT_DLLPUBLIC IToolPanelDeck
+    {
+    public:
+        /** returns the number of panels in the container
+        */
+        virtual size_t      GetPanelCount() const = 0;
+
+        /** retrieves the panel with the given index. Invalid indexes will be reported via an assertion in the
+            non-product version, and silently ignored in the product version, with a NULL panel being returned.
+        */
+        virtual PToolPanel  GetPanel( const size_t i_nPos ) const = 0;
+
+        /** returns the number of the currently active panel.
+        */
+        virtual ::boost::optional< size_t >
+                            GetActivePanel() const = 0;
+
+        /** activates the panel with the given number. If the given number is larger or equal to the number of panels
+            in the deck, this will be reported via an assertion in non-product builds, and otherwise ignored.
+            @param i_rPanel
+                the number of the panel to activate. If this is not set, the currently active panel is de-activated,
+                and no new panel is activated at all. Whether or not this makes sense for your application is at
+                your own discretion.
+        */
+        virtual void        ActivatePanel( const ::boost::optional< size_t >& i_rPanel ) = 0;
+
+        /** inserts a new panel into the container. NULL panels are not allowed, as are positions greater than the
+            current panel count. Violations of this will be reported via an assertion in the non-product version, and
+            silently ignored in the product version.
+        */
+        virtual size_t      InsertPanel( const PToolPanel& i_pPanel, const size_t i_nPosition ) = 0;
+
+        /** removes a panel specified by its position.
+
+            Note: It is the responsibility of the caller to ensure that the panel is destroyed appropriately. That is,
+            the tool panel deck will not invoke IToolPanel::Dispose on the removed panel.
+            The advantage is that the panel might be re-used later, with the disadvantage that the owner of the panel
+            deck must know whether Dispose must be invoked after removal, or whether the panel will properly
+            dispose itself when its ref count drops to 0.
+        */
+        virtual PToolPanel  RemovePanel( const size_t i_nPosition ) = 0;
+
+        /** adds a new listener to be notified when the container content changes. The caller is responsible
+            for life time control, i.e. removing the listener before it actually dies.
+        */
+        virtual void        AddListener( IToolPanelDeckListener& i_rListener ) = 0;
+
+        /** removes a container listener previously added via addListener.
+        */
+        virtual void        RemoveListener( IToolPanelDeckListener& i_rListener ) = 0;
+    };
+
+    //====================================================================
+    //= ToolPanelDeck
+    //====================================================================
+    class SVT_DLLPUBLIC ToolPanelDeck   :public Control
+                                        ,public IToolPanelDeck
+    {
+    public:
+        ToolPanelDeck( Window& i_rParent, const WinBits i_nStyle = WB_DIALOGCONTROL );
+        ~ToolPanelDeck();
+
+        // attributes
+        PDeckLayouter       GetLayouter() const;
+        void                SetLayouter( const PDeckLayouter& i_pNewLayouter );
+
+        /** returns the window which acts as anchor for the panel windows.
+
+            This is a single dedicated window, which is passed to the IToolPanel::ActivatePanel method
+            whenever a panel is activated, to act as parent window for the panel's VCL-Window.
+        */
+        ::Window&           GetPanelWindowAnchor();
+        const ::Window&     GetPanelWindowAnchor() const;
+
+        /** sets the window which should act as parent in the A11Y object hierarchy.
+
+            Calling this method has no effect if CreateAccessible had always been called.
+        */
+        void                SetAccessibleParentWindow( ::Window* i_pAccessibleParent );
+        ::Window*           GetAccessibleParentWindow() const;
+
+        // IToolPanelDeck
+        virtual size_t      GetPanelCount() const;
+        virtual PToolPanel  GetPanel( const size_t i_nPos ) const;
+        virtual ::boost::optional< size_t >
+                            GetActivePanel() const;
+        virtual void        ActivatePanel( const ::boost::optional< size_t >& i_rPanel );
+        virtual size_t      InsertPanel( const PToolPanel& i_pPanel, const size_t i_nPosition );
+        virtual PToolPanel  RemovePanel( const size_t i_nPosition );
+        virtual void        AddListener( IToolPanelDeckListener& i_rListener );
+        virtual void        RemoveListener( IToolPanelDeckListener& i_rListener );
+
+    protected:
+        // Window overridables
+        virtual void Resize();
+        virtual long Notify( NotifyEvent& i_rNotifyEvent );
+        virtual void GetFocus();
+
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >
+                     GetComponentInterface( BOOL i_bCreate );
+
+    private:
+        ::std::auto_ptr< ToolPanelDeck_Impl >   m_pImpl;
+
+    private:
+        using Window::GetAccessibleParentWindow;
+    };
+
+//........................................................................
+} // namespace svt
+//........................................................................
+
+#endif // SVT_TOOLPANELDECK_HXX
diff --git a/svtools/source/toolpanel/drawerlayouter.cxx b/svtools/source/toolpanel/drawerlayouter.cxx
index 7fc7d05ea0c9..63b35f5835b7 100644
--- a/svtools/source/toolpanel/drawerlayouter.cxx
+++ b/svtools/source/toolpanel/drawerlayouter.cxx
@@ -26,7 +26,7 @@
 
 #include "precompiled_svtools.hxx"
 
-#include "svtools/toolpanel/drawerlayouter.hxx"
+#include "svtools/drawerlayouter.hxx"
 #include "toolpaneldrawer.hxx"
 
 #include 
diff --git a/svtools/source/toolpanel/dummypanel.hxx b/svtools/source/toolpanel/dummypanel.hxx
index d2ca4480fce5..0a3cb407a0b9 100644
--- a/svtools/source/toolpanel/dummypanel.hxx
+++ b/svtools/source/toolpanel/dummypanel.hxx
@@ -27,8 +27,8 @@
 #ifndef DUMMYPANEL_HXX
 #define DUMMYPANEL_HXX
 
-#include "svtools/toolpanel/toolpanel.hxx"
-#include "svtools/toolpanel/refbase.hxx"
+#include "svtools/toolpanel.hxx"
+#include "svtools/refbase.hxx"
 
 //........................................................................
 namespace svt
diff --git a/svtools/source/toolpanel/paneldecklisteners.cxx b/svtools/source/toolpanel/paneldecklisteners.cxx
index 32ba9b5c6a24..dc5407a79bb3 100755
--- a/svtools/source/toolpanel/paneldecklisteners.cxx
+++ b/svtools/source/toolpanel/paneldecklisteners.cxx
@@ -27,7 +27,7 @@
 #include "precompiled_svtools.hxx"
 
 #include "paneldecklisteners.hxx"
-#include "svtools/toolpanel/toolpaneldeck.hxx"
+#include "svtools/toolpaneldeck.hxx"
 
 //........................................................................
 namespace svt
diff --git a/svtools/source/toolpanel/paneldecklisteners.hxx b/svtools/source/toolpanel/paneldecklisteners.hxx
index bc7e2ae7db88..8fb9414215f5 100755
--- a/svtools/source/toolpanel/paneldecklisteners.hxx
+++ b/svtools/source/toolpanel/paneldecklisteners.hxx
@@ -27,7 +27,7 @@
 #ifndef PANELDECKLISTENERS_HXX
 #define PANELDECKLISTENERS_HXX
 
-#include "svtools/toolpanel/toolpaneldeck.hxx"
+#include "svtools/toolpaneldeck.hxx"
 
 #include 
 #include 
diff --git a/svtools/source/toolpanel/paneltabbar.cxx b/svtools/source/toolpanel/paneltabbar.cxx
index 23067d3ee5d0..d0b52b577144 100755
--- a/svtools/source/toolpanel/paneltabbar.cxx
+++ b/svtools/source/toolpanel/paneltabbar.cxx
@@ -26,8 +26,8 @@
 
 #include "precompiled_svtools.hxx"
 
-#include "svtools/toolpanel/paneltabbar.hxx"
-#include "svtools/toolpanel/toolpaneldeck.hxx"
+#include "svtools/paneltabbar.hxx"
+#include "svtools/toolpaneldeck.hxx"
 #include "svtools/svtdata.hxx"
 #include "svtools/svtools.hrc"
 
diff --git a/svtools/source/toolpanel/paneltabbarpeer.cxx b/svtools/source/toolpanel/paneltabbarpeer.cxx
index d8329109ffb4..302c830a2253 100644
--- a/svtools/source/toolpanel/paneltabbarpeer.cxx
+++ b/svtools/source/toolpanel/paneltabbarpeer.cxx
@@ -27,7 +27,7 @@
 #include "precompiled_svtools.hxx"
 
 #include "paneltabbarpeer.hxx"
-#include "svtools/toolpanel/paneltabbar.hxx"
+#include "svtools/paneltabbar.hxx"
 
 /** === begin UNO includes === **/
 #include 
diff --git a/svtools/source/toolpanel/refbase.cxx b/svtools/source/toolpanel/refbase.cxx
index f41aa2d9bb9c..309a87c2f436 100644
--- a/svtools/source/toolpanel/refbase.cxx
+++ b/svtools/source/toolpanel/refbase.cxx
@@ -26,7 +26,7 @@
 
 #include "precompiled_svtools.hxx"
 
-#include "svtools/toolpanel/refbase.hxx"
+#include "svtools/refbase.hxx"
 
 //........................................................................
 namespace svt
diff --git a/svtools/source/toolpanel/tabbargeometry.hxx b/svtools/source/toolpanel/tabbargeometry.hxx
index 059d69a3e233..97e460ff1397 100644
--- a/svtools/source/toolpanel/tabbargeometry.hxx
+++ b/svtools/source/toolpanel/tabbargeometry.hxx
@@ -27,7 +27,7 @@
 #ifndef TABBARGEOMETRY_HXX
 #define TABBARGEOMETRY_HXX
 
-#include "svtools/toolpanel/tabalignment.hxx"
+#include "svtools/tabalignment.hxx"
 
 #include "tabitemdescriptor.hxx"
 
diff --git a/svtools/source/toolpanel/tabitemdescriptor.hxx b/svtools/source/toolpanel/tabitemdescriptor.hxx
index 8005816b0fe2..992f524cba94 100644
--- a/svtools/source/toolpanel/tabitemdescriptor.hxx
+++ b/svtools/source/toolpanel/tabitemdescriptor.hxx
@@ -27,8 +27,8 @@
 #ifndef TABITEMDESCRIPTOR_HXX
 #define TABITEMDESCRIPTOR_HXX
 
-#include "svtools/toolpanel/toolpanel.hxx"
-#include "svtools/toolpanel/tabitemcontent.hxx"
+#include "svtools/toolpanel.hxx"
+#include "svtools/tabitemcontent.hxx"
 
 #include 
 #include 
diff --git a/svtools/source/toolpanel/tablayouter.cxx b/svtools/source/toolpanel/tablayouter.cxx
index f68bbc1bbd0f..377ef0477752 100755
--- a/svtools/source/toolpanel/tablayouter.cxx
+++ b/svtools/source/toolpanel/tablayouter.cxx
@@ -26,9 +26,9 @@
 
 #include "precompiled_svtools.hxx"
 
-#include "svtools/toolpanel/tablayouter.hxx"
-#include "svtools/toolpanel/toolpaneldeck.hxx"
-#include "svtools/toolpanel/paneltabbar.hxx"
+#include "svtools/tablayouter.hxx"
+#include "svtools/toolpaneldeck.hxx"
+#include "svtools/paneltabbar.hxx"
 #include "svtaccessiblefactory.hxx"
 
 #include 
diff --git a/svtools/source/toolpanel/toolpanel.cxx b/svtools/source/toolpanel/toolpanel.cxx
index f7b999494563..128c3e2602e6 100644
--- a/svtools/source/toolpanel/toolpanel.cxx
+++ b/svtools/source/toolpanel/toolpanel.cxx
@@ -26,7 +26,7 @@
 
 #include "precompiled_svtools.hxx"
 
-#include "svtools/toolpanel/toolpanel.hxx"
+#include "svtools/toolpanel.hxx"
 
 //........................................................................
 namespace svt
diff --git a/svtools/source/toolpanel/toolpanelcollection.hxx b/svtools/source/toolpanel/toolpanelcollection.hxx
index 2bdba38546c9..6f90469b543a 100644
--- a/svtools/source/toolpanel/toolpanelcollection.hxx
+++ b/svtools/source/toolpanel/toolpanelcollection.hxx
@@ -27,7 +27,7 @@
 #ifndef TOOLPANELCOLLECTION_HXX
 #define TOOLPANELCOLLECTION_HXX
 
-#include "svtools/toolpanel/toolpaneldeck.hxx"
+#include "svtools/toolpaneldeck.hxx"
 
 #include 
 
diff --git a/svtools/source/toolpanel/toolpaneldeck.cxx b/svtools/source/toolpanel/toolpaneldeck.cxx
index e157090bbf0e..67003c441216 100755
--- a/svtools/source/toolpanel/toolpaneldeck.cxx
+++ b/svtools/source/toolpanel/toolpaneldeck.cxx
@@ -30,9 +30,9 @@
 #include "toolpanelcollection.hxx"
 #include "paneldecklisteners.hxx"
 #include "toolpaneldeckpeer.hxx"
-#include "svtools/toolpanel/toolpaneldeck.hxx"
-#include "svtools/toolpanel/tablayouter.hxx"
-#include "svtools/toolpanel/drawerlayouter.hxx"
+#include "svtools/toolpaneldeck.hxx"
+#include "svtools/tablayouter.hxx"
+#include "svtools/drawerlayouter.hxx"
 
 /** === begin UNO includes === **/
 #include 
diff --git a/svtools/source/toolpanel/toolpaneldeckpeer.cxx b/svtools/source/toolpanel/toolpaneldeckpeer.cxx
index 0a84a90b4fb3..26e9bbc43b47 100755
--- a/svtools/source/toolpanel/toolpaneldeckpeer.cxx
+++ b/svtools/source/toolpanel/toolpaneldeckpeer.cxx
@@ -27,7 +27,7 @@
 #include "precompiled_svtools.hxx"
 
 #include "toolpaneldeckpeer.hxx"
-#include "svtools/toolpanel/toolpaneldeck.hxx"
+#include "svtools/toolpaneldeck.hxx"
 
 /** === begin UNO includes === **/
 #include 
-- 
cgit 


From 7a4ec865eafbb8c0a6fb703d843a8f023c5a6a9c Mon Sep 17 00:00:00 2001
From: "Herbert Duerr [hdu]" 
Date: Fri, 19 Nov 2010 14:37:26 +0100
Subject: #i115618# fix bad PDF export regression for simple RTL cases

---
 vcl/source/gdi/pdfwriter_impl.cxx | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 580161da8a4e..aa9f642f9fee 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -7398,7 +7398,14 @@ void PDFWriterImpl::drawLayout( SalLayout& rLayout, const String& rText, bool bT
                 // try to handle ligatures and such
                 if( i < nGlyphs-1 )
                 {
-                    pUnicodesPerGlyph[i] = nChars = pCharPosAry[i+1] - pCharPosAry[i];
+                    nChars = pCharPosAry[i+1] - pCharPosAry[i];
+                    // #i115618# fix for simple RTL+CTL cases
+                    // TODO: sanitize for RTL ligatures, more complex CTL, etc.
+                    if( nChars < 0 )
+                        nChars = -nChars;
+            else if( nChars == 0 )
+                        nChars = 1;
+                    pUnicodesPerGlyph[i] = nChars;
                     for( int n = 1; n < nChars; n++ )
                         aUnicodes.push_back( rText.GetChar( sal::static_int_cast(pCharPosAry[i]+n) ) );
                 }
-- 
cgit 


From 56ddf2250badc5096faed0c7ee00c16e9c1cda8a Mon Sep 17 00:00:00 2001
From: Hans-Joachim Lankenau 
Date: Fri, 19 Nov 2010 15:23:52 +0100
Subject: gnumake2: undo toolpanel header move

---
 svl/Package_inc.mk                               |   1 +
 svtools/Package_inc.mk                           |  38 +++--
 svtools/inc/svtools/decklayouter.hxx             | 104 ------------
 svtools/inc/svtools/drawerlayouter.hxx           | 102 ------------
 svtools/inc/svtools/paneltabbar.hxx              | 102 ------------
 svtools/inc/svtools/refbase.hxx                  |  80 ----------
 svtools/inc/svtools/tabalignment.hxx             |  47 ------
 svtools/inc/svtools/tabitemcontent.hxx           |  48 ------
 svtools/inc/svtools/tablayouter.hxx              | 112 -------------
 svtools/inc/svtools/toolpanel.hxx                | 146 -----------------
 svtools/inc/svtools/toolpanel/decklayouter.hxx   | 104 ++++++++++++
 svtools/inc/svtools/toolpanel/drawerlayouter.hxx | 102 ++++++++++++
 svtools/inc/svtools/toolpanel/paneltabbar.hxx    | 102 ++++++++++++
 svtools/inc/svtools/toolpanel/refbase.hxx        |  80 ++++++++++
 svtools/inc/svtools/toolpanel/tabalignment.hxx   |  47 ++++++
 svtools/inc/svtools/toolpanel/tabitemcontent.hxx |  48 ++++++
 svtools/inc/svtools/toolpanel/tablayouter.hxx    | 112 +++++++++++++
 svtools/inc/svtools/toolpanel/toolpanel.hxx      | 146 +++++++++++++++++
 svtools/inc/svtools/toolpanel/toolpaneldeck.hxx  | 193 +++++++++++++++++++++++
 svtools/inc/svtools/toolpaneldeck.hxx            | 193 -----------------------
 svtools/source/toolpanel/drawerlayouter.cxx      |   2 +-
 svtools/source/toolpanel/dummypanel.hxx          |   4 +-
 svtools/source/toolpanel/paneldecklisteners.cxx  |   2 +-
 svtools/source/toolpanel/paneldecklisteners.hxx  |   2 +-
 svtools/source/toolpanel/paneltabbar.cxx         |   4 +-
 svtools/source/toolpanel/paneltabbarpeer.cxx     |   2 +-
 svtools/source/toolpanel/refbase.cxx             |   2 +-
 svtools/source/toolpanel/tabbargeometry.hxx      |   2 +-
 svtools/source/toolpanel/tabitemdescriptor.hxx   |   4 +-
 svtools/source/toolpanel/tablayouter.cxx         |   6 +-
 svtools/source/toolpanel/toolpanel.cxx           |   2 +-
 svtools/source/toolpanel/toolpanelcollection.hxx |   2 +-
 svtools/source/toolpanel/toolpaneldeck.cxx       |   6 +-
 svtools/source/toolpanel/toolpaneldeckpeer.cxx   |   2 +-
 34 files changed, 977 insertions(+), 972 deletions(-)
 delete mode 100755 svtools/inc/svtools/decklayouter.hxx
 delete mode 100644 svtools/inc/svtools/drawerlayouter.hxx
 delete mode 100644 svtools/inc/svtools/paneltabbar.hxx
 delete mode 100644 svtools/inc/svtools/refbase.hxx
 delete mode 100644 svtools/inc/svtools/tabalignment.hxx
 delete mode 100644 svtools/inc/svtools/tabitemcontent.hxx
 delete mode 100755 svtools/inc/svtools/tablayouter.hxx
 delete mode 100644 svtools/inc/svtools/toolpanel.hxx
 create mode 100755 svtools/inc/svtools/toolpanel/decklayouter.hxx
 create mode 100644 svtools/inc/svtools/toolpanel/drawerlayouter.hxx
 create mode 100644 svtools/inc/svtools/toolpanel/paneltabbar.hxx
 create mode 100644 svtools/inc/svtools/toolpanel/refbase.hxx
 create mode 100644 svtools/inc/svtools/toolpanel/tabalignment.hxx
 create mode 100644 svtools/inc/svtools/toolpanel/tabitemcontent.hxx
 create mode 100755 svtools/inc/svtools/toolpanel/tablayouter.hxx
 create mode 100644 svtools/inc/svtools/toolpanel/toolpanel.hxx
 create mode 100755 svtools/inc/svtools/toolpanel/toolpaneldeck.hxx
 delete mode 100755 svtools/inc/svtools/toolpaneldeck.hxx

diff --git a/svl/Package_inc.mk b/svl/Package_inc.mk
index 0944d0a491d6..c0f22768b473 100644
--- a/svl/Package_inc.mk
+++ b/svl/Package_inc.mk
@@ -75,6 +75,7 @@ $(eval $(call gb_Package_add_file,svl_inc,inc/svl/sharecontrolfile.hxx,svl/share
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/slstitm.hxx,svl/slstitm.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/smplhint.hxx,svl/smplhint.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/solar.hrc,svl/solar.hrc))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/svl.hrc,svl/svl.hrc))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/stritem.hxx,svl/stritem.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/style.hrc,svl/style.hrc))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/style.hxx,svl/style.hxx))
diff --git a/svtools/Package_inc.mk b/svtools/Package_inc.mk
index 38cd74c74a6f..b74e2fd022c5 100644
--- a/svtools/Package_inc.mk
+++ b/svtools/Package_inc.mk
@@ -26,12 +26,9 @@
 #*************************************************************************
 
 $(eval $(call gb_Package_Package,svtools_inc,$(SRCDIR)/svtools/inc))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/AccessibleBrowseBoxObjType.hxx,svtools/AccessibleBrowseBoxObjType.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/DocumentInfoPreview.hxx,svtools/DocumentInfoPreview.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/FilterConfigItem.hxx,svtools/FilterConfigItem.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/QueryFolderName.hxx,svtools/QueryFolderName.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/acceleratorexecute.hxx,svtools/acceleratorexecute.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibilityoptions.hxx,svtools/accessibilityoptions.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/AccessibleBrowseBoxObjType.hxx,svtools/AccessibleBrowseBoxObjType.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessiblefactory.hxx,svtools/accessiblefactory.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibletable.hxx,svtools/accessibletable.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibletableprovider.hxx,svtools/accessibletableprovider.hxx))
@@ -51,8 +48,11 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/contextmenuhelper.hxx,
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/controldims.hrc,svtools/controldims.hrc))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ctrlbox.hxx,svtools/ctrlbox.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ctrltool.hxx,svtools/ctrltool.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/decklayouter.hxx,svtools/toolpanel/decklayouter.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/dialogclosedlistener.hxx,svtools/dialogclosedlistener.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/dialogcontrolling.hxx,svtools/dialogcontrolling.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/DocumentInfoPreview.hxx,svtools/DocumentInfoPreview.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/drawerlayouter.hxx,svtools/toolpanel/drawerlayouter.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/editbrowsebox.hxx,svtools/editbrowsebox.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/editimplementation.hxx,svtools/editimplementation.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/editsyntaxhighlighter.hxx,svtools/editsyntaxhighlighter.hxx))
@@ -63,10 +63,11 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/expander.hxx,svtools/e
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/extcolorcfg.hxx,svtools/extcolorcfg.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/extensionlistbox.hxx,svtools/extensionlistbox.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filectrl.hxx,svtools/filectrl.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filedlg.hxx,svtools/filedlg.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filedlg2.hrc,svtools/filedlg2.hrc))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filedlg.hxx,svtools/filedlg.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fileurlbox.hxx,svtools/fileurlbox.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fileview.hxx,svtools/fileview.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/FilterConfigItem.hxx,svtools/FilterConfigItem.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filter.hxx,svtools/filter.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fixedhyper.hxx,svtools/fixedhyper.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fltcall.hxx,svtools/fltcall.hxx))
@@ -89,8 +90,8 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/hyperlabel.hxx,svtools
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imagemgr.hrc,svtools/imagemgr.hrc))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imagemgr.hxx,svtools/imagemgr.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imageresourceaccess.hxx,svtools/imageresourceaccess.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imap.hxx,svtools/imap.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imapcirc.hxx,svtools/imapcirc.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imap.hxx,svtools/imap.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imapobj.hxx,svtools/imapobj.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imappoly.hxx,svtools/imappoly.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imaprect.hxx,svtools/imaprect.hxx))
@@ -108,12 +109,17 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/localresaccess.hxx,svt
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/menuoptions.hxx,svtools/menuoptions.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/miscopt.hxx,svtools/miscopt.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/optionsdrawinglayer.hxx,svtools/optionsdrawinglayer.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/paneltabbar.hxx,svtools/toolpanel/paneltabbar.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/parhtml.hxx,svtools/parhtml.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/parrtf.hxx,svtools/parrtf.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/popupmenucontrollerbase.hxx,svtools/popupmenucontrollerbase.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/popupwindowcontroller.hxx,svtools/popupwindowcontroller.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/prgsbar.hxx,svtools/prgsbar.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/printdlg.hxx,svtools/printdlg.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/printoptions.hxx,svtools/printoptions.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/prnsetup.hxx,svtools/prnsetup.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/QueryFolderName.hxx,svtools/QueryFolderName.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/refbase.hxx,svtools/toolpanel/refbase.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/roadmap.hxx,svtools/roadmap.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/roadmapwizard.hxx,svtools/roadmapwizard.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/rtfkeywd.hxx,svtools/rtfkeywd.hxx))
@@ -132,17 +138,21 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/stringtransfer.hxx,svt
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svicnvw.hxx,svtools/svicnvw.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svlbitm.hxx,svtools/svlbitm.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svlbox.hxx,svtools/svlbox.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svmedit.hxx,svtools/svmedit.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svmedit2.hxx,svtools/svmedit2.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svmedit.hxx,svtools/svmedit.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svparser.hxx,svtools/svparser.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtabbx.hxx,svtools/svtabbx.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtdata.hxx,svtools/svtdata.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtdllapi.h,svtools/svtdllapi.h))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtools.hrc,svtools/svtools.hrc))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtreebx.hxx,svtools/svtreebx.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svxbox.hxx,svtools/svxbox.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/sychconv.hxx,svtools/sychconv.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/syntaxhighlight.hxx,svtools/syntaxhighlight.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/tabalignment.hxx,svtools/toolpanel/tabalignment.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/tabbar.hxx,svtools/tabbar.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/tabitemcontent.hxx,svtools/toolpanel/tabitemcontent.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/tablayouter.hxx,svtools/toolpanel/tablayouter.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/abstracttablecontrol.hxx,svtools/table/abstracttablecontrol.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/defaultinputhandler.hxx,svtools/table/defaultinputhandler.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/gridtablerenderer.hxx,svtools/table/gridtablerenderer.hxx))
@@ -160,7 +170,10 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/textdata.hxx,svtools/t
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/texteng.hxx,svtools/texteng.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/textview.hxx,svtools/textview.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/textwindowpeer.hxx,svtools/textwindowpeer.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolbarmenu.hxx,svtools/toolbarmenu.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolboxcontroller.hxx,svtools/toolboxcontroller.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/toolpaneldeck.hxx,svtools/toolpanel/toolpaneldeck.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/toolpanel.hxx,svtools/toolpanel/toolpanel.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/tooltiplbox.hxx,svtools/tooltiplbox.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/transfer.hxx,svtools/transfer.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/treelist.hxx,svtools/treelist.hxx))
@@ -177,13 +190,4 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wizardmachine.hxx,svto
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wizdlg.hxx,svtools/wizdlg.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wmf.hxx,svtools/wmf.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/xtextedt.hxx,svtools/xtextedt.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtools.hrc,svtools/svtools.hrc))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/decklayouter.hxx,svtools/decklayouter.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/refbase.hxx,svtools/refbase.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/tablayouter.hxx,svtools/tablayouter.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/drawerlayouter.hxx,svtools/drawerlayouter.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/tabalignment.hxx,svtools/tabalignment.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpaneldeck.hxx,svtools/toolpaneldeck.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/paneltabbar.hxx,svtools/paneltabbar.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/tabitemcontent.hxx,svtools/tabitemcontent.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel.hxx,svtools/toolpanel.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/xwindowitem.hxx,svtools/xwindowitem.hxx))
diff --git a/svtools/inc/svtools/decklayouter.hxx b/svtools/inc/svtools/decklayouter.hxx
deleted file mode 100755
index da03d7c6c3aa..000000000000
--- a/svtools/inc/svtools/decklayouter.hxx
+++ /dev/null
@@ -1,104 +0,0 @@
-/*************************************************************************
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * 
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#ifndef SVT_DECKLAYOUTER_HXX
-#define SVT_DECKLAYOUTER_HXX
-
-#include 
-
-#include 
-
-#include 
-
-namespace com { namespace sun { namespace star { namespace accessibility {
-    class XAccessible;
-} } } }
-class Rectangle;
-class Point;
-
-//........................................................................
-namespace svt
-{
-//........................................................................
-
-    //====================================================================
-    //= IDeckLayouter
-    //====================================================================
-    class IDeckLayouter : public ::rtl::IReference
-    {
-    public:
-        /** re-arranges the elements of the tool deck, taking into account the
-            available space for the complete deck.
-
-            @param i_rDeckPlayground
-                the playground for the complete tool panel deck
-            @return
-                the content area for a single tool panel
-        */
-        virtual ::Rectangle Layout( const ::Rectangle& i_rDeckPlayground ) = 0;
-
-        /** destroys the instance
-
-            Since the layouter is ref-counted, but might keep references to non-ref-counted objects
-            (in particular, the ToolPanelDeck, which is a VCL-Window, and thus cannot be ref-counted),
-            Destroy is the definitive way to dispose the instance. Technically, it's still alive afterwards,
-            but non-functional.
-        */
-        virtual void        Destroy() = 0;
-
-        /** assuming that a layouter neesds to provide some kind of panel selector control, this method
-            requests to set the focus to this control.
-        */
-        virtual void        SetFocusToPanelSelector() = 0;
-
-        /** returns the number of components in the XAccessible hierarchy which are needed to represent all elements
-            the layouter is responsible form.
-
-            Note that the implementation must guarantee that the count is fixed over the life time of the layouter.
-        */
-        virtual size_t      GetAccessibleChildCount() const = 0;
-
-        /** retrieves the XAccessible implementation for the i_nChildIndex'th child in the XAccessible
-            hierarchy.
-        */
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
-                            GetAccessibleChild(
-                                const size_t i_nChildIndex,
-                                const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rParentAccessible
-                            ) = 0;
-
-        virtual ~IDeckLayouter()
-        {
-        }
-    };
-
-    typedef ::rtl::Reference< IDeckLayouter >   PDeckLayouter;
-
-//........................................................................
-} // namespace svt
-//........................................................................
-
-#endif // SVT_DECKLAYOUTER_HXX
diff --git a/svtools/inc/svtools/drawerlayouter.hxx b/svtools/inc/svtools/drawerlayouter.hxx
deleted file mode 100644
index 5174fa613697..000000000000
--- a/svtools/inc/svtools/drawerlayouter.hxx
+++ /dev/null
@@ -1,102 +0,0 @@
-/*************************************************************************
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * 
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#ifndef SVT_DRAWERLAYOUTER_HXX
-#define SVT_DRAWERLAYOUTER_HXX
-
-#include "svtools/svtdllapi.h"
-#include "svtools/refbase.hxx"
-#include "svtools/toolpaneldeck.hxx"
-#include "svtools/decklayouter.hxx"
-
-#include 
-
-//......................................................................................................................
-namespace svt
-{
-//......................................................................................................................
-
-    class ToolPanelViewShell;
-    class ToolPanelDrawer;
-    typedef ::boost::shared_ptr< ToolPanelDrawer >  PToolPanelDrawer;
-
-    //==================================================================================================================
-    //= ToolPanelDrawer
-    //==================================================================================================================
-    /** a class which implements a tool panel selector in the form of the classical drawers
-    */
-    class SVT_DLLPUBLIC DrawerDeckLayouter  :public RefBase
-                                            ,public IDeckLayouter
-                                            ,public IToolPanelDeckListener
-    {
-    public:
-        DrawerDeckLayouter(
-            ::Window& i_rParentWindow,
-            IToolPanelDeck& i_rPanels
-        );
-        ~DrawerDeckLayouter();
-
-        // IReference
-        DECLARE_IREFERENCE()
-
-        // IDeckLayouter
-        virtual Rectangle   Layout( const Rectangle& i_rDeckPlayground );
-        virtual void        Destroy();
-        virtual void        SetFocusToPanelSelector();
-        virtual size_t      GetAccessibleChildCount() const;
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
-                            GetAccessibleChild(
-                                const size_t i_nChildIndex,
-                                const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rParentAccessible
-                            );
-
-        // IToolPanelDeckListener
-        virtual void PanelInserted( const PToolPanel& i_pPanel, const size_t i_nPosition );
-        virtual void PanelRemoved( const size_t i_nPosition );
-        virtual void ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive );
-        virtual void LayouterChanged( const PDeckLayouter& i_rNewLayouter );
-        virtual void Dying();
-
-    private:
-        // triggers a re-arrance of the panel deck elements
-        void    impl_triggerRearrange() const;
-        size_t  impl_getPanelPositionFromWindow( const Window* i_pDrawerWindow ) const;
-        void    impl_removeDrawer( const size_t i_nPosition );
-
-        DECL_LINK( OnWindowEvent, VclSimpleEvent* );
-
-private:
-        Window&                             m_rParentWindow;
-        IToolPanelDeck&                     m_rPanelDeck;
-        ::std::vector< PToolPanelDrawer >   m_aDrawers;
-        ::boost::optional< size_t >         m_aLastKnownActivePanel;
-    };
-
-//......................................................................................................................
-} // namespace svt
-//......................................................................................................................
-
-#endif // SVT_DRAWERLAYOUTER_HXX
diff --git a/svtools/inc/svtools/paneltabbar.hxx b/svtools/inc/svtools/paneltabbar.hxx
deleted file mode 100644
index e499ce70ff6c..000000000000
--- a/svtools/inc/svtools/paneltabbar.hxx
+++ /dev/null
@@ -1,102 +0,0 @@
-/*************************************************************************
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * 
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#ifndef SVT_PANELTABBAR_HXX
-#define SVT_PANELTABBAR_HXX
-
-#include "svtools/svtdllapi.h"
-#include "svtools/tabalignment.hxx"
-#include "svtools/tabitemcontent.hxx"
-
-#include 
-
-#include 
-#include 
-
-class PushButton;
-
-//........................................................................
-namespace svt
-{
-//........................................................................
-
-    class PanelTabBar_Impl;
-    class IToolPanelDeck;
-
-    //====================================================================
-    //= PanelTabBar
-    //====================================================================
-    /** a tab bar for selecting panels
-
-        At the moment, this control aligns the tabs vertically, this might be extended to also support a horizontal
-        layout in the future.
-    */
-    class SVT_DLLPUBLIC PanelTabBar : public Control
-    {
-    public:
-        PanelTabBar( Window& i_rParentWindow, IToolPanelDeck& i_rPanelDeck, const TabAlignment i_eAlignment, const TabItemContent i_eItemContent );
-        ~PanelTabBar();
-
-        // attribute access
-        TabItemContent  GetTabItemContent() const;
-        void            SetTabItemContent( const TabItemContent& i_eItemContent );
-
-        ::boost::optional< size_t > GetFocusedPanelItem() const;
-        void                        FocusPanelItem( const size_t i_nItemPos );
-        Rectangle                   GetItemScreenRect( const size_t i_nItemPos ) const;
-        bool                        IsVertical() const;
-        IToolPanelDeck&             GetPanelDeck() const;
-        PushButton&                 GetScrollButton( const bool i_bForward );
-
-        // Window overridables
-        virtual Size    GetOptimalSize( WindowSizeType i_eType ) const;
-
-    protected:
-        // Window overridables
-        virtual void    Paint( const Rectangle& i_rRect );
-        virtual void    Resize();
-        virtual void    MouseMove( const MouseEvent& i_rMouseEvent );
-        virtual void    MouseButtonDown( const MouseEvent& i_rMouseEvent );
-        virtual void    MouseButtonUp( const MouseEvent& i_rMouseEvent );
-        virtual void    RequestHelp( const HelpEvent& i_rHelpEvent );
-        virtual void    GetFocus();
-        virtual void    LoseFocus();
-        virtual void    KeyInput( const KeyEvent& i_rKeyEvent );
-        virtual void    DataChanged( const DataChangedEvent& i_rDataChanedEvent );
-
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >
-                        GetComponentInterface( BOOL i_bCreate );
-
-    private:
-        ::std::auto_ptr< PanelTabBar_Impl > m_pImpl;
-    };
-
-//........................................................................
-} // namespace svt
-//........................................................................
-
-#endif // SVT_PANELTABBAR_HXX
-
diff --git a/svtools/inc/svtools/refbase.hxx b/svtools/inc/svtools/refbase.hxx
deleted file mode 100644
index 991d6e619090..000000000000
--- a/svtools/inc/svtools/refbase.hxx
+++ /dev/null
@@ -1,80 +0,0 @@
-/*************************************************************************
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * 
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#ifndef SVT_REFBASE_HXX
-#define SVT_REFBASE_HXX
-
-#include "svtools/svtdllapi.h"
-
-#include 
-
-//........................................................................
-namespace svt
-{
-//........................................................................
-
-    //====================================================================
-    //= RefBase
-    //====================================================================
-    class SVT_DLLPUBLIC RefBase : public ::rtl::IReference
-    {
-    protected:
-        RefBase()
-            :m_refCount( 0 )
-        {
-        }
-
-        virtual ~RefBase()
-        {
-        }
-
-        virtual oslInterlockedCount SAL_CALL acquire();
-        virtual oslInterlockedCount SAL_CALL release();
-
-    private:
-        oslInterlockedCount m_refCount;
-    };
-
-#define DECLARE_IREFERENCE()    \
-    virtual oslInterlockedCount SAL_CALL acquire(); \
-    virtual oslInterlockedCount SAL_CALL release();
-
-
-#define IMPLEMENT_IREFERENCE( classname )   \
-    oslInterlockedCount classname::acquire()    \
-    {   \
-        return RefBase::acquire();  \
-    }   \
-    oslInterlockedCount classname::release()    \
-    {   \
-        return RefBase::release();  \
-    }
-
-//........................................................................
-} // namespace svt
-//........................................................................
-
-#endif // SVT_REFBASE_HXX
diff --git a/svtools/inc/svtools/tabalignment.hxx b/svtools/inc/svtools/tabalignment.hxx
deleted file mode 100644
index cc3f17469ffe..000000000000
--- a/svtools/inc/svtools/tabalignment.hxx
+++ /dev/null
@@ -1,47 +0,0 @@
-/*************************************************************************
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * 
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#ifndef SVT_TABALIGNMENT_HXX
-#define SVT_TABALIGNMENT_HXX
-
-//........................................................................
-namespace svt
-{
-//........................................................................
-
-    enum TabAlignment
-    {
-        TABS_LEFT,
-        TABS_RIGHT,
-        TABS_TOP,
-        TABS_BOTTOM
-    };
-
-//........................................................................
-} // namespace svt
-//........................................................................
-
-#endif // SVT_TABALIGNMENT_HXX
diff --git a/svtools/inc/svtools/tabitemcontent.hxx b/svtools/inc/svtools/tabitemcontent.hxx
deleted file mode 100644
index a1cf9deae9f4..000000000000
--- a/svtools/inc/svtools/tabitemcontent.hxx
+++ /dev/null
@@ -1,48 +0,0 @@
-/*************************************************************************
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * 
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#ifndef SVT_TABITEMCONTENT_HXX
-#define SVT_TABITEMCONTENT_HXX
-
-//........................................................................
-namespace svt
-{
-//........................................................................
-
-    enum TabItemContent
-    {
-        TABITEM_IMAGE_AND_TEXT,
-        TABITEM_IMAGE_ONLY,
-        TABITEM_TEXT_ONLY,
-
-        TABITEM_AUTO
-    };
-
-//........................................................................
-} // namespace svt
-//........................................................................
-
-#endif // SVT_TABITEMCONTENT_HXX
diff --git a/svtools/inc/svtools/tablayouter.hxx b/svtools/inc/svtools/tablayouter.hxx
deleted file mode 100755
index 2cd20bc7fcda..000000000000
--- a/svtools/inc/svtools/tablayouter.hxx
+++ /dev/null
@@ -1,112 +0,0 @@
-/*************************************************************************
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * 
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#ifndef SVT_TABLAYOUTER_HXX
-#define SVT_TABLAYOUTER_HXX
-
-#include "svtools/svtdllapi.h"
-#include "svtools/decklayouter.hxx"
-#include "svtools/tabalignment.hxx"
-#include "svtools/tabitemcontent.hxx"
-#include "svtools/refbase.hxx"
-
-#include 
-
-#include 
-
-class Window;
-
-//........................................................................
-namespace svt
-{
-//........................................................................
-
-    class IToolPanelDeck;
-
-    struct TabDeckLayouter_Data;
-
-    //====================================================================
-    //= TabDeckLayouter
-    //====================================================================
-    class SVT_DLLPUBLIC TabDeckLayouter :public RefBase
-                                        ,public IDeckLayouter
-                                        ,public ::boost::noncopyable
-    {
-    public:
-        /** creates a new layouter
-            @param i_rParent
-                is the parent window for any VCL windows the layouter needs to create.
-            @param i_rPanels
-                is the panel deck which the layouter is responsible for.
-            @param i_eAlignment
-                specifies the alignment of the panel selector
-            @param TabItemContent
-                specifies the content to show on the tab items
-        */
-        TabDeckLayouter(
-            Window& i_rParent,
-            IToolPanelDeck& i_rPanels,
-            const TabAlignment i_eAlignment,
-            const TabItemContent i_eItemContent
-        );
-        ~TabDeckLayouter();
-
-        // attribute access
-        TabItemContent  GetTabItemContent() const;
-        void            SetTabItemContent( const TabItemContent& i_eItemContent );
-        TabAlignment    GetTabAlignment() const;
-
-        // helpers for the A11Y implementation
-        ::boost::optional< size_t >
-                        GetFocusedPanelItem() const;
-        void            FocusPanelItem( const size_t i_nItemPos );
-        bool            IsPanelSelectorEnabled() const;
-        bool            IsPanelSelectorVisible() const;
-        Rectangle       GetItemScreenRect( const size_t i_nItemPos ) const;
-
-        // IDeckLayouter
-        virtual Rectangle   Layout( const Rectangle& i_rDeckPlayground );
-        virtual void        Destroy();
-        virtual void        SetFocusToPanelSelector();
-        virtual size_t      GetAccessibleChildCount() const;
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
-                            GetAccessibleChild(
-                                const size_t i_nChildIndex,
-                                const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rParentAccessible
-                            );
-
-        // IReference
-        DECLARE_IREFERENCE()
-
-    private:
-        ::std::auto_ptr< TabDeckLayouter_Data > m_pData;
-    };
-
-//........................................................................
-} // namespace svt
-//........................................................................
-
-#endif // SVT_TABLAYOUTER_HXX
diff --git a/svtools/inc/svtools/toolpanel.hxx b/svtools/inc/svtools/toolpanel.hxx
deleted file mode 100644
index 084182231480..000000000000
--- a/svtools/inc/svtools/toolpanel.hxx
+++ /dev/null
@@ -1,146 +0,0 @@
-/*************************************************************************
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * 
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#ifndef SVT_TOOLPANEL_HXX
-#define SVT_TOOLPANEL_HXX
-
-#include "svtools/svtdllapi.h"
-#include "svtools/refbase.hxx"
-
-#include 
-#include 
-
-#include 
-
-class Rectangle;
-class Window;
-namespace com { namespace sun { namespace star { namespace accessibility {
-    class XAccessible;
-} } } }
-
-//........................................................................
-namespace svt
-{
-//........................................................................
-
-    //====================================================================
-    //= IToolPanel
-    //====================================================================
-    /** abstract interface for a single tool panel
-    */
-    class SVT_DLLPUBLIC IToolPanel : public ::rtl::IReference
-    {
-    public:
-        /// retrieves the display name of the panel
-        virtual ::rtl::OUString GetDisplayName() const = 0;
-
-        /// retrieves the image associated with the panel, if any
-        virtual Image GetImage() const = 0;
-
-        /// retrieves the help ID associated with the panel, if any.
-        virtual rtl::OString GetHelpID() const = 0;
-
-        /** activates the panel
-
-            Usually, this means the panel's Window is created (if not previosly done so) and shown.
-
-            @param i_rParentWindow
-                the parent window to anchor the panel window at. Subsequent calls to the Activate
-                method will always get the same parent window. The complete area of this window is
-                available, and should be used, for the panel window.
-        */
-        virtual void Activate( Window& i_rParentWindow ) = 0;
-
-        /** deactivates the panel
-
-            There are different ways how an implementation could deactivate a panel. The easiest way
-            would be to simply hide the associated Window. Alternatively, you could completely destroy it,
-            or decide to cache it by re-parenting it to another (temporary, invisible) window.
-        */
-        virtual void Deactivate() = 0;
-
-        /** sets a new size for the panel's Window
-
-            The panel window is always expected to be positioned at (0,0), relative to the parent window
-            which was passed to the Activate member. Resizing the panel window is necessary when the size of
-            this parent window changes. Effectively, this method is a means of convenience, to relief panel
-            implementations from reacting on size changes of their parent window themselves.
-        */
-        virtual void SetSizePixel( const Size& i_rPanelWindowSize ) = 0;
-
-        /// sets the focus to the panel window
-        virtual void GrabFocus() = 0;
-
-        /** release any resources associated with the panel.
-
-            In particular, implementations should ultimately destroy the VCL window which implements the panel
-            window. No subsequent calls to any other method will happen after Destroy has been called.
-        */
-        virtual void Dispose() = 0;
-
-        /** creates an XAccessible for the tool panel
-
-            Implementations are allowed to create a new instance each time this method is called, the caller
-            is responsible for caching the XAccessible implementation, if this is desired.
-        */
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
-                    CreatePanelAccessible(
-                        const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rParentAccessible
-                    ) = 0;
-
-        virtual ~IToolPanel()
-        {
-        }
-    };
-
-    typedef ::rtl::Reference< IToolPanel >  PToolPanel;
-
-    //====================================================================
-    //= ToolPanelBase
-    //====================================================================
-    /** base class for tool panel implementations, adding ref count implementation to the IToolPanel interface,
-        but still being abstract
-    */
-    class SVT_DLLPUBLIC ToolPanelBase   :public IToolPanel
-                                        ,public RefBase
-                                        ,public ::boost::noncopyable
-    {
-    protected:
-        ToolPanelBase();
-        ~ToolPanelBase();
-
-    public:
-        DECLARE_IREFERENCE()
-
-    private:
-        oslInterlockedCount m_refCount;
-    };
-
-//........................................................................
-} // namespace svt
-//........................................................................
-
-#endif // SVT_TOOLPANEL_HXX
diff --git a/svtools/inc/svtools/toolpanel/decklayouter.hxx b/svtools/inc/svtools/toolpanel/decklayouter.hxx
new file mode 100755
index 000000000000..da03d7c6c3aa
--- /dev/null
+++ b/svtools/inc/svtools/toolpanel/decklayouter.hxx
@@ -0,0 +1,104 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * 
+ * for a copy of the LGPLv3 License.
+ *
+************************************************************************/
+
+#ifndef SVT_DECKLAYOUTER_HXX
+#define SVT_DECKLAYOUTER_HXX
+
+#include 
+
+#include 
+
+#include 
+
+namespace com { namespace sun { namespace star { namespace accessibility {
+    class XAccessible;
+} } } }
+class Rectangle;
+class Point;
+
+//........................................................................
+namespace svt
+{
+//........................................................................
+
+    //====================================================================
+    //= IDeckLayouter
+    //====================================================================
+    class IDeckLayouter : public ::rtl::IReference
+    {
+    public:
+        /** re-arranges the elements of the tool deck, taking into account the
+            available space for the complete deck.
+
+            @param i_rDeckPlayground
+                the playground for the complete tool panel deck
+            @return
+                the content area for a single tool panel
+        */
+        virtual ::Rectangle Layout( const ::Rectangle& i_rDeckPlayground ) = 0;
+
+        /** destroys the instance
+
+            Since the layouter is ref-counted, but might keep references to non-ref-counted objects
+            (in particular, the ToolPanelDeck, which is a VCL-Window, and thus cannot be ref-counted),
+            Destroy is the definitive way to dispose the instance. Technically, it's still alive afterwards,
+            but non-functional.
+        */
+        virtual void        Destroy() = 0;
+
+        /** assuming that a layouter neesds to provide some kind of panel selector control, this method
+            requests to set the focus to this control.
+        */
+        virtual void        SetFocusToPanelSelector() = 0;
+
+        /** returns the number of components in the XAccessible hierarchy which are needed to represent all elements
+            the layouter is responsible form.
+
+            Note that the implementation must guarantee that the count is fixed over the life time of the layouter.
+        */
+        virtual size_t      GetAccessibleChildCount() const = 0;
+
+        /** retrieves the XAccessible implementation for the i_nChildIndex'th child in the XAccessible
+            hierarchy.
+        */
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+                            GetAccessibleChild(
+                                const size_t i_nChildIndex,
+                                const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rParentAccessible
+                            ) = 0;
+
+        virtual ~IDeckLayouter()
+        {
+        }
+    };
+
+    typedef ::rtl::Reference< IDeckLayouter >   PDeckLayouter;
+
+//........................................................................
+} // namespace svt
+//........................................................................
+
+#endif // SVT_DECKLAYOUTER_HXX
diff --git a/svtools/inc/svtools/toolpanel/drawerlayouter.hxx b/svtools/inc/svtools/toolpanel/drawerlayouter.hxx
new file mode 100644
index 000000000000..0ecf493d0e98
--- /dev/null
+++ b/svtools/inc/svtools/toolpanel/drawerlayouter.hxx
@@ -0,0 +1,102 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * 
+ * for a copy of the LGPLv3 License.
+ *
+************************************************************************/
+
+#ifndef SVT_DRAWERLAYOUTER_HXX
+#define SVT_DRAWERLAYOUTER_HXX
+
+#include "svtools/svtdllapi.h"
+#include "svtools/toolpanel/refbase.hxx"
+#include "svtools/toolpanel/toolpaneldeck.hxx"
+#include "svtools/toolpanel/decklayouter.hxx"
+
+#include 
+
+//......................................................................................................................
+namespace svt
+{
+//......................................................................................................................
+
+    class ToolPanelViewShell;
+    class ToolPanelDrawer;
+    typedef ::boost::shared_ptr< ToolPanelDrawer >  PToolPanelDrawer;
+
+    //==================================================================================================================
+    //= ToolPanelDrawer
+    //==================================================================================================================
+    /** a class which implements a tool panel selector in the form of the classical drawers
+    */
+    class SVT_DLLPUBLIC DrawerDeckLayouter  :public RefBase
+                                            ,public IDeckLayouter
+                                            ,public IToolPanelDeckListener
+    {
+    public:
+        DrawerDeckLayouter(
+            ::Window& i_rParentWindow,
+            IToolPanelDeck& i_rPanels
+        );
+        ~DrawerDeckLayouter();
+
+        // IReference
+        DECLARE_IREFERENCE()
+
+        // IDeckLayouter
+        virtual Rectangle   Layout( const Rectangle& i_rDeckPlayground );
+        virtual void        Destroy();
+        virtual void        SetFocusToPanelSelector();
+        virtual size_t      GetAccessibleChildCount() const;
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+                            GetAccessibleChild(
+                                const size_t i_nChildIndex,
+                                const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rParentAccessible
+                            );
+
+        // IToolPanelDeckListener
+        virtual void PanelInserted( const PToolPanel& i_pPanel, const size_t i_nPosition );
+        virtual void PanelRemoved( const size_t i_nPosition );
+        virtual void ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive );
+        virtual void LayouterChanged( const PDeckLayouter& i_rNewLayouter );
+        virtual void Dying();
+
+    private:
+        // triggers a re-arrance of the panel deck elements
+        void    impl_triggerRearrange() const;
+        size_t  impl_getPanelPositionFromWindow( const Window* i_pDrawerWindow ) const;
+        void    impl_removeDrawer( const size_t i_nPosition );
+
+        DECL_LINK( OnWindowEvent, VclSimpleEvent* );
+
+private:
+        Window&                             m_rParentWindow;
+        IToolPanelDeck&                     m_rPanelDeck;
+        ::std::vector< PToolPanelDrawer >   m_aDrawers;
+        ::boost::optional< size_t >         m_aLastKnownActivePanel;
+    };
+
+//......................................................................................................................
+} // namespace svt
+//......................................................................................................................
+
+#endif // SVT_DRAWERLAYOUTER_HXX
diff --git a/svtools/inc/svtools/toolpanel/paneltabbar.hxx b/svtools/inc/svtools/toolpanel/paneltabbar.hxx
new file mode 100644
index 000000000000..668935d8a739
--- /dev/null
+++ b/svtools/inc/svtools/toolpanel/paneltabbar.hxx
@@ -0,0 +1,102 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * 
+ * for a copy of the LGPLv3 License.
+ *
+************************************************************************/
+
+#ifndef SVT_PANELTABBAR_HXX
+#define SVT_PANELTABBAR_HXX
+
+#include "svtools/svtdllapi.h"
+#include "svtools/toolpanel/tabalignment.hxx"
+#include "svtools/toolpanel/tabitemcontent.hxx"
+
+#include 
+
+#include 
+#include 
+
+class PushButton;
+
+//........................................................................
+namespace svt
+{
+//........................................................................
+
+    class PanelTabBar_Impl;
+    class IToolPanelDeck;
+
+    //====================================================================
+    //= PanelTabBar
+    //====================================================================
+    /** a tab bar for selecting panels
+
+        At the moment, this control aligns the tabs vertically, this might be extended to also support a horizontal
+        layout in the future.
+    */
+    class SVT_DLLPUBLIC PanelTabBar : public Control
+    {
+    public:
+        PanelTabBar( Window& i_rParentWindow, IToolPanelDeck& i_rPanelDeck, const TabAlignment i_eAlignment, const TabItemContent i_eItemContent );
+        ~PanelTabBar();
+
+        // attribute access
+        TabItemContent  GetTabItemContent() const;
+        void            SetTabItemContent( const TabItemContent& i_eItemContent );
+
+        ::boost::optional< size_t > GetFocusedPanelItem() const;
+        void                        FocusPanelItem( const size_t i_nItemPos );
+        Rectangle                   GetItemScreenRect( const size_t i_nItemPos ) const;
+        bool                        IsVertical() const;
+        IToolPanelDeck&             GetPanelDeck() const;
+        PushButton&                 GetScrollButton( const bool i_bForward );
+
+        // Window overridables
+        virtual Size    GetOptimalSize( WindowSizeType i_eType ) const;
+
+    protected:
+        // Window overridables
+        virtual void    Paint( const Rectangle& i_rRect );
+        virtual void    Resize();
+        virtual void    MouseMove( const MouseEvent& i_rMouseEvent );
+        virtual void    MouseButtonDown( const MouseEvent& i_rMouseEvent );
+        virtual void    MouseButtonUp( const MouseEvent& i_rMouseEvent );
+        virtual void    RequestHelp( const HelpEvent& i_rHelpEvent );
+        virtual void    GetFocus();
+        virtual void    LoseFocus();
+        virtual void    KeyInput( const KeyEvent& i_rKeyEvent );
+        virtual void    DataChanged( const DataChangedEvent& i_rDataChanedEvent );
+
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >
+                        GetComponentInterface( BOOL i_bCreate );
+
+    private:
+        ::std::auto_ptr< PanelTabBar_Impl > m_pImpl;
+    };
+
+//........................................................................
+} // namespace svt
+//........................................................................
+
+#endif // SVT_PANELTABBAR_HXX
+
diff --git a/svtools/inc/svtools/toolpanel/refbase.hxx b/svtools/inc/svtools/toolpanel/refbase.hxx
new file mode 100644
index 000000000000..991d6e619090
--- /dev/null
+++ b/svtools/inc/svtools/toolpanel/refbase.hxx
@@ -0,0 +1,80 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * 
+ * for a copy of the LGPLv3 License.
+ *
+************************************************************************/
+
+#ifndef SVT_REFBASE_HXX
+#define SVT_REFBASE_HXX
+
+#include "svtools/svtdllapi.h"
+
+#include 
+
+//........................................................................
+namespace svt
+{
+//........................................................................
+
+    //====================================================================
+    //= RefBase
+    //====================================================================
+    class SVT_DLLPUBLIC RefBase : public ::rtl::IReference
+    {
+    protected:
+        RefBase()
+            :m_refCount( 0 )
+        {
+        }
+
+        virtual ~RefBase()
+        {
+        }
+
+        virtual oslInterlockedCount SAL_CALL acquire();
+        virtual oslInterlockedCount SAL_CALL release();
+
+    private:
+        oslInterlockedCount m_refCount;
+    };
+
+#define DECLARE_IREFERENCE()    \
+    virtual oslInterlockedCount SAL_CALL acquire(); \
+    virtual oslInterlockedCount SAL_CALL release();
+
+
+#define IMPLEMENT_IREFERENCE( classname )   \
+    oslInterlockedCount classname::acquire()    \
+    {   \
+        return RefBase::acquire();  \
+    }   \
+    oslInterlockedCount classname::release()    \
+    {   \
+        return RefBase::release();  \
+    }
+
+//........................................................................
+} // namespace svt
+//........................................................................
+
+#endif // SVT_REFBASE_HXX
diff --git a/svtools/inc/svtools/toolpanel/tabalignment.hxx b/svtools/inc/svtools/toolpanel/tabalignment.hxx
new file mode 100644
index 000000000000..cc3f17469ffe
--- /dev/null
+++ b/svtools/inc/svtools/toolpanel/tabalignment.hxx
@@ -0,0 +1,47 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * 
+ * for a copy of the LGPLv3 License.
+ *
+************************************************************************/
+
+#ifndef SVT_TABALIGNMENT_HXX
+#define SVT_TABALIGNMENT_HXX
+
+//........................................................................
+namespace svt
+{
+//........................................................................
+
+    enum TabAlignment
+    {
+        TABS_LEFT,
+        TABS_RIGHT,
+        TABS_TOP,
+        TABS_BOTTOM
+    };
+
+//........................................................................
+} // namespace svt
+//........................................................................
+
+#endif // SVT_TABALIGNMENT_HXX
diff --git a/svtools/inc/svtools/toolpanel/tabitemcontent.hxx b/svtools/inc/svtools/toolpanel/tabitemcontent.hxx
new file mode 100644
index 000000000000..a1cf9deae9f4
--- /dev/null
+++ b/svtools/inc/svtools/toolpanel/tabitemcontent.hxx
@@ -0,0 +1,48 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * 
+ * for a copy of the LGPLv3 License.
+ *
+************************************************************************/
+
+#ifndef SVT_TABITEMCONTENT_HXX
+#define SVT_TABITEMCONTENT_HXX
+
+//........................................................................
+namespace svt
+{
+//........................................................................
+
+    enum TabItemContent
+    {
+        TABITEM_IMAGE_AND_TEXT,
+        TABITEM_IMAGE_ONLY,
+        TABITEM_TEXT_ONLY,
+
+        TABITEM_AUTO
+    };
+
+//........................................................................
+} // namespace svt
+//........................................................................
+
+#endif // SVT_TABITEMCONTENT_HXX
diff --git a/svtools/inc/svtools/toolpanel/tablayouter.hxx b/svtools/inc/svtools/toolpanel/tablayouter.hxx
new file mode 100755
index 000000000000..92b36acf9114
--- /dev/null
+++ b/svtools/inc/svtools/toolpanel/tablayouter.hxx
@@ -0,0 +1,112 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * 
+ * for a copy of the LGPLv3 License.
+ *
+************************************************************************/
+
+#ifndef SVT_TABLAYOUTER_HXX
+#define SVT_TABLAYOUTER_HXX
+
+#include "svtools/svtdllapi.h"
+#include "svtools/toolpanel/decklayouter.hxx"
+#include "svtools/toolpanel/tabalignment.hxx"
+#include "svtools/toolpanel/tabitemcontent.hxx"
+#include "svtools/toolpanel/refbase.hxx"
+
+#include 
+
+#include 
+
+class Window;
+
+//........................................................................
+namespace svt
+{
+//........................................................................
+
+    class IToolPanelDeck;
+
+    struct TabDeckLayouter_Data;
+
+    //====================================================================
+    //= TabDeckLayouter
+    //====================================================================
+    class SVT_DLLPUBLIC TabDeckLayouter :public RefBase
+                                        ,public IDeckLayouter
+                                        ,public ::boost::noncopyable
+    {
+    public:
+        /** creates a new layouter
+            @param i_rParent
+                is the parent window for any VCL windows the layouter needs to create.
+            @param i_rPanels
+                is the panel deck which the layouter is responsible for.
+            @param i_eAlignment
+                specifies the alignment of the panel selector
+            @param TabItemContent
+                specifies the content to show on the tab items
+        */
+        TabDeckLayouter(
+            Window& i_rParent,
+            IToolPanelDeck& i_rPanels,
+            const TabAlignment i_eAlignment,
+            const TabItemContent i_eItemContent
+        );
+        ~TabDeckLayouter();
+
+        // attribute access
+        TabItemContent  GetTabItemContent() const;
+        void            SetTabItemContent( const TabItemContent& i_eItemContent );
+        TabAlignment    GetTabAlignment() const;
+
+        // helpers for the A11Y implementation
+        ::boost::optional< size_t >
+                        GetFocusedPanelItem() const;
+        void            FocusPanelItem( const size_t i_nItemPos );
+        bool            IsPanelSelectorEnabled() const;
+        bool            IsPanelSelectorVisible() const;
+        Rectangle       GetItemScreenRect( const size_t i_nItemPos ) const;
+
+        // IDeckLayouter
+        virtual Rectangle   Layout( const Rectangle& i_rDeckPlayground );
+        virtual void        Destroy();
+        virtual void        SetFocusToPanelSelector();
+        virtual size_t      GetAccessibleChildCount() const;
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+                            GetAccessibleChild(
+                                const size_t i_nChildIndex,
+                                const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rParentAccessible
+                            );
+
+        // IReference
+        DECLARE_IREFERENCE()
+
+    private:
+        ::std::auto_ptr< TabDeckLayouter_Data > m_pData;
+    };
+
+//........................................................................
+} // namespace svt
+//........................................................................
+
+#endif // SVT_TABLAYOUTER_HXX
diff --git a/svtools/inc/svtools/toolpanel/toolpanel.hxx b/svtools/inc/svtools/toolpanel/toolpanel.hxx
new file mode 100644
index 000000000000..d38d8e7d257d
--- /dev/null
+++ b/svtools/inc/svtools/toolpanel/toolpanel.hxx
@@ -0,0 +1,146 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * 
+ * for a copy of the LGPLv3 License.
+ *
+************************************************************************/
+
+#ifndef SVT_TOOLPANEL_HXX
+#define SVT_TOOLPANEL_HXX
+
+#include "svtools/svtdllapi.h"
+#include "svtools/toolpanel/refbase.hxx"
+
+#include 
+#include 
+
+#include 
+
+class Rectangle;
+class Window;
+namespace com { namespace sun { namespace star { namespace accessibility {
+    class XAccessible;
+} } } }
+
+//........................................................................
+namespace svt
+{
+//........................................................................
+
+    //====================================================================
+    //= IToolPanel
+    //====================================================================
+    /** abstract interface for a single tool panel
+    */
+    class SVT_DLLPUBLIC IToolPanel : public ::rtl::IReference
+    {
+    public:
+        /// retrieves the display name of the panel
+        virtual ::rtl::OUString GetDisplayName() const = 0;
+
+        /// retrieves the image associated with the panel, if any
+        virtual Image GetImage() const = 0;
+
+        /// retrieves the help ID associated with the panel, if any.
+        virtual rtl::OString GetHelpID() const = 0;
+
+        /** activates the panel
+
+            Usually, this means the panel's Window is created (if not previosly done so) and shown.
+
+            @param i_rParentWindow
+                the parent window to anchor the panel window at. Subsequent calls to the Activate
+                method will always get the same parent window. The complete area of this window is
+                available, and should be used, for the panel window.
+        */
+        virtual void Activate( Window& i_rParentWindow ) = 0;
+
+        /** deactivates the panel
+
+            There are different ways how an implementation could deactivate a panel. The easiest way
+            would be to simply hide the associated Window. Alternatively, you could completely destroy it,
+            or decide to cache it by re-parenting it to another (temporary, invisible) window.
+        */
+        virtual void Deactivate() = 0;
+
+        /** sets a new size for the panel's Window
+
+            The panel window is always expected to be positioned at (0,0), relative to the parent window
+            which was passed to the Activate member. Resizing the panel window is necessary when the size of
+            this parent window changes. Effectively, this method is a means of convenience, to relief panel
+            implementations from reacting on size changes of their parent window themselves.
+        */
+        virtual void SetSizePixel( const Size& i_rPanelWindowSize ) = 0;
+
+        /// sets the focus to the panel window
+        virtual void GrabFocus() = 0;
+
+        /** release any resources associated with the panel.
+
+            In particular, implementations should ultimately destroy the VCL window which implements the panel
+            window. No subsequent calls to any other method will happen after Destroy has been called.
+        */
+        virtual void Dispose() = 0;
+
+        /** creates an XAccessible for the tool panel
+
+            Implementations are allowed to create a new instance each time this method is called, the caller
+            is responsible for caching the XAccessible implementation, if this is desired.
+        */
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+                    CreatePanelAccessible(
+                        const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rParentAccessible
+                    ) = 0;
+
+        virtual ~IToolPanel()
+        {
+        }
+    };
+
+    typedef ::rtl::Reference< IToolPanel >  PToolPanel;
+
+    //====================================================================
+    //= ToolPanelBase
+    //====================================================================
+    /** base class for tool panel implementations, adding ref count implementation to the IToolPanel interface,
+        but still being abstract
+    */
+    class SVT_DLLPUBLIC ToolPanelBase   :public IToolPanel
+                                        ,public RefBase
+                                        ,public ::boost::noncopyable
+    {
+    protected:
+        ToolPanelBase();
+        ~ToolPanelBase();
+
+    public:
+        DECLARE_IREFERENCE()
+
+    private:
+        oslInterlockedCount m_refCount;
+    };
+
+//........................................................................
+} // namespace svt
+//........................................................................
+
+#endif // SVT_TOOLPANEL_HXX
diff --git a/svtools/inc/svtools/toolpanel/toolpaneldeck.hxx b/svtools/inc/svtools/toolpanel/toolpaneldeck.hxx
new file mode 100755
index 000000000000..a1009591ffba
--- /dev/null
+++ b/svtools/inc/svtools/toolpanel/toolpaneldeck.hxx
@@ -0,0 +1,193 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * 
+ * for a copy of the LGPLv3 License.
+ *
+************************************************************************/
+
+#ifndef SVT_TOOLPANELDECK_HXX
+#define SVT_TOOLPANELDECK_HXX
+
+#include "svtools/svtdllapi.h"
+#include "svtools/toolpanel/toolpanel.hxx"
+#include "svtools/toolpanel/decklayouter.hxx"
+
+#include 
+
+#include 
+#include 
+
+//........................................................................
+namespace svt
+{
+//........................................................................
+
+    class ToolPanelCollection;
+    class ToolPanelDeck_Impl;
+
+    //====================================================================
+    //= IToolPanelDeckListener
+    //====================================================================
+    class SAL_NO_VTABLE IToolPanelDeckListener
+    {
+    public:
+        /** called when a panel has been inserted into the deck
+        */
+        virtual void PanelInserted( const PToolPanel& i_pPanel, const size_t i_nPosition ) = 0;
+
+        /** called when a panel has been removed from the deck
+        */
+        virtual void PanelRemoved( const size_t i_nPosition ) = 0;
+
+        /** called when the active panel of the deck changed
+        */
+        virtual void ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive ) = 0;
+
+        /** called when a new layouter has been set at a tool panel deck.
+
+            The method is called after the old layouter has been disposed (i.e. its Destroy method has been
+            invoked), and after the complete deck has been re-layouter.
+        */
+        virtual void LayouterChanged( const PDeckLayouter& i_rNewLayouter ) = 0;
+
+        /** called when the tool panel deck which the listener registered at is dying. The listener is required to
+            release all references to the deck then.
+        */
+        virtual void Dying() = 0;
+    };
+
+    //====================================================================
+    //= IToolPanelDeck
+    //====================================================================
+    class SVT_DLLPUBLIC IToolPanelDeck
+    {
+    public:
+        /** returns the number of panels in the container
+        */
+        virtual size_t      GetPanelCount() const = 0;
+
+        /** retrieves the panel with the given index. Invalid indexes will be reported via an assertion in the
+            non-product version, and silently ignored in the product version, with a NULL panel being returned.
+        */
+        virtual PToolPanel  GetPanel( const size_t i_nPos ) const = 0;
+
+        /** returns the number of the currently active panel.
+        */
+        virtual ::boost::optional< size_t >
+                            GetActivePanel() const = 0;
+
+        /** activates the panel with the given number. If the given number is larger or equal to the number of panels
+            in the deck, this will be reported via an assertion in non-product builds, and otherwise ignored.
+            @param i_rPanel
+                the number of the panel to activate. If this is not set, the currently active panel is de-activated,
+                and no new panel is activated at all. Whether or not this makes sense for your application is at
+                your own discretion.
+        */
+        virtual void        ActivatePanel( const ::boost::optional< size_t >& i_rPanel ) = 0;
+
+        /** inserts a new panel into the container. NULL panels are not allowed, as are positions greater than the
+            current panel count. Violations of this will be reported via an assertion in the non-product version, and
+            silently ignored in the product version.
+        */
+        virtual size_t      InsertPanel( const PToolPanel& i_pPanel, const size_t i_nPosition ) = 0;
+
+        /** removes a panel specified by its position.
+
+            Note: It is the responsibility of the caller to ensure that the panel is destroyed appropriately. That is,
+            the tool panel deck will not invoke IToolPanel::Dispose on the removed panel.
+            The advantage is that the panel might be re-used later, with the disadvantage that the owner of the panel
+            deck must know whether Dispose must be invoked after removal, or whether the panel will properly
+            dispose itself when its ref count drops to 0.
+        */
+        virtual PToolPanel  RemovePanel( const size_t i_nPosition ) = 0;
+
+        /** adds a new listener to be notified when the container content changes. The caller is responsible
+            for life time control, i.e. removing the listener before it actually dies.
+        */
+        virtual void        AddListener( IToolPanelDeckListener& i_rListener ) = 0;
+
+        /** removes a container listener previously added via addListener.
+        */
+        virtual void        RemoveListener( IToolPanelDeckListener& i_rListener ) = 0;
+    };
+
+    //====================================================================
+    //= ToolPanelDeck
+    //====================================================================
+    class SVT_DLLPUBLIC ToolPanelDeck   :public Control
+                                        ,public IToolPanelDeck
+    {
+    public:
+        ToolPanelDeck( Window& i_rParent, const WinBits i_nStyle = WB_DIALOGCONTROL );
+        ~ToolPanelDeck();
+
+        // attributes
+        PDeckLayouter       GetLayouter() const;
+        void                SetLayouter( const PDeckLayouter& i_pNewLayouter );
+
+        /** returns the window which acts as anchor for the panel windows.
+
+            This is a single dedicated window, which is passed to the IToolPanel::ActivatePanel method
+            whenever a panel is activated, to act as parent window for the panel's VCL-Window.
+        */
+        ::Window&           GetPanelWindowAnchor();
+        const ::Window&     GetPanelWindowAnchor() const;
+
+        /** sets the window which should act as parent in the A11Y object hierarchy.
+
+            Calling this method has no effect if CreateAccessible had always been called.
+        */
+        void                SetAccessibleParentWindow( ::Window* i_pAccessibleParent );
+        ::Window*           GetAccessibleParentWindow() const;
+
+        // IToolPanelDeck
+        virtual size_t      GetPanelCount() const;
+        virtual PToolPanel  GetPanel( const size_t i_nPos ) const;
+        virtual ::boost::optional< size_t >
+                            GetActivePanel() const;
+        virtual void        ActivatePanel( const ::boost::optional< size_t >& i_rPanel );
+        virtual size_t      InsertPanel( const PToolPanel& i_pPanel, const size_t i_nPosition );
+        virtual PToolPanel  RemovePanel( const size_t i_nPosition );
+        virtual void        AddListener( IToolPanelDeckListener& i_rListener );
+        virtual void        RemoveListener( IToolPanelDeckListener& i_rListener );
+
+    protected:
+        // Window overridables
+        virtual void Resize();
+        virtual long Notify( NotifyEvent& i_rNotifyEvent );
+        virtual void GetFocus();
+
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >
+                     GetComponentInterface( BOOL i_bCreate );
+
+    private:
+        ::std::auto_ptr< ToolPanelDeck_Impl >   m_pImpl;
+
+    private:
+        using Window::GetAccessibleParentWindow;
+    };
+
+//........................................................................
+} // namespace svt
+//........................................................................
+
+#endif // SVT_TOOLPANELDECK_HXX
diff --git a/svtools/inc/svtools/toolpaneldeck.hxx b/svtools/inc/svtools/toolpaneldeck.hxx
deleted file mode 100755
index 75d210c5ad2a..000000000000
--- a/svtools/inc/svtools/toolpaneldeck.hxx
+++ /dev/null
@@ -1,193 +0,0 @@
-/*************************************************************************
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * 
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#ifndef SVT_TOOLPANELDECK_HXX
-#define SVT_TOOLPANELDECK_HXX
-
-#include "svtools/svtdllapi.h"
-#include "svtools/toolpanel.hxx"
-#include "svtools/decklayouter.hxx"
-
-#include 
-
-#include 
-#include 
-
-//........................................................................
-namespace svt
-{
-//........................................................................
-
-    class ToolPanelCollection;
-    class ToolPanelDeck_Impl;
-
-    //====================================================================
-    //= IToolPanelDeckListener
-    //====================================================================
-    class SAL_NO_VTABLE IToolPanelDeckListener
-    {
-    public:
-        /** called when a panel has been inserted into the deck
-        */
-        virtual void PanelInserted( const PToolPanel& i_pPanel, const size_t i_nPosition ) = 0;
-
-        /** called when a panel has been removed from the deck
-        */
-        virtual void PanelRemoved( const size_t i_nPosition ) = 0;
-
-        /** called when the active panel of the deck changed
-        */
-        virtual void ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive ) = 0;
-
-        /** called when a new layouter has been set at a tool panel deck.
-
-            The method is called after the old layouter has been disposed (i.e. its Destroy method has been
-            invoked), and after the complete deck has been re-layouter.
-        */
-        virtual void LayouterChanged( const PDeckLayouter& i_rNewLayouter ) = 0;
-
-        /** called when the tool panel deck which the listener registered at is dying. The listener is required to
-            release all references to the deck then.
-        */
-        virtual void Dying() = 0;
-    };
-
-    //====================================================================
-    //= IToolPanelDeck
-    //====================================================================
-    class SVT_DLLPUBLIC IToolPanelDeck
-    {
-    public:
-        /** returns the number of panels in the container
-        */
-        virtual size_t      GetPanelCount() const = 0;
-
-        /** retrieves the panel with the given index. Invalid indexes will be reported via an assertion in the
-            non-product version, and silently ignored in the product version, with a NULL panel being returned.
-        */
-        virtual PToolPanel  GetPanel( const size_t i_nPos ) const = 0;
-
-        /** returns the number of the currently active panel.
-        */
-        virtual ::boost::optional< size_t >
-                            GetActivePanel() const = 0;
-
-        /** activates the panel with the given number. If the given number is larger or equal to the number of panels
-            in the deck, this will be reported via an assertion in non-product builds, and otherwise ignored.
-            @param i_rPanel
-                the number of the panel to activate. If this is not set, the currently active panel is de-activated,
-                and no new panel is activated at all. Whether or not this makes sense for your application is at
-                your own discretion.
-        */
-        virtual void        ActivatePanel( const ::boost::optional< size_t >& i_rPanel ) = 0;
-
-        /** inserts a new panel into the container. NULL panels are not allowed, as are positions greater than the
-            current panel count. Violations of this will be reported via an assertion in the non-product version, and
-            silently ignored in the product version.
-        */
-        virtual size_t      InsertPanel( const PToolPanel& i_pPanel, const size_t i_nPosition ) = 0;
-
-        /** removes a panel specified by its position.
-
-            Note: It is the responsibility of the caller to ensure that the panel is destroyed appropriately. That is,
-            the tool panel deck will not invoke IToolPanel::Dispose on the removed panel.
-            The advantage is that the panel might be re-used later, with the disadvantage that the owner of the panel
-            deck must know whether Dispose must be invoked after removal, or whether the panel will properly
-            dispose itself when its ref count drops to 0.
-        */
-        virtual PToolPanel  RemovePanel( const size_t i_nPosition ) = 0;
-
-        /** adds a new listener to be notified when the container content changes. The caller is responsible
-            for life time control, i.e. removing the listener before it actually dies.
-        */
-        virtual void        AddListener( IToolPanelDeckListener& i_rListener ) = 0;
-
-        /** removes a container listener previously added via addListener.
-        */
-        virtual void        RemoveListener( IToolPanelDeckListener& i_rListener ) = 0;
-    };
-
-    //====================================================================
-    //= ToolPanelDeck
-    //====================================================================
-    class SVT_DLLPUBLIC ToolPanelDeck   :public Control
-                                        ,public IToolPanelDeck
-    {
-    public:
-        ToolPanelDeck( Window& i_rParent, const WinBits i_nStyle = WB_DIALOGCONTROL );
-        ~ToolPanelDeck();
-
-        // attributes
-        PDeckLayouter       GetLayouter() const;
-        void                SetLayouter( const PDeckLayouter& i_pNewLayouter );
-
-        /** returns the window which acts as anchor for the panel windows.
-
-            This is a single dedicated window, which is passed to the IToolPanel::ActivatePanel method
-            whenever a panel is activated, to act as parent window for the panel's VCL-Window.
-        */
-        ::Window&           GetPanelWindowAnchor();
-        const ::Window&     GetPanelWindowAnchor() const;
-
-        /** sets the window which should act as parent in the A11Y object hierarchy.
-
-            Calling this method has no effect if CreateAccessible had always been called.
-        */
-        void                SetAccessibleParentWindow( ::Window* i_pAccessibleParent );
-        ::Window*           GetAccessibleParentWindow() const;
-
-        // IToolPanelDeck
-        virtual size_t      GetPanelCount() const;
-        virtual PToolPanel  GetPanel( const size_t i_nPos ) const;
-        virtual ::boost::optional< size_t >
-                            GetActivePanel() const;
-        virtual void        ActivatePanel( const ::boost::optional< size_t >& i_rPanel );
-        virtual size_t      InsertPanel( const PToolPanel& i_pPanel, const size_t i_nPosition );
-        virtual PToolPanel  RemovePanel( const size_t i_nPosition );
-        virtual void        AddListener( IToolPanelDeckListener& i_rListener );
-        virtual void        RemoveListener( IToolPanelDeckListener& i_rListener );
-
-    protected:
-        // Window overridables
-        virtual void Resize();
-        virtual long Notify( NotifyEvent& i_rNotifyEvent );
-        virtual void GetFocus();
-
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >
-                     GetComponentInterface( BOOL i_bCreate );
-
-    private:
-        ::std::auto_ptr< ToolPanelDeck_Impl >   m_pImpl;
-
-    private:
-        using Window::GetAccessibleParentWindow;
-    };
-
-//........................................................................
-} // namespace svt
-//........................................................................
-
-#endif // SVT_TOOLPANELDECK_HXX
diff --git a/svtools/source/toolpanel/drawerlayouter.cxx b/svtools/source/toolpanel/drawerlayouter.cxx
index 63b35f5835b7..7fc7d05ea0c9 100644
--- a/svtools/source/toolpanel/drawerlayouter.cxx
+++ b/svtools/source/toolpanel/drawerlayouter.cxx
@@ -26,7 +26,7 @@
 
 #include "precompiled_svtools.hxx"
 
-#include "svtools/drawerlayouter.hxx"
+#include "svtools/toolpanel/drawerlayouter.hxx"
 #include "toolpaneldrawer.hxx"
 
 #include 
diff --git a/svtools/source/toolpanel/dummypanel.hxx b/svtools/source/toolpanel/dummypanel.hxx
index 0a3cb407a0b9..d2ca4480fce5 100644
--- a/svtools/source/toolpanel/dummypanel.hxx
+++ b/svtools/source/toolpanel/dummypanel.hxx
@@ -27,8 +27,8 @@
 #ifndef DUMMYPANEL_HXX
 #define DUMMYPANEL_HXX
 
-#include "svtools/toolpanel.hxx"
-#include "svtools/refbase.hxx"
+#include "svtools/toolpanel/toolpanel.hxx"
+#include "svtools/toolpanel/refbase.hxx"
 
 //........................................................................
 namespace svt
diff --git a/svtools/source/toolpanel/paneldecklisteners.cxx b/svtools/source/toolpanel/paneldecklisteners.cxx
index dc5407a79bb3..32ba9b5c6a24 100755
--- a/svtools/source/toolpanel/paneldecklisteners.cxx
+++ b/svtools/source/toolpanel/paneldecklisteners.cxx
@@ -27,7 +27,7 @@
 #include "precompiled_svtools.hxx"
 
 #include "paneldecklisteners.hxx"
-#include "svtools/toolpaneldeck.hxx"
+#include "svtools/toolpanel/toolpaneldeck.hxx"
 
 //........................................................................
 namespace svt
diff --git a/svtools/source/toolpanel/paneldecklisteners.hxx b/svtools/source/toolpanel/paneldecklisteners.hxx
index 8fb9414215f5..bc7e2ae7db88 100755
--- a/svtools/source/toolpanel/paneldecklisteners.hxx
+++ b/svtools/source/toolpanel/paneldecklisteners.hxx
@@ -27,7 +27,7 @@
 #ifndef PANELDECKLISTENERS_HXX
 #define PANELDECKLISTENERS_HXX
 
-#include "svtools/toolpaneldeck.hxx"
+#include "svtools/toolpanel/toolpaneldeck.hxx"
 
 #include 
 #include 
diff --git a/svtools/source/toolpanel/paneltabbar.cxx b/svtools/source/toolpanel/paneltabbar.cxx
index d0b52b577144..23067d3ee5d0 100755
--- a/svtools/source/toolpanel/paneltabbar.cxx
+++ b/svtools/source/toolpanel/paneltabbar.cxx
@@ -26,8 +26,8 @@
 
 #include "precompiled_svtools.hxx"
 
-#include "svtools/paneltabbar.hxx"
-#include "svtools/toolpaneldeck.hxx"
+#include "svtools/toolpanel/paneltabbar.hxx"
+#include "svtools/toolpanel/toolpaneldeck.hxx"
 #include "svtools/svtdata.hxx"
 #include "svtools/svtools.hrc"
 
diff --git a/svtools/source/toolpanel/paneltabbarpeer.cxx b/svtools/source/toolpanel/paneltabbarpeer.cxx
index 302c830a2253..d8329109ffb4 100644
--- a/svtools/source/toolpanel/paneltabbarpeer.cxx
+++ b/svtools/source/toolpanel/paneltabbarpeer.cxx
@@ -27,7 +27,7 @@
 #include "precompiled_svtools.hxx"
 
 #include "paneltabbarpeer.hxx"
-#include "svtools/paneltabbar.hxx"
+#include "svtools/toolpanel/paneltabbar.hxx"
 
 /** === begin UNO includes === **/
 #include 
diff --git a/svtools/source/toolpanel/refbase.cxx b/svtools/source/toolpanel/refbase.cxx
index 309a87c2f436..f41aa2d9bb9c 100644
--- a/svtools/source/toolpanel/refbase.cxx
+++ b/svtools/source/toolpanel/refbase.cxx
@@ -26,7 +26,7 @@
 
 #include "precompiled_svtools.hxx"
 
-#include "svtools/refbase.hxx"
+#include "svtools/toolpanel/refbase.hxx"
 
 //........................................................................
 namespace svt
diff --git a/svtools/source/toolpanel/tabbargeometry.hxx b/svtools/source/toolpanel/tabbargeometry.hxx
index 97e460ff1397..059d69a3e233 100644
--- a/svtools/source/toolpanel/tabbargeometry.hxx
+++ b/svtools/source/toolpanel/tabbargeometry.hxx
@@ -27,7 +27,7 @@
 #ifndef TABBARGEOMETRY_HXX
 #define TABBARGEOMETRY_HXX
 
-#include "svtools/tabalignment.hxx"
+#include "svtools/toolpanel/tabalignment.hxx"
 
 #include "tabitemdescriptor.hxx"
 
diff --git a/svtools/source/toolpanel/tabitemdescriptor.hxx b/svtools/source/toolpanel/tabitemdescriptor.hxx
index 992f524cba94..8005816b0fe2 100644
--- a/svtools/source/toolpanel/tabitemdescriptor.hxx
+++ b/svtools/source/toolpanel/tabitemdescriptor.hxx
@@ -27,8 +27,8 @@
 #ifndef TABITEMDESCRIPTOR_HXX
 #define TABITEMDESCRIPTOR_HXX
 
-#include "svtools/toolpanel.hxx"
-#include "svtools/tabitemcontent.hxx"
+#include "svtools/toolpanel/toolpanel.hxx"
+#include "svtools/toolpanel/tabitemcontent.hxx"
 
 #include 
 #include 
diff --git a/svtools/source/toolpanel/tablayouter.cxx b/svtools/source/toolpanel/tablayouter.cxx
index 377ef0477752..f68bbc1bbd0f 100755
--- a/svtools/source/toolpanel/tablayouter.cxx
+++ b/svtools/source/toolpanel/tablayouter.cxx
@@ -26,9 +26,9 @@
 
 #include "precompiled_svtools.hxx"
 
-#include "svtools/tablayouter.hxx"
-#include "svtools/toolpaneldeck.hxx"
-#include "svtools/paneltabbar.hxx"
+#include "svtools/toolpanel/tablayouter.hxx"
+#include "svtools/toolpanel/toolpaneldeck.hxx"
+#include "svtools/toolpanel/paneltabbar.hxx"
 #include "svtaccessiblefactory.hxx"
 
 #include 
diff --git a/svtools/source/toolpanel/toolpanel.cxx b/svtools/source/toolpanel/toolpanel.cxx
index 128c3e2602e6..f7b999494563 100644
--- a/svtools/source/toolpanel/toolpanel.cxx
+++ b/svtools/source/toolpanel/toolpanel.cxx
@@ -26,7 +26,7 @@
 
 #include "precompiled_svtools.hxx"
 
-#include "svtools/toolpanel.hxx"
+#include "svtools/toolpanel/toolpanel.hxx"
 
 //........................................................................
 namespace svt
diff --git a/svtools/source/toolpanel/toolpanelcollection.hxx b/svtools/source/toolpanel/toolpanelcollection.hxx
index 6f90469b543a..2bdba38546c9 100644
--- a/svtools/source/toolpanel/toolpanelcollection.hxx
+++ b/svtools/source/toolpanel/toolpanelcollection.hxx
@@ -27,7 +27,7 @@
 #ifndef TOOLPANELCOLLECTION_HXX
 #define TOOLPANELCOLLECTION_HXX
 
-#include "svtools/toolpaneldeck.hxx"
+#include "svtools/toolpanel/toolpaneldeck.hxx"
 
 #include 
 
diff --git a/svtools/source/toolpanel/toolpaneldeck.cxx b/svtools/source/toolpanel/toolpaneldeck.cxx
index 67003c441216..e157090bbf0e 100755
--- a/svtools/source/toolpanel/toolpaneldeck.cxx
+++ b/svtools/source/toolpanel/toolpaneldeck.cxx
@@ -30,9 +30,9 @@
 #include "toolpanelcollection.hxx"
 #include "paneldecklisteners.hxx"
 #include "toolpaneldeckpeer.hxx"
-#include "svtools/toolpaneldeck.hxx"
-#include "svtools/tablayouter.hxx"
-#include "svtools/drawerlayouter.hxx"
+#include "svtools/toolpanel/toolpaneldeck.hxx"
+#include "svtools/toolpanel/tablayouter.hxx"
+#include "svtools/toolpanel/drawerlayouter.hxx"
 
 /** === begin UNO includes === **/
 #include 
diff --git a/svtools/source/toolpanel/toolpaneldeckpeer.cxx b/svtools/source/toolpanel/toolpaneldeckpeer.cxx
index 26e9bbc43b47..0a84a90b4fb3 100755
--- a/svtools/source/toolpanel/toolpaneldeckpeer.cxx
+++ b/svtools/source/toolpanel/toolpaneldeckpeer.cxx
@@ -27,7 +27,7 @@
 #include "precompiled_svtools.hxx"
 
 #include "toolpaneldeckpeer.hxx"
-#include "svtools/toolpaneldeck.hxx"
+#include "svtools/toolpanel/toolpaneldeck.hxx"
 
 /** === begin UNO includes === **/
 #include 
-- 
cgit 


From dcec10a0b731fac660456e889997f35245e08954 Mon Sep 17 00:00:00 2001
From: Hans-Joachim Lankenau 
Date: Fri, 19 Nov 2010 17:14:27 +0100
Subject: gnumake2: last bunch of missing headers

---
 tools/Package_inc.mk | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tools/Package_inc.mk b/tools/Package_inc.mk
index bd1b72d9908a..d1026b05a43c 100644
--- a/tools/Package_inc.mk
+++ b/tools/Package_inc.mk
@@ -26,8 +26,8 @@
 #*************************************************************************
 
 $(eval $(call gb_Package_Package,tools_inc,$(SRCDIR)/tools/inc))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/StringListResource.hxx,tools/StringListResource.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/appendunixshellword.hxx,tools/appendunixshellword.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/b3dtrans.hxx,tools/b3dtrans.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/bigint.hxx,tools/bigint.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/cachestr.hxx,tools/cachestr.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/color.hxx,tools/color.hxx))
@@ -87,15 +87,17 @@ $(eval $(call gb_Package_add_file,tools_inc,inc/tools/solarmutex.hxx,tools/solar
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/stack.hxx,tools/stack.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/stream.hxx,tools/stream.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/string.hxx,tools/string.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/StringListResource.hxx,tools/StringListResource.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/svborder.hxx,tools/svborder.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/svlibrary.hxx,tools/svlibrary.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/svwin.h,tools/svwin.h))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/table.hxx,tools/table.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/tempfile.hxx,tools/tempfile.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/tenccvt.hxx,tools/tenccvt.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/testtoolloader.hxx,tools/testtoolloader.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/time.hxx,tools/time.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/tools.h,tools/tools.h))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/toolsdllapi.h,tools/toolsdllapi.h))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/tools.h,tools/tools.h))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/unqid.hxx,tools/unqid.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/unqidx.hxx,tools/unqidx.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/urlobj.hxx,tools/urlobj.hxx))
@@ -106,4 +108,3 @@ $(eval $(call gb_Package_add_file,tools_inc,inc/tools/weakbase.hxx,tools/weakbas
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/wintypes.hxx,tools/wintypes.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/wldcrd.hxx,tools/wldcrd.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/zcodec.hxx,tools/zcodec.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/b3dtrans.hxx,tools/b3dtrans.hxx))
-- 
cgit 


From c8e2c920be9958a3f211a983d2c88bac6ea351c3 Mon Sep 17 00:00:00 2001
From: Bjoern Michaelsen 
Date: Fri, 19 Nov 2010 21:45:41 +0100
Subject: gnumake2: removing old dmake file in migrated modules

---
 svl/inc/makefile.mk                                |  48 -----
 svl/qa/complex/ConfigItems/helper/makefile.mk      |  74 --------
 svl/qa/complex/ConfigItems/makefile.mk             |  61 -------
 svl/qa/complex/passwordcontainer/makefile.mk       | 134 --------------
 svl/qa/makefile.mk                                 | 101 -----------
 svl/source/config/makefile.mk                      |  52 ------
 svl/source/filepicker/makefile.mk                  |  46 -----
 svl/source/filerec/makefile.mk                     |  46 -----
 svl/source/fsstor/makefile.mk                      |  74 --------
 svl/source/items/makefile.mk                       |  84 ---------
 svl/source/memtools/makefile.mk                    |  46 -----
 svl/source/misc/makefile.mk                        |  70 --------
 svl/source/notify/makefile.mk                      |  62 -------
 svl/source/numbers/makefile.mk                     |  74 --------
 svl/source/passwordcontainer/makefile.mk           |  70 --------
 svl/source/svdde/makefile.mk                       |  60 -------
 svl/source/svsql/makefile.mk                       |  46 -----
 svl/source/undo/makefile.mk                        |  47 -----
 svl/source/uno/makefile.mk                         |  47 -----
 svl/unx/source/svdde/makefile.mk                   |  46 -----
 svl/util/makefile.mk                               | 130 --------------
 svtools/bmpmaker/makefile.mk                       |  74 --------
 svtools/inc/makefile.mk                            |  48 -----
 svtools/qa/unoapi/makefile.mk                      |  48 -----
 svtools/source/brwbox/makefile.mk                  |  59 -------
 svtools/source/config/makefile.mk                  |  58 ------
 svtools/source/config/test/makefile.mk             |  62 -------
 svtools/source/contnr/makefile.mk                  |  82 ---------
 svtools/source/control/makefile.mk                 |  87 ---------
 svtools/source/dialogs/makefile.mk                 |  75 --------
 svtools/source/edit/makefile.mk                    |  63 -------
 svtools/source/filter.vcl/filter/makefile.mk       |  81 ---------
 svtools/source/filter.vcl/igif/makefile.mk         |  45 -----
 svtools/source/filter.vcl/ixbm/makefile.mk         |  44 -----
 svtools/source/filter.vcl/ixpm/makefile.mk         |  43 -----
 svtools/source/filter.vcl/jpeg/makefile.mk         |  45 -----
 svtools/source/filter.vcl/wmf/makefile.mk          |  50 ------
 svtools/source/graphic/makefile.mk                 |  66 -------
 svtools/source/hatchwindow/makefile.mk             |  73 --------
 svtools/source/java/makefile.mk                    |  50 ------
 svtools/source/misc/makefile.mk                    |  81 ---------
 svtools/source/plugapp/makefile.mk                 |  55 ------
 svtools/source/productregistration/makefile.mk     |  86 ---------
 svtools/source/svhtml/makefile.mk                  |  51 ------
 svtools/source/svrtf/makefile.mk                   |  49 ------
 svtools/source/table/makefile.mk                   |  55 ------
 svtools/source/toolpanel/makefile.mk               |  68 -------
 svtools/source/uno/makefile.mk                     |  61 -------
 svtools/source/uno/wizard/makefile.mk              |  48 -----
 svtools/source/urlobj/makefile.mk                  |  46 -----
 svtools/util/makefile.mk                           | 195 ---------------------
 svtools/workben/cui/makefile.mk                    |  60 -------
 svtools/workben/makefile.mk                        |  69 --------
 svtools/workben/toolpanel/makefile.mk              | 110 ------------
 svtools/workben/treecontrol/makefile.mk            |  91 ----------
 svtools/workben/unodialog/makefile.mk              |  90 ----------
 toolkit/inc/makefile.mk                            |  48 -----
 .../qa/complex/toolkit/interface_tests/makefile.mk |  57 ------
 toolkit/qa/complex/toolkit/makefile.mk             | 120 -------------
 toolkit/qa/complex/xunitconversion/makefile.mk     |  52 ------
 toolkit/qa/unoapi/makefile.mk                      |  48 -----
 toolkit/source/awt/makefile.mk                     |  84 ---------
 toolkit/source/controls/grid/makefile.mk           |  50 ------
 toolkit/source/controls/makefile.mk                |  66 -------
 toolkit/source/controls/tree/makefile.mk           |  48 -----
 toolkit/source/helper/makefile.mk                  |  64 -------
 toolkit/source/layout/core/makefile.mk             |  65 -------
 toolkit/source/layout/vcl/makefile.mk              |  52 ------
 toolkit/test/accessibility/makefile.mk             | 127 --------------
 toolkit/test/accessibility/ov/makefile.mk          |  51 ------
 toolkit/test/accessibility/tools/makefile.mk       |  42 -----
 toolkit/uiconfig/layout/makefile.mk                |  54 ------
 toolkit/util/makefile.mk                           |  93 ----------
 toolkit/workben/layout/makefile.mk                 | 151 ----------------
 toolkit/workben/makefile.mk                        |  84 ---------
 tools/bootstrp/addexes/makefile.mk                 |  49 ------
 tools/bootstrp/addexes2/makefile.mk                |  56 ------
 tools/bootstrp/makefile.mk                         |  96 ----------
 tools/inc/makefile.mk                              |  48 -----
 tools/os2/source/dll/makefile.mk                   |  46 -----
 tools/qa/makefile.mk                               |  52 ------
 tools/source/communi/makefile.mk                   |  50 ------
 tools/source/datetime/makefile.mk                  |  50 ------
 tools/source/debug/makefile.mk                     |  53 ------
 tools/source/fsys/makefile.mk                      |  67 -------
 tools/source/generic/makefile.mk                   |  71 --------
 tools/source/inet/makefile.mk                      |  45 -----
 tools/source/makefile.mk                           |  58 ------
 tools/source/memtools/makefile.mk                  |  56 ------
 tools/source/misc/makefile.mk                      |  47 -----
 tools/source/rc/makefile.mk                        |  53 ------
 tools/source/ref/makefile.mk                       |  53 ------
 tools/source/stream/makefile.mk                    |  58 ------
 tools/source/string/makefile.mk                    |  79 ---------
 tools/source/testtoolloader/makefile.mk            |  45 -----
 tools/source/zcodec/makefile.mk                    |  47 -----
 tools/test/makefile.mk                             |  65 -------
 tools/unx/source/dll/makefile.mk                   |  48 -----
 tools/util/makefile.mk                             | 159 -----------------
 tools/win/source/dll/makefile.mk                   |  56 ------
 tools/workben/makefile.mk                          |  89 ----------
 101 files changed, 6738 deletions(-)
 delete mode 100644 svl/inc/makefile.mk
 delete mode 100644 svl/qa/complex/ConfigItems/helper/makefile.mk
 delete mode 100644 svl/qa/complex/ConfigItems/makefile.mk
 delete mode 100644 svl/qa/complex/passwordcontainer/makefile.mk
 delete mode 100644 svl/qa/makefile.mk
 delete mode 100644 svl/source/config/makefile.mk
 delete mode 100644 svl/source/filepicker/makefile.mk
 delete mode 100644 svl/source/filerec/makefile.mk
 delete mode 100644 svl/source/fsstor/makefile.mk
 delete mode 100644 svl/source/items/makefile.mk
 delete mode 100644 svl/source/memtools/makefile.mk
 delete mode 100644 svl/source/misc/makefile.mk
 delete mode 100644 svl/source/notify/makefile.mk
 delete mode 100644 svl/source/numbers/makefile.mk
 delete mode 100644 svl/source/passwordcontainer/makefile.mk
 delete mode 100644 svl/source/svdde/makefile.mk
 delete mode 100644 svl/source/svsql/makefile.mk
 delete mode 100644 svl/source/undo/makefile.mk
 delete mode 100644 svl/source/uno/makefile.mk
 delete mode 100644 svl/unx/source/svdde/makefile.mk
 delete mode 100644 svl/util/makefile.mk
 delete mode 100644 svtools/bmpmaker/makefile.mk
 delete mode 100644 svtools/inc/makefile.mk
 delete mode 100644 svtools/qa/unoapi/makefile.mk
 delete mode 100644 svtools/source/brwbox/makefile.mk
 delete mode 100644 svtools/source/config/makefile.mk
 delete mode 100644 svtools/source/config/test/makefile.mk
 delete mode 100644 svtools/source/contnr/makefile.mk
 delete mode 100755 svtools/source/control/makefile.mk
 delete mode 100755 svtools/source/dialogs/makefile.mk
 delete mode 100644 svtools/source/edit/makefile.mk
 delete mode 100644 svtools/source/filter.vcl/filter/makefile.mk
 delete mode 100644 svtools/source/filter.vcl/igif/makefile.mk
 delete mode 100644 svtools/source/filter.vcl/ixbm/makefile.mk
 delete mode 100644 svtools/source/filter.vcl/ixpm/makefile.mk
 delete mode 100644 svtools/source/filter.vcl/jpeg/makefile.mk
 delete mode 100644 svtools/source/filter.vcl/wmf/makefile.mk
 delete mode 100644 svtools/source/graphic/makefile.mk
 delete mode 100644 svtools/source/hatchwindow/makefile.mk
 delete mode 100644 svtools/source/java/makefile.mk
 delete mode 100755 svtools/source/misc/makefile.mk
 delete mode 100644 svtools/source/plugapp/makefile.mk
 delete mode 100644 svtools/source/productregistration/makefile.mk
 delete mode 100644 svtools/source/svhtml/makefile.mk
 delete mode 100644 svtools/source/svrtf/makefile.mk
 delete mode 100644 svtools/source/table/makefile.mk
 delete mode 100755 svtools/source/toolpanel/makefile.mk
 delete mode 100644 svtools/source/uno/makefile.mk
 delete mode 100644 svtools/source/uno/wizard/makefile.mk
 delete mode 100644 svtools/source/urlobj/makefile.mk
 delete mode 100644 svtools/util/makefile.mk
 delete mode 100644 svtools/workben/cui/makefile.mk
 delete mode 100644 svtools/workben/makefile.mk
 delete mode 100644 svtools/workben/toolpanel/makefile.mk
 delete mode 100644 svtools/workben/treecontrol/makefile.mk
 delete mode 100644 svtools/workben/unodialog/makefile.mk
 delete mode 100644 toolkit/inc/makefile.mk
 delete mode 100755 toolkit/qa/complex/toolkit/interface_tests/makefile.mk
 delete mode 100755 toolkit/qa/complex/toolkit/makefile.mk
 delete mode 100644 toolkit/qa/complex/xunitconversion/makefile.mk
 delete mode 100644 toolkit/qa/unoapi/makefile.mk
 delete mode 100644 toolkit/source/awt/makefile.mk
 delete mode 100644 toolkit/source/controls/grid/makefile.mk
 delete mode 100644 toolkit/source/controls/makefile.mk
 delete mode 100644 toolkit/source/controls/tree/makefile.mk
 delete mode 100644 toolkit/source/helper/makefile.mk
 delete mode 100644 toolkit/source/layout/core/makefile.mk
 delete mode 100644 toolkit/source/layout/vcl/makefile.mk
 delete mode 100644 toolkit/test/accessibility/makefile.mk
 delete mode 100644 toolkit/test/accessibility/ov/makefile.mk
 delete mode 100644 toolkit/test/accessibility/tools/makefile.mk
 delete mode 100644 toolkit/uiconfig/layout/makefile.mk
 delete mode 100644 toolkit/util/makefile.mk
 delete mode 100644 toolkit/workben/layout/makefile.mk
 delete mode 100644 toolkit/workben/makefile.mk
 delete mode 100644 tools/bootstrp/addexes/makefile.mk
 delete mode 100644 tools/bootstrp/addexes2/makefile.mk
 delete mode 100644 tools/bootstrp/makefile.mk
 delete mode 100644 tools/inc/makefile.mk
 delete mode 100644 tools/os2/source/dll/makefile.mk
 delete mode 100644 tools/qa/makefile.mk
 delete mode 100644 tools/source/communi/makefile.mk
 delete mode 100644 tools/source/datetime/makefile.mk
 delete mode 100644 tools/source/debug/makefile.mk
 delete mode 100644 tools/source/fsys/makefile.mk
 delete mode 100644 tools/source/generic/makefile.mk
 delete mode 100644 tools/source/inet/makefile.mk
 delete mode 100644 tools/source/makefile.mk
 delete mode 100644 tools/source/memtools/makefile.mk
 delete mode 100644 tools/source/misc/makefile.mk
 delete mode 100644 tools/source/rc/makefile.mk
 delete mode 100644 tools/source/ref/makefile.mk
 delete mode 100644 tools/source/stream/makefile.mk
 delete mode 100644 tools/source/string/makefile.mk
 delete mode 100644 tools/source/testtoolloader/makefile.mk
 delete mode 100644 tools/source/zcodec/makefile.mk
 delete mode 100644 tools/test/makefile.mk
 delete mode 100644 tools/unx/source/dll/makefile.mk
 delete mode 100644 tools/util/makefile.mk
 delete mode 100644 tools/win/source/dll/makefile.mk
 delete mode 100644 tools/workben/makefile.mk

diff --git a/svl/inc/makefile.mk b/svl/inc/makefile.mk
deleted file mode 100644
index a99cf8acc0d2..000000000000
--- a/svl/inc/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..
-
-PRJNAME=svl
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svl.pmk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-
diff --git a/svl/qa/complex/ConfigItems/helper/makefile.mk b/svl/qa/complex/ConfigItems/helper/makefile.mk
deleted file mode 100644
index 95f2e456fab3..000000000000
--- a/svl/qa/complex/ConfigItems/helper/makefile.mk
+++ /dev/null
@@ -1,74 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=../../../..
-
-PRJNAME=			svl
-TARGET=				ConfigItemTest
-USE_DEFFILE=		TRUE
-ENABLE_EXCEPTIONS=	TRUE
-NO_BSYMBOLIC=		TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  		settings.mk
-
-# --- Generate -----------------------------------------------------
-
-INCPOST += $(PRJ)/source/inc
-
-# --- light services library ----------------------------------------------------
-
-SHL1TARGET=		svt_$(TARGET)
-
-SHL1OBJS=       \
-                $(SLO)/UserOptTest.obj	\
-                $(SLO)/HistoryOptTest.obj \
-                $(SLO)/ConfigItemTest.obj
-
-#				$(SLO)/PrintOptTest.obj	
-#				$(SLO)/AccessibilityOptTest.obj	
-
-SHL1STDLIBS=	\
-                $(SVLIB) \
-                $(SVLLIB) \
-                $(UNOTOOLSLIB) \
-                $(COMPHELPERLIB) \
-                $(CPPUHELPERLIB) \
-                $(CPPULIB) \
-                $(SALLIB)
-
-SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
-#SHL1DEPN=       $(SHL1IMPLIBN) $(SHL1TARGETN)
-
-DEF1NAME=       $(SHL1TARGET)
-
-SHL1VERSIONMAP= $(SOLARENV)/src/component.map
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :			target.mk
-
diff --git a/svl/qa/complex/ConfigItems/makefile.mk b/svl/qa/complex/ConfigItems/makefile.mk
deleted file mode 100644
index b4241f24dfee..000000000000
--- a/svl/qa/complex/ConfigItems/makefile.mk
+++ /dev/null
@@ -1,61 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../../..
-PRJNAME = svl
-TARGET = qa_complex_ConfigItems
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/ConfigItems
-
-# here store only Files which contain a @Test
-JAVATESTFILES = \
-    CheckConfigItems.java
-
-# put here all other files
-JAVAFILES = $(JAVATESTFILES)
-
-JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-
-# Sample how to debug
-# JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
-
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
-
-
diff --git a/svl/qa/complex/passwordcontainer/makefile.mk b/svl/qa/complex/passwordcontainer/makefile.mk
deleted file mode 100644
index 625404682761..000000000000
--- a/svl/qa/complex/passwordcontainer/makefile.mk
+++ /dev/null
@@ -1,134 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../../..
-PRJNAME = svl
-TARGET = qa_complex_passwordcontainer
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/passwordcontainer
-
-# here store only Files which contain a @Test
-JAVATESTFILES = \
-    PasswordContainerUnitTest.java
-
-
-# put here all other files
-JAVAFILES = $(JAVATESTFILES) \
-    PasswordContainerTest.java\
-    Test01.java\
-    Test02.java\
-    Test03.java\
-    TestHelper.java\
-    MasterPasswdHandler.java
-
-
-JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-
-# Sample how to debug
-# JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
-
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
-
-
-# 
-# 
-# 
-# 
-# PRJ = ..$/..$/..
-# TARGET  = PasswordContainerUnitTest
-# PRJNAME=svl
-# PACKAGE = complex$/passwordcontainer
-# 
-# # --- Settings -----------------------------------------------------
-# .INCLUDE: settings.mk
-# 
-# 
-# #----- compile .java files -----------------------------------------
-# 
-# JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
-# 
-# JAVAFILES       =\
-# 				PasswordContainerUnitTest.java\
-# 				PasswordContainerTest.java\
-# 				TestHelper.java\
-# 				Test01.java\
-#                 Test02.java\
-#                 Test03.java\
-# 				MasterPasswdHandler.java
-# 
-# JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-# 
-# #----- make a jar from compiled files ------------------------------
-# 
-# MAXLINELENGTH = 100000
-# 
-# JARCLASSDIRS    = $(PACKAGE)
-# JARTARGET       = $(TARGET).jar
-# JARCOMPRESS 	= TRUE
-# 
-# # --- Parameters for the test --------------------------------------
-# 
-# # start an office if the parameter is set for the makefile
-# .IF "$(OFFICE)" == ""
-# CT_APPEXECCOMMAND =
-# .ELSE
-# CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;"
-# .ENDIF
-# 
-# # test base is java complex
-# CT_TESTBASE = -TestBase java_complex
-# 
-# # test looks something like the.full.package.TestName
-# CT_TEST     = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b)
-# 
-# # start the runner application
-# CT_APP      = org.openoffice.Runner
-# 
-# # --- Targets ------------------------------------------------------
-# 
-# .INCLUDE: target.mk
-# 
-# RUN: run
-# 
-# run:
-#     +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_APPEXECCOMMAND) $(CT_TEST)
-# 
-# 
diff --git a/svl/qa/makefile.mk b/svl/qa/makefile.mk
deleted file mode 100644
index 7e8c7ee795cc..000000000000
--- a/svl/qa/makefile.mk
+++ /dev/null
@@ -1,101 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ = ..
-PRJNAME=svl
-TARGET = qa
-
-ENABLE_EXCEPTIONS = true
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
-# BEGIN ----------------------------------------------------------------
-# auto generated Target:job by codegen.pl
-SHL1OBJS=  \
-    $(SLO)$/test_URIHelper.obj
-
-SHL1TARGET= URIHelper
-SHL1STDLIBS=\
-     $(CPPULIB) \
-     $(CPPUHELPERLIB) \
-     $(SALLIB) \
-     $(SVLLIB) \
-     $(TOOLSLIB) \
-     $(UNOTOOLSLIB) \
-     $(TESTSHL2LIB)    \
-     $(CPPUNITLIB)
-
-SHL1IMPLIB= i$(SHL1TARGET)
-DEF1NAME    =$(SHL1TARGET)
-SHL1VERSIONMAP= export.map
-# auto generated Target:job
-# END ------------------------------------------------------------------
-
-#------------------------------- All object files -------------------------------
-# do this here, so we get right dependencies
-# SLOFILES=$(SHL1OBJS)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
-
-# LLA: old stuff
-# USE_DEFFILE = true
-#
-# .INCLUDE: settings.mk
-#
-# .IF "$(OS)" == "WNT"
-# REGEXP = "s/^[\#].*$$//"
-# .ELSE # OS, WNT
-# REGEXP = 's/^[\#].*$$//'
-# .ENDIF # OS, WNT
-#
-# SHL1TARGET = URIHelper
-# SHL1OBJS = \
-# 	$(SLO)$/test_URIHelper.obj
-# SHL1STDLIBS = \
-#     $(CPPULIB) \
-#     $(CPPUHELPERLIB) \
-#     $(SALLIB) \
-#     $(SVTOOLLIB) \
-#     $(TOOLSLIB) \
-#     $(UNOTOOLSLIB)
-#
-# DEF1NAME = $(SHL1TARGET)
-# DEF1EXPORTFILE = $(MISC)$/$(SHL1TARGET).dxp
-#
-# .INCLUDE: target.mk
-#
-# $(MISC)$/$(SHL1TARGET).dxp: sce$/$(SHL1TARGET).sce
-#     + $(TYPE) $< | sed $(REGEXP) > $@
-#     + $(TYPE) $@ | sed "s/^/test_/" > $(MISC)$/$(SHL1TARGET).tst
-#     + $(TYPE) $(MISC)$/$(SHL1TARGET).tst | sed "/test_./ w $@"
diff --git a/svl/source/config/makefile.mk b/svl/source/config/makefile.mk
deleted file mode 100644
index beb696c0feaf..000000000000
--- a/svl/source/config/makefile.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME=svl
-TARGET=config
-
-ENABLE_EXCEPTIONS := TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svl.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=  \
-        $(SLO)$/asiancfg.obj \
-        $(SLO)$/cjkoptions.obj          \
-        $(SLO)$/ctloptions.obj          \
-        $(SLO)$/srchcfg.obj \
-        $(SLO)$/itemholder2.obj \
-        $(SLO)$/languageoptions.obj  
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/svl/source/filepicker/makefile.mk b/svl/source/filepicker/makefile.mk
deleted file mode 100644
index b3c2a829cf54..000000000000
--- a/svl/source/filepicker/makefile.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME=svl
-TARGET=filepicker
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :	settings.mk
-.INCLUDE :  $(PRJ)$/util$/svl.pmk
-
-# --- Files --------------------------------------------------------------
-
-SLOFILES =\
-        $(SLO)$/pickerhistory.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :	target.mk
-
diff --git a/svl/source/filerec/makefile.mk b/svl/source/filerec/makefile.mk
deleted file mode 100644
index ea2b88d8d493..000000000000
--- a/svl/source/filerec/makefile.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svl
-TARGET=filerec
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svl.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-        $(SLO)$/filerec.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/svl/source/fsstor/makefile.mk b/svl/source/fsstor/makefile.mk
deleted file mode 100644
index 1dd5d2307037..000000000000
--- a/svl/source/fsstor/makefile.mk
+++ /dev/null
@@ -1,74 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=svl
-TARGET=fsstorage.uno
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-DLLPRE=
-
-# --- Files -------------------------------------
-
-SLOFILES=\
-        $(SLO)$/fsfactory.obj \
-        $(SLO)$/fsstorage.obj \
-        $(SLO)$/oinputstreamcontainer.obj \
-        $(SLO)$/ostreamcontainer.obj
-
-SHL1TARGET=	$(TARGET)
-SHL1IMPLIB=	i$(TARGET)
-SHL1OBJS=	$(SLOFILES)
-SHL1STDLIBS=\
-    $(UNOTOOLSLIB) \
-    $(TOOLSLIB) \
-    $(COMPHELPERLIB) \
-    $(UCBHELPERLIB) \
-    $(CPPUHELPERLIB) \
-    $(CPPULIB) \
-    $(SALLIB)
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=	$(SHL1TARGET)
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
-
-ALLTAR : $(MISC)/fsstorage.component
-
-$(MISC)/fsstorage.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        fsstorage.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt fsstorage.component
diff --git a/svl/source/items/makefile.mk b/svl/source/items/makefile.mk
deleted file mode 100644
index da602391239a..000000000000
--- a/svl/source/items/makefile.mk
+++ /dev/null
@@ -1,84 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=svl
-TARGET=items
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svl.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=\
-    $(SLO)$/aeitem.obj	\
-    $(SLO)$/cenumitm.obj	\
-    $(SLO)$/cintitem.obj	\
-    $(SLO)$/cntwall.obj	\
-    $(SLO)$/ctypeitm.obj	\
-    $(SLO)$/custritm.obj	\
-    $(SLO)$/dateitem.obj \
-    $(SLO)$/eitem.obj	\
-    $(SLO)$/flagitem.obj	\
-    $(SLO)$/globalnameitem.obj	\
-    $(SLO)$/ilstitem.obj    \
-    $(SLO)$/imageitm.obj    \
-    $(SLO)$/intitem.obj	\
-    $(SLO)$/itemiter.obj	\
-    $(SLO)$/itempool.obj	\
-    $(SLO)$/itemprop.obj	\
-    $(SLO)$/itemset.obj	\
-    $(SLO)$/lckbitem.obj	\
-    $(SLO)$/macitem.obj	\
-    $(SLO)$/poolcach.obj	\
-    $(SLO)$/poolio.obj	\
-    $(SLO)$/poolitem.obj	\
-    $(SLO)$/ptitem.obj	\
-    $(SLO)$/rectitem.obj	\
-    $(SLO)$/rngitem.obj	\
-    $(SLO)$/sfontitm.obj	\
-    $(SLO)$/sitem.obj	    \
-    $(SLO)$/slstitm.obj	\
-    $(SLO)$/srchitem.obj \
-    $(SLO)$/stritem.obj	\
-    $(SLO)$/style.obj	\
-    $(SLO)$/stylepool.obj	\
-    $(SLO)$/szitem.obj \
-    $(SLO)$/visitem.obj \
-    $(SLO)$/whiter.obj 
-
-SRS1NAME=$(TARGET)
-SRC1FILES=\
-    cstitem.src
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/svl/source/memtools/makefile.mk b/svl/source/memtools/makefile.mk
deleted file mode 100644
index e19667214d13..000000000000
--- a/svl/source/memtools/makefile.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svl
-TARGET=svarray
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svl.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=\
-    $(SLO)$/svarray.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/svl/source/misc/makefile.mk b/svl/source/misc/makefile.mk
deleted file mode 100644
index a68cb396f22c..000000000000
--- a/svl/source/misc/makefile.mk
+++ /dev/null
@@ -1,70 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=svl
-TARGET=misc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svl.pmk
-
-# --- Files --------------------------------------------------------
-
-EXCEPTIONSFILES=\
-    $(SLO)$/documentlockfile.obj \
-    $(SLO)$/folderrestriction.obj \
-    $(SLO)$/fstathelper.obj \
-    $(SLO)$/lockfilecommon.obj \
-    $(SLO)$/ownlist.obj \
-    $(SLO)$/restrictedpaths.obj \
-    $(SLO)$/sharecontrolfile.obj \
-    $(SLO)$/strmadpt.obj \
-    $(SLO)$/svldata.obj \
-    $(SLO)$/urihelper.obj 
-
-SLOFILES=\
-    $(EXCEPTIONSFILES) \
-    $(SLO)$/adrparse.obj \
-    $(SLO)$/filenotation.obj \
-    $(SLO)$/inethist.obj \
-    $(SLO)$/inettype.obj \
-    $(SLO)$/lngmisc.obj \
-    $(SLO)$/PasswordHelper.obj
-
-SRS1NAME=$(TARGET)
-SRC1FILES=\
-    mediatyp.src
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-
-
-
diff --git a/svl/source/notify/makefile.mk b/svl/source/notify/makefile.mk
deleted file mode 100644
index c2e6648907e5..000000000000
--- a/svl/source/notify/makefile.mk
+++ /dev/null
@@ -1,62 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svl
-TARGET=notify
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svl.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-        $(SLO)$/smplhint.obj \
-        $(SLO)$/hint.obj \
-        $(SLO)$/lstner.obj \
-        $(SLO)$/isethint.obj \
-        $(SLO)$/brdcst.obj \
-        $(SLO)$/listener.obj \
-        $(SLO)$/listenerbase.obj \
-        $(SLO)$/listeneriter.obj \
-        $(SLO)$/broadcast.obj
-
-HXX1TARGET= notify
-HXX1EXT=    hxx
-HXX1FILES=  $(INC)$/hint.hxx                \
-             $(INC)$/smplhint.hxx            \
-             $(INC)$/lstner.hxx              \
-             $(INC)$/brdcst.hxx
-HXX1EXCL=   -E:*include*
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/svl/source/numbers/makefile.mk b/svl/source/numbers/makefile.mk
deleted file mode 100644
index 87a367566a8b..000000000000
--- a/svl/source/numbers/makefile.mk
+++ /dev/null
@@ -1,74 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svl
-TARGET=numbers
-LIBTARGET=NO
-
-PROJECTPCH=
-PROJECTPCHSOURCE=
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svl.pmk
-
-# --- Files --------------------------------------------------------
-
-EXCEPTIONSFILES= \
-        $(SLO)$/numuno.obj \
-        $(SLO)$/numfmuno.obj \
-        $(SLO)$/supservs.obj \
-        $(SLO)$/zforlist.obj
-
-SLOFILES =  \
-        $(EXCEPTIONSFILES) \
-        $(SLO)$/zforfind.obj	\
-        $(SLO)$/zformat.obj 	\
-        $(SLO)$/zforscan.obj \
-        $(SLO)$/numhead.obj
-
-LIB1TARGET=	$(SLB)$/$(TARGET).uno.lib
-LIB1OBJFILES=	\
-        $(SLO)$/numfmuno.obj \
-        $(SLO)$/supservs.obj
-
-LIB2TARGET=	$(SLB)$/$(TARGET).lib
-LIB2OBJFILES=	\
-        $(SLO)$/zforfind.obj	\
-        $(SLO)$/zforlist.obj \
-        $(SLO)$/zformat.obj 	\
-        $(SLO)$/zforscan.obj \
-        $(SLO)$/numuno.obj \
-        $(SLO)$/numhead.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/svl/source/passwordcontainer/makefile.mk b/svl/source/passwordcontainer/makefile.mk
deleted file mode 100644
index 626a6ffc5830..000000000000
--- a/svl/source/passwordcontainer/makefile.mk
+++ /dev/null
@@ -1,70 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=svl
-TARGET=passwordcontainer.uno
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-DLLPRE=
-
-# --- Files -------------------------------------
-
-SLOFILES=	\
-    $(SLO)$/passwordcontainer.obj\
-    $(SLO)$/syscreds.obj
-
-SHL1TARGET=	$(TARGET)
-SHL1IMPLIB=	i$(TARGET)
-SHL1OBJS=	$(SLOFILES)
-SHL1STDLIBS=\
-    $(UNOTOOLSLIB) \
-    $(UCBHELPERLIB) \
-    $(CPPUHELPERLIB) \
-    $(CPPULIB) \
-    $(SALLIB)
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=	$(SHL1TARGET)
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
-
-ALLTAR : $(MISC)/passwordcontainer.component
-
-$(MISC)/passwordcontainer.component .ERRREMOVE : \
-        $(SOLARENV)/bin/createcomponent.xslt passwordcontainer.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt passwordcontainer.component
diff --git a/svl/source/svdde/makefile.mk b/svl/source/svdde/makefile.mk
deleted file mode 100644
index d7f0a790486b..000000000000
--- a/svl/source/svdde/makefile.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-.IF "$(GUIBASE)"=="WIN"
-
-PRJ=..$/..
-
-PRJNAME=svl
-TARGET=svdde
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svl.pmk
-
-# --- Files --------------------------------------------------------
-
-
-SLOFILES=	$(SLO)$/ddecli.obj	\
-            $(SLO)$/ddesvr.obj	\
-            $(SLO)$/ddedata.obj	\
-            $(SLO)$/ddestrg.obj	\
-            $(SLO)$/ddewrap.obj \
-            $(SLO)$/ddeinf.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.ELSE
-dummy:
-    @echo GUI == "$(GUI)"  -  nothing to do
-
-.ENDIF
-
diff --git a/svl/source/svsql/makefile.mk b/svl/source/svsql/makefile.mk
deleted file mode 100644
index e837d022fb1e..000000000000
--- a/svl/source/svsql/makefile.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svl
-TARGET=svsql
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svl.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =  \
-        $(SLO)$/converter.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/svl/source/undo/makefile.mk b/svl/source/undo/makefile.mk
deleted file mode 100644
index 8a615d97a03b..000000000000
--- a/svl/source/undo/makefile.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svl
-TARGET=undo
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svl.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-        $(SLO)$/undo.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/svl/source/uno/makefile.mk b/svl/source/uno/makefile.mk
deleted file mode 100644
index 3414871305d5..000000000000
--- a/svl/source/uno/makefile.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svl
-TARGET=unoiface
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/svl.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= \
-            $(SLO)$/registerservices.obj\
-            $(SLO)$/pathservice.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/svl/unx/source/svdde/makefile.mk b/svl/unx/source/svdde/makefile.mk
deleted file mode 100644
index 3d2ae4308821..000000000000
--- a/svl/unx/source/svdde/makefile.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=svl
-TARGET=svdde
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svl.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-    $(SLO)$/ddedummy.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/svl/util/makefile.mk b/svl/util/makefile.mk
deleted file mode 100644
index 8f0ced38aca8..000000000000
--- a/svl/util/makefile.mk
+++ /dev/null
@@ -1,130 +0,0 @@
-#*************************************************************************
-#*
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=svl
-TARGET=svl
-RESTARGETSIMPLE=svl
-GEN_HID=TRUE
-# GEN_HID_OTHER=TRUE
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- general section ----------------------------------------------------
-
-.IF "$(GUI)"!="UNX"
-LIB2TARGET= $(LB)$/isvl.lib
-LIB2FILES=	$(LB)$/_isvl.lib
-.ENDIF
-
-LIB1TARGET= $(SLB)$/svl.lib
-LIB1FILES=	\
-        $(SLB)$/config.lib	\
-        $(SLB)$/svdde.lib \
-        $(SLB)$/undo.lib		\
-        $(SLB)$/numbers.lib 	\
-        $(SLB)$/numbers.uno.lib 	\
-        $(SLB)$/filerec.lib \
-        $(SLB)$/filepicker.lib \
-        $(SLB)$/items.lib	\
-        $(SLB)$/misc.lib	\
-        $(SLB)$/notify.lib	\
-                $(SLB)$/unoiface.lib      \
-        $(SLB)$/svarray.lib \
-        $(SLB)$/svsql.lib
-
-# generation of resourcen-lib ----------------------------------------
-
-RESLIB1NAME=	$(RESTARGETSIMPLE)
-RESLIB1SRSFILES=\
-        $(SRS)$/items.srs \
-        $(SRS)$/misc.srs
-
-# build the shared library  --------------------------------------------------
-
-SHL1TARGET= svl$(DLLPOSTFIX)
-SHL1IMPLIB= _isvl
-SHL1USE_EXPORTS=name
-#Do not link with VCL or any other library that links with VCL
-SHL1STDLIBS= \
-        $(UNOTOOLSLIB)		\
-        $(TOOLSLIB) 		\
-        $(I18NISOLANGLIB)   \
-        $(UCBHELPERLIB)		\
-        $(COMPHELPERLIB)	\
-        $(CPPUHELPERLIB)	\
-        $(CPPULIB)			\
-        $(VOSLIB)			\
-                $(SOTLIB)     \
-        $(SALLIB)
-
-.IF "$(GUI)"=="WNT"
-SHL1STDLIBS+= \
-        $(UWINAPILIB) \
-        $(ADVAPI32LIB)	\
-        $(GDI32LIB)
-.ENDIF # WNT
-
-SHL1LIBS=	$(SLB)$/svl.lib
-
-SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=	$(SHL1TARGET)
-DEF1DEPN=	$(SLB)$/svl.lib
-DEFLIB1NAME=svl
-DEF1DES =SvTools lite
-
-# --- Targets ------------------------------------------------------
-
-.IF "$(GUI)"=="UNX"
-SVTTARGETS= $(LB)$/lib$(SHL1TARGET)$(DLLPOST)
-.ELSE
-SVTTARGETS= $(LB)$/isvl.lib
-.ENDIF
-
-# just a quick fix - has to be cleaned up some day...
-.IF "$(L10N-framework)"==""
-ALL: $(SLB)$/svl.lib \
-    $(MISC)$/$(SHL1TARGET).def \
-    $(SVTTARGETS) \
-    ALLTAR
-.ENDIF          # "$(L10N-framework)"==""
-
-.INCLUDE :	target.mk
-
-
-ALLTAR : $(MISC)/svl.component
-
-$(MISC)/svl.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        svl.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt svl.component
diff --git a/svtools/bmpmaker/makefile.mk b/svtools/bmpmaker/makefile.mk
deleted file mode 100644
index a1303343a503..000000000000
--- a/svtools/bmpmaker/makefile.mk
+++ /dev/null
@@ -1,74 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-PRJNAME=svtools
-TARGET=bmp
-LIBTARGET=NO
-
-# --- Settings -----------------------------------------------------
-
-ENABLE_EXCEPTIONS=true
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-OBJFILES=   $(OBJ)$/bmp.obj			\
-            $(OBJ)$/bmpcore.obj		\
-            $(OBJ)$/g2g.obj			\
-            $(OBJ)$/bmpsum.obj
-
-# --- APP1TARGET ---------------------------------------------------
-
-APP1TARGET= $(TARGET)
-
-APP1STDLIBS =		\
-    $(VCLLIB)		\
-    $(TOOLSLIB)		\
-    $(VOSLIB) 		\
-    $(SALLIB)
-
-APP1OBJS=   $(OBJ)$/bmp.obj			\
-            $(OBJ)$/bmpcore.obj		
-            
-APP1BASE=0x10000000
-
-# --- APP2TARGET --------------------------------------------------
-
-APP2TARGET	=	bmpsum
-APP2BASE	=	0x10000000
-APP2OBJS	=   $(OBJ)$/bmpsum.obj
-
-APP2STDLIBS	=	$(VCLLIB)		\
-                $(TOOLSLIB)		\
-                $(VOSLIB) 		\
-                $(SALLIB)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/svtools/inc/makefile.mk b/svtools/inc/makefile.mk
deleted file mode 100644
index cde85ffe82ca..000000000000
--- a/svtools/inc/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..
-
-PRJNAME=svtools
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svt.pmk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-
diff --git a/svtools/qa/unoapi/makefile.mk b/svtools/qa/unoapi/makefile.mk
deleted file mode 100644
index e3afb77e637a..000000000000
--- a/svtools/qa/unoapi/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#***********************************************************************/
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../..
-PRJNAME = svtools
-TARGET = qa_unoapi
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = org/openoffice/svtools/qa/unoapi
-JAVATESTFILES = Test.java
-JAVAFILES = $(JAVATESTFILES)
-JARFILES = OOoRunner.jar ridl.jar test.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
diff --git a/svtools/source/brwbox/makefile.mk b/svtools/source/brwbox/makefile.mk
deleted file mode 100644
index e195e0ef4859..000000000000
--- a/svtools/source/brwbox/makefile.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svtools
-TARGET=browse
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svt.pmk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES=		editbrowsebox.src
-
-EXCEPTIONSFILES =\
-            $(SLO)$/editbrowsebox2.obj		\
-            $(SLO)$/brwbox1.obj				\
-            $(SLO)$/brwbox3.obj
-
-SLOFILES=   \
-            $(EXCEPTIONSFILES)			\
-            $(SLO)$/ebbcontrols.obj		\
-            $(SLO)$/editbrowsebox.obj	\
-            $(SLO)$/brwbox2.obj			\
-            $(SLO)$/brwhead.obj			\
-            $(SLO)$/datwin.obj
-
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/svtools/source/config/makefile.mk b/svtools/source/config/makefile.mk
deleted file mode 100644
index d3ba43de68ef..000000000000
--- a/svtools/source/config/makefile.mk
+++ /dev/null
@@ -1,58 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME=svtools
-TARGET=config
-
-ENABLE_EXCEPTIONS := TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svt.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=  \
-        $(SLO)$/accessibilityoptions.obj	\
-        $(SLO)$/apearcfg.obj				\
-        $(SLO)$/colorcfg.obj            \
-        $(SLO)$/extcolorcfg.obj            \
-        $(SLO)$/fontsubstconfig.obj				\
-        $(SLO)$/helpopt.obj                 \
-    $(SLO)$/htmlcfg.obj \
-        $(SLO)$/itemholder2.obj \
-        $(SLO)$/menuoptions.obj				\
-        $(SLO)$/miscopt.obj             \
-        $(SLO)$/optionsdrawinglayer.obj		\
-        $(SLO)$/printoptions.obj			
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/svtools/source/config/test/makefile.mk b/svtools/source/config/test/makefile.mk
deleted file mode 100644
index 71bea788d8de..000000000000
--- a/svtools/source/config/test/makefile.mk
+++ /dev/null
@@ -1,62 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..$/..
-
-PRJNAME=			svtools
-TARGET=				test_configitems
-LIBTARGET=			NO
-ENABLE_EXCEPTIONS=	TRUE
-USE_DEFFILE=		TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- application: "test" --------------------------------------------------
-
-APP1TARGET= 	test
-
-APP1OBJS=		$(SLO)$/test.obj					\
-                $(SLO)$/dynamicmenuoptions.obj
-
-DEPOBJFILES=$(APP1OBJS)
-
-APP1STDLIBS=	$(CPPULIB)							\
-                $(CPPUHELPERLIB)					\
-                $(COMPHELPERLIB)					\
-                $(UNOTOOLSLIB) 						\
-                $(SALLIB)							\
-                $(VOSLIB)							\
-                $(TOOLSLIB) 						\
-                $(VCLLIB)
-
-APP1DEPN=		$(SLO)$/dynamicmenuoptions.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
diff --git a/svtools/source/contnr/makefile.mk b/svtools/source/contnr/makefile.mk
deleted file mode 100644
index 232665c88c9c..000000000000
--- a/svtools/source/contnr/makefile.mk
+++ /dev/null
@@ -1,82 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svtools
-TARGET=svcontnr
-
-PROJECTPCH4DLL=TRUE
-PROJECTPCH=cont_pch
-PROJECTPCHSOURCE=cont_pch
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svt.pmk
-
-# --- Files --------------------------------------------------------
-
-EXCEPTIONSFILES=\
-            $(SLO)$/contentenumeration.obj	\
-            $(SLO)$/fileview.obj	\
-            $(SLO)$/svlbox.obj		\
-            $(SLO)$/svtabbx.obj		\
-            $(SLO)$/svimpbox.obj	\
-            $(SLO)$/templwin.obj
-
-SLOFILES=   $(EXCEPTIONSFILES) \
-            $(SLO)$/svicnvw.obj		\
-            $(SLO)$/svimpicn.obj	\
-            $(SLO)$/treelist.obj	\
-            $(SLO)$/svlbitm.obj		\
-            $(SLO)$/svtreebx.obj	\
-            $(SLO)$/imivctl1.obj	\
-            $(SLO)$/imivctl2.obj	\
-            $(SLO)$/ivctrl.obj		\
-            $(SLO)$/tooltiplbox.obj
-
-SRS1NAME=$(TARGET)
-SRC1FILES =\
-            fileview.src	\
-            templwin.src	\
-            svcontnr.src
-
-HXX1TARGET=	svcontnr
-HXX1EXT=	hxx
-HXX1FILES=	$(PRJ)$/inc$/svlbox.hxx \
-        $(PRJ)$/inc$/svlbitm.hxx \
-        $(PRJ)$/inc$/svtreebx.hxx \
-        $(PRJ)$/inc$/svicnvw.hxx \
-        $(PRJ)$/inc$/svtabbx.hxx \
-        $(PRJ)$/inc$/treelist.hxx
-HXX1EXCL=	-E:*include*
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/svtools/source/control/makefile.mk b/svtools/source/control/makefile.mk
deleted file mode 100755
index a2e622730635..000000000000
--- a/svtools/source/control/makefile.mk
+++ /dev/null
@@ -1,87 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svtools
-TARGET=ctrl
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-.INCLUDE :  $(PRJ)$/util$/svt.pmk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES=\
-        ctrltool.src \
-        ctrlbox.src \
-        calendar.src \
-        filectrl.src
-
-EXCEPTIONSFILES=\
-        $(SLO)$/svxbox.obj \
-        $(SLO)$/filectrl2.obj \
-        $(SLO)$/roadmap.obj \
-        $(SLO)$/scriptedtext.obj\
-        $(SLO)$/fmtfield.obj \
-        $(SLO)$/inettbc.obj \
-        $(SLO)$/valueacc.obj \
-        $(SLO)$/toolbarmenu.obj \
-        $(SLO)$/toolbarmenuacc.obj
-
-SLOFILES=\
-      $(EXCEPTIONSFILES) \
-        $(SLO)$/asynclink.obj \
-        $(SLO)$/urlcontrol.obj \
-        $(SLO)$/fileurlbox.obj \
-        $(SLO)$/ctrltool.obj  \
-        $(SLO)$/ctrlbox.obj  \
-        $(SLO)$/stdctrl.obj  \
-        $(SLO)$/stdmenu.obj  \
-        $(SLO)$/valueset.obj \
-        $(SLO)$/tabbar.obj       \
-        $(SLO)$/headbar.obj  \
-        $(SLO)$/prgsbar.obj  \
-        $(SLO)$/ruler.obj        \
-        $(SLO)$/taskbar.obj  \
-        $(SLO)$/taskbox.obj  \
-        $(SLO)$/taskstat.obj \
-        $(SLO)$/taskmisc.obj \
-        $(SLO)$/calendar.obj \
-        $(SLO)$/filectrl.obj \
-        $(SLO)$/scrwin.obj       \
-        $(SLO)$/collatorres.obj \
-        $(SLO)$/indexentryres.obj \
-        $(SLO)$/hyperlabel.obj  \
-        $(SLO)$/fixedhyper.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
diff --git a/svtools/source/dialogs/makefile.mk b/svtools/source/dialogs/makefile.mk
deleted file mode 100755
index 99c4b59b76ae..000000000000
--- a/svtools/source/dialogs/makefile.mk
+++ /dev/null
@@ -1,75 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svtools
-TARGET=dialogs
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-.INCLUDE :  $(PRJ)$/util$/svt.pmk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES=		filedlg2.src	\
-                                so3res.src    \
-                                formats.src    \
-                prnsetup.src	\
-                printdlg.src	\
-                colrdlg.src		\
-                addresstemplate.src	\
-                wizardmachine.src
-
-
-EXCEPTIONSFILES=	$(SLO)$/addresstemplate.obj	\
-                    $(SLO)$/insdlg.obj       \
-                    $(SLO)$/roadmapwizard.obj 	\
-                    $(SLO)$/printdlg.obj \
-                    $(SLO)$/wizardmachine.obj
-
-
-SLOFILES=	\
-                    $(SLO)$/insdlg.obj       \
-                    $(SLO)$/roadmapwizard.obj 	\
-                    $(SLO)$/wizardmachine.obj 	\
-                    $(SLO)$/addresstemplate.obj 	\
-                    $(SLO)$/filedlg.obj 	\
-                    $(SLO)$/filedlg2.obj	\
-                    $(SLO)$/prnsetup.obj	\
-                    $(SLO)$/printdlg.obj	\
-                    $(SLO)$/colctrl.obj 	\
-                    $(SLO)$/colrdlg.obj 	\
-                    $(SLO)$/property.obj	\
-                    $(SLO)$/wizdlg.obj		\
-                    $(SLO)$/mcvmath.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
diff --git a/svtools/source/edit/makefile.mk b/svtools/source/edit/makefile.mk
deleted file mode 100644
index 58a63be58f78..000000000000
--- a/svtools/source/edit/makefile.mk
+++ /dev/null
@@ -1,63 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svtools
-TARGET=edit
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svt.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=   \
-            $(SLO)$/textdata.obj	\
-            $(SLO)$/textdoc.obj		\
-            $(SLO)$/texteng.obj		\
-            $(SLO)$/textundo.obj	\
-            $(SLO)$/textview.obj	\
-            $(SLO)$/txtattr.obj		\
-            $(SLO)$/xtextedt.obj	\
-            $(SLO)$/sychconv.obj	\
-            $(SLO)$/svmedit.obj		\
-            $(SLO)$/svmedit2.obj    \
-            $(SLO)$/textwindowpeer.obj	\
-            $(SLO)$/syntaxhighlight.obj \
-        $(SLO)$/editsyntaxhighlighter.obj
-
-EXCEPTIONSFILES=	\
-            $(SLO)$/textview.obj	\
-            $(SLO)$/textdoc.obj     \
-            $(SLO)$/texteng.obj     \
-            $(SLO)$/textwindowpeer.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/svtools/source/filter.vcl/filter/makefile.mk b/svtools/source/filter.vcl/filter/makefile.mk
deleted file mode 100644
index 11d35150bda8..000000000000
--- a/svtools/source/filter.vcl/filter/makefile.mk
+++ /dev/null
@@ -1,81 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=svtools
-TARGET=filter
-LIBTARGET=NO
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svt.pmk
-
-SOLARINC+=-I../../inc
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES=exportdialog.src
-
-SLOFILES= $(SLO)$/filter.obj				\
-          $(SLO)$/filter2.obj				\
-          $(SLO)$/exportdialog.obj			\
-          $(SLO)$/sgfbram.obj				\
-          $(SLO)$/sgvmain.obj				\
-          $(SLO)$/sgvtext.obj				\
-          $(SLO)$/sgvspln.obj				\
-          $(SLO)$/FilterConfigItem.obj		\
-          $(SLO)$/FilterConfigCache.obj		\
-          $(SLO)$/SvFilterOptionsDialog.obj
-
-EXCEPTIONSFILES=		$(SLO)$/exportdialog.obj
-
-EXCEPTIONSNOOPTFILES=	$(SLO)$/filter.obj				\
-                        $(SLO)$/FilterConfigItem.obj	\
-                        $(SLO)$/FilterConfigCache.obj	\
-                        $(SLO)$/SvFilterOptionsDialog.obj
-
-LIB1TARGET=		$(SLB)$/$(TARGET).uno.lib
-LIB1OBJFILES=	$(SLO)$/exportdialog.obj		\
-                $(SLO)$/SvFilterOptionsDialog.obj
-
-LIB2TARGET=		$(SLB)$/$(TARGET).lib
-LIB2OBJFILES=	$(SLO)$/filter.obj				\
-                $(SLO)$/filter2.obj				\
-                $(SLO)$/sgfbram.obj				\
-                $(SLO)$/sgvmain.obj				\
-                $(SLO)$/sgvtext.obj				\
-                $(SLO)$/sgvspln.obj				\
-                $(SLO)$/FilterConfigItem.obj	\
-                $(SLO)$/FilterConfigCache.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/svtools/source/filter.vcl/igif/makefile.mk b/svtools/source/filter.vcl/igif/makefile.mk
deleted file mode 100644
index 0821591e0178..000000000000
--- a/svtools/source/filter.vcl/igif/makefile.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=svtools
-TARGET=igif
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svt.pmk
-SOLARINC+=-I../../inc
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= $(SLO)$/gifread.obj   \
-          $(SLO)$/decode.obj
-
-.INCLUDE :  target.mk
-
diff --git a/svtools/source/filter.vcl/ixbm/makefile.mk b/svtools/source/filter.vcl/ixbm/makefile.mk
deleted file mode 100644
index 55708d2f2630..000000000000
--- a/svtools/source/filter.vcl/ixbm/makefile.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=svtools
-TARGET=ixbm
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svt.pmk
-SOLARINC+=-I../../inc
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= $(SLO)$/xbmread.obj
-
-.INCLUDE :  target.mk
-
diff --git a/svtools/source/filter.vcl/ixpm/makefile.mk b/svtools/source/filter.vcl/ixpm/makefile.mk
deleted file mode 100644
index 98f93290d325..000000000000
--- a/svtools/source/filter.vcl/ixpm/makefile.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=svtools
-TARGET=ixpm
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svt.pmk
-SOLARINC+=-I../../inc
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= $(SLO)$/xpmread.obj
-
-.INCLUDE :  target.mk
diff --git a/svtools/source/filter.vcl/jpeg/makefile.mk b/svtools/source/filter.vcl/jpeg/makefile.mk
deleted file mode 100644
index c782c520324c..000000000000
--- a/svtools/source/filter.vcl/jpeg/makefile.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=svtools
-TARGET=jpeg
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svt.pmk
-
-SOLARINC+=-I../../inc
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=	$(SLO)$/jpegc.obj \
-            $(SLO)$/jpeg.obj
-
-.INCLUDE :  target.mk
diff --git a/svtools/source/filter.vcl/wmf/makefile.mk b/svtools/source/filter.vcl/wmf/makefile.mk
deleted file mode 100644
index 5c9412bc8387..000000000000
--- a/svtools/source/filter.vcl/wmf/makefile.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=svtools
-TARGET=wmf
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-.INCLUDE :	$(PRJ)$/util$/svt.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= $(SLO)$/wmf.obj		\
-          $(SLO)$/winmtf.obj	\
-          $(SLO)$/winwmf.obj	\
-          $(SLO)$/enhwmf.obj	\
-          $(SLO)$/emfwr.obj	\
-          $(SLO)$/wmfwr.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :	target.mk
diff --git a/svtools/source/graphic/makefile.mk b/svtools/source/graphic/makefile.mk
deleted file mode 100644
index 37870b46b80b..000000000000
--- a/svtools/source/graphic/makefile.mk
+++ /dev/null
@@ -1,66 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svtools
-TARGET=graphic
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svt.pmk
-
-.IF "$(GUI)"=="WIN"
-LINKFLAGS=$(LINKFLAGS) /PACKC:32768
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=							\
-            $(SLO)$/grfattr.obj		\
-            $(SLO)$/grfmgr.obj		\
-            $(SLO)$/grfmgr2.obj		\
-            $(SLO)$/grfcache.obj	\
-            $(SLO)$/descriptor.obj	\
-            $(SLO)$/provider.obj	\
-            $(SLO)$/graphic.obj		\
-            $(SLO)$/renderer.obj	\
-            $(SLO)$/graphicunofactory.obj	\
-            $(SLO)$/transformer.obj
-
-EXCEPTIONSFILES=					\
-            $(SLO)$/descriptor.obj	\
-            $(SLO)$/provider.obj	\
-            $(SLO)$/graphic.obj		\
-            $(SLO)$/renderer.obj	\
-            $(SLO)$/graphicunofactory.obj	\
-            $(SLO)$/transformer.obj
-
-# --- Target -------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/svtools/source/hatchwindow/makefile.mk b/svtools/source/hatchwindow/makefile.mk
deleted file mode 100644
index 3c736bc4e66a..000000000000
--- a/svtools/source/hatchwindow/makefile.mk
+++ /dev/null
@@ -1,73 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=svtools
-TARGET=hatchwindowfactory.uno
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-DLLPRE=
-
-# --- Files -------------------------------------
-
-SLOFILES=	\
-    $(SLO)$/hatchwindow.obj\
-    $(SLO)$/hatchwindowfactory.obj\
-    $(SLO)$/documentcloser.obj\
-    $(SLO)$/ipwin.obj
-
-SHL1TARGET=	$(TARGET)
-SHL1IMPLIB=	i$(TARGET)
-SHL1OBJS=	$(SLOFILES)
-SHL1STDLIBS=\
-    $(TKLIB) \
-    $(VCLLIB) \
-    $(TOOLSLIB) \
-    $(CPPUHELPERLIB) \
-    $(CPPULIB) \
-    $(SALLIB)
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=	$(SHL1TARGET)
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
-
-ALLTAR : $(MISC)/hatchwindowfactory.component
-
-$(MISC)/hatchwindowfactory.component .ERRREMOVE : \
-        $(SOLARENV)/bin/createcomponent.xslt hatchwindowfactory.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt hatchwindowfactory.component
diff --git a/svtools/source/java/makefile.mk b/svtools/source/java/makefile.mk
deleted file mode 100644
index 0c6ccedcc311..000000000000
--- a/svtools/source/java/makefile.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svtools
-TARGET=java
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/svt.pmk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME= javaerror
-SRC1FILES= javaerror.src
-
-SLOFILES= \
-    $(SLO)$/javainteractionhandler.obj \
-    $(SLO)$/javacontext.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/svtools/source/misc/makefile.mk b/svtools/source/misc/makefile.mk
deleted file mode 100755
index 266dad976e4b..000000000000
--- a/svtools/source/misc/makefile.mk
+++ /dev/null
@@ -1,81 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=svtools
-TARGET=misc
-
-ENABLE_EXCEPTIONS := TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svt.pmk
-
-# --- Files --------------------------------------------------------
-
-#use local "bmp" as it may not yet be delivered
-
-SRS1NAME=misc
-SRC1FILES=\
-    ehdl.src \
-    undo.src \
-    helpagent.src \
-    imagemgr.src      \
-    langtab.src 
-
-SLOFILES=\
-    $(SLO)$/acceleratorexecute.obj  \
-    $(SLO)$/chartprettypainter.obj \
-    $(SLO)$/cliplistener.obj        \
-    $(SLO)$/dialogclosedlistener.obj\
-    $(SLO)$/dialogcontrolling.obj   \
-    $(SLO)$/ehdl.obj                \
-    $(SLO)$/embedhlp.obj            \
-    $(SLO)$/embedtransfer.obj       \
-    $(SLO)$/helpagentwindow.obj     \
-    $(SLO)$/imagemgr.obj            \
-    $(SLO)$/imageresourceaccess.obj \
-    $(SLO)$/imap.obj                \
-    $(SLO)$/imap2.obj               \
-    $(SLO)$/imap3.obj               \
-    $(SLO)$/itemdel.obj				\
-    $(SLO)$/langtab.obj				\
-    $(SLO)$/stringtransfer.obj      \
-    $(SLO)$/svtaccessiblefactory.obj \
-    $(SLO)$/svtdata.obj             \
-    $(SLO)$/templatefoldercache.obj \
-    $(SLO)$/transfer.obj            \
-    $(SLO)$/transfer2.obj           \
-    $(SLO)$/unitconv.obj           \
-    $(SLO)$/wallitem.obj           \
-    $(SLO)$/xwindowitem.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/svtools/source/plugapp/makefile.mk b/svtools/source/plugapp/makefile.mk
deleted file mode 100644
index 32a16926c59e..000000000000
--- a/svtools/source/plugapp/makefile.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME=svtools
-TARGET=plugapp
-LIBTARGET=NO
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svt.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES = \
-    $(SLO)$/ttprops.obj 
-
-
-SRS2NAME=$(TARGET)
-SRC2FILES=   testtool.src
-
-
-LIB1TARGET= $(SLB)$/plugapp.lib
-LIB1OBJFILES=  $(SLOFILES)
-
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/svtools/source/productregistration/makefile.mk b/svtools/source/productregistration/makefile.mk
deleted file mode 100644
index b6e119601697..000000000000
--- a/svtools/source/productregistration/makefile.mk
+++ /dev/null
@@ -1,86 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=svtools
-TARGET=productregistration.uno
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-GEN_HID=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-DLLPRE=
-
-# --- Files -------------------------------------
-
-SLOFILES=	\
-    $(SLO)$/productregistration.obj \
-    $(SLO)$/registrationdlg.obj
-
-SHL1TARGET=	$(TARGET)
-SHL1IMPLIB=	i$(TARGET)
-
-SHL1OBJS= \
-    $(SLOFILES)
-
-SHL1STDLIBS=\
-    $(TKLIB) \
-    $(VCLLIB) \
-    $(SVLLIB) \
-        $(UNOTOOLSLIB) \
-    $(TOOLSLIB) \
-    $(CPPUHELPERLIB) \
-    $(CPPULIB) \
-    $(SALLIB)
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=	$(SHL1TARGET)
-
-SRS1NAME=	productregistration
-SRC1FILES=	\
-    registrationdlg.src
-
-RESLIB1NAME=productregistration
-RESLIB1IMAGES=$(PRJ)$/res
-RESLIB1SRSFILES=\
-    $(SRS)$/productregistration.srs
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
-
-ALLTAR : $(MISC)/productregistration.uno.component
-
-$(MISC)/productregistration.uno.component .ERRREMOVE : \
-        $(SOLARENV)/bin/createcomponent.xslt productregistration.uno.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt productregistration.uno.component
diff --git a/svtools/source/svhtml/makefile.mk b/svtools/source/svhtml/makefile.mk
deleted file mode 100644
index 7a8552f2b672..000000000000
--- a/svtools/source/svhtml/makefile.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svtools
-TARGET=svhtml
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svt.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=\
-    $(SLO)$/htmlkywd.obj	\
-    $(SLO)$/htmlsupp.obj	\
-    $(SLO)$/htmlout.obj		\
-    $(SLO)$/parhtml.obj
-
-# ==========================================================================
-
-.INCLUDE :  target.mk
-
diff --git a/svtools/source/svrtf/makefile.mk b/svtools/source/svrtf/makefile.mk
deleted file mode 100644
index 5ebb0e28c69e..000000000000
--- a/svtools/source/svrtf/makefile.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svtools
-TARGET=svrtf
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svt.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-        $(SLO)$/svparser.obj \
-        $(SLO)$/parrtf.obj	\
-        $(SLO)$/rtfout.obj \
-        $(SLO)$/rtfkeywd.obj
-
-# ==========================================================================
-
-.INCLUDE :  target.mk
-
diff --git a/svtools/source/table/makefile.mk b/svtools/source/table/makefile.mk
deleted file mode 100644
index cf1adc76fe92..000000000000
--- a/svtools/source/table/makefile.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-ENABLE_EXCEPTIONS=TRUE
-PRJNAME=svtools
-TARGET=table
-#LIBTARGET=NO
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-.INCLUDE :  $(PRJ)$/util$/svt.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=\
-        $(SLO)$/tablecontrol.obj \
-        $(SLO)$/tablecontrol_impl.obj \
-        $(SLO)$/gridtablerenderer.obj \
-        $(SLO)$/tablegeometry.obj \
-        $(SLO)$/defaultinputhandler.obj \
-        $(SLO)$/tabledatawindow.obj
-
-#LIB1TARGET=     $(SLB)$/$(TARGET).lib
-#LIB1OBJFILES=   $(SLOFILES)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
diff --git a/svtools/source/toolpanel/makefile.mk b/svtools/source/toolpanel/makefile.mk
deleted file mode 100755
index 58282056f529..000000000000
--- a/svtools/source/toolpanel/makefile.mk
+++ /dev/null
@@ -1,68 +0,0 @@
-#*************************************************************************
-#
-# 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
-#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.16 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svtools
-TARGET=toolpanel
-
-# --- Settings -----------------------------------------------------
-
-ENABLE_EXCEPTIONS=TRUE
-
-.INCLUDE :	settings.mk
-.INCLUDE :  $(PRJ)$/util$/svt.pmk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES=\
-        toolpanel.src
-
-SLOFILES=\
-        $(SLO)$/drawerlayouter.obj \
-        $(SLO)$/dummypanel.obj \
-        $(SLO)$/paneldecklisteners.obj \
-        $(SLO)$/paneltabbar.obj \
-        $(SLO)$/paneltabbarpeer.obj \
-        $(SLO)$/refbase.obj \
-        $(SLO)$/tabbargeometry.obj \
-        $(SLO)$/tablayouter.obj \
-        $(SLO)$/toolpanel.obj \
-        $(SLO)$/toolpanelcollection.obj \
-        $(SLO)$/toolpaneldrawer.obj \
-        $(SLO)$/toolpaneldrawerpeer.obj \
-        $(SLO)$/toolpaneldeck.obj \
-        $(SLO)$/toolpaneldeckpeer.obj \
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
diff --git a/svtools/source/uno/makefile.mk b/svtools/source/uno/makefile.mk
deleted file mode 100644
index 7c1c44006047..000000000000
--- a/svtools/source/uno/makefile.mk
+++ /dev/null
@@ -1,61 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svtools
-TARGET=unoiface
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/svt.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= \
-            $(SLO)$/addrtempuno.obj \
-            $(SLO)$/contextmenuhelper.obj \
-            $(SLO)$/framestatuslistener.obj \
-            $(SLO)$/generictoolboxcontroller.obj \
-            $(SLO)$/genericunodialog.obj \
-            $(SLO)$/miscservices.obj\
-            $(SLO)$/statusbarcontroller.obj \
-            $(SLO)$/toolboxcontroller.obj \
-            $(SLO)$/treecontrolpeer.obj \
-            $(SLO)$/unocontroltablemodel.obj \
-            $(SLO)$/unoevent.obj \
-            $(SLO)$/unoiface.obj \
-            $(SLO)$/unoimap.obj \
-            $(SLO)$/svtxgridcontrol.obj \
-            $(SLO)$/popupwindowcontroller.obj \
-            $(SLO)$/popupmenucontrollerbase.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/svtools/source/uno/wizard/makefile.mk b/svtools/source/uno/wizard/makefile.mk
deleted file mode 100644
index 521496fc5d48..000000000000
--- a/svtools/source/uno/wizard/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=../../..
-
-PRJNAME=svtools
-TARGET=unowiz
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/svt.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= \
-    $(SLO)$/unowizard.obj \
-    $(SLO)$/wizardshell.obj \
-    $(SLO)$/wizardpagecontroller.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/svtools/source/urlobj/makefile.mk b/svtools/source/urlobj/makefile.mk
deleted file mode 100644
index c75e592ea10b..000000000000
--- a/svtools/source/urlobj/makefile.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svtools
-TARGET=urlobj
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/svt.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =	\
-        $(SLO)$/inetimg.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/svtools/util/makefile.mk b/svtools/util/makefile.mk
deleted file mode 100644
index 3a9429cf3735..000000000000
--- a/svtools/util/makefile.mk
+++ /dev/null
@@ -1,195 +0,0 @@
-#*************************************************************************
-#*
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=svtools
-TARGET=svtool
-RESTARGET=svt
-GEN_HID=TRUE
-GEN_HID_OTHER=TRUE
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-USE_LDUMP2=TRUE
-
-# --- general section ----------------------------------------------------
-
-.IF "$(GUI)"!="UNX"
-LIB2TARGET= $(LB)$/svtool.lib
-LIB2FILES=	$(LB)$/_svt.lib
-.ENDIF
-
-LIB1TARGET= $(SLB)/svt.lib
-LIB1FILES=	\
-        $(SLB)/browse.lib		\
-        $(SLB)/config.lib	\
-        $(SLB)/svcontnr.lib	\
-        $(SLB)/ctrl.lib		\
-        $(SLB)/dialogs.lib 	\
-        $(SLB)/edit.lib		\
-        $(SLB)/filter.lib		\
-        $(SLB)/filter.uno.lib	\
-        $(SLB)$/graphic.lib	\
-        $(SLB)/igif.lib		\
-        $(SLB)/jpeg.lib		\
-        $(SLB)/ixpm.lib		\
-        $(SLB)/ixbm.lib		\
-        $(SLB)/wmf.lib 		\
-        $(SLB)/java.lib		\
-        $(SLB)/misc.lib		\
-        $(SLB)/plugapp.lib 	\
-        $(SLB)/svhtml.lib   \
-        $(SLB)/svrtf.lib	\
-        $(SLB)/table.lib 	\
-        $(SLB)/unoiface.lib	\
-        $(SLB)/unowiz.lib	\
-        $(SLB)/urlobj.lib	\
-        $(SLB)/toolpanel.lib
-
-# generation of resourcen-lib ----------------------------------------
-
-RESLIB1NAME=	$(RESTARGET)
-RESLIB1IMAGES=$(PRJ)$/res
-RESLIB1SRSFILES= \
-        $(SRS)$/filter.srs  \
-        $(SRS)$/misc.srs        \
-        $(SRS)$/ctrl.srs        \
-        $(SRS)$/dialogs.srs     \
-        $(SRS)$/plugapp.srs     \
-        $(SRS)$/svcontnr.srs    \
-        $(SRS)$/browse.srs		\
-        $(SRS)$/toolpanel.srs		\
-        $(SRS)$/javaerror.srs
-
-# build the shared library  --------------------------------------------------
-
-SHL1TARGET= svt$(DLLPOSTFIX)
-SHL1IMPLIB= _svt
-SHL1USE_EXPORTS=name
-
-.IF "$(OS)"!="MACOSX"
-# static libraries
-SHL1STDLIBS+= $(JPEG3RDLIB)
-.ENDIF
-
-# dynamic libraries
-SHL1STDLIBS+= \
-        $(TKLIB)			\
-        $(VCLLIB)			\
-        $(SVLLIB)			\
-        $(SOTLIB)			\
-        $(BASEGFXLIB)		\
-        $(UNOTOOLSLIB)		\
-        $(TOOLSLIB)			\
-        $(I18NISOLANGLIB)   \
-        $(I18NUTILLIB)		\
-        $(UCBHELPERLIB)		\
-        $(COMPHELPERLIB)	\
-        $(CPPUHELPERLIB)	\
-        $(CPPULIB)			\
-        $(VOSLIB)			\
-        $(SALLIB)			\
-        $(ICUUCLIB)		\
-        $(JVMFWKLIB)
-
-.IF "$(OS)"=="MACOSX"
-# static libraries go at end
-SHL1STDLIBS+= $(JPEG3RDLIB)
-.ENDIF
-
-.IF "$(GUI)"=="WNT"
-SHL1STDLIBS+= \
-        $(UWINAPILIB) \
-        $(ADVAPI32LIB)	\
-        $(GDI32LIB) \
-        $(OLE32LIB) 	\
-        $(UUIDLIB) 	\
-        $(ADVAPI32LIB)	\
-        $(OLEAUT32LIB)
-.ENDIF # WNT
-
-SHL1LIBS= \
-    $(SLB)$/svt.lib
-
-SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=	$(SHL1TARGET)
-DEFLIB1NAME =svt
-DEF1DES 	=SvTools
-
-
-# --- g2g application --------------------------------------------------
-
-APP2TARGET	=	g2g
-APP2BASE	=	0x10000000
-APP2DEPN	=   $(SHL1TARGETN) $(SHL2TARGETN)
-
-APP2OBJS	=   $(OBJ)$/g2g.obj
-
-.IF "$(GUI)"!="UNX"
-APP2STDLIBS+= $(SVTOOLLIB)
-.ELSE
-APP2STDLIBS+= -lsvt$(DLLPOSTFIX)
-APP2STDLIBS+= -lsvl$(DLLPOSTFIX)
-.ENDIF
-
-APP2STDLIBS+=	$(VCLLIB)		\
-                $(TOOLSLIB)		\
-                $(VOSLIB) 		\
-                $(SALLIB)
-
-# --- Targets ------------------------------------------------------
-
-.IF "$(GUI)"=="UNX"
-SVTTARGETS= $(LB)$/lib$(SHL1TARGET)$(DLLPOST)
-.ELSE
-SVTTARGETS= $(BIN)$/$(SHL1TARGET)$(DLLPOST)
-.ENDIF
-
-# just a quick fix - has to be cleaned up some day...
-.IF "$(L10N-framework)"==""
-ALL: $(SLB)$/svt.lib \
-    $(MISC)$/$(SHL1TARGET).def \
-    $(SVTTARGETS) \
-    ALLTAR
-.ENDIF          # "$(L10N-framework)"==""
-
-.INCLUDE :	target.mk
-
-
-
-ALLTAR : $(MISC)/svt.component
-
-$(MISC)/svt.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        svt.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt svt.component
diff --git a/svtools/workben/cui/makefile.mk b/svtools/workben/cui/makefile.mk
deleted file mode 100644
index 2c7d06682c77..000000000000
--- a/svtools/workben/cui/makefile.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svtools
-TARGET=cuidem
-LIBTARGET=NO
-
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-OBJFILES=   $(OBJ)$/loadlib.obj  
-
-APP4TARGET=     dllver
-APP4STDLIBS= \
-            $(SVTOOLLIB) \
-            $(SVLLIB) \
-            $(VCLLIB) \
-            $(TOOLSLIB) \
-            $(VOSLIB) \
-            $(SALLIB)
-.IF "$(GUI)"=="WNT" || "$(COM)"=="GCC"
-APP4STDLIBS+= $(CPPULIB)
-.ENDIF
-APP4OBJS=       $(OBJ)$/loadlib.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/svtools/workben/makefile.mk b/svtools/workben/makefile.mk
deleted file mode 100644
index 9e50208b9ee9..000000000000
--- a/svtools/workben/makefile.mk
+++ /dev/null
@@ -1,69 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=svtools
-TARGET=svdem
-LIBTARGET=NO
-TARGETTYPE=GUI
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Files --------------------------------------------------------
-
-OBJFILES=	$(OBJ)$/svdem.obj
-
-APP1TARGET= 	$(TARGET)
-APP1STDLIBS=	$(SVTOOLLIB)		\
-                $(VCLLIB)			\
-                $(UNOTOOLSLIB) 		\
-                $(COMPHELPERLIB) 	\
-                $(TOOLSLIB) 		\
-                $(SALLIB)			\
-                $(VOSLIB)			\
-                $(CPPUHELPERLIB)	\
-                $(CPPULIB)
-
-APP1OBJS=		$(OBJ)$/svdem.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :	target.mk
-
-ALLTAR : $(BIN)$/applicat.rdb 
-
-$(BIN)$/applicat.rdb : makefile.mk $(UNOUCRRDB)
-    rm -f $@
-    $(GNUCOPY) $(UNOUCRRDB) $@
-     cd $(BIN) && \
-         regcomp -register -r applicat.rdb \
-             -c i18nsearch.uno$(DLLPOST) \
-             -c i18npool.uno$(DLLPOST) 
diff --git a/svtools/workben/toolpanel/makefile.mk b/svtools/workben/toolpanel/makefile.mk
deleted file mode 100644
index e64e3cd8eccd..000000000000
--- a/svtools/workben/toolpanel/makefile.mk
+++ /dev/null
@@ -1,110 +0,0 @@
-#*************************************************************************
-#
-# 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
-#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.16 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svtools
-TARGET=toolpaneltest
-TARGETTYPE=GUI
-LIBTARGET=NO
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-CXXFILES=   toolpaneltest.cxx
-
-OBJFILES=   $(OBJ)$/toolpaneltest.obj
-
-APP1TARGET= $(TARGET)
-APP1OBJS=   $(OBJFILES)
-APP1STDLIBS=\
-            $(VCLLIB)           \
-            $(UCBHELPERLIB)     \
-            $(SALLIB)           \
-            $(TOOLSLIB)         \
-            $(COMPHELPERLIB)    \
-            $(CPPUHELPERLIB)    \
-            $(CPPULIB)          \
-            $(BASEGFXLIB)       \
-            $(SVTOOLLIB)        \
-
-APP1RAPTH=BRAND
-
-.IF "$(GUI)"!="UNX"
-APP1DEF=    $(MISC)$/$(TARGET).def
-.ENDIF
-
-.IF "$(COM)"=="GCC"
-ADDOPTFILES=$(OBJ)$/toolpaneltest.obj
-add_cflagscxx="-frtti -fexceptions"
-.ENDIF
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-
-# ------------------------------------------------------------------
-# MAC
-# ------------------------------------------------------------------
-
-.IF "$(GUI)" == "MAC"
-
-$(MISC)$/$(TARGET).def: makefile
-    echo Kein Def-File fuer Applikationen auf Mac
-.ENDIF
-
-
-# ------------------------------------------------------------------
-# Windows
-# ------------------------------------------------------------------
-
-.IF "$(GUI)" == "WIN"
-
-$(MISC)$/$(TARGET).def: makefile
-    echo  NAME          $(TARGET)                           >$@
-    echo  DESCRIPTION   'ToolPanel - Testprogramm'         >>$@
-    echo  EXETYPE       WINDOWS                            >>$@
-    echo  STUB          'winSTUB.EXE'                      >>$@
-    echo  PROTMODE                                         >>$@
-    echo  CODE          PRELOAD MOVEABLE DISCARDABLE       >>$@
-    echo  DATA          PRELOAD MOVEABLE MULTIPLE          >>$@
-    echo  HEAPSIZE      8192                               >>$@
-    echo  STACKSIZE     32768                              >>$@
-
-.ENDIF
-
diff --git a/svtools/workben/treecontrol/makefile.mk b/svtools/workben/treecontrol/makefile.mk
deleted file mode 100644
index 2558ed2c9a94..000000000000
--- a/svtools/workben/treecontrol/makefile.mk
+++ /dev/null
@@ -1,91 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svtools
-TARGET=treetest
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-APP1NOSAL=	TRUE
-APP1TARGET= treetest
-APP1OBJS=	$(OBJ)$/treetest.obj
-APP1STDLIBS=$(SOTLIB)			\
-            $(COMPHELPERLIB)	\
-            $(CPPULIB)			\
-            $(CPPUHELPERLIB)	\
-            $(SALLIB)
-
-#			$(SVTOOLLIB)		\
-
-APP2DEF=	$(MISC)$/treetest.def
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-
-# ------------------------------------------------------------------
-# Windows
-# ------------------------------------------------------------------
-
-.IF "$(GUI)" == "WIN"
-
-$(MISC)$/treetest.def: makefile.mk
-    echo  NAME			treetest							>$@
-    echo  DESCRIPTION	'StarView - Testprogramm'          >>$@
-    echo  EXETYPE		WINDOWS 						   >>$@
-    echo  STUB			'winSTUB.EXE'                      >>$@
-    echo  PROTMODE										   >>$@
-    echo  CODE			PRELOAD MOVEABLE DISCARDABLE	   >>$@
-    echo  DATA			PRELOAD MOVEABLE MULTIPLE		   >>$@
-    echo  HEAPSIZE		8192							   >>$@
-    echo  STACKSIZE 	32768							   >>$@
-
-.ENDIF
-
-ALLTAR : $(BIN)$/treetest.rdb 
-
-$(BIN)$/treetest.rdb : makefile.mk $(UNOUCRRDB)
-    rm -f $@
-    $(GNUCOPY) $(UNOUCRRDB) $@
-     +cd $(BIN) && \
-         regcomp -register -r treetest.rdb \
-             -c i18nsearch.uno$(DLLPOST) \
-             -c i18npool.uno$(DLLPOST) \
-             -c connector.uno$(DLLPOST) \
-            -c remotebridge.uno$(DLLPOST) \
-            -c bridgefac.uno$(DLLPOST) \
-            -c uuresolver.uno$(DLLPOST) \
-            -c $(DLLPRE)tk$(DLLPOSTFIX)$(DLLPOST)
diff --git a/svtools/workben/unodialog/makefile.mk b/svtools/workben/unodialog/makefile.mk
deleted file mode 100644
index f18feffce5c3..000000000000
--- a/svtools/workben/unodialog/makefile.mk
+++ /dev/null
@@ -1,90 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJINC=$(PRJ)/inc
-PRJNAME=svtools
-TARGET=udlg
-USE_DEFFILE=TRUE
-
-ENABLE_EXCEPTIONS=TRUE
-VISIBILITY_HIDDEN=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files -------------------------------------
-
-# ... resource files ............................
-
-SRS1NAME=$(TARGET)
-SRC1FILES =	\
-        roadmapskeleton.src
-
-# ... object files ............................
-SLOFILES=   $(SLO)$/unodialogsample.obj \
-            $(SLO)$/roadmapskeleton.obj \
-            $(SLO)$/roadmapskeletonpages.obj \
-            $(SLO)$/udlg_module.obj \
-            $(SLO)$/udlg_services.obj \
-
-# --- library -----------------------------------
-
-SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-SHL1STDLIBS= \
-        $(CPPULIB)          \
-        $(CPPUHELPERLIB)    \
-        $(COMPHELPERLIB)    \
-        $(UNOTOOLSLIB)      \
-        $(TOOLSLIB)         \
-        $(SALLIB)           \
-        $(SVTOOLLIB)        \
-        $(VCLLIB)
-
-SHL1LIBS=       $(SLB)$/$(TARGET).lib
-SHL1IMPLIB=     i$(TARGET)
-SHL1DEPN=       $(SHL1LIBS)
-SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=       $(SHL1TARGET)
-
-# --- .res files -------------------------------
-
-RES1FILELIST=\
-    $(SRS)$/$(TARGET).srs
-
-RESLIB1NAME=$(TARGET)
-RESLIB1IMAGES=$(PRJ)$/res
-RESLIB1SRSFILES=$(RES1FILELIST)
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/toolkit/inc/makefile.mk b/toolkit/inc/makefile.mk
deleted file mode 100644
index 41100071a4d8..000000000000
--- a/toolkit/inc/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..
-
-PRJNAME=toolkit
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-
diff --git a/toolkit/qa/complex/toolkit/interface_tests/makefile.mk b/toolkit/qa/complex/toolkit/interface_tests/makefile.mk
deleted file mode 100755
index 7d8c4c951d4e..000000000000
--- a/toolkit/qa/complex/toolkit/interface_tests/makefile.mk
+++ /dev/null
@@ -1,57 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ = ../../../..
-TARGET  = Toolkit
-PRJNAME = $(TARGET)
-PACKAGE = complex/toolkit/interface_tests
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-
-#----- compile .java files -----------------------------------------
-
-JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
-JAVAFILES       = _XAccessibleComponent.java         \
-                  _XAccessibleContext.java           \
-                  _XAccessibleExtendedComponent.java \
-                  _XAccessibleEventBroadcaster.java  \
-                  _XAccessibleText.java              \
-                  _XRequestCallback.java
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)/$(PACKAGE)/$(i:b).class)
-
-# --- Targets ------------------------------------------------------
-
-.IF "$(depend)" == ""
-ALL :   ALLTAR
-.ELSE
-ALL: 	ALLDEP
-.ENDIF
-
-.INCLUDE :  target.mk
-
diff --git a/toolkit/qa/complex/toolkit/makefile.mk b/toolkit/qa/complex/toolkit/makefile.mk
deleted file mode 100755
index 70918d602624..000000000000
--- a/toolkit/qa/complex/toolkit/makefile.mk
+++ /dev/null
@@ -1,120 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../../..
-PRJNAME = toolkit
-TARGET = qa_complex_toolkit
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/toolkit
-
-JAVATESTFILES       = CheckAccessibleStatusBar.java \
-    CheckAccessibleStatusBarItem.java \
-    CheckAsyncCallback.java \
-    CallbackClass.java
-
-JAVAFILES = $(JAVATESTFILES) \
- _XAccessibleComponent.java \
- _XAccessibleContext.java \
- _XAccessibleEventBroadcaster.java \
- _XAccessibleExtendedComponent.java \
- _XAccessibleText.java \
- _XRequestCallback.java
-
-JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
-
-
-# PRJ = ..$/..$/..
-# TARGET  = Toolkit
-# PRJNAME = $(TARGET)
-# PACKAGE = complex$/toolkit
-# 
-# # --- Settings -----------------------------------------------------
-# .INCLUDE: settings.mk
-# 
-# 
-# #----- compile .java files -----------------------------------------
-# 
-# JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar 
-# JAVAFILES       = CheckAccessibleStatusBar.java CheckAccessibleStatusBarItem.java CheckAsyncCallback.java CallbackClass.java
-# JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-# SUBDIRS		= interface_tests
-# 
-# #----- make a jar from compiled files ------------------------------
-# 
-# MAXLINELENGTH = 100000
-# 
-# JARCLASSDIRS    = $(PACKAGE)
-# JARTARGET       = $(TARGET).jar
-# JARCOMPRESS 	= TRUE
-# 
-# # --- Parameters for the test --------------------------------------
-# 
-# # start an office if the parameter is set for the makefile
-# .IF "$(OFFICE)" == ""
-# CT_APPEXECCOMMAND =
-# .ELSE
-# CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;"
-# .ENDIF
-# 
-# # test base is java complex
-# CT_TESTBASE = -tb java_complex
-# 
-# # build up package name with "." instead of $/
-# CT_PACKAGE     = -o $(PACKAGE:s\$/\.\)
-# 
-# # start the runner application
-# CT_APP      = org.openoffice.Runner
-# 
-# # --- Targets ------------------------------------------------------
-# 
-# .INCLUDE :  target.mk
-# 
-# run: \
-#     CheckAccessibleStatusBarItem
-# 
-# CheckAccessibleStatusBar:
-#     +java -cp $(CLASSPATH) $(CT_APP) $(CT_APPEXECCOMMAND) $(CT_TESTBASE) $(CT_PACKAGE).CheckAccessibleStatusBar
-# 
-# CheckAccessibleStatusBarItem:
-#     +java -cp $(CLASSPATH) $(CT_APP) $(CT_APPEXECCOMMAND) $(CT_TESTBASE) $(CT_PACKAGE).CheckAccessibleStatusBarItem
-# 
diff --git a/toolkit/qa/complex/xunitconversion/makefile.mk b/toolkit/qa/complex/xunitconversion/makefile.mk
deleted file mode 100644
index bc5a0e7c5949..000000000000
--- a/toolkit/qa/complex/xunitconversion/makefile.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../../..
-PRJNAME = sc
-TARGET = qa_complex_xunitconversiontest
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = complex/xunitconversion
-
-JAVATESTFILES = \
-    XUnitConversionTest.java
-JAVAFILES = $(JAVATESTFILES)
-JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
diff --git a/toolkit/qa/unoapi/makefile.mk b/toolkit/qa/unoapi/makefile.mk
deleted file mode 100644
index 9517601c3917..000000000000
--- a/toolkit/qa/unoapi/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#***********************************************************************/
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../..
-PRJNAME = toolkit
-TARGET = qa_unoapi
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = org/openoffice/toolkit/qa/unoapi
-JAVATESTFILES = Test.java
-JAVAFILES = $(JAVATESTFILES)
-JARFILES = OOoRunner.jar ridl.jar test.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
diff --git a/toolkit/source/awt/makefile.mk b/toolkit/source/awt/makefile.mk
deleted file mode 100644
index 88b40a597410..000000000000
--- a/toolkit/source/awt/makefile.mk
+++ /dev/null
@@ -1,84 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=toolkit
-TARGET=awt
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(GUIBASE)"=="aqua"
-CFLAGSCXX+=$(OBJCXXFLAGS)
-.ENDIF  # "$(GUIBASE)"=="aqua"
-
-SLOFILES=   \
-            $(SLO)$/stylesettings.obj                   \
-            $(SLO)$/vclxaccessiblecomponent.obj         \
-            $(SLO)$/vclxbitmap.obj 						\
-            $(SLO)$/vclxcontainer.obj 					\
-            $(SLO)$/vclxdevice.obj 						\
-            $(SLO)$/vclxfont.obj 						\
-            $(SLO)$/vclxgraphics.obj 					\
-            $(SLO)$/vclxmenu.obj 						\
-            $(SLO)$/vclxpointer.obj 					\
-            $(SLO)$/vclxprinter.obj 					\
-            $(SLO)$/vclxregion.obj 						\
-            $(SLO)$/vclxsystemdependentwindow.obj		\
-            $(SLO)$/vclxtoolkit.obj 					\
-            $(SLO)$/vclxtopwindow.obj 					\
-            $(SLO)$/vclxwindow.obj 						\
-            $(SLO)$/vclxwindow1.obj 					\
-            $(SLO)$/vclxwindows.obj                     \
-            $(SLO)$/vclxspinbutton.obj                  \
-            $(SLO)$/xsimpleanimation.obj                \
-            $(SLO)$/xthrobber.obj						\
-            $(SLO)$/asynccallback.obj\
-            $(SLO)/vclxbutton.obj\
-            $(SLO)/vclxdialog.obj\
-            $(SLO)/vclxfixedline.obj\
-            $(SLO)/vclxplugin.obj\
-            $(SLO)/vclxscroller.obj\
-            $(SLO)/vclxsplitter.obj\
-            $(SLO)/vclxtabcontrol.obj\
-            $(SLO)/vclxtabpage.obj
-
-SRS1NAME=$(TARGET)
-SRC1FILES=\
-            xthrobber.src
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
diff --git a/toolkit/source/controls/grid/makefile.mk b/toolkit/source/controls/grid/makefile.mk
deleted file mode 100644
index 70bfc34b9d02..000000000000
--- a/toolkit/source/controls/grid/makefile.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=toolkit
-TARGET=grid
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=   \
-            $(SLO)$/gridcontrol.obj\
-            $(SLO)$/defaultgriddatamodel.obj\
-            $(SLO)$/defaultgridcolumnmodel.obj\
-            $(SLO)$/gridcolumn.obj
-            
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
diff --git a/toolkit/source/controls/makefile.mk b/toolkit/source/controls/makefile.mk
deleted file mode 100644
index 1ce9f7b22c8c..000000000000
--- a/toolkit/source/controls/makefile.mk
+++ /dev/null
@@ -1,66 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=toolkit
-TARGET=controls
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=   \
-            $(SLO)$/accessiblecontrolcontext.obj    \
-            $(SLO)$/geometrycontrolmodel.obj        \
-            $(SLO)$/eventcontainer.obj				\
-            $(SLO)$/stdtabcontroller.obj 			\
-            $(SLO)$/stdtabcontrollermodel.obj 		\
-            $(SLO)$/unocontrol.obj 					\
-            $(SLO)$/unocontrolbase.obj 				\
-            $(SLO)$/unocontrolcontainer.obj 		\
-            $(SLO)$/unocontrolcontainermodel.obj 	\
-            $(SLO)$/unocontrolmodel.obj 			\
-            $(SLO)$/unocontrols.obj					\
-            $(SLO)$/formattedcontrol.obj			\
-            $(SLO)$/roadmapcontrol.obj				\
-            $(SLO)$/roadmapentry.obj				\
-            $(SLO)$/dialogcontrol.obj    			\
-            $(SLO)$/tkscrollbar.obj                 \
-            $(SLO)$/tkspinbutton.obj                \
-            $(SLO)$/tksimpleanimation.obj           \
-            $(SLO)$/tkthrobber.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
diff --git a/toolkit/source/controls/tree/makefile.mk b/toolkit/source/controls/tree/makefile.mk
deleted file mode 100644
index 4e72b62b416b..000000000000
--- a/toolkit/source/controls/tree/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=toolkit
-TARGET=tree
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=   \
-            $(SLO)$/treecontrol.obj\
-            $(SLO)$/treedatamodel.obj
-            
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
diff --git a/toolkit/source/helper/makefile.mk b/toolkit/source/helper/makefile.mk
deleted file mode 100644
index bf10b0aa0178..000000000000
--- a/toolkit/source/helper/makefile.mk
+++ /dev/null
@@ -1,64 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=toolkit
-TARGET=helper
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=   \
-            $(SLO)$/listenermultiplexer.obj 		\
-            $(SLO)$/property.obj 					\
-            $(SLO)$/registerservices.obj 			\
-            $(SLO)$/servicenames.obj 				\
-            $(SLO)$/tkresmgr.obj                    \
-            $(SLO)$/unomemorystream.obj 			\
-            $(SLO)$/unopropertyarrayhelper.obj		\
-            $(SLO)$/unowrapper.obj 					\
-            $(SLO)$/vclunohelper.obj				\
-            $(SLO)$/externallock.obj                \
-            $(SLO)$/imagealign.obj                  \
-            $(SLO)$/throbberimpl.obj                \
-            $(SLO)$/formpdfexport.obj				\
-            $(SLO)$/accessibilityclient.obj         \
-            $(SLO)$/fixedhyperbase.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
diff --git a/toolkit/source/layout/core/makefile.mk b/toolkit/source/layout/core/makefile.mk
deleted file mode 100644
index 2c90921799af..000000000000
--- a/toolkit/source/layout/core/makefile.mk
+++ /dev/null
@@ -1,65 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=../../..
-PRJNAME=toolkit
-TARGET=layout-core
-ENABLE_EXCEPTIONS=true
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-# FIXME: This is bad, hmkay
-CFLAGS+= -I$(PRJ)/source
-
-SLOFILES= \
-    $(SLO)$/bin.obj \
-    $(SLO)$/box-base.obj \
-    $(SLO)$/box.obj \
-    $(SLO)$/byteseq.obj \
-    $(SLO)$/container.obj \
-    $(SLO)$/dialogbuttonhbox.obj \
-    $(SLO)$/factory.obj \
-    $(SLO)$/flow.obj \
-    $(SLO)$/helper.obj \
-    $(SLO)$/import.obj \
-    $(SLO)$/localized-string.obj \
-    $(SLO)$/proplist.obj \
-    $(SLO)$/root.obj \
-    $(SLO)$/table.obj \
-    $(SLO)$/timer.obj \
-    $(SLO)$/translate.obj\
-    $(SLO)$/vcl.obj\
-#
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/toolkit/source/layout/vcl/makefile.mk b/toolkit/source/layout/vcl/makefile.mk
deleted file mode 100644
index 529ddc31d97e..000000000000
--- a/toolkit/source/layout/vcl/makefile.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=../../..
-PRJNAME=toolkit
-TARGET=layout-vcl
-ENABLE_EXCEPTIONS=true
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-.IF "$(COMNAME)" == "gcc3"
-CFLAGS+=-Wall -fno-default-inline
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= \
-    $(SLO)$/wrapper.obj \
-    $(SLO)$/wbutton.obj \
-    $(SLO)$/wcontainer.obj \
-    $(SLO)$/wfield.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/toolkit/test/accessibility/makefile.mk b/toolkit/test/accessibility/makefile.mk
deleted file mode 100644
index cc6f410f7404..000000000000
--- a/toolkit/test/accessibility/makefile.mk
+++ /dev/null
@@ -1,127 +0,0 @@
-# This is the dmake version.
-
-# copied from settings.mk
-SOLARBINDIR=$(SOLARVERSION)$/$(INPATH)$/bin$(UPDMINOREXT)
-
-# Please modify the following lines to match your environment:
-#   If you use the run: target at the end of the file, then adapt port number.
-PORT_NUMBER = 5678
-
-# The following variables probably don't need to be changed.
-JAVAC = javac
-JAVA = java
-#   The JAR_PATH points to the jar files of your local office installation.
-JAR_PATH = $(SOLARBINDIR)$/
-
-
-# The rest of this makefile should not need to be touched.
-
-all : AccessibilityWorkBench
-
-JAR_FILES =		\
-    unoil.jar	\
-    ridl.jar	\
-    jurt.jar	\
-    juh.jar		\
-    java_uno.jar
-
-JAVA_FILES = 								\
-    AccTreeNode.java						\
-    AccessibilityTree.java					\
-    AccessibilityTreeModel.java 			\
-    AccessibilityTreeModelBase.java 		\
-    AccessibilityWorkBench.java				\
-    AccessibleActionHandler.java			\
-    AccessibleActionNode.java				\
-    AccessibleCellHandler.java				\
-    AccessibleComponentHandler.java			\
-    AccessibleContextHandler.java			\
-    AccessibleEditableTextHandler.java		\
-    AccessibleExtendedComponentHandler.java	\
-    AccessibleHyperlinkHandler.java			\
-    AccessibleHypertextHandler.java			\
-    AccessibleImageHandler.java				\
-    AccessibleRelationHandler.java			\
-    AccessibleSelectionHandler.java			\
-    AccessibleTableHandler.java				\
-    AccessibleTextHandler.java				\
-    AccessibleTreeCellRenderer.java			\
-    AccessibleTreeHandler.java				\
-    AccessibleTreeNode.java					\
-    AccessibleUNOHandler.java				\
-    Canvas.java								\
-    CanvasShape.java						\
-    ChildEventHandler.java					\
-    ContextEventHandler.java				\
-    EventHandler.java						\
-    EventListener.java						\
-    EventLogger.java						\
-    EventQueue.java							\
-    FrameActionListener.java				\
-    GeometryEventHandler.java				\
-    HelpWindow.java							\
-    InformationWriter.java					\
-    MessageArea.java						\
-    NodeFactory.java						\
-    NodeHandler.java						\
-    NodeMap.java							\
-    OfficeConnection.java					\
-    Options.java							\
-    QueuedListener.java						\
-    QueuedTopWindowListener.java			\
-    SelectionDialog.java					\
-    SimpleOffice.java						\
-    StringNode.java							\
-    TableEventHandler.java					\
-    TextLogger.java							\
-    TextUpdateListener.java					\
-    TopWindowListener.java					\
-    VectorNode.java
-
-JAVA_CLASSPATHS := 			\
-    .						\
-    $(foreach,i,$(JAR_FILES) $(JAR_PATH)$i) \
-    $(CLASSPATH)
-
-CLASSPATH !:=$(JAVA_CLASSPATHS:t$(PATH_SEPERATOR))
-
-JFLAGS = -deprecation -classpath $(CLASSPATH)
-
-%.class : %.java
-    $(JAVAC) $(JFLAGS) $<
-
-%.class : %.java
-    $(JAVAC) $(JFLAGS) $<
-
-AccessibilityWorkBench : ObjectView Tools $(JAVA_FILES:b:+".class")
-
-ObjectView .SETDIR=ov :
-    @echo "making package ObjectView"
-    dmake
-
-Tools .SETDIR=tools :
-    @echo "making package Tools"
-    dmake
-
-# Remove all class files.
-clean : ObjectView.clean Tools.clean
-    rm *.class
-    rm AccessibilityWorkBench.jar
-ObjectView.clean .SETDIR=ov :
-    rm *.class
-Tools.clean .SETDIR=tools :
-    rm *.class
-
-# Create a jar file of all files neccessary to build and run the work bench.
-dist: AccessibilityWorkBench.jar
-
-AccessibilityWorkBench.jar: $(JAVA_FILES:b:+".class") jawb.mf
-    jar -cfm AccessibilityWorkBench.jar jawb.mf *.class ov\*.class tools\*.class
-
-# Example of how to run the work bench.
-run: all
-    $(JAVA) -classpath $(CLASSPATH) AccessibilityWorkBench -p $(PORT_NUMBER)
-
-runjar: all dist
-    $(JAVA) -classpath $(CLASSPATH) -jar AccessibilityWorkBench.jar -p $(PORT_NUMBER)
-
diff --git a/toolkit/test/accessibility/ov/makefile.mk b/toolkit/test/accessibility/ov/makefile.mk
deleted file mode 100644
index 56fb563eeee0..000000000000
--- a/toolkit/test/accessibility/ov/makefile.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-# This is the dmake version.
-
-# copied from settings.mk
-SOLARBINDIR=$(SOLARVERSION)$/$(INPATH)$/bin$(UPDMINOREXT)
-
-# Please modify the following lines to match your environment:
-#   If you use the run: target at the end of the file, then adapt port number.
-PORT_NUMBER = 5678
-
-# The following variables probably don't need to be changed.
-JAVAC = javac
-JAVA = java
-#   The JAR_PATH points to the jar files of your local office installation.
-JAR_PATH = $(SOLARBINDIR)$/
-
-
-# The rest of this makefile should not need to be touched.
-
-all : ov
-
-JAR_FILES =		\
-    unoil.jar	\
-    ridl.jar	\
-    jurt.jar	\
-    juh.jar		\
-    java_uno.jar
-
-JAVA_FILES = 								\
-    ov/ObjectViewContainer.java				\
-    ov/ObjectView.java						\
-    ov/ListeningObjectView.java				\
-    ov/ContextView.java						\
-    ov/FocusView.java						\
-    ov/SelectionView.java					\
-    ov/TextView.java
-#	ov/StateSetView.java					\
-
-
-JAVA_CLASSPATHS := 			\
-    .	..					\
-    $(foreach,i,$(JAR_FILES) $(JAR_PATH)$i) \
-    $(CLASSPATH)
-
-CLASSPATH !:=$(JAVA_CLASSPATHS:t$(PATH_SEPERATOR))
-
-JFLAGS = -deprecation -classpath $(CLASSPATH)
-
-%.class : %.java
-    $(JAVAC) $(JFLAGS) $<
-
-ov : $(JAVA_FILES:b:+".class")
diff --git a/toolkit/test/accessibility/tools/makefile.mk b/toolkit/test/accessibility/tools/makefile.mk
deleted file mode 100644
index 045ba6f65b49..000000000000
--- a/toolkit/test/accessibility/tools/makefile.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-# copied from settings.mk
-SOLARBINDIR=$(SOLARVERSION)$/$(INPATH)$/bin$(UPDMINOREXT)
-
-# Please modify the following lines to match your environment:
-#   If you use the run: target at the end of the file, then adapt port number.
-PORT_NUMBER = 5678
-
-# The following variables probably don't need to be changed.
-JAVAC = javac
-JAVA = java
-#   The JAR_PATH points to the jar files of your local office installation.
-JAR_PATH = $(SOLARBINDIR)$/
-
-
-# The rest of this makefile should not need to be touched.
-
-all : tools
-
-JAR_FILES =		\
-    unoil.jar	\
-    ridl.jar	\
-    jurt.jar	\
-    juh.jar		\
-    java_uno.jar
-
-JAVA_FILES = 					\
-    tools/NameProvider.java
-
-
-JAVA_CLASSPATHS := 			\
-    .	..					\
-    $(foreach,i,$(JAR_FILES) $(JAR_PATH)$i) \
-    $(CLASSPATH)
-
-CLASSPATH !:=$(JAVA_CLASSPATHS:t$(PATH_SEPERATOR))
-
-JFLAGS = -deprecation -classpath $(CLASSPATH)
-
-%.class : %.java
-    $(JAVAC) $(JFLAGS) $<
-
-tools : $(JAVA_FILES:b:+".class")
diff --git a/toolkit/uiconfig/layout/makefile.mk b/toolkit/uiconfig/layout/makefile.mk
deleted file mode 100644
index 46d0b187b744..000000000000
--- a/toolkit/uiconfig/layout/makefile.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=../..
-PRJNAME=toolkit
-TARGET=layout
-
-.INCLUDE : settings.mk
-
-.IF "$(ENABLE_LAYOUT)" == "TRUE"
-
-all: ALLTAR
-
-XML_FILES=\
-  message-box.xml\
-  tab-dialog.xml\
-
-#
-
-.INCLUDE : layout.mk
-
-.ELSE # ENABLE_LAYOUT != TRUE
-all .PHONY:
-.ENDIF # ENABLE_LAYOUT != TRUE
-
-.INCLUDE :  target.mk
-
-localize.sdf:
-    echo '#empty' | cat - > $@
-    rm -f *-$@
diff --git a/toolkit/util/makefile.mk b/toolkit/util/makefile.mk
deleted file mode 100644
index 85123623fb05..000000000000
--- a/toolkit/util/makefile.mk
+++ /dev/null
@@ -1,93 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# tk.dxp should contain all c functions that have to be exported. MT 2001/11/29
-
-PRJ=..
-
-PRJNAME=toolkit
-TARGET=tk
-TARGET2=tka
-USE_DEFFILE=TRUE
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :	settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-
-# --- Allgemein ----------------------------------------------------------
-
-# ========================================================================
-# = tk lib: the "classic" toolkit library
-
-LIB1TARGET= $(SLB)$/$(TARGET).lib
-LIB1FILES=	$(SLB)$/awt.lib \
-            $(SLB)$/tree.lib \
-            $(SLB)$/grid.lib \
-            $(SLB)$/controls.lib \
-            $(SLB)$/helper.lib\
-            $(SLB)$/layout-core.lib \
-            $(SLB)$/layout-vcl.lib
-
-SHL1TARGET= tk$(DLLPOSTFIX)
-SHL1IMPLIB= itk
-SHL1USE_EXPORTS=name
-
-SHL1STDLIBS=\
-        $(VCLLIB)			\
-        $(UNOTOOLSLIB)		\
-        $(TOOLSLIB)			\
-        $(COMPHELPERLIB)	\
-        $(CPPUHELPERLIB)	\
-        $(CPPULIB)			\
-        $(SALLIB)
-
-SHL1LIBS=	$(LIB1TARGET)
-SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
-SHL1DEPN=$(LIB1TARGET)
-
-DEF1NAME	=$(SHL1TARGET)
-DEF1DEPN	=$(LIB1TARGET)
-DEF1DES		=TK
-DEFLIB1NAME	=tk
-
-RESLIB1IMAGES=$(PRJ)$/source$/awt $(SOLARSRC)/$(RSCDEFIMG)/$(TARGET)/res
-RES1FILELIST=$(SRS)$/awt.srs
-RESLIB1NAME=$(TARGET)
-RESLIB1SRSFILES=$(RES1FILELIST)
-
-# --- Footer -------------------------------------------------------------
-.INCLUDE :	target.mk
-
-ALLTAR : $(MISC)/tk.component
-
-$(MISC)/tk.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        tk.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt tk.component
diff --git a/toolkit/workben/layout/makefile.mk b/toolkit/workben/layout/makefile.mk
deleted file mode 100644
index 53797e5a3102..000000000000
--- a/toolkit/workben/layout/makefile.mk
+++ /dev/null
@@ -1,151 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=../..
-PRJNAME=toolkit
-TARGET=test
-TARGETTYPE=GUI
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-
-.INCLUDE :  settings.mk
-
-.IF "$(ENABLE_LAYOUT)" == "TRUE"
-
-# Allow zoom and wordcount to be built without depending on svx,sv,sfx2
-CFLAGS += -I../$(PRJ)/svx/inc -I../$(PRJ)/svtools/inc -I../$(PRJ)/sfx2/inc -I../$(PRJ)/sc/inc -I../$(PRJ)/sc/source/ui/inc -I../$(PRJ)/sw/inc
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-.IF "$(COMNAME)" == "gcc3"
-CFLAGS+=-Wall -Wno-non-virtual-dtor
-.ENDIF
-
-CXXFILES=\
-    editor.cxx \
-    plugin.cxx \
-    recover.cxx \
-    wordcountdialog.cxx \
-    test.cxx \
-    zoom.cxx
-
-OBJFILES=\
-    $(OBJ)$/editor.obj \
-    $(OBJ)$/plugin.obj \
-    $(OBJ)$/recover.obj \
-    $(OBJ)$/test.obj \
-    $(OBJ)$/tpsort.obj \
-    $(OBJ)$/sortdlg.obj \
-    $(OBJ)$/wordcountdialog.obj \
-    $(OBJ)$/zoom.obj
-
-APP1TARGET=$(TARGET)
-APP1OBJS=$(OBJFILES)
-APP1STDLIBS= \
-        $(TOOLSLIB)			\
-        $(COMPHELPERLIB)		\
-        $(VCLLIB)			\
-        $(CPPULIB)			\
-        $(CPPUHELPERLIB)		\
-        $(SALLIB)			\
-        $(XMLSCRIPTLIB)			\
-        $(TKLIB) \
-        $(SVXLIB) \
-        $(ISCLIB) \
-#
-
-svtools = $(INCCOM)/svtools
-default: ALLTAR
-
-.INCLUDE : target.mk
-
-XML_FILES=\
-    insert-sheet.xml\
-    message-box.xml\
-    move-copy-sheet.xml\
-    recover.xml\
-    sort-options.xml\
-    string-input.xml\
-    tab-dialog.xml\
-    wordcount.xml\
-    zoom.xml\
-
-TRALAY=$(AUGMENT_LIBRARY_PATH) tralay
-XML_LANGS=$(alllangiso)
-
-ALLTAR: localize.sdf $(BIN)/testrc $(svtools) $(foreach,i,$(XML_FILES) en-US/$i)
-
-$(XML_LANGS:f:t"/%.xml ")/%.xml: %.xml
-    $(TRALAY) -m localize.sdf -o . -l $(XML_LANGS:f:t" -l ") $<
-    rm -rf en-US
-
-$(BIN)/%: %.in
-    cp $< $@
-
-$(svtools):
-# FIXME: there's a bug in svtools layout or usage
-# Include files are in svtools/inc, but are referenced as 
-# They probably should be in svtools/inc/svtools
-# This means that include files can only be included after svtools
-# is built, which would mean a circular dependency,
-# because svtools depends on toolkit.
-    ln -sf ..$/$(PRJ)$/svtools$/inc $(INCCOM)$/svtools
-
-dist .PHONY :
-    cp -pv message-box.xml $(PRJ)/uiconfig/layout
-    cp -pv tab-dialog.xml $(PRJ)/uiconfig/layout
-    $(SHELL) ./un-test.sh zoom.cxx > ../$(PRJ)/svx/source/dialog/zoom.cxx
-    $(SHELL) ./un-test.sh zoom.hxx > ../$(PRJ)/svx/source/dialog/zoom.hxx
-    touch ../$(PRJ)/svx/source/dialog/dlgfact.cxx
-    cp -pv zoom.xml ../$(PRJ)/svx/uiconfig/layout
-    $(SHELL) ./un-test.sh wordcountdialog.cxx > ../$(PRJ)/sw/source/ui/dialog/wordcountdialog.cxx
-    $(SHELL) ./un-test.sh wordcountdialog.hxx > ../$(PRJ)/sw/source/ui/inc/wordcountdialog.hxx
-    touch ../$(PRJ)/sw/source/ui/dialog/swdlgfact.cxx
-    cp -pv wordcount.xml ../$(PRJ)/sw/uiconfig/layout
-    # FIXME: broken setup
-    ln -sf ../inc/wordcountdialog.hxx ../$(PRJ)/sw/source/ui/dialog/wordcountdialog.hxx 
-    $(SHELL) ./un-test.sh tpsort.cxx > ../$(PRJ)/sc/source/ui/dbgui/tpsort.cxx
-    $(SHELL) ./un-test.sh tpsort.hxx > ../$(PRJ)/sc/source/ui/inc/tpsort.hxx
-    $(SHELL) ./un-test.sh sortdlg.cxx > ../$(PRJ)/sc/source/ui/dbgui/sortdlg.cxx
-    $(SHELL) ./un-test.sh sortdlg.hxx > ../$(PRJ)/sc/source/ui/inc/sortdlg.hxx
-    touch ../$(PRJ)/sc/source/ui/attrdlg/scdlgfact.cxx
-    touch ../$(PRJ)/sc/source/ui/view/cellsh2.cxx
-    cp -pv insert-sheet.xml ../$(PRJ)/sc/uiconfig/layout
-    cp -pv move-copy-sheet.xml ../$(PRJ)/sc/uiconfig/layout
-    cp -pv sort-options.xml ../$(PRJ)/sc/uiconfig/layout
-    cp -pv string-input.xml ../$(PRJ)/sc/uiconfig/layout
-
-localize.sdf: $(PRJ)/../svx/source/dialog/localize.sdf $(PRJ)/../sw/source/ui/dialog/localize.sdf $(PRJ)/../sc/source/ui/src/localize.sdf
-    grep sortdlg.src $(PRJ)/../sc/source/ui/src/localize.sdf | awk -F'\t' '{{printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "layout", "sc\\uiconfig\\layout\\sort-options.xml", $$3, "layout", $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\t_label/\tRID_SCDLG_SORT_title/' > sort-options-$@
-    grep wordcountdialog.src $(PRJ)/../sw/source/ui/dialog/localize.sdf | awk -F'\t' '{{printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "layout", "sw\\uiconfig\\layout\\wordcount.xml", $$3, "layout", $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\t_label/\tDLG_WORDCOUNT_title/' > wordcount-$@
-    grep zoom.src $(PRJ)/source/dialog/localize.sdf | awk -F'\t' '{{printf "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", "layout", "svx\\uiconfig\\layout\\zoom.xml", $$3, "layout", $$6 "_label", "", "", $$8, "0", $$10, $$11, $$12, "", $$14, $$15}}' | sed -e 's/\(\(FL\|STR\)_[^\t]*\)_label/\1_text/' -e 's/\t_label/\tRID_SVXDLG_ZOOM_title/' > zoom-$@
-    echo '#empty' | cat - sort-options-$@ wordcount-$@ zoom-$@ > $@
-    rm -f *-$@
-
-.ELSE # ENABLE_LAYOUT != TRUE
-all .PHONY:
-.ENDIF # ENABLE_LAYOUT != TRUE
diff --git a/toolkit/workben/makefile.mk b/toolkit/workben/makefile.mk
deleted file mode 100644
index 8e54c7737a20..000000000000
--- a/toolkit/workben/makefile.mk
+++ /dev/null
@@ -1,84 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=toolkit
-TARGET=unodialog
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-CXXFILES=	unodialog.cxx
-
-OBJFILES=	$(OBJ)$/unodialog.obj
-
-
-APP2NOSAL=		TRUE
-APP2TARGET= unodialog
-APP2OBJS=	$(OBJ)$/unodialog.obj
-APP2STDLIBS=$(TOOLSLIB)			\
-            $(SOTLIB)			\
-            $(COMPHELPERLIB)	\
-            $(CPPULIB)			\
-            $(CPPUHELPERLIB)	\
-            $(VCLLIB)			\
-            $(SALLIB)
-
-#			$(SVTOOLLIB)		\
-
-APP2DEF=	$(MISC)$/unodialog.def
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-
-# ------------------------------------------------------------------
-# Windows
-# ------------------------------------------------------------------
-
-.IF "$(GUI)" == "WIN"
-
-$(MISC)$/unodialog.def: makefile.mk
-    echo  NAME			unodialog							>$@
-    echo  DESCRIPTION	'StarView - Testprogramm'          >>$@
-    echo  EXETYPE		WINDOWS 						   >>$@
-    echo  STUB			'winSTUB.EXE'                      >>$@
-    echo  PROTMODE										   >>$@
-    echo  CODE			PRELOAD MOVEABLE DISCARDABLE	   >>$@
-    echo  DATA			PRELOAD MOVEABLE MULTIPLE		   >>$@
-    echo  HEAPSIZE		8192							   >>$@
-    echo  STACKSIZE 	32768							   >>$@
-
-.ENDIF
diff --git a/tools/bootstrp/addexes/makefile.mk b/tools/bootstrp/addexes/makefile.mk
deleted file mode 100644
index 324de9479502..000000000000
--- a/tools/bootstrp/addexes/makefile.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=tools
-TARGET=addexes
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-CDEFS+=-D_TOOLS_STRINGLIST
-
-# --- Files --------------------------------------------------------
-
-APP1TARGET= txtrepl
-APP1OBJS= $(OBJ)$/replace.obj
-APP1STDLIBS=$(TOOLSLIB)
-
-DEPOBJFILES		=	$(APP1OBJS)
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/tools/bootstrp/addexes2/makefile.mk b/tools/bootstrp/addexes2/makefile.mk
deleted file mode 100644
index 7e4d3d0da7fa..000000000000
--- a/tools/bootstrp/addexes2/makefile.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=tools
-TARGET=addexes2
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-APP1TARGET=	mkunroll
-APP1OBJS=   $(OBJ)$/mkfilt.obj
-APP1STDLIBS= $(SALLIB) $(VOSLIB) $(TOOLSLIB)
-.IF "$(OS)"=="LINUX"
-APP1STDLIBS+=-lpthread
-.ENDIF
-.IF "$(OS)"=="NETBSD"
-APP1STDLIBS+=-lpthread
-.ENDIF
-APP1LIBS=	$(LB)$/btstrp.lib $(LB)$/bootstrp2.lib
-APP1DEPN=   $(LB)$/btstrp.lib $(LB)$/bootstrp2.lib
-
-
-DEPOBJFILES		=	$(APP1OBJS)
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/tools/bootstrp/makefile.mk b/tools/bootstrp/makefile.mk
deleted file mode 100644
index 3db493cbe162..000000000000
--- a/tools/bootstrp/makefile.mk
+++ /dev/null
@@ -1,96 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=tools
-TARGET=btstrp
-TARGET1=bootstrp2
-TARGETTYPE=CUI
-LIBTARGET=NO
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-CDEFS+=-D_TOOLS_STRINGLIST
-
-.IF "$(HAVE_GETOPT)" == "YES"
-CDEFS += -DHAVE_GETOPT
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-OBJFILES= \
-          $(OBJ)$/appdef.obj \
-          $(OBJ)$/cppdep.obj\
-          $(OBJ)$/inimgr.obj
-
-SLOFILES= \
-          $(SLO)$/appdef.obj \
-          $(SLO)$/cppdep.obj \
-          $(SLO)$/inimgr.obj 
-
-LIB1TARGET= $(LB)$/$(TARGET).lib
-LIB1ARCHIV= $(LB)$/lib$(TARGET).a
-LIB1OBJFILES=\
-          $(OBJ)$/appdef.obj \
-          $(OBJ)$/cppdep.obj \
-          $(OBJ)$/inimgr.obj 
-
-LIB2TARGET= $(LB)$/$(TARGET1).lib
-LIB2ARCHIV= $(LB)$/lib$(TARGET1).a
-LIB2OBJFILES=\
-        $(OBJ)$/prj.obj
-
-APP1TARGET= sspretty
-APP1OBJS=   $(OBJ)$/sspretty.obj
-APP1LIBS=   $(LB)$/$(TARGET).lib $(LB)$/$(TARGET1).lib
-APP1STDLIBS=$(SALLIB) $(VOSLIB) $(TOOLSLIB) $(BASEGFXLIB) $(UCBHELPERLIB) $(CPPULIB) $(COMPHELPERLIB) $(CPPUHELPERLIB) $(SALHELPERLIB) $(I18NISOLANGLIB) 
-
-APP2TARGET= rscdep
-APP2OBJS=	$(OBJ)$/rscdep.obj
-APP2LIBS=   $(LB)$/$(TARGET).lib $(LB)$/$(TARGET1).lib
-APP2STDLIBS= $(SALLIB) $(VOSLIB) $(TOOLSLIB) $(BASEGFXLIB) $(UCBHELPERLIB) $(CPPULIB) $(COMPHELPERLIB) $(I18NISOLANGLIB) $(CPPUHELPERLIB) $(SALHELPERLIB)
-.IF "$(HAVE_GETOPT)" != "YES"
-.IF "$(OS)"=="WNT"
-APP2STDLIBS+=gnu_getopt.lib
-.ENDIF
-.ENDIF
-APP2RPATH=  NONE
-APP2RPATH=  NONE
-APP2RPATH=  NONE
-
-APP3TARGET=  so_checksum
-APP3OBJS=    $(OBJ)$/md5.obj \
-             $(OBJ)$/so_checksum.obj
-APP3STDLIBS= $(TOOLSLIB) $(SALLIB) $(VOSLIB) $(BASEGFXLIB) $(UCBHELPERLIB) $(CPPULIB) $(COMPHELPERLIB) $(I18NISOLANGLIB) $(CPPUHELPERLIB) $(SALHELPERLIB)
-
-DEPOBJFILES	= $(APP1OBJS) $(APP2OBJS) $(APP3OBJS)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/tools/inc/makefile.mk b/tools/inc/makefile.mk
deleted file mode 100644
index a3a76dc94a11..000000000000
--- a/tools/inc/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..
-
-PRJNAME=tools
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-
diff --git a/tools/os2/source/dll/makefile.mk b/tools/os2/source/dll/makefile.mk
deleted file mode 100644
index 97cff795defb..000000000000
--- a/tools/os2/source/dll/makefile.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=TOOLS
-TARGET=dll
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-CXXFILES=   toolsdll.cxx
-
-SLOFILES=   $(SLO)$/toolsdll.obj
-
-OBJFILES=   $(OBJ)$/toolsdll.obj
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/tools/qa/makefile.mk b/tools/qa/makefile.mk
deleted file mode 100644
index abaea848c1db..000000000000
--- a/tools/qa/makefile.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ = ..
-PRJNAME = tools
-TARGET = qa
-ENABLE_EXCEPTIONS = TRUE
-
-.INCLUDE: settings.mk
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-DLLPRE = # no leading "lib" on .so files
-
-SHL1TARGET = test_pathutils
-SHL1OBJS = $(SLO)$/test_pathutils.obj $(SLO)$/pathutils.obj
-SHL1STDLIBS = $(CPPUNITLIB) $(SALLIB) $(TESTSHL2LIB)
-SHL1VERSIONMAP = version.map
-SHL1IMPLIB = i$(SHL1TARGET)
-DEF1NAME = $(SHL1TARGET)
-
-SLOFILES = $(SHL1OBJS)
-
-.INCLUDE: target.mk
-
-ALLTAR: test
-
-test .PHONY: $(SHL1TARGETN)
-    $(TESTSHL2) $(SHL1TARGETN) -forward $(BIN)$/$(TARGET).rdb
diff --git a/tools/source/communi/makefile.mk b/tools/source/communi/makefile.mk
deleted file mode 100644
index 1795081a9ec5..000000000000
--- a/tools/source/communi/makefile.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=TOOLS
-TARGET=communi
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :      $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-OBJFILES=   \
-            $(OBJ)$/parser.obj		\
-            $(OBJ)$/geninfo.obj		\
-
-SLOFILES=   \
-            $(SLO)$/parser.obj		\
-            $(SLO)$/geninfo.obj		\
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk                                                          
diff --git a/tools/source/datetime/makefile.mk b/tools/source/datetime/makefile.mk
deleted file mode 100644
index 3d46cc6ce1b0..000000000000
--- a/tools/source/datetime/makefile.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=tools
-TARGET=datetime
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :      $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=   $(SLO)$/tdate.obj     \
-            $(SLO)$/ttime.obj     \
-            $(SLO)$/datetime.obj
-
-OBJFILES=   $(OBJ)$/tdate.obj     \
-            $(OBJ)$/ttime.obj     \
-            $(OBJ)$/datetime.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/tools/source/debug/makefile.mk b/tools/source/debug/makefile.mk
deleted file mode 100644
index 925ae90f333d..000000000000
--- a/tools/source/debug/makefile.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=tools
-TARGET=debug
-
-ENABLE_EXCEPTIONS := TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-.INCLUDE :      $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-CXXFILES=	debug.cxx			\
-            stcktree.cxx
-
-SLOFILES=	$(SLO)$/debug.obj	 \
-            $(SLO)$/stcktree.obj
-
-OBJFILES=	$(OBJ)$/debug.obj	 \
-            $(OBJ)$/stcktree.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
diff --git a/tools/source/fsys/makefile.mk b/tools/source/fsys/makefile.mk
deleted file mode 100644
index b1d34d6347f3..000000000000
--- a/tools/source/fsys/makefile.mk
+++ /dev/null
@@ -1,67 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=tools
-TARGET=fsys
-ENABLE_EXCEPTIONS=true
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :      $(PRJ)$/util$/makefile.pmk
-
-.IF "$(COM)"=="GCC"
-CFLAGSCXX+=-fexceptions
-.ENDIF
-
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= \
-            $(SLO)$/tempfile.obj   \
-            $(SLO)$/wldcrd.obj   \
-            $(SLO)$/fstat.obj    \
-            $(SLO)$/comdep.obj   \
-            $(SLO)$/filecopy.obj \
-            $(SLO)$/dirent.obj   \
-            $(SLO)$/tdir.obj	\
-            $(SLO)$/urlobj.obj
-
-OBJFILES=   $(OBJ)$/wldcrd.obj   \
-            $(OBJ)$/fstat.obj    \
-            $(OBJ)$/comdep.obj   \
-            $(OBJ)$/filecopy.obj \
-            $(OBJ)$/dirent.obj   \
-            $(OBJ)$/tdir.obj	\
-            $(OBJ)$/urlobj.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/tools/source/generic/makefile.mk b/tools/source/generic/makefile.mk
deleted file mode 100644
index 07bab82f32b0..000000000000
--- a/tools/source/generic/makefile.mk
+++ /dev/null
@@ -1,71 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=tools
-TARGET=gen
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE :      $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-EXCEPTIONSFILES = $(SLO)$/poly.obj $(OBJ)$/poly.obj $(SLO)$/svlibrary.obj
-
-SLOFILES=       $(SLO)$/toolsin.obj     \
-            $(SLO)$/svlibrary.obj \
-            $(SLO)$/b3dtrans.obj                \
-            $(SLO)$/link.obj                \
-            $(SLO)$/bigint.obj              \
-            $(SLO)$/fract.obj               \
-            $(SLO)$/color.obj               \
-            $(SLO)$/gen.obj			\
-            $(SLO)$/config.obj		\
-            $(SLO)$/poly.obj		\
-            $(SLO)$/poly2.obj		\
-            $(SLO)$/svborder.obj \
-            $(SLO)$/line.obj
-
-OBJFILES=       $(OBJ)$/toolsin.obj     \
-            $(OBJ)$/b3dtrans.obj                \
-            $(OBJ)$/link.obj                \
-            $(OBJ)$/bigint.obj              \
-            $(OBJ)$/fract.obj               \
-            $(OBJ)$/color.obj               \
-            $(OBJ)$/gen.obj			\
-            $(OBJ)$/config.obj		\
-            $(OBJ)$/poly.obj		\
-            $(OBJ)$/poly2.obj		\
-            $(OBJ)$/svborder.obj \
-            $(OBJ)$/line.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/tools/source/inet/makefile.mk b/tools/source/inet/makefile.mk
deleted file mode 100644
index 1e0bdfdd2391..000000000000
--- a/tools/source/inet/makefile.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ = ..$/..
-PRJNAME = tools
-TARGET = inet
-
-.INCLUDE: settings.mk
-.INCLUDE :      $(PRJ)$/util$/makefile.pmk
-
-SLOFILES=\
-    $(SLO)$/inetmime.obj \
-    $(SLO)$/inetmsg.obj \
-    $(SLO)$/inetstrm.obj
-
-OBJFILES=\
-    $(OBJ)$/inetmime.obj \
-    $(OBJ)$/inetmsg.obj \
-    $(OBJ)$/inetstrm.obj
-
-.INCLUDE: target.mk
diff --git a/tools/source/makefile.mk b/tools/source/makefile.mk
deleted file mode 100644
index 8c3f3167635e..000000000000
--- a/tools/source/makefile.mk
+++ /dev/null
@@ -1,58 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-TARGET=source
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(GUI)" == "UNX"
-SUBDIRS+= solar
-.ENDIF
-
-SUBDIRS+= \
-    datetime \
-    timestamp \
-    debug \
-    fsys \
-    generic \
-    intntl \
-    memtools \
-    misc \
-    rc \
-    ref \
-    stream \
-    zcodec
-
-
-.INCLUDE :  target.mk
-
diff --git a/tools/source/memtools/makefile.mk b/tools/source/memtools/makefile.mk
deleted file mode 100644
index de03a0d50cc3..000000000000
--- a/tools/source/memtools/makefile.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=tools
-TARGET=mtools
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-.INCLUDE :      $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=	$(SLO)$/contnr.obj	\
-            $(SLO)$/table.obj	\
-            $(SLO)$/unqidx.obj	\
-            $(SLO)$/mempool.obj \
-            $(SLO)$/multisel.obj
-
-EXCEPTIONSFILES= $(SLO)$/multisel.obj $(OBJ)$/multisel.obj
-
-OBJFILES=	$(OBJ)$/contnr.obj	 \
-            $(OBJ)$/table.obj	 \
-            $(OBJ)$/unqidx.obj	 \
-            $(OBJ)$/mempool.obj  \
-            $(OBJ)$/multisel.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
diff --git a/tools/source/misc/makefile.mk b/tools/source/misc/makefile.mk
deleted file mode 100644
index a426bb4053c3..000000000000
--- a/tools/source/misc/makefile.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ = ..$/..
-PRJNAME = tools
-TARGET = misc
-LIBTARGET = NO
-ENABLE_EXCEPTIONS = TRUE
-
-.INCLUDE: settings.mk
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-LIB1TARGET = $(SLB)$/$(TARGET).lib
-LIB1OBJFILES = \
-    $(SLO)$/appendunixshellword.obj \
-    $(SLO)$/extendapplicationenvironment.obj \
-    $(SLO)$/solarmutex.obj \
-    $(SLO)$/getprocessworkingdir.obj
-
-OBJFILES = $(OBJ)$/pathutils.obj
-SLOFILES = $(SLO)$/pathutils.obj $(LIB1OBJFILES) $(SLO)$/solarmutex.obj
-
-.INCLUDE: target.mk
diff --git a/tools/source/rc/makefile.mk b/tools/source/rc/makefile.mk
deleted file mode 100644
index f8b46f38a0f7..000000000000
--- a/tools/source/rc/makefile.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=tools
-TARGET=rc
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-.INCLUDE :      $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=	$(SLO)$/rc.obj		\
-            $(SLO)$/isofallback.obj	\
-            $(SLO)$/resmgr.obj	\
-            $(SLO)$/resary.obj
-
-OBJFILES=	$(OBJ)$/rc.obj		\
-            $(OBJ)$/isofallback.obj	\
-            $(OBJ)$/resmgr.obj	\
-            $(OBJ)$/resary.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
diff --git a/tools/source/ref/makefile.mk b/tools/source/ref/makefile.mk
deleted file mode 100644
index c87f8a740a4f..000000000000
--- a/tools/source/ref/makefile.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=tools
-TARGET=ref
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :      $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=   $(SLO)$/ref.obj      \
-            $(SLO)$/pstm.obj  	\
-            $(SLO)$/globname.obj \
-            $(SLO)$/errinf.obj
-
-OBJFILES=   $(OBJ)$/ref.obj      \
-            $(OBJ)$/pstm.obj  	\
-            $(OBJ)$/globname.obj \
-            $(OBJ)$/errinf.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/tools/source/stream/makefile.mk b/tools/source/stream/makefile.mk
deleted file mode 100644
index ee548934c6c6..000000000000
--- a/tools/source/stream/makefile.mk
+++ /dev/null
@@ -1,58 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=tools
-TARGET=stream
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :      $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=   $(SLO)$/stream.obj   \
-            $(SLO)$/strmsys.obj  \
-            $(SLO)$/cachestr.obj \
-            $(SLO)$/vcompat.obj
-
-OBJFILES+=  $(OBJ)$/stream.obj    \
-            $(OBJ)$/strmsys.obj   \
-            $(OBJ)$/cachestr.obj  \
-            $(OBJ)$/vcompat.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-$(SLO)$/strmsys.obj : \
-    strmwnt.cxx \
-    strmos2.cxx \
-    strmunx.cxx
-
diff --git a/tools/source/string/makefile.mk b/tools/source/string/makefile.mk
deleted file mode 100644
index 4caa31672472..000000000000
--- a/tools/source/string/makefile.mk
+++ /dev/null
@@ -1,79 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=tools
-TARGET=str
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-ALWAYSDBGFILES = $(SLO)$/debugprint.obj
-
-.IF "$(ALWAYSDBGFILES)" != ""
-ALWAYSDBGTARGET=do_it_alwaysdebug
-.ENDIF
-
-SLOFILES=   $(SLO)$/tstring.obj     \
-            $(SLO)$/tustring.obj    \
-            $(SLO)$/tenccvt.obj     \
-            $(SLO)$/debugprint.obj
-
-OBJFILES=   $(OBJ)$/tstring.obj     \
-            $(OBJ)$/tustring.obj    \
-            $(OBJ)$/tenccvt.obj     \
-            $(OBJ)$/debugprint.obj
-
-# --- Targets ------------------------------------------------------
-
-.IF "$(ALWAYSDBG_FLAG)"==""
-TARGETDEPS+=$(ALWAYSDBGTARGET)
-.ENDIF
-
-.INCLUDE : target.mk
-
-.IF "$(ALWAYSDBGTARGET)" != ""
-.IF "$(ALWAYSDBG_FLAG)" == ""
-# --------------------------------------------------
-# - ALWAYSDBG - files always compiled with debugging
-# --------------------------------------------------
-$(ALWAYSDBGTARGET):
-       @echo --- ALWAYSDBGFILES ---
-       @dmake $(MFLAGS) $(MAKEFILE) debug=true $(ALWAYSDBGFILES) ALWAYSDBG_FLAG=TRUE $(CALLMACROS)
-       @echo --- ALWAYSDBGFILES OVER ---
-
-$(ALWAYSDBGFILES):
-       @echo --- ALWAYSDBG ---
-       @dmake $(MFLAGS) $(MAKEFILE) debug=true ALWAYSDBG_FLAG=TRUE $(CALLMACROS) $@
-       @echo --- ALWAYSDBG OVER ---
-.ENDIF
-.ENDIF
diff --git a/tools/source/testtoolloader/makefile.mk b/tools/source/testtoolloader/makefile.mk
deleted file mode 100644
index 3d5cb8223e3f..000000000000
--- a/tools/source/testtoolloader/makefile.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=TOOLS
-TARGET=testtoolloader
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :      $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=   \
-            $(SLO)$/testtoolloader.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk                                                          
diff --git a/tools/source/zcodec/makefile.mk b/tools/source/zcodec/makefile.mk
deleted file mode 100644
index 9067b45c3b5d..000000000000
--- a/tools/source/zcodec/makefile.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=tools
-TARGET=zcodec
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :      $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(SYSTEM_ZLIB)" == "YES"
-CFLAGS+=-DSYSTEM_ZLIB
-.ENDIF
-SLOFILES=	$(SLO)$/zcodec.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/tools/test/makefile.mk b/tools/test/makefile.mk
deleted file mode 100644
index ab2cfd8e6676..000000000000
--- a/tools/test/makefile.mk
+++ /dev/null
@@ -1,65 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=tools
-TARGET=tests
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
-# --- Common ----------------------------------------------------------
-
-SHL1OBJS=  \
-    $(SLO)$/tests.obj
-
-SHL1TARGET= tests
-SHL1STDLIBS= 	$(SALLIB)	 \
-                $(TOOLSLIB)	 \
-                                $(TESTSHL2LIB)    \
-                $(CPPUNITLIB)
-
-SHL1IMPLIB= i$(SHL1TARGET)
-
-DEF1NAME    =$(SHL1TARGET)
-SHL1VERSIONMAP = export.map
-
-#------------------------------- All object files ----------------------------
-
-# do this here, so we get right dependencies
-SLOFILES=$(SHL1OBJS)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-.INCLUDE : _cppunit.mk
diff --git a/tools/unx/source/dll/makefile.mk b/tools/unx/source/dll/makefile.mk
deleted file mode 100644
index da1d73f04682..000000000000
--- a/tools/unx/source/dll/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=TOOLS
-TARGET=dll
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-CXXFILES=   toolsdll.cxx
-
-SLOFILES=   $(SLO)$/toolsdll.obj
-
-OBJFILES=   $(OBJ)$/toolsdll.obj
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/tools/util/makefile.mk b/tools/util/makefile.mk
deleted file mode 100644
index 735b5380614d..000000000000
--- a/tools/util/makefile.mk
+++ /dev/null
@@ -1,159 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=TOOLS
-TARGET=tools
-ENABLE_EXCEPTIONS=true
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Allgemein ----------------------------------------------------
-
-# --- STDSTRM.LIB ---
-#LIB3TARGET= $(LB)$/stdstrm.lib
-#LIB3ARCHIV= $(LB)$/libstdstrm.a
-#LIB3FILES=  $(LB)$/stream.lib
-
-#LIB7TARGET= $(LB)$/a$(TARGET).lib
-#LIB7ARCHIV= $(LB)$/liba$(TARGET).a
-#LIB7FILES=  $(LB)$/gen.lib          \
-#            $(LB)$/str.lib          \
-#            $(LB)$/mtools.lib       \
-#            $(LB)$/datetime.lib     \
-#            $(LB)$/fsys.lib         \
-#            $(LB)$/communi.lib      \
-#            $(LB)$/stream.lib       \
-#            $(LB)$/ref.lib          \
-#            $(LB)$/rc.lib           \
-#            $(LB)$/inet.lib         \
-#            $(LB)$/debug.lib
-#
-#LIB7FILES+= $(LB)$/dll.lib
-
-# --- TOOLS.LIB ---
-LIB1TARGET:= $(SLB)$/$(TARGET).lib
-LIB1FILES+=  \
-            $(SLB)$/gen.lib         \
-            $(SLB)$/str.lib         \
-            $(SLB)$/mtools.lib      \
-            $(SLB)$/datetime.lib    \
-            $(SLB)$/fsys.lib        \
-            $(SLB)$/communi.lib     \
-            $(SLB)$/stream.lib      \
-            $(SLB)$/ref.lib         \
-            $(SLB)$/rc.lib          \
-            $(SLB)$/debug.lib       \
-            $(SLB)$/zcodec.lib      \
-            $(SLB)$/inet.lib        \
-            $(SLB)$/testtoolloader.lib \
-            $(SLB)$/misc.lib
-
-.IF "$(OS)"=="MACOSX"
-SHL1STDLIBS += $(CPPULIB)	 \
-            $(ZLIB3RDLIB)
-.ELSE
-SHL1STDLIBS += $(ZLIB3RDLIB) \
-            $(CPPULIB)
-.ENDIF
-
-LIB1FILES+=  $(SLB)$/dll.lib
-
-# --- TOOLS.DLL ---
-
-SHL1TARGET=     tl$(DLLPOSTFIX)
-SHL1LIBS=       $(LIB1TARGET)
-SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
-SHL1IMPLIB=     itools
-SHL1USE_EXPORTS=name
-SHL1STDLIBS+=   $(SALLIB) $(VOSLIB) $(BASEGFXLIB) $(I18NISOLANGLIB) $(COMPHELPERLIB)
-
-.IF "$(GUI)"=="WNT"
-SHL1STDLIBS+=   $(SHELL32LIB)     \
-                $(MPRLIB)         \
-                $(OLE32LIB)       \
-                $(UUIDLIB)        \
-                $(ADVAPI32LIB)
-.ENDIF
-
-DEF1NAME        =$(SHL1TARGET)
-DEF1DEPN = \
-        $(MISC)$/$(SHL1TARGET).flt      \
-        $(HXX1FILES)                    \
-        $(HXX2FILES)                    \
-        $(HXX3FILES)                    \
-        $(HXX4FILES)                    \
-        $(HXX5FILES)                    \
-        $(HXX6FILES)                    \
-        $(HXX7FILES)                    \
-        $(HXX8FILES)                    \
-        $(HXX9FILES)                    \
-        $(HXX10FILES)                   \
-        $(HXX11FILES)                   \
-        $(HXX12FILES)                   \
-        $(HXX13FILES)                   \
-        $(HXX14FILES)                   \
-        $(HXX15FILES)                   \
-        $(HXX16FILES)                   \
-        $(HXX17FILES)                   \
-        $(HXX18FILES)                   \
-        $(HXX19FILES)                   \
-        $(HXX20FILES)                   \
-        makefile.mk
-
-DEFLIB1NAME =tools
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :      target.mk
-
-# --- TOOLS.FLT ---
-$(MISC)$/$(SHL1TARGET).flt:  makefile.mk
-    @echo ------------------------------
-    @echo Making: $@
-    @echo Imp>$@
-    @echo PointerList>>$@
-    @echo DbgCheck>>$@
-    @echo LabelList>>$@
-    @echo ActionList>>$@
-    @echo CBlock>>$@
-    @echo DirEntryStack>>$@
-    @echo readdir>>$@
-    @echo closedir>>$@
-    @echo opendir>>$@
-    @echo volumeid>>$@
-    @echo MsDos2Time>>$@
-    @echo MsDos2Date>>$@
-    @echo __new_alloc>>$@
-    @echo __CT>>$@
-    @echo unnamed>>$@
-.IF "$(COM)"=="BLC"
-    @echo WEP>>$@
-.ENDIF
diff --git a/tools/win/source/dll/makefile.mk b/tools/win/source/dll/makefile.mk
deleted file mode 100644
index 403da065d653..000000000000
--- a/tools/win/source/dll/makefile.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=TOOLS
-TARGET=dll
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-# --- WNT ----------------------------------------------------------
-
-.IF "$(GUI)" == "WNT"
-
-# --- Files --------------------------------------------------------
-
-CXXFILES=   toolsdll.cxx
-
-SLOFILES=   $(SLO)$/toolsdll.obj
-
-OBJFILES=   $(OBJ)$/toolsdll.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.ENDIF
-
diff --git a/tools/workben/makefile.mk b/tools/workben/makefile.mk
deleted file mode 100644
index 73d5753fe233..000000000000
--- a/tools/workben/makefile.mk
+++ /dev/null
@@ -1,89 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ = ..
-PRJNAME = tl
-TARGET = tldem
-LIBTARGET = NO
-TARGETTYPE = CUI
-ENABLE_EXCEPTIONS=TRUE
-
-.INCLUDE: settings.mk
-
-OBJFILES = \
-    $(OBJ)$/solar.obj \
-    $(OBJ)$/urltest.obj \
-    $(OBJ)$/inetmimetest.obj
-#	$(OBJ)$/demostor.obj \
-#	$(OBJ)$/fstest.obj \
-#	$(OBJ)$/tldem.obj \
-
-APP1TARGET = solar
-APP1OBJS = $(OBJ)$/solar.obj
-.IF "$(GUI)" == "UNX" || "$(GUI)" == "OS2"
-APP1STDLIBS = $(TOOLSLIB)
-.ELSE
-APP1LIBS = $(LB)$/itools.lib
-.ENDIF
-
-APP2TARGET = urltest
-APP2OBJS = $(OBJ)$/urltest.obj
-.IF "$(GUI)" == "UNX" || "$(GUI)" == "OS2"
-APP2STDLIBS = $(TOOLSLIB) $(VOSLIB) $(SALLIB) $(CPPULIB) $(CPPUHELPERLIB)
-.ELSE
-APP2STDLIBS = $(LB)$/itools.lib $(VOSLIB) $(SALLIB) $(CPPULIB) $(CPPUHELPERLIB)
-.ENDIF
-
-APP3TARGET = inetmimetest
-APP3OBJS = $(OBJ)$/inetmimetest.obj
-APP3STDLIBS = $(SALLIB) $(TOOLSLIB)
-
-# APP3TARGET = tldem
-# APP3OBJS = $(OBJ)$/tldem.obj
-# .IF "$(GUI)" == "UNX"
-# APP3STDLIBS = $(TOOLSLIB)
-# .ELSE
-# APP3STDLIBS = $(LB)$/itools.lib
-# .ENDIF
-
-# APP4TARGET = demostor
-# APP4OBJS = $(OBJ)$/demostor.obj
-# .IF "$(GUI)" == "UNX"
-# APP4STDLIBS = $(TOOLSLIB) $(VOSLIB) $(SALLIB)
-# .ELSE
-# APP4STDLIBS = $(LB)$/itools.lib $(VOSLIB) $(SALLIB)
-# .ENDIF
-
-# APP5TARGET = fstest
-# APP5OBJS = $(OBJ)$/fstest.obj
-# .IF "$(GUI)" == "UNX"
-# APP5STDLIBS = $(TOOLSLIB) $(VOSLIB) $(SALLIB)
-# .ELSE
-# APP5STDLIBS = $(LB)$/itools.lib $(VOSLIB) $(SALLIB)
-# .ENDIF
-
-.INCLUDE: target.mk
-- 
cgit 


From b630c9f0a8f7c6dddc675fb8e52f6ccc90f8dc1c Mon Sep 17 00:00:00 2001
From: Bjoern Michaelsen 
Date: Fri, 19 Nov 2010 22:11:42 +0100
Subject: gnumake2: cleared migrated build.lst

---
 svl/prj/build.lst     |  6 ------
 svtools/prj/build.lst |  1 -
 toolkit/prj/build.lst | 10 ----------
 3 files changed, 17 deletions(-)

diff --git a/svl/prj/build.lst b/svl/prj/build.lst
index 17a26dd2a6c7..4f8f44c4127d 100644
--- a/svl/prj/build.lst
+++ b/svl/prj/build.lst
@@ -1,9 +1,3 @@
 sl	svl	:	l10n rsc offuh ucbhelper unotools cppu cppuhelper comphelper sal sot libxslt NULL
 sl	svl								usr1	-	all	svl_mkout NULL
 sl	svl\prj	nmake	-	all	svl_prj NULL
-
-# complex test for ConfigItems are marked as defect
-# sl	svl\qa\complex\ConfigItems\helper       nmake	-	all	svl_qa_complex_help svl_util svl_passcont NULL
-# sl	svl\qa\complex\ConfigItems	        nmake	-	all	svl_qa_complex svl_qa_complex_help svl_util svl_passcont NULL
-sl	svl\qa\complex\passwordcontainer	nmake	-	all	svl_qa_complex svl_prj NULL
-
diff --git a/svtools/prj/build.lst b/svtools/prj/build.lst
index 17542856e75c..31a21e73e366 100644
--- a/svtools/prj/build.lst
+++ b/svtools/prj/build.lst
@@ -1,4 +1,3 @@
 st	svtools	:	l10n svl offuh toolkit ucbhelper unotools JPEG:jpeg cppu cppuhelper comphelper sal sot jvmfwk NULL
-st	svtools								usr1	-	all	st_mkout NULL
 st	svtools\prj					        nmake	-	all	st_prj NULL
 
diff --git a/toolkit/prj/build.lst b/toolkit/prj/build.lst
index 7abd412d1103..8ab1f988011d 100644
--- a/toolkit/prj/build.lst
+++ b/toolkit/prj/build.lst
@@ -1,12 +1,2 @@
 ti toolkit : vcl NULL
-ti toolkit     usr1  - all ti_mkout NULL
 ti toolkit\prj nmake - all ti_prj NULL
-
-ti      toolkit\qa\unoapi nmake - all ti_qa_unoapi NULL
-
-# fail on unxsoli4
-#ti      toolkit\qa\complex\xunitconversion nmake - all ti_complex_conv ti_util NULL
-
-# fails
-# ti      toolkit\qa\complex\toolkit                   nmake - all ti_complex_ti ti_qa_complex_toolkit_interface_tests ti_util NULL
-
-- 
cgit 


From 80740d204fe5a6325be1aaddf98ffaa882504669 Mon Sep 17 00:00:00 2001
From: Bjoern Michaelsen 
Date: Sat, 20 Nov 2010 12:30:28 +0100
Subject: gnumake2: added missing header for windows in toolkit

---
 toolkit/Package_inc.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/toolkit/Package_inc.mk b/toolkit/Package_inc.mk
index be23e1a95a1c..5b40430f2386 100644
--- a/toolkit/Package_inc.mk
+++ b/toolkit/Package_inc.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxcontainer.hxx,
 $(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxdevice.hxx,toolkit/awt/vclxdevice.hxx))
 $(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxfont.hxx,toolkit/awt/vclxfont.hxx))
 $(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxmenu.hxx,toolkit/awt/vclxmenu.hxx))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxsystemdependentwindow.hxx,toolkit/awt/vclxsystemdependentwindow.hxx))
 $(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxtoolkit.hxx,toolkit/awt/vclxtoolkit.hxx))
 $(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxtopwindow.hxx,toolkit/awt/vclxtopwindow.hxx))
 $(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/awt/vclxwindow.hxx,toolkit/awt/vclxwindow.hxx))
-- 
cgit 


From 4df5971193bd7e983c2e9c45bc21013f3bc5bfb1 Mon Sep 17 00:00:00 2001
From: Bjoern Michaelsen 
Date: Sat, 20 Nov 2010 16:34:24 +0100
Subject: gnumake2: more missing headers from toolkit

---
 toolkit/Package_inc.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/toolkit/Package_inc.mk b/toolkit/Package_inc.mk
index 5b40430f2386..3fc23a5b9f1f 100644
--- a/toolkit/Package_inc.mk
+++ b/toolkit/Package_inc.mk
@@ -44,18 +44,25 @@ $(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/controls/unocontrolbas
 $(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/controls/unocontrolmodel.hxx,toolkit/controls/unocontrolmodel.hxx))
 $(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/controls/unocontrols.hxx,toolkit/controls/unocontrols.hxx))
 $(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/dllapi.h,toolkit/dllapi.h))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/accessibilityclient.hxx,toolkit/helper/accessibilityclient.hxx))
 $(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/accessiblefactory.hxx,toolkit/helper/accessiblefactory.hxx))
 $(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/convert.hxx,toolkit/helper/convert.hxx))
 $(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/emptyfontdescriptor.hxx,toolkit/helper/emptyfontdescriptor.hxx))
 $(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/externallock.hxx,toolkit/helper/externallock.hxx))
 $(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/fixedhyperbase.hxx,toolkit/helper/fixedhyperbase.hxx))
 $(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/formpdfexport.hxx,toolkit/helper/formpdfexport.hxx))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/imagealign.hxx,toolkit/helper/imagealign.hxx))
 $(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/listenermultiplexer.hxx,toolkit/helper/listenermultiplexer.hxx))
 $(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/macros.hxx,toolkit/helper/macros.hxx))
 $(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/mutexandbroadcasthelper.hxx,toolkit/helper/mutexandbroadcasthelper.hxx))
 $(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/mutexhelper.hxx,toolkit/helper/mutexhelper.hxx))
 $(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/property.hxx,toolkit/helper/property.hxx))
 $(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/servicenames.hxx,toolkit/helper/servicenames.hxx))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/solarrelease.hxx,toolkit/helper/solarrelease.hxx))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/throbberimpl.hxx,toolkit/helper/throbberimpl.hxx))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/tkresmgr.hxx,toolkit/helper/tkresmgr.hxx))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/unomemorystream.hxx,toolkit/helper/unomemorystream.hxx))
+$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/unopropertyarrayhelper.hxx,toolkit/helper/unopropertyarrayhelper.hxx))
 $(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/unowrapper.hxx,toolkit/helper/unowrapper.hxx))
 $(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/vclunohelper.hxx,toolkit/helper/vclunohelper.hxx))
 $(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/unohlp.hxx,toolkit/helper/vclunohelper.hxx))
-- 
cgit 


From a7efcc63895bb32164a9077a3e46b7cab33c3454 Mon Sep 17 00:00:00 2001
From: "Herbert Duerr [hdu]" 
Date: Mon, 22 Nov 2010 10:18:47 +0100
Subject: #i108584# workaround unexpected ATSUBreakLine error result

---
 vcl/aqua/source/gdi/salatslayout.cxx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/vcl/aqua/source/gdi/salatslayout.cxx b/vcl/aqua/source/gdi/salatslayout.cxx
index 335505de85ac..0261ab3b56fa 100755
--- a/vcl/aqua/source/gdi/salatslayout.cxx
+++ b/vcl/aqua/source/gdi/salatslayout.cxx
@@ -753,10 +753,11 @@ int ATSLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int nFactor ) cons
 
     // initial measurement of text break position
     UniCharArrayOffset nBreakPos = mnMinCharPos;
-    const ATSUTextMeasurement nATSUMaxWidth = Vcl2Fixed( nPixelWidth );
+    ATSUTextMeasurement nATSUMaxWidth = Vcl2Fixed( nPixelWidth );
+    if( nATSUMaxWidth <= 0xFFFF ) // #i108584# avoid ATSU rejecting the parameter
+        return mnMinCharPos;      //           or do ATSUMaxWidth=0x10000;
     OSStatus eStatus = ATSUBreakLine( maATSULayout, mnMinCharPos,
         nATSUMaxWidth, false, &nBreakPos );
-
     if( (eStatus != noErr) && (eStatus != kATSULineBreakInWord) )
         return STRING_LEN;
 
-- 
cgit 


From a26b166697b3486eebe005e33184b713689c3382 Mon Sep 17 00:00:00 2001
From: "Herbert Duerr [hdu]" 
Date: Mon, 22 Nov 2010 10:29:58 +0100
Subject: #i108584# workaround unexpected ATSUBreakLine error result

---
 vcl/aqua/source/gdi/salatslayout.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vcl/aqua/source/gdi/salatslayout.cxx b/vcl/aqua/source/gdi/salatslayout.cxx
index 0261ab3b56fa..a355ff86d00e 100755
--- a/vcl/aqua/source/gdi/salatslayout.cxx
+++ b/vcl/aqua/source/gdi/salatslayout.cxx
@@ -753,7 +753,7 @@ int ATSLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int nFactor ) cons
 
     // initial measurement of text break position
     UniCharArrayOffset nBreakPos = mnMinCharPos;
-    ATSUTextMeasurement nATSUMaxWidth = Vcl2Fixed( nPixelWidth );
+    const ATSUTextMeasurement nATSUMaxWidth = Vcl2Fixed( nPixelWidth );
     if( nATSUMaxWidth <= 0xFFFF ) // #i108584# avoid ATSU rejecting the parameter
         return mnMinCharPos;      //           or do ATSUMaxWidth=0x10000;
     OSStatus eStatus = ATSUBreakLine( maATSULayout, mnMinCharPos,
@@ -782,7 +782,7 @@ int ATSLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int nFactor ) cons
     if( eStatus != noErr )
         return nBreakPos;
     const ATSUTextMeasurement nATSURemWidth = nATSUMaxWidth - (nRight - nLeft);
-    if( nATSURemWidth <= 0 )
+    if( nATSURemWidth <= 0xFFFF ) // #i108584# avoid ATSU rejecting the parameter
         return nBreakPos;
     UniCharArrayOffset nBreakPosInWord = nBreakPos;
     eStatus = ATSUBreakLine( maATSULayout, nBreakPos, nATSURemWidth, false, &nBreakPosInWord );
-- 
cgit 


From 7c69e9471c4985a24a1d6957245ee58ec1eed6ea Mon Sep 17 00:00:00 2001
From: Bjoern Michaelsen 
Date: Mon, 22 Nov 2010 13:40:19 +0100
Subject: gnumake2: getting rid of obsolete install and uninstall targets

---
 svl/prj/makefile.mk     | 2 +-
 svtools/prj/makefile.mk | 2 +-
 toolkit/prj/makefile.mk | 2 +-
 tools/prj/makefile.mk   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/svl/prj/makefile.mk b/svl/prj/makefile.mk
index 3d495209d74a..3b1b54d4357f 100644
--- a/svl/prj/makefile.mk
+++ b/svl/prj/makefile.mk
@@ -37,4 +37,4 @@ VERBOSEFLAG := -s
 .ENDIF
 
 all:
-    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) install
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS)
diff --git a/svtools/prj/makefile.mk b/svtools/prj/makefile.mk
index 3d495209d74a..3b1b54d4357f 100644
--- a/svtools/prj/makefile.mk
+++ b/svtools/prj/makefile.mk
@@ -37,4 +37,4 @@ VERBOSEFLAG := -s
 .ENDIF
 
 all:
-    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) install
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS)
diff --git a/toolkit/prj/makefile.mk b/toolkit/prj/makefile.mk
index 3d495209d74a..3b1b54d4357f 100644
--- a/toolkit/prj/makefile.mk
+++ b/toolkit/prj/makefile.mk
@@ -37,4 +37,4 @@ VERBOSEFLAG := -s
 .ENDIF
 
 all:
-    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) install
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS)
diff --git a/tools/prj/makefile.mk b/tools/prj/makefile.mk
index 3d495209d74a..3b1b54d4357f 100644
--- a/tools/prj/makefile.mk
+++ b/tools/prj/makefile.mk
@@ -37,4 +37,4 @@ VERBOSEFLAG := -s
 .ENDIF
 
 all:
-    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) install
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS)
-- 
cgit 


From 13881ca76ecbbbef8ede8df923aaf2504a16c5f4 Mon Sep 17 00:00:00 2001
From: sj 
Date: Mon, 22 Nov 2010 18:54:49 +0100
Subject: os145: #b7001888# fixing small svm problem

---
 vcl/source/gdi/metaact.cxx | 34 +++++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 8c1545758c3b..79d875542509 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -1441,19 +1441,35 @@ void MetaTextArrayAction::Read( SvStream& rIStm, ImplMetaReadData* pData )
     rIStm   >> mnLen;
     rIStm   >> nAryLen;
 
+    if ( mnIndex > mnLen )
+    {
+        mnIndex = 0;
+        mpDXAry = 0;
+        return;
+    }
+
     if( nAryLen )
     {
         // #i9762#, #106172# Ensure that DX array is at least mnLen entries long
-        const ULONG nIntAryLen( Max(nAryLen, static_cast(mnLen)) );
-        mpDXAry = new sal_Int32[ nIntAryLen ];
-
-        ULONG i;
-        for( i = 0UL; i < nAryLen; i++ )
-            rIStm >> mpDXAry[ i ];
+        if ( mnLen >= nAryLen )
+        {
+            mpDXAry = new (std::nothrow)sal_Int32[ mnLen ];
+            if ( mpDXAry )
+            {
+                   ULONG i;
+                for( i = 0UL; i < nAryLen; i++ )
+                    rIStm >> mpDXAry[ i ];
 
-        // #106172# setup remainder
-        for( ; i < nIntAryLen; i++ )
-            mpDXAry[ i ] = 0;
+                // #106172# setup remainder
+                for( ; i < mnLen; i++ )
+                    mpDXAry[ i ] = 0;
+            }
+        }
+        else
+        {
+            mpDXAry = NULL;
+            return;
+        }
     }
     else
         mpDXAry = NULL;
-- 
cgit 


From b9113ba2a8a4fca7d21b1268a250f4cdc70ba64d Mon Sep 17 00:00:00 2001
From: sj 
Date: Mon, 22 Nov 2010 19:00:24 +0100
Subject: os145: #b7001886# fixing small ppt import problem, improving png
 reader

---
 vcl/source/gdi/pngread.cxx | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx
index 11971db34378..df67c4974d47 100644
--- a/vcl/source/gdi/pngread.cxx
+++ b/vcl/source/gdi/pngread.cxx
@@ -411,7 +411,9 @@ BitmapEx PNGReaderImpl::GetBitmapEx( const Size& rPreviewSizeHint )
 
             case PNGCHUNK_IDAT :
             {
-                if ( !mbIDAT )      // the gfx is finished, but there may be left a zlibCRC of about 4Bytes
+                if ( !mpInflateInBuf )  // taking care that the header has properly been read
+                    mbStatus = FALSE;
+                else if ( !mbIDAT )     // the gfx is finished, but there may be left a zlibCRC of about 4Bytes
                     ImplReadIDAT();
             }
             break;
@@ -527,7 +529,7 @@ BOOL PNGReaderImpl::ImplReadHeader( const Size& rPreviewSizeHint )
     mbIDAT = mbAlphaChannel = mbTransparent = FALSE;
     mbGrayScale = mbRGBTriple = FALSE;
     mnTargetDepth = mnPngDepth;
-    mnScansize = ( ( maOrigSize.Width() * mnPngDepth ) + 7 ) >> 3;
+    sal_uInt64 nScansize64 = ( ( static_cast< sal_uInt64 >( maOrigSize.Width() ) * mnPngDepth ) + 7 ) >> 3;
 
     // valid color types are 0,2,3,4 & 6
     switch ( mnColorType )
@@ -557,7 +559,7 @@ BOOL PNGReaderImpl::ImplReadHeader( const Size& rPreviewSizeHint )
         case 2 :    // each pixel is an RGB triple
         {
             mbRGBTriple = TRUE;
-            mnScansize *= 3;
+            nScansize64 *= 3;
             switch ( mnPngDepth )
             {
                 case 16 :           // we have to reduce the bitmap
@@ -590,7 +592,7 @@ BOOL PNGReaderImpl::ImplReadHeader( const Size& rPreviewSizeHint )
 
         case 4 :    // each pixel is a grayscale sample followed by an alpha sample
         {
-            mnScansize *= 2;
+            nScansize64 *= 2;
             mbAlphaChannel = TRUE;
             switch ( mnPngDepth )
             {
@@ -608,7 +610,7 @@ BOOL PNGReaderImpl::ImplReadHeader( const Size& rPreviewSizeHint )
         case 6 :    // each pixel is an RGB triple followed by an alpha sample
         {
             mbRGBTriple = TRUE;
-            mnScansize *= 4;
+            nScansize64 *= 4;
             mbAlphaChannel = TRUE;
             switch (mnPngDepth )
             {
@@ -626,16 +628,24 @@ BOOL PNGReaderImpl::ImplReadHeader( const Size& rPreviewSizeHint )
             return FALSE;
     }
 
-    mnBPP = mnScansize / maOrigSize.Width();
+    mnBPP = static_cast< sal_uInt32 >( nScansize64 / maOrigSize.Width() );
     if ( !mnBPP )
         mnBPP = 1;
 
-    mnScansize++;       // each scanline includes one filterbyte
+    nScansize64++;       // each scanline includes one filterbyte
+
+    if ( nScansize64 > SAL_MAX_UINT32 )
+        return FALSE;
+
+    mnScansize = static_cast< sal_uInt32 >( nScansize64 );
 
     // TODO: switch between both scanlines instead of copying
-    mpInflateInBuf = new BYTE[ mnScansize ];
+    mpInflateInBuf = new (std::nothrow) BYTE[ mnScansize ];
     mpScanCurrent = mpInflateInBuf;
-    mpScanPrior = new BYTE[ mnScansize ];
+    mpScanPrior = new (std::nothrow) BYTE[ mnScansize ];
+
+    if ( !mpInflateInBuf || !mpScanPrior )
+        return FALSE;
 
     // calculate target size from original size and the preview hint
     if( rPreviewSizeHint.Width() || rPreviewSizeHint.Height() )
-- 
cgit 


From ae831144a3de6f721547bbce87a542cd8eb69b99 Mon Sep 17 00:00:00 2001
From: Hans-Joachim Lankenau 
Date: Tue, 23 Nov 2010 14:24:46 +0100
Subject: gnumake2: enable packmodule in setsolar mws builds

---
 svl/prj/makefile.mk     | 2 +-
 svtools/prj/makefile.mk | 2 +-
 toolkit/prj/makefile.mk | 2 +-
 tools/prj/makefile.mk   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/svl/prj/makefile.mk b/svl/prj/makefile.mk
index 3b1b54d4357f..c73a3d944bbf 100644
--- a/svl/prj/makefile.mk
+++ b/svl/prj/makefile.mk
@@ -37,4 +37,4 @@ VERBOSEFLAG := -s
 .ENDIF
 
 all:
-    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS)
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET)
diff --git a/svtools/prj/makefile.mk b/svtools/prj/makefile.mk
index 3b1b54d4357f..c73a3d944bbf 100644
--- a/svtools/prj/makefile.mk
+++ b/svtools/prj/makefile.mk
@@ -37,4 +37,4 @@ VERBOSEFLAG := -s
 .ENDIF
 
 all:
-    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS)
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET)
diff --git a/toolkit/prj/makefile.mk b/toolkit/prj/makefile.mk
index 3b1b54d4357f..c73a3d944bbf 100644
--- a/toolkit/prj/makefile.mk
+++ b/toolkit/prj/makefile.mk
@@ -37,4 +37,4 @@ VERBOSEFLAG := -s
 .ENDIF
 
 all:
-    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS)
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET)
diff --git a/tools/prj/makefile.mk b/tools/prj/makefile.mk
index 3b1b54d4357f..c73a3d944bbf 100644
--- a/tools/prj/makefile.mk
+++ b/tools/prj/makefile.mk
@@ -37,4 +37,4 @@ VERBOSEFLAG := -s
 .ENDIF
 
 all:
-    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS)
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET)
-- 
cgit 


From e16777656a71ae48b0d9d9e87b035018ff1f20ee Mon Sep 17 00:00:00 2001
From: Bjoern Michaelsen 
Date: Tue, 23 Nov 2010 15:28:37 +0100
Subject: gnumake2: fix for really ugly pathutils hack to register delivered
 object in for gb_deliver.log

---
 tools/StaticLibrary_ooopathutils.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/StaticLibrary_ooopathutils.mk b/tools/StaticLibrary_ooopathutils.mk
index 5eac00c4193c..a5b12532c60b 100755
--- a/tools/StaticLibrary_ooopathutils.mk
+++ b/tools/StaticLibrary_ooopathutils.mk
@@ -35,11 +35,14 @@ $(eval $(call gb_StaticLibrary_add_exception_objects,ooopathutils,\
 
 
 # HACK for now
+# We really should fix the clients of this to link against the static library
+# Instead of this evil linking of an object from $(OUTDIR)
 define StaticLibrary_ooopathutils_hack
 $(call gb_StaticLibrary_get_target,ooopathutils) : $(OUTDIR)/lib/$(1)
+$$(eval $$(call gb_Deliver_add_deliverable,$(OUTDIR)/lib/$(1),$(call gb_CxxObject_get_target,tools/source/misc/pathutils)))
 
 $(OUTDIR)/lib/$(1) : $(call gb_CxxObject_get_target,tools/source/misc/pathutils)
-    cp -f $$< $$@
+    $$(call gb_Deliver_deliver,$$<,$$@)
 
 endef
 
-- 
cgit 


From baa3cdb1a532bb79ec3fbfbc23cbb4ee4b566308 Mon Sep 17 00:00:00 2001
From: obo 
Date: Wed, 24 Nov 2010 16:52:49 +0100
Subject: #i115761# Impress freezes opening the attached odp file(s)

---
 basegfx/source/polygon/b2dtrapezoid.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/basegfx/source/polygon/b2dtrapezoid.cxx b/basegfx/source/polygon/b2dtrapezoid.cxx
index c1e0f7f6c7c1..d89ec7c6cf73 100644
--- a/basegfx/source/polygon/b2dtrapezoid.cxx
+++ b/basegfx/source/polygon/b2dtrapezoid.cxx
@@ -798,6 +798,7 @@ namespace basegfx
                                         if(splitEdgeAtGivenPoint(aLeft, *pNewLeft, aCurrent))
                                         {
                                             maNewPoints.push_back(pNewLeft);
+                                            bDone = true;
                                         }
                                         else
                                         {
@@ -809,13 +810,12 @@ namespace basegfx
                                         if(splitEdgeAtGivenPoint(aRight, *pNewRight, aCurrent))
                                         {
                                             maNewPoints.push_back(pNewRight);
+                                            bDone = true;
                                         }
                                         else
                                         {
                                             delete pNewRight;
                                         }
-
-                                        bDone = true;
                                     }
                                 }
 
-- 
cgit 


From 7c153ad4212964199f431c90ab521c3a8b550614 Mon Sep 17 00:00:00 2001
From: Bjoern Michaelsen 
Date: Wed, 24 Nov 2010 22:30:09 +0100
Subject: gnumake2: using set_defs instead of set_cxxflags in library tl as we
 should

---
 tools/Library_tl.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index 0e327527bef0..35ed1b4af783 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -44,8 +44,8 @@ $(eval $(call gb_Library_set_include,tl,\
     -I$(OUTDIR)/inc/stl \
 ))
 
-$(eval $(call gb_Library_set_cxxflags,tl,\
-    $$(CXXFLAGS) \
+$(eval $(call gb_Library_set_defs,tl,\
+    $$(DEFS) \
     -DSHARED_LIB \
     -DTOOLS_DLLIMPLEMENTATION \
     -DVCL \
-- 
cgit 


From 8cbc2d0363811781f5de45b3a11b3614feec4a9a Mon Sep 17 00:00:00 2001
From: Mikhail Voytenko 
Date: Thu, 25 Nov 2010 17:50:45 +0100
Subject: pl08: #163778# fix buildbot - use rtl functions

---
 comphelper/source/misc/docpasswordhelper.cxx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/comphelper/source/misc/docpasswordhelper.cxx b/comphelper/source/misc/docpasswordhelper.cxx
index 697f221d9c80..3c8d66bd57e4 100644
--- a/comphelper/source/misc/docpasswordhelper.cxx
+++ b/comphelper/source/misc/docpasswordhelper.cxx
@@ -294,10 +294,10 @@ Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence(
     if ( aPassword.getLength() && aDocId.getLength() == 16 )
     {
         sal_uInt16 pPassData[16];
-        memset( pPassData, 0, sizeof(pPassData) );
+        rtl_zeroMemory( pPassData, sizeof(pPassData) );
 
         sal_Int32 nPassLen = ::std::min< sal_Int32 >( aPassword.getLength(), 15 );
-        (void)memcpy( pPassData, aPassword.getStr(), nPassLen * sizeof(pPassData[0]) );
+        rtl_copyMemory( pPassData, aPassword.getStr(), nPassLen * sizeof(pPassData[0]) );
 
         aResultKey = GenerateStd97Key( pPassData, aDocId );
     }
@@ -312,7 +312,7 @@ Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence(
     if ( pPassData[0] && aDocId.getLength() == 16 )
     {
         sal_uInt8 pKeyData[64];
-        (void)memset( pKeyData, 0, sizeof(pKeyData) );
+        rtl_zeroMemory( pKeyData, sizeof(pKeyData) );
 
         sal_Int32 nInd = 0;
 
@@ -342,7 +342,7 @@ Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence(
 
         // Update digest with padding.
         pKeyData[16] = 0x80;
-        (void)memset (pKeyData + 17, 0, sizeof(pKeyData) - 17);
+        rtl_zeroMemory( pKeyData + 17, sizeof(pKeyData) - 17 );
         pKeyData[56] = 0x80;
         pKeyData[57] = 0x0a;
 
@@ -353,7 +353,7 @@ Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence(
         rtl_digest_rawMD5 ( hDigest, (sal_uInt8*)aResultKey.getArray(), aResultKey.getLength() );
 
         // Erase KeyData array and leave.
-        (void)memset (pKeyData, 0, sizeof(pKeyData));
+        rtl_zeroMemory( pKeyData, sizeof(pKeyData) );
     }
 
     return aResultKey;
-- 
cgit 


From d2e5e59c6b28235a832cdc06480e30f0ed96b580 Mon Sep 17 00:00:00 2001
From: Bjoern Michaelsen 
Date: Fri, 26 Nov 2010 13:37:22 +0100
Subject: gnumake2: sorting all lists in makefiles

---
 svl/Library_fsstorage.mk               |  2 +-
 svl/Library_passwordcontainer.mk       |  6 +--
 svl/Library_svl.mk                     |  2 +-
 svl/Package_inc.mk                     | 76 +++++++++++++++++-----------------
 svtools/Executable_bmp.mk              |  6 +--
 svtools/Executable_bmpsum.mk           |  6 +--
 svtools/Executable_g2g.mk              |  6 +--
 svtools/Library_hatchwindowfactory.mk  |  8 ++--
 svtools/Library_productregistration.mk |  6 +--
 svtools/Library_svt.mk                 |  2 +-
 svtools/Package_inc.mk                 | 30 +++++++-------
 toolkit/Library_tk.mk                  |  6 +--
 toolkit/Module_toolkit.mk              |  2 +-
 toolkit/Package_source.mk              |  2 +-
 tools/Executable_mkunroll.mk           |  4 +-
 tools/Executable_rscdep.mk             |  4 +-
 tools/Executable_so_checksum.mk        |  4 +-
 tools/Executable_sspretty.mk           |  4 +-
 tools/Package_inc.mk                   |  4 +-
 19 files changed, 90 insertions(+), 90 deletions(-)

diff --git a/svl/Library_fsstorage.mk b/svl/Library_fsstorage.mk
index 379ea9697c0a..f109e0620d5e 100644
--- a/svl/Library_fsstorage.mk
+++ b/svl/Library_fsstorage.mk
@@ -53,8 +53,8 @@ $(eval $(call gb_Library_add_linked_libs,fsstorage,\
 ))
 
 $(eval $(call gb_Library_add_linked_system_libs,fsstorage,\
-    icuuc \
     dl \
+    icuuc \
     m \
     pthread \
 ))
diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk
index fc602ef048ad..d0b35552e18a 100644
--- a/svl/Library_passwordcontainer.mk
+++ b/svl/Library_passwordcontainer.mk
@@ -42,12 +42,12 @@ $(eval $(call gb_Library_set_include,passwordcontainer,\
 ))
 
 $(eval $(call gb_Library_add_linked_libs,passwordcontainer,\
-    utl \
-    ucbhelper \
-    cppuhelper \
     cppu \
+    cppuhelper \
     sal \
     stl \
+    ucbhelper \
+    utl \
 ))
 
 $(eval $(call gb_Library_add_linked_system_libs,passwordcontainer,\
diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk
index eb839abf4f94..7faf5caa7f65 100644
--- a/svl/Library_svl.mk
+++ b/svl/Library_svl.mk
@@ -67,8 +67,8 @@ $(eval $(call gb_Library_add_linked_libs,svl,\
 ))
 
 $(eval $(call gb_Library_add_linked_system_libs,svl,\
-    icuuc \
     dl \
+    icuuc \
     m \
     pthread \
 ))
diff --git a/svl/Package_inc.mk b/svl/Package_inc.mk
index c0f22768b473..888cdc38cfa6 100644
--- a/svl/Package_inc.mk
+++ b/svl/Package_inc.mk
@@ -27,27 +27,43 @@
 
 $(eval $(call gb_Package_Package,svl_inc,$(SRCDIR)/svl/inc))
 
+
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/PasswordHelper.hxx,svl/PasswordHelper.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/adrparse.hxx,svl/adrparse.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/aeitem.hxx,svl/aeitem.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/asiancfg.hxx,svl/asiancfg.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/brdcst.hxx,svl/brdcst.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/broadcast.hxx,svl/broadcast.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/broadcast.hxx,svl/broadcast.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/cenumitm.hxx,svl/cenumitm.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/cintitem.hxx,svl/cintitem.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/cjkoptions.hxx,svl/cjkoptions.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/cntnrsrt.hxx,svl/cntnrsrt.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/cntwall.hxx,svl/cntwall.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/cntwids.hrc,svl/cntwids.hrc))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/converter.hxx,svl/converter.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/ctloptions.hxx,svl/ctloptions.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/ctypeitm.hxx,svl/ctypeitm.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/custritm.hxx,svl/custritm.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/dateitem.hxx,svl/dateitem.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/documentlockfile.hxx,svl/documentlockfile.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/eitem.hxx,svl/eitem.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/filenotation.hxx,svl/filenotation.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/filerec.hxx,svl/filerec.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/flagitem.hxx,svl/flagitem.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/folderrestriction.hxx,svl/folderrestriction.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/fstathelper.hxx,svl/fstathelper.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/globalnameitem.hxx,svl/globalnameitem.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/hint.hxx,svl/hint.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/httpcook.hxx,svl/httpcook.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/ilstitem.hxx,svl/ilstitem.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/imageitm.hxx,svl/imageitm.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/inetdef.hxx,svl/inetdef.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/inethist.hxx,svl/inethist.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/inetmsg.hxx,svl/inetmsg.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/inetstrm.hxx,svl/inetstrm.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/inettype.hxx,svl/inettype.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/instrm.hxx,svl/instrm.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/intitem.hxx,svl/intitem.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/isethint.hxx,svl/isethint.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/itemiter.hxx,svl/itemiter.hxx))
@@ -56,15 +72,27 @@ $(eval $(call gb_Package_add_file,svl_inc,inc/svl/itemprop.hxx,svl/itemprop.hxx)
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/itemset.hxx,svl/itemset.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/languageoptions.hxx,svl/languageoptions.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/lckbitem.hxx,svl/lckbitem.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/listener.hxx,svl/listener.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/listeneriter.hxx,svl/listeneriter.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/lngmisc.hxx,svl/lngmisc.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/lockfilecommon.hxx,svl/lockfilecommon.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/lstner.hxx,svl/lstner.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/macitem.hxx,svl/macitem.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/mailenum.hxx,svl/mailenum.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/memberid.hrc,svl/memberid.hrc))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/metitem.hxx,svl/metitem.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/nfkeytab.hxx,svl/nfkeytab.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/nfsymbol.hxx,svl/nfsymbol.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/nfversi.hxx,svl/nfversi.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/nranges.hxx,svl/nranges.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/numuno.hxx,svl/numuno.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/ondemand.hxx,svl/ondemand.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/outstrm.hxx,svl/outstrm.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/ownlist.hxx,svl/ownlist.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/pickerhelper.hxx,svl/pickerhelper.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/pickerhistory.hxx,svl/pickerhistory.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/pickerhistoryaccess.hxx,svl/pickerhistoryaccess.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/poolcach.hxx,svl/poolcach.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/poolitem.hxx,svl/poolitem.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/ptitem.hxx,svl/ptitem.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/rectitem.hxx,svl/rectitem.hxx))
@@ -75,55 +103,27 @@ $(eval $(call gb_Package_add_file,svl_inc,inc/svl/sharecontrolfile.hxx,svl/share
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/slstitm.hxx,svl/slstitm.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/smplhint.hxx,svl/smplhint.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/solar.hrc,svl/solar.hrc))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/svl.hrc,svl/svl.hrc))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/srchcfg.hxx,svl/srchcfg.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/srchdefs.hxx,svl/srchdefs.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/srchitem.hxx,svl/srchitem.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/stritem.hxx,svl/stritem.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/strmadpt.hxx,svl/strmadpt.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/style.hrc,svl/style.hrc))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/style.hxx,svl/style.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/stylepool.hxx,svl/stylepool.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/svarray.hxx,svl/svarray.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/svdde.hxx,svl/svdde.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/svl.hrc,svl/svl.hrc))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/svldata.hxx,svl/svldata.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/svldllapi.h,svl/svldllapi.h))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/svstdarr.hxx,svl/svstdarr.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/szitem.hxx,svl/szitem.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/undo.hxx,svl/undo.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/urlfilter.hxx,svl/urlfilter.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/visitem.hxx,svl/visitem.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/zforlist.hxx,svl/zforlist.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/zformat.hxx,svl/zformat.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/PasswordHelper.hxx,svl/PasswordHelper.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/adrparse.hxx,svl/adrparse.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/broadcast.hxx,svl/broadcast.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/cntnrsrt.hxx,svl/cntnrsrt.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/cntwids.hrc,svl/cntwids.hrc))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/converter.hxx,svl/converter.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/filenotation.hxx,svl/filenotation.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/folderrestriction.hxx,svl/folderrestriction.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/fstathelper.hxx,svl/fstathelper.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/inetdef.hxx,svl/inetdef.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/inetmsg.hxx,svl/inetmsg.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/inetstrm.hxx,svl/inetstrm.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/instrm.hxx,svl/instrm.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/listener.hxx,svl/listener.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/listeneriter.hxx,svl/listeneriter.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/lngmisc.hxx,svl/lngmisc.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/memberid.hrc,svl/memberid.hrc))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/nfsymbol.hxx,svl/nfsymbol.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/numuno.hxx,svl/numuno.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/outstrm.hxx,svl/outstrm.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/pickerhistory.hxx,svl/pickerhistory.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/pickerhistoryaccess.hxx,svl/pickerhistoryaccess.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/pickerhelper.hxx,svl/pickerhelper.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/poolcach.hxx,svl/poolcach.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/strmadpt.hxx,svl/strmadpt.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/stylepool.hxx,svl/stylepool.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/urihelper.hxx,svl/urihelper.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/urlbmk.hxx,svl/urlbmk.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/urlfilter.hxx,svl/urlfilter.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/visitem.hxx,svl/visitem.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/whiter.hxx,svl/whiter.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/xmlement.hxx,svl/xmlement.hxx))
-
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/asiancfg.hxx,svl/asiancfg.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/broadcast.hxx,svl/broadcast.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/mailenum.hxx,svl/mailenum.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/srchcfg.hxx,svl/srchcfg.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/srchdefs.hxx,svl/srchdefs.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/srchitem.hxx,svl/srchitem.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/zforlist.hxx,svl/zforlist.hxx))
+$(eval $(call gb_Package_add_file,svl_inc,inc/svl/zformat.hxx,svl/zformat.hxx))
diff --git a/svtools/Executable_bmp.mk b/svtools/Executable_bmp.mk
index 57b34292ff11..24019ced63d2 100644
--- a/svtools/Executable_bmp.mk
+++ b/svtools/Executable_bmp.mk
@@ -40,11 +40,11 @@ $(eval $(call gb_Executable_set_include,bmp,\
 ))
 
 $(eval $(call gb_Executable_add_linked_libs,bmp,\
+    sal \
     stl \
-    vcl \
     tl \
+    vcl \
     vos3 \
-    sal \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,bmp,\
@@ -64,8 +64,8 @@ endif
 
 ifeq ($(OS),LINUX)
 $(eval $(call gb_Executable_add_linked_libs,bmp,\
-   pthread \
    dl \
+   pthread \
 ))
 endif
 # vim: set noet sw=4 ts=4:
diff --git a/svtools/Executable_bmpsum.mk b/svtools/Executable_bmpsum.mk
index ec0f90f2b04b..3d04c3b5a25a 100644
--- a/svtools/Executable_bmpsum.mk
+++ b/svtools/Executable_bmpsum.mk
@@ -37,11 +37,11 @@ $(eval $(call gb_Executable_set_include,bmpsum,\
 ))
 
 $(eval $(call gb_Executable_add_linked_libs,bmpsum,\
+    sal \
     stl \
-    vcl \
     tl \
+    vcl \
     vos3 \
-    sal \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,bmpsum,\
@@ -60,8 +60,8 @@ endif
 
 ifeq ($(OS),LINUX)
 $(eval $(call gb_Executable_add_linked_libs,bmpsum,\
-   pthread \
    dl \
+   pthread \
 ))
 endif
 # vim: set noet sw=4 ts=4:
diff --git a/svtools/Executable_g2g.mk b/svtools/Executable_g2g.mk
index b1cf99546513..99bde19e1055 100644
--- a/svtools/Executable_g2g.mk
+++ b/svtools/Executable_g2g.mk
@@ -38,12 +38,12 @@ $(eval $(call gb_Executable_set_include,g2g,\
 
 $(eval $(call gb_Executable_add_linked_libs,g2g,\
     jvmfwk \
+    sal \
     stl \
-    vcl \
+    svt \
     tl \
+    vcl \
     vos3 \
-    svt \
-    sal \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,g2g,\
diff --git a/svtools/Library_hatchwindowfactory.mk b/svtools/Library_hatchwindowfactory.mk
index 67f6f8d95ba8..150b71396284 100644
--- a/svtools/Library_hatchwindowfactory.mk
+++ b/svtools/Library_hatchwindowfactory.mk
@@ -41,19 +41,19 @@ $(eval $(call gb_Library_set_include,hatchwindowfactory,\
 ))
 
 $(eval $(call gb_Library_add_linked_libs,hatchwindowfactory,\
-    tk \
-    tl \
     cppu \
     cppuhelper \
     sal \
+    tk \
+    tl \
     vcl \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,hatchwindowfactory,\
-    svtools/source/hatchwindow/hatchwindowfactory \
     svtools/source/hatchwindow/documentcloser \
-    svtools/source/hatchwindow/ipwin \
     svtools/source/hatchwindow/hatchwindow \
+    svtools/source/hatchwindow/hatchwindowfactory \
+    svtools/source/hatchwindow/ipwin \
 ))
 
 ifeq ($(OS),LINUX)
diff --git a/svtools/Library_productregistration.mk b/svtools/Library_productregistration.mk
index 670e06c5f1bd..8b0c27d4469a 100644
--- a/svtools/Library_productregistration.mk
+++ b/svtools/Library_productregistration.mk
@@ -41,13 +41,13 @@ $(eval $(call gb_Library_set_include,productregistration,\
 ))
 
 $(eval $(call gb_Library_add_linked_libs,productregistration,\
-    svl \
-    tk \
-    tl \
     cppu \
     cppuhelper \
     sal \
     stl \
+    svl \
+    tk \
+    tl \
     utl \
     vcl \
 ))
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index 816c4ad4466c..545690bd0f12 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -178,10 +178,10 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
     svtools/source/edit/textwindowpeer \
     svtools/source/edit/txtattr \
     svtools/source/edit/xtextedt \
-    svtools/source/filter.vcl/filter/exportdialog \
     svtools/source/filter.vcl/filter/FilterConfigCache \
     svtools/source/filter.vcl/filter/FilterConfigItem \
     svtools/source/filter.vcl/filter/SvFilterOptionsDialog \
+    svtools/source/filter.vcl/filter/exportdialog \
     svtools/source/filter.vcl/filter/filter \
     svtools/source/filter.vcl/filter/filter2 \
     svtools/source/filter.vcl/filter/sgfbram \
diff --git a/svtools/Package_inc.mk b/svtools/Package_inc.mk
index b74e2fd022c5..ef656f9ba061 100644
--- a/svtools/Package_inc.mk
+++ b/svtools/Package_inc.mk
@@ -26,9 +26,12 @@
 #*************************************************************************
 
 $(eval $(call gb_Package_Package,svtools_inc,$(SRCDIR)/svtools/inc))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/AccessibleBrowseBoxObjType.hxx,svtools/AccessibleBrowseBoxObjType.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/DocumentInfoPreview.hxx,svtools/DocumentInfoPreview.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/FilterConfigItem.hxx,svtools/FilterConfigItem.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/QueryFolderName.hxx,svtools/QueryFolderName.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/acceleratorexecute.hxx,svtools/acceleratorexecute.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibilityoptions.hxx,svtools/accessibilityoptions.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/AccessibleBrowseBoxObjType.hxx,svtools/AccessibleBrowseBoxObjType.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessiblefactory.hxx,svtools/accessiblefactory.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibletable.hxx,svtools/accessibletable.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/accessibletableprovider.hxx,svtools/accessibletableprovider.hxx))
@@ -48,11 +51,8 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/contextmenuhelper.hxx,
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/controldims.hrc,svtools/controldims.hrc))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ctrlbox.hxx,svtools/ctrlbox.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/ctrltool.hxx,svtools/ctrltool.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/decklayouter.hxx,svtools/toolpanel/decklayouter.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/dialogclosedlistener.hxx,svtools/dialogclosedlistener.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/dialogcontrolling.hxx,svtools/dialogcontrolling.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/DocumentInfoPreview.hxx,svtools/DocumentInfoPreview.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/drawerlayouter.hxx,svtools/toolpanel/drawerlayouter.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/editbrowsebox.hxx,svtools/editbrowsebox.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/editimplementation.hxx,svtools/editimplementation.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/editsyntaxhighlighter.hxx,svtools/editsyntaxhighlighter.hxx))
@@ -63,11 +63,10 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/expander.hxx,svtools/e
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/extcolorcfg.hxx,svtools/extcolorcfg.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/extensionlistbox.hxx,svtools/extensionlistbox.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filectrl.hxx,svtools/filectrl.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filedlg2.hrc,svtools/filedlg2.hrc))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filedlg.hxx,svtools/filedlg.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filedlg2.hrc,svtools/filedlg2.hrc))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fileurlbox.hxx,svtools/fileurlbox.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fileview.hxx,svtools/fileview.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/FilterConfigItem.hxx,svtools/FilterConfigItem.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filter.hxx,svtools/filter.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fixedhyper.hxx,svtools/fixedhyper.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fltcall.hxx,svtools/fltcall.hxx))
@@ -90,8 +89,8 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/hyperlabel.hxx,svtools
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imagemgr.hrc,svtools/imagemgr.hrc))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imagemgr.hxx,svtools/imagemgr.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imageresourceaccess.hxx,svtools/imageresourceaccess.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imapcirc.hxx,svtools/imapcirc.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imap.hxx,svtools/imap.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imapcirc.hxx,svtools/imapcirc.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imapobj.hxx,svtools/imapobj.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imappoly.hxx,svtools/imappoly.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/imaprect.hxx,svtools/imaprect.hxx))
@@ -109,7 +108,6 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/localresaccess.hxx,svt
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/menuoptions.hxx,svtools/menuoptions.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/miscopt.hxx,svtools/miscopt.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/optionsdrawinglayer.hxx,svtools/optionsdrawinglayer.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/paneltabbar.hxx,svtools/toolpanel/paneltabbar.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/parhtml.hxx,svtools/parhtml.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/parrtf.hxx,svtools/parrtf.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/popupmenucontrollerbase.hxx,svtools/popupmenucontrollerbase.hxx))
@@ -118,8 +116,6 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/prgsbar.hxx,svtools/pr
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/printdlg.hxx,svtools/printdlg.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/printoptions.hxx,svtools/printoptions.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/prnsetup.hxx,svtools/prnsetup.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/QueryFolderName.hxx,svtools/QueryFolderName.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/refbase.hxx,svtools/toolpanel/refbase.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/roadmap.hxx,svtools/roadmap.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/roadmapwizard.hxx,svtools/roadmapwizard.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/rtfkeywd.hxx,svtools/rtfkeywd.hxx))
@@ -138,8 +134,8 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/stringtransfer.hxx,svt
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svicnvw.hxx,svtools/svicnvw.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svlbitm.hxx,svtools/svlbitm.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svlbox.hxx,svtools/svlbox.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svmedit2.hxx,svtools/svmedit2.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svmedit.hxx,svtools/svmedit.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svmedit2.hxx,svtools/svmedit2.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svparser.hxx,svtools/svparser.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtabbx.hxx,svtools/svtabbx.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtdata.hxx,svtools/svtdata.hxx))
@@ -149,10 +145,7 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtreebx.hxx,svtools/s
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svxbox.hxx,svtools/svxbox.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/sychconv.hxx,svtools/sychconv.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/syntaxhighlight.hxx,svtools/syntaxhighlight.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/tabalignment.hxx,svtools/toolpanel/tabalignment.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/tabbar.hxx,svtools/tabbar.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/tabitemcontent.hxx,svtools/toolpanel/tabitemcontent.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/tablayouter.hxx,svtools/toolpanel/tablayouter.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/abstracttablecontrol.hxx,svtools/table/abstracttablecontrol.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/defaultinputhandler.hxx,svtools/table/defaultinputhandler.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/gridtablerenderer.hxx,svtools/table/gridtablerenderer.hxx))
@@ -172,8 +165,15 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/textview.hxx,svtools/t
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/textwindowpeer.hxx,svtools/textwindowpeer.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolbarmenu.hxx,svtools/toolbarmenu.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolboxcontroller.hxx,svtools/toolboxcontroller.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/toolpaneldeck.hxx,svtools/toolpanel/toolpaneldeck.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/decklayouter.hxx,svtools/toolpanel/decklayouter.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/drawerlayouter.hxx,svtools/toolpanel/drawerlayouter.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/paneltabbar.hxx,svtools/toolpanel/paneltabbar.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/refbase.hxx,svtools/toolpanel/refbase.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/tabalignment.hxx,svtools/toolpanel/tabalignment.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/tabitemcontent.hxx,svtools/toolpanel/tabitemcontent.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/tablayouter.hxx,svtools/toolpanel/tablayouter.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/toolpanel.hxx,svtools/toolpanel/toolpanel.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/toolpaneldeck.hxx,svtools/toolpanel/toolpaneldeck.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/tooltiplbox.hxx,svtools/tooltiplbox.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/transfer.hxx,svtools/transfer.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/treelist.hxx,svtools/treelist.hxx))
diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk
index eadd87b77322..9d94c76314f1 100644
--- a/toolkit/Library_tk.mk
+++ b/toolkit/Library_tk.mk
@@ -50,17 +50,18 @@ $(eval $(call gb_Library_set_defs,tk,\
 
 $(eval $(call gb_Library_add_linked_libs,tk,\
     comphelper \
-    stl \
-    tl \
     cppu \
     cppuhelper \
     sal \
+    stl \
+    tl \
     utl \
     vcl \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,tk,\
     toolkit/source/awt/asynccallback \
+    toolkit/source/awt/stylesettings \
     toolkit/source/awt/vclxaccessiblecomponent \
     toolkit/source/awt/vclxbitmap \
     toolkit/source/awt/vclxbutton \
@@ -86,7 +87,6 @@ $(eval $(call gb_Library_add_exception_objects,tk,\
     toolkit/source/awt/vclxwindow \
     toolkit/source/awt/vclxwindow1 \
     toolkit/source/awt/vclxwindows \
-    toolkit/source/awt/stylesettings \
     toolkit/source/awt/xsimpleanimation \
     toolkit/source/awt/xthrobber \
     toolkit/source/controls/accessiblecontrolcontext \
diff --git a/toolkit/Module_toolkit.mk b/toolkit/Module_toolkit.mk
index ce54e3243fe4..666fd44a6db3 100644
--- a/toolkit/Module_toolkit.mk
+++ b/toolkit/Module_toolkit.mk
@@ -28,11 +28,11 @@
 $(eval $(call gb_Module_Module,toolkit))
 
 $(eval $(call gb_Module_add_targets,toolkit,\
+    AllLangResTarget_tk \
     Library_tk \
     Package_inc \
     Package_source \
     Package_util \
-    AllLangResTarget_tk \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/toolkit/Package_source.mk b/toolkit/Package_source.mk
index 8a5aa5ffc3cb..41f46138df2b 100644
--- a/toolkit/Package_source.mk
+++ b/toolkit/Package_source.mk
@@ -26,7 +26,6 @@
 #*************************************************************************
 
 $(eval $(call gb_Package_Package,toolkit_source,$(SRCDIR)/toolkit/source))
-$(eval $(call gb_Package_add_file,toolkit_source,inc/toolkit/awt/vclxdialog.hxx,awt/vclxdialog.hxx))
 $(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/bin.hxx,layout/core/bin.hxx))
 $(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/box-base.hxx,layout/core/box-base.hxx))
 $(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/box.hxx,layout/core/box.hxx))
@@ -45,3 +44,4 @@ $(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/timer.hxx,layou
 $(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/translate.hxx,layout/core/translate.hxx))
 $(eval $(call gb_Package_add_file,toolkit_source,inc/layout/core/vcl.hxx,layout/core/vcl.hxx))
 $(eval $(call gb_Package_add_file,toolkit_source,inc/layout/vcl/wrapper.hxx,layout/vcl/wrapper.hxx))
+$(eval $(call gb_Package_add_file,toolkit_source,inc/toolkit/awt/vclxdialog.hxx,awt/vclxdialog.hxx))
diff --git a/tools/Executable_mkunroll.mk b/tools/Executable_mkunroll.mk
index e08a83bb651c..6a88e48f232a 100644
--- a/tools/Executable_mkunroll.mk
+++ b/tools/Executable_mkunroll.mk
@@ -60,17 +60,17 @@ $(eval $(call gb_Executable_add_exception_objects,mkunroll,\
 ifeq ($(OS),WNT)
 $(eval $(call gb_Executable_add_linked_libs,mkunroll,\
     kernel32 \
-    user32 \
     msvcrt \
     oldnames \
+    user32 \
     uwinapi \
 ))
 endif
 
 ifeq ($(OS),LINUX)
 $(eval $(call gb_Executable_add_linked_libs,mkunroll,\
-    pthread \
     dl \
+    pthread \
 ))
 endif
 
diff --git a/tools/Executable_rscdep.mk b/tools/Executable_rscdep.mk
index 244e5fdc9bd7..d6f2c25a1763 100644
--- a/tools/Executable_rscdep.mk
+++ b/tools/Executable_rscdep.mk
@@ -58,17 +58,17 @@ ifeq ($(OS),WNT)
 $(eval $(call gb_Executable_add_linked_libs,rscdep,\
     gnu_getopt \
     kernel32 \
-    user32 \
     msvcrt \
     oldnames \
+    user32 \
     uwinapi \
 ))
 endif
 
 ifeq ($(OS),LINUX)
 $(eval $(call gb_Executable_add_linked_libs,rscdep,\
-    pthread \
     dl \
+    pthread \
 ))
 endif
 # vim: set noet sw=4 ts=4:
diff --git a/tools/Executable_so_checksum.mk b/tools/Executable_so_checksum.mk
index 4498f3e29abc..071f0c5bb7b0 100644
--- a/tools/Executable_so_checksum.mk
+++ b/tools/Executable_so_checksum.mk
@@ -53,17 +53,17 @@ $(eval $(call gb_Executable_add_exception_objects,so_checksum,\
 ifeq ($(OS),WNT)
 $(eval $(call gb_Executable_add_linked_libs,so_checksum,\
     kernel32 \
-    user32 \
     msvcrt \
     oldnames \
+    user32 \
     uwinapi \
 ))
 endif
 
 ifeq ($(OS),LINUX)
 $(eval $(call gb_Executable_add_linked_libs,so_checksum,\
-    pthread \
     dl \
+    pthread \
 ))
 endif
 # vim: set noet sw=4 ts=4:
diff --git a/tools/Executable_sspretty.mk b/tools/Executable_sspretty.mk
index 5f5ab4e98f4f..0c83b7137eea 100644
--- a/tools/Executable_sspretty.mk
+++ b/tools/Executable_sspretty.mk
@@ -58,17 +58,17 @@ $(eval $(call gb_Executable_add_exception_objects,sspretty,\
 ifeq ($(OS),WNT)
 $(eval $(call gb_Executable_add_linked_libs,sspretty,\
     kernel32 \
-    user32 \
     msvcrt \
     oldnames \
+    user32 \
     uwinapi \
 ))
 endif
 
 ifeq ($(OS),LINUX)
 $(eval $(call gb_Executable_add_linked_libs,sspretty,\
-    pthread \
     dl \
+    pthread \
 ))
 endif
 # vim: set noet sw=4 ts=4:
diff --git a/tools/Package_inc.mk b/tools/Package_inc.mk
index d1026b05a43c..97d99653c312 100644
--- a/tools/Package_inc.mk
+++ b/tools/Package_inc.mk
@@ -26,6 +26,7 @@
 #*************************************************************************
 
 $(eval $(call gb_Package_Package,tools_inc,$(SRCDIR)/tools/inc))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/StringListResource.hxx,tools/StringListResource.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/appendunixshellword.hxx,tools/appendunixshellword.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/b3dtrans.hxx,tools/b3dtrans.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/bigint.hxx,tools/bigint.hxx))
@@ -87,7 +88,6 @@ $(eval $(call gb_Package_add_file,tools_inc,inc/tools/solarmutex.hxx,tools/solar
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/stack.hxx,tools/stack.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/stream.hxx,tools/stream.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/string.hxx,tools/string.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/StringListResource.hxx,tools/StringListResource.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/svborder.hxx,tools/svborder.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/svlibrary.hxx,tools/svlibrary.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/svwin.h,tools/svwin.h))
@@ -96,8 +96,8 @@ $(eval $(call gb_Package_add_file,tools_inc,inc/tools/tempfile.hxx,tools/tempfil
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/tenccvt.hxx,tools/tenccvt.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/testtoolloader.hxx,tools/testtoolloader.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/time.hxx,tools/time.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/toolsdllapi.h,tools/toolsdllapi.h))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/tools.h,tools/tools.h))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/toolsdllapi.h,tools/toolsdllapi.h))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/unqid.hxx,tools/unqid.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/unqidx.hxx,tools/unqidx.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/urlobj.hxx,tools/urlobj.hxx))
-- 
cgit 


From 070522a5673ae40e0212feee3ff937128bc17fcd Mon Sep 17 00:00:00 2001
From: Mathias Bauer 
Date: Mon, 29 Nov 2010 13:41:51 +0100
Subject: CWS gnumake2: fix some build breakers in svtools, xmloff and
 framework

---
 svtools/source/contnr/svimpbox.cxx | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index df6475c131ce..74c6bb163797 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -41,13 +41,8 @@
 #include 
 #include 
 #include 
-#ifndef _SVTOOLS_HRC
 #include 
-
-// #102891# --------------------
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX
 #include 
-#endif
 
 #define NODE_BMP_TABDIST_NOTVALID   -2000000
 #define FIRST_ENTRY_TAB             1
-- 
cgit 


From 24a26cf9a43c7b88150c6a374ee6edb4d3754125 Mon Sep 17 00:00:00 2001
From: Mathias Bauer 
Date: Mon, 29 Nov 2010 18:26:43 +0100
Subject: CWS gnumake2: warning on Windows fixed

---
 svl/source/items/poolio.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx
index 8bf8f2b2434b..a3d87ca76e5d 100644
--- a/svl/source/items/poolio.cxx
+++ b/svl/source/items/poolio.cxx
@@ -241,7 +241,7 @@ SvStream &SfxItemPool::Store(SvStream &rStream) const
                         const SfxPoolItem *pItem = (*pArr)->operator[](j);
                         if ( pItem && pItem->GetRefCount() ) //! siehe anderes MI-REF
                         {
-                            aItemsRec.NewContent(j, 'X' );
+                            aItemsRec.NewContent((USHORT)j, 'X' );
 
                             if ( pItem->GetRefCount() == SFX_ITEMS_SPECIAL )
                                 rStream << (USHORT) pItem->GetKind();
-- 
cgit 


From 23cdc612ccef2d48c6c5abad534f40990e921003 Mon Sep 17 00:00:00 2001
From: sj 
Date: Tue, 30 Nov 2010 13:41:46 +0100
Subject: impress205: #i115825# fixed copy&paste problem of metafiles

---
 vcl/source/gdi/metaact.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 79d875542509..9a7fb6527e26 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -1441,7 +1441,7 @@ void MetaTextArrayAction::Read( SvStream& rIStm, ImplMetaReadData* pData )
     rIStm   >> mnLen;
     rIStm   >> nAryLen;
 
-    if ( mnIndex > mnLen )
+    if ( mnIndex + mnLen > maStr.Len() )
     {
         mnIndex = 0;
         mpDXAry = 0;
-- 
cgit 


From 16b32932006dab6a1dac0858e75af0991192b73a Mon Sep 17 00:00:00 2001
From: Mikhail Voytenko 
Date: Wed, 1 Dec 2010 11:22:11 +0100
Subject: fwk160: #i74950# let imported links be readonly

---
 comphelper/inc/comphelper/documentconstants.hxx |  38 +++++
 comphelper/inc/comphelper/mimeconfighelper.hxx  |  15 ++
 comphelper/source/misc/mimeconfighelper.cxx     | 200 ++++++++++++++++++++----
 3 files changed, 221 insertions(+), 32 deletions(-)

diff --git a/comphelper/inc/comphelper/documentconstants.hxx b/comphelper/inc/comphelper/documentconstants.hxx
index b78150586e28..73b90d72cc8a 100644
--- a/comphelper/inc/comphelper/documentconstants.hxx
+++ b/comphelper/inc/comphelper/documentconstants.hxx
@@ -111,3 +111,41 @@
 #define ODFVER_012_TEXT ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ODFVER_012_TEXT_ASCII ) )
 #endif
 
+// filter flags
+// TODO/LATER: The flags should be part of the UNO specification
+#define SFX_FILTER_IMPORT            0x00000001L
+#define SFX_FILTER_EXPORT            0x00000002L
+#define SFX_FILTER_TEMPLATE          0x00000004L
+#define SFX_FILTER_INTERNAL          0x00000008L
+#define SFX_FILTER_TEMPLATEPATH      0x00000010L
+#define SFX_FILTER_OWN               0x00000020L
+#define SFX_FILTER_ALIEN             0x00000040L
+#define SFX_FILTER_USESOPTIONS       0x00000080L
+
+#define SFX_FILTER_DEFAULT           0x00000100L
+#define SFX_FILTER_EXECUTABLE        0x00000200L
+#define SFX_FILTER_SUPPORTSSELECTION 0x00000400L
+#define SFX_FILTER_MAPTOAPPPLUG      0x00000800L
+#define SFX_FILTER_NOTINFILEDLG      0x00001000L
+#define SFX_FILTER_NOTINCHOOSER      0x00002000L
+#define SFX_FILTER_ASYNC             0x00004000L
+#define SFX_FILTER_CREATOR           0x00008000L
+#define SFX_FILTER_OPENREADONLY      0x00010000L
+#define SFX_FILTER_MUSTINSTALL       0x00020000L
+#define SFX_FILTER_CONSULTSERVICE    0x00040000L
+
+#define SFX_FILTER_STARONEFILTER     0x00080000L
+#define SFX_FILTER_PACKED            0x00100000L
+#define SFX_FILTER_SILENTEXPORT      0x00200000L
+
+#define SFX_FILTER_BROWSERPREFERED   0x00400000L
+
+#define SFX_FILTER_ENCRYPTION        0x01000000L
+#define SFX_FILTER_PASSWORDTOMODIFY  0x02000000L
+
+#define SFX_FILTER_PREFERED          0x10000000L
+
+#define SFX_FILTER_VERSION_NONE      0
+#define SFX_FILTER_NOTINSTALLED      SFX_FILTER_MUSTINSTALL | SFX_FILTER_CONSULTSERVICE
+
+
diff --git a/comphelper/inc/comphelper/mimeconfighelper.hxx b/comphelper/inc/comphelper/mimeconfighelper.hxx
index 5e02d4761cb1..16a0a159d5a4 100644
--- a/comphelper/inc/comphelper/mimeconfighelper.hxx
+++ b/comphelper/inc/comphelper/mimeconfighelper.hxx
@@ -32,6 +32,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -50,6 +51,8 @@ class COMPHELPER_DLLPUBLIC MimeConfigurationHelper
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xVerbsConfig;
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xMediaTypeConfig;
 
+    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xFilterFactory;
+
 public:
 
     MimeConfigurationHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory );
@@ -106,6 +109,10 @@ public:
     ::rtl::OUString GetFactoryNameByMediaType( const ::rtl::OUString& aMediaType );
 
     // typedetection related
+    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > GetFilterFactory();
+
+    sal_Int32 GetFilterFlags( const ::rtl::OUString& aFilterName );
+
     ::rtl::OUString UpdateMediaDescriptorWithFilterName(
                         ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr,
                         sal_Bool bIgnoreType );
@@ -117,6 +124,14 @@ public:
 
     ::rtl::OUString GetDefaultFilterFromServiceName( const ::rtl::OUString& aServName, sal_Int32 nVersion );
 
+    ::rtl::OUString GetExportFilterFromImportFilter( const ::rtl::OUString& aImportFilterName );
+
+    static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SearchForFilter(
+                        const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerQuery >& xFilterQuery,
+                        const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aSearchRequest,
+                        sal_Int32 nMustFlags,
+                        sal_Int32 nDontFlags );
+
     static sal_Bool ClassIDsEqual( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID1,
                         const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID2 );
     static ::com::sun::star::uno::Sequence< sal_Int8 > GetSequenceClassID( sal_uInt32 n1, sal_uInt16 n2, sal_uInt16 n3,
diff --git a/comphelper/source/misc/mimeconfighelper.cxx b/comphelper/source/misc/mimeconfighelper.cxx
index b677c977739e..5be9df3d61b6 100644
--- a/comphelper/source/misc/mimeconfighelper.cxx
+++ b/comphelper/source/misc/mimeconfighelper.cxx
@@ -35,6 +35,7 @@
 #include 
 #include 
 #include 
+#include 
 
 
 using namespace ::com::sun::star;
@@ -187,6 +188,46 @@ uno::Reference< container::XNameAccess > MimeConfigurationHelper::GetMediaTypeCo
 
     return m_xMediaTypeConfig;
 }
+
+//-----------------------------------------------------------------------
+uno::Reference< container::XNameAccess > MimeConfigurationHelper::GetFilterFactory()
+{
+    osl::MutexGuard aGuard( m_aMutex );
+
+    if ( !m_xFilterFactory.is() )
+        m_xFilterFactory.set(
+            m_xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.document.FilterFactory" ) ),
+            uno::UNO_QUERY );
+
+    return m_xFilterFactory;
+}
+
+//-----------------------------------------------------------------------
+sal_Int32 MimeConfigurationHelper::GetFilterFlags( const ::rtl::OUString& aFilterName )
+{
+    sal_Int32 nFlags = 0;
+    try
+    {
+        if ( aFilterName.getLength() )
+        {
+            uno::Reference< container::XNameAccess > xFilterFactory(
+                GetFilterFactory(),
+                uno::UNO_SET_THROW );
+
+            uno::Any aFilterAny = xFilterFactory->getByName( aFilterName );
+            uno::Sequence< beans::PropertyValue > aData;
+            if ( aFilterAny >>= aData )
+            {
+                SequenceAsHashMap aFilterHM( aData );
+                nFlags = aFilterHM.getUnpackedValueOrDefault( ::rtl::OUString::createFromAscii( "Flags" ), (sal_Int32)0 );
+            }
+        }
+    } catch( uno::Exception& )
+    {}
+
+    return nFlags;
+}
+
 //-------------------------------------------------------------------------
 ::rtl::OUString MimeConfigurationHelper::GetDocServiceNameFromFilter( const ::rtl::OUString& aFilterName )
 {
@@ -195,8 +236,8 @@ uno::Reference< container::XNameAccess > MimeConfigurationHelper::GetMediaTypeCo
     try
     {
         uno::Reference< container::XNameAccess > xFilterFactory(
-            m_xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.document.FilterFactory" ) ),
-            uno::UNO_QUERY_THROW );
+            GetFilterFactory(),
+            uno::UNO_SET_THROW );
 
         uno::Any aFilterAnyData = xFilterFactory->getByName( aFilterName );
         uno::Sequence< beans::PropertyValue > aFilterData;
@@ -668,36 +709,17 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByDocu
 sal_Bool MimeConfigurationHelper::AddFilterNameCheckOwnFile(
                         uno::Sequence< beans::PropertyValue >& aMediaDescr )
 {
+    sal_Bool bResult = sal_False;
+
     ::rtl::OUString aFilterName = UpdateMediaDescriptorWithFilterName( aMediaDescr, sal_False );
     if ( aFilterName.getLength() )
     {
-        try
-        {
-            uno::Reference< container::XNameAccess > xFilterFactory(
-                m_xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.document.FilterFactory" ) ),
-                uno::UNO_QUERY_THROW );
-
-            uno::Any aFilterAnyData = xFilterFactory->getByName( aFilterName );
-            uno::Sequence< beans::PropertyValue > aFilterData;
-            if ( aFilterAnyData >>= aFilterData )
-            {
-                for ( sal_Int32 nInd = 0; nInd < aFilterData.getLength(); nInd++ )
-                    if ( aFilterData[nInd].Name.equalsAscii( "Flags" ) )
-                    {
-                        uno::Any aVal = aFilterData[nInd].Value;
-                        sal_Int32 nFlags = 0;
-                        // check the OWN flag
-                        if ( ( aFilterData[nInd].Value >>= nFlags ) && ( nFlags & 0x20 ) )
-                            return sal_True;
-                        break;
-                    }
-            }
-        }
-        catch( uno::Exception& )
-        {}
+        sal_Int32 nFlags = GetFilterFlags( aFilterName );
+        // check the OWN flag
+        bResult = ( nFlags & SFX_FILTER_OWN );
     }
 
-    return sal_False;
+    return bResult;
 }
 
 //-----------------------------------------------------------
@@ -709,7 +731,7 @@ sal_Bool MimeConfigurationHelper::AddFilterNameCheckOwnFile(
         try
         {
             uno::Reference< container::XContainerQuery > xFilterQuery(
-                m_xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.document.FilterFactory" ) ),
+                GetFilterFactory(),
                 uno::UNO_QUERY_THROW );
 
             uno::Sequence< beans::NamedValue > aSearchRequest( 2 );
@@ -734,14 +756,15 @@ sal_Bool MimeConfigurationHelper::AddFilterNameCheckOwnFile(
                                                                                 (sal_Int32)0 );
 
                         // that should be import, export, own filter and not a template filter ( TemplatePath flag )
-                        if ( ( ( nFlags & 0x23L ) == 0x23L ) && !( nFlags & 0x10 ) )
+                        sal_Int32 nRequired = ( SFX_FILTER_OWN | SFX_FILTER_EXPORT | SFX_FILTER_IMPORT );
+                        if ( ( ( nFlags & nRequired ) == nRequired ) && !( nFlags & SFX_FILTER_TEMPLATEPATH ) )
                         {
                             // if there are more than one filter the preffered one should be used
                             // if there is no preffered filter the first one will be used
-                            if ( !aResult.getLength() || ( nFlags & 0x10000000L ) )
+                            if ( !aResult.getLength() || ( nFlags & SFX_FILTER_PREFERED ) )
                                 aResult = aPropsHM.getUnpackedValueOrDefault( ::rtl::OUString::createFromAscii( "Name" ),
                                                                                 ::rtl::OUString() );
-                            if ( nFlags & 0x10000000L )
+                            if ( nFlags & SFX_FILTER_PREFERED )
                                 break; // the preffered filter was found
                         }
                     }
@@ -752,6 +775,116 @@ sal_Bool MimeConfigurationHelper::AddFilterNameCheckOwnFile(
 
     return aResult;
 }
+
+//-------------------------------------------------------------------------
+::rtl::OUString MimeConfigurationHelper::GetExportFilterFromImportFilter( const ::rtl::OUString& aImportFilterName )
+{
+    ::rtl::OUString aExportFilterName;
+
+    try
+    {
+        if ( aImportFilterName.getLength() )
+        {
+            uno::Reference< container::XNameAccess > xFilterFactory(
+                GetFilterFactory(),
+                uno::UNO_SET_THROW );
+
+            uno::Any aImpFilterAny = xFilterFactory->getByName( aImportFilterName );
+            uno::Sequence< beans::PropertyValue > aImpData;
+            if ( aImpFilterAny >>= aImpData )
+            {
+                SequenceAsHashMap aImpFilterHM( aImpData );
+                sal_Int32 nFlags = aImpFilterHM.getUnpackedValueOrDefault( ::rtl::OUString::createFromAscii( "Flags" ),
+                                                                        (sal_Int32)0 );
+
+                if ( !( nFlags & SFX_FILTER_IMPORT ) )
+                {
+                    OSL_ENSURE( sal_False, "This is no import filter!" );
+                    throw uno::Exception();
+                }
+
+                if ( nFlags & SFX_FILTER_EXPORT )
+                {
+                    aExportFilterName = aImportFilterName;
+                }
+                else
+                {
+                    ::rtl::OUString aDocumentServiceName = aImpFilterHM.getUnpackedValueOrDefault( ::rtl::OUString::createFromAscii( "DocumentService" ), ::rtl::OUString() );
+                    ::rtl::OUString aTypeName = aImpFilterHM.getUnpackedValueOrDefault( ::rtl::OUString::createFromAscii( "Type" ), ::rtl::OUString() );
+
+                    OSL_ENSURE( aDocumentServiceName.getLength() && aTypeName.getLength(), "Incomplete filter data!" );
+                    if ( aDocumentServiceName.getLength() && aTypeName.getLength() )
+                    {
+                        uno::Sequence< beans::NamedValue > aSearchRequest( 2 );
+                        aSearchRequest[0].Name = ::rtl::OUString::createFromAscii( "Type" );
+                        aSearchRequest[0].Value <<= aTypeName;
+                        aSearchRequest[1].Name = ::rtl::OUString::createFromAscii( "DocumentService" );
+                        aSearchRequest[1].Value <<= aDocumentServiceName;
+
+                        uno::Sequence< beans::PropertyValue > aExportFilterProps = SearchForFilter(
+                            uno::Reference< container::XContainerQuery >( xFilterFactory, uno::UNO_QUERY_THROW ),
+                            aSearchRequest,
+                            SFX_FILTER_EXPORT,
+                            SFX_FILTER_INTERNAL );
+
+                        if ( aExportFilterProps.getLength() )
+                        {
+                            SequenceAsHashMap aExpPropsHM( aExportFilterProps );
+                            aExportFilterName = aExpPropsHM.getUnpackedValueOrDefault( ::rtl::OUString::createFromAscii( "Name" ), ::rtl::OUString() );
+                        }
+                    }
+                }
+            }
+        }
+    }
+    catch( uno::Exception& )
+    {}
+
+    return aExportFilterName;
+}
+
+//-------------------------------------------------------------------------
+// static
+uno::Sequence< beans::PropertyValue > MimeConfigurationHelper::SearchForFilter(
+                                                        const uno::Reference< container::XContainerQuery >& xFilterQuery,
+                                                        const uno::Sequence< beans::NamedValue >& aSearchRequest,
+                                                        sal_Int32 nMustFlags,
+                                                        sal_Int32 nDontFlags )
+{
+    uno::Sequence< beans::PropertyValue > aFilterProps;
+    uno::Reference< container::XEnumeration > xFilterEnum =
+                                            xFilterQuery->createSubSetEnumerationByProperties( aSearchRequest );
+
+    // the first default filter will be taken,
+    // if there is no filter with flag default the first acceptable filter will be taken
+    if ( xFilterEnum.is() )
+    {
+        while ( xFilterEnum->hasMoreElements() )
+        {
+            uno::Sequence< beans::PropertyValue > aProps;
+            if ( xFilterEnum->nextElement() >>= aProps )
+            {
+                SequenceAsHashMap aPropsHM( aProps );
+                sal_Int32 nFlags = aPropsHM.getUnpackedValueOrDefault( ::rtl::OUString::createFromAscii( "Flags" ),
+                                                                        (sal_Int32)0 );
+                if ( ( ( nFlags & nMustFlags ) == nMustFlags ) && !( nFlags & nDontFlags ) )
+                {
+                    if ( ( nFlags & SFX_FILTER_DEFAULT ) == SFX_FILTER_DEFAULT )
+                    {
+                        aFilterProps = aProps;
+                        break;
+                    }
+                    else if ( !aFilterProps.getLength() )
+                        aFilterProps = aProps;
+                }
+            }
+        }
+    }
+
+    return aFilterProps;
+}
+
+
 //-------------------------------------------------------------------------
 sal_Bool MimeConfigurationHelper::ClassIDsEqual( const uno::Sequence< sal_Int8 >& aClassID1, const uno::Sequence< sal_Int8 >& aClassID2 )
 {
@@ -764,7 +897,8 @@ sal_Bool MimeConfigurationHelper::ClassIDsEqual( const uno::Sequence< sal_Int8 >
 
     return sal_True;
 }
-//----------------------------------------------
+
+//-------------------------------------------------------------------------
 uno::Sequence< sal_Int8 > MimeConfigurationHelper::GetSequenceClassID( sal_uInt32 n1, sal_uInt16 n2, sal_uInt16 n3,
                                                 sal_uInt8 b8, sal_uInt8 b9, sal_uInt8 b10, sal_uInt8 b11,
                                                 sal_uInt8 b12, sal_uInt8 b13, sal_uInt8 b14, sal_uInt8 b15 )
@@ -789,6 +923,8 @@ uno::Sequence< sal_Int8 > MimeConfigurationHelper::GetSequenceClassID( sal_uInt3
 
     return aResult;
 }
+
+//-------------------------------------------------------------------------
 uno::Sequence MimeConfigurationHelper::GetSequenceClassIDFromObjectName(const ::rtl::OUString& _sObjectName)
 {
     uno::Sequence aClassId;
-- 
cgit 


From 2e512af879c769bd29ddaf00dbd3eae60d3d4813 Mon Sep 17 00:00:00 2001
From: sj 
Date: Thu, 2 Dec 2010 14:31:22 +0100
Subject: impress205: #i115825# fixed metatextarray issues

---
 vcl/source/gdi/metaact.cxx | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 9a7fb6527e26..f398888a33b6 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -1481,6 +1481,12 @@ void MetaTextArrayAction::Read( SvStream& rIStm, ImplMetaReadData* pData )
         sal_Unicode* pBuffer = maStr.AllocBuffer( nLen );
         while ( nLen-- )
             rIStm >> *pBuffer++;
+
+        if ( mnIndex + mnLen > maStr.Len() )
+        {
+            mnIndex = 0;
+            delete[] mpDXAry, mpDXAry = NULL;
+        }
     }
 }
 
-- 
cgit 


From e56690c2a55888c5f315ca5328b6af4851bf2c85 Mon Sep 17 00:00:00 2001
From: Bjoern Michaelsen 
Date: Fri, 3 Dec 2010 13:11:37 +0100
Subject: gnumake2: adding undo resources in svt

---
 svtools/AllLangResTarget_svt.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/svtools/AllLangResTarget_svt.mk b/svtools/AllLangResTarget_svt.mk
index 3574b2e6c9ec..511cdb4ed13e 100644
--- a/svtools/AllLangResTarget_svt.mk
+++ b/svtools/AllLangResTarget_svt.mk
@@ -66,9 +66,9 @@ $(eval $(call gb_SrsTarget_add_files,svt/res,\
     svtools/source/misc/helpagent.src \
     svtools/source/misc/imagemgr.src \
     svtools/source/misc/langtab.src \
+    svtools/source/misc/undo.src \
     svtools/source/plugapp/testtool.src \
 ))
 
-    #svtools/source/misc/undo.src \
 
 # vim: set noet sw=4 ts=4:
-- 
cgit 


From 9134cbd5d73ff5267e7f97ddae5b57beb02ca0df Mon Sep 17 00:00:00 2001
From: Release Engineering 
Date: Wed, 8 Dec 2010 14:52:11 +0100
Subject: ause128: remove target file before copy over it

---
 l10ntools/scripts/tool/l10ntool.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/l10ntools/scripts/tool/l10ntool.py b/l10ntools/scripts/tool/l10ntool.py
index f1630027ccdc..b65c262b6020 100644
--- a/l10ntools/scripts/tool/l10ntool.py
+++ b/l10ntools/scripts/tool/l10ntool.py
@@ -116,6 +116,11 @@ class AbstractL10nTool:
         return self._options.inputfile[0] == '@'
 
     def copy_file(self, inputfilename, outputfilename):
+        try: 
+            os.remove(outputfilename)
+        except:
+            pass    
+
         try:
             shutil.copy(inputfilename, outputfilename)
         except IOError:
-- 
cgit 


From 550dd2b5017ddc6c37a27bc8f32cc1671507ee8b Mon Sep 17 00:00:00 2001
From: Bjoern Michaelsen 
Date: Thu, 9 Dec 2010 16:05:29 +0100
Subject: gnumake2: #i105735# removed obsolete defines

---
 tools/Library_tl.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index 35ed1b4af783..dde1f8f5dd92 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -46,7 +46,6 @@ $(eval $(call gb_Library_set_include,tl,\
 
 $(eval $(call gb_Library_set_defs,tl,\
     $$(DEFS) \
-    -DSHARED_LIB \
     -DTOOLS_DLLIMPLEMENTATION \
     -DVCL \
 ))
-- 
cgit 


From 2f598fc2b16ae6377da9720209ae6829c231d6a6 Mon Sep 17 00:00:00 2001
From: Bjoern Michaelsen 
Date: Fri, 10 Dec 2010 12:47:08 +0100
Subject: gnumake2: fixing ::rtl::Reference/::com::sun::star::uno::Reference
 collision, which broke PCH

---
 svtools/source/filter.vcl/filter/FilterConfigCache.cxx | 2 +-
 svtools/source/filter.vcl/filter/FilterConfigItem.cxx  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/svtools/source/filter.vcl/filter/FilterConfigCache.cxx b/svtools/source/filter.vcl/filter/FilterConfigCache.cxx
index 4c8023bed883..48408609cf98 100644
--- a/svtools/source/filter.vcl/filter/FilterConfigCache.cxx
+++ b/svtools/source/filter.vcl/filter/FilterConfigCache.cxx
@@ -46,7 +46,7 @@ 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 ::rtl::OUString;
 
 const char* FilterConfigCache::FilterConfigCacheEntry::InternalPixelFilterNameList[] =
 {
diff --git a/svtools/source/filter.vcl/filter/FilterConfigItem.cxx b/svtools/source/filter.vcl/filter/FilterConfigItem.cxx
index 765711ad8d4a..312f62af9d84 100644
--- a/svtools/source/filter.vcl/filter/FilterConfigItem.cxx
+++ b/svtools/source/filter.vcl/filter/FilterConfigItem.cxx
@@ -38,7 +38,7 @@
 #include 
 #include 
 
-using namespace ::rtl;
+using ::rtl::OUString;
 using namespace ::utl                       ;   // getProcessServiceFactory
 using namespace ::com::sun::star::lang      ;   // XMultiServiceFactory
 using namespace ::com::sun::star::beans     ;   // PropertyValue
-- 
cgit