diff options
-rw-r--r-- | dbaccess/source/ui/querydesign/querycontroller.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/tabledesign/TEditControl.hxx | 2 | ||||
-rw-r--r-- | extensions/source/ole/unoobjw.cxx | 2 | ||||
-rw-r--r-- | include/sot/exchange.hxx | 1 | ||||
-rw-r--r-- | sax/test/sax/testsax.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/outlview.cxx | 6 | ||||
-rw-r--r-- | sfx2/source/view/viewprn.cxx | 1 | ||||
-rw-r--r-- | svtools/source/control/fmtfield.cxx | 1 | ||||
-rw-r--r-- | svx/source/fmcomp/gridctrl.cxx | 2 | ||||
-rw-r--r-- | svx/source/svdraw/svdibrow.cxx | 12 | ||||
-rw-r--r-- | svx/source/svdraw/svdopath.cxx | 6 | ||||
-rw-r--r-- | sw/source/filter/html/parcss1.hxx | 1 | ||||
-rw-r--r-- | tubes/source/manager.cxx | 8 | ||||
-rw-r--r-- | vcl/source/gdi/pdfwriter_impl.cxx | 6 | ||||
-rw-r--r-- | vcl/win/source/gdi/salprn.cxx | 24 |
15 files changed, 38 insertions, 38 deletions
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index f7eea99bc77f..bce93978e7c6 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -865,7 +865,6 @@ void OQueryController::impl_initialize() OUString sCommand; m_nCommandType = CommandType::QUERY; - // ......................................................................... // . reading parameters: // legacy parameters first (later overwritten by regular parameters) @@ -966,7 +965,6 @@ void OQueryController::impl_initialize() bForceInitialDesign = true; } - // ......................................................................... if ( !ensureConnected( sal_False ) ) { // we have no connection so what else should we do m_bGraphicalDesign = sal_False; diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx index 54d95d9e201a..2679fdffc6d7 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.hxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx @@ -80,6 +80,7 @@ namespace dbaui protected: DECL_LINK(OnInvalidate, void*); }; + friend class OTableEditorCtrl::ClipboardInvalidator; ClipboardInvalidator m_aInvalidate; @@ -169,6 +170,7 @@ namespace dbaui virtual void cut(); virtual void copy(); virtual void paste(); + private: DECL_LINK( StartIndexing, void* ); DECL_LINK( DelayedCut, void* ); diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx index aa01d11f14e6..0bed03e4d59b 100644 --- a/extensions/source/ole/unoobjw.cxx +++ b/extensions/source/ole/unoobjw.cxx @@ -21,6 +21,7 @@ #if _WIN32_WINNT != 0x403 #error wrong _WIN32_WINNT #endif + #include <stdio.h> #include <vector> #include <list> @@ -106,7 +107,6 @@ InterfaceOleWrapper_Impl::~InterfaceOleWrapper_Impl() fprintf(stderr,"[automation bridge] UnoObjToWrapperMap contains: %i \n", UnoObjToWrapperMap.size()); #endif - } STDMETHODIMP InterfaceOleWrapper_Impl::QueryInterface(REFIID riid, LPVOID FAR * ppv) diff --git a/include/sot/exchange.hxx b/include/sot/exchange.hxx index c73515762ff2..bdc2899077b5 100644 --- a/include/sot/exchange.hxx +++ b/include/sot/exchange.hxx @@ -143,6 +143,7 @@ SOT_DLLPUBLIC bool IsFormatSupported( const DataFlavorExVector& rDataFlavorExVec #define EXCHG_DEST_SWDOC_FREE_AREA_WEB 17 class SvGlobalName; + class SOT_DLLPUBLIC SotExchange { public: diff --git a/sax/test/sax/testsax.cxx b/sax/test/sax/testsax.cxx index 1100119e7bb6..815e7fccee02 100644 --- a/sax/test/sax/testsax.cxx +++ b/sax/test/sax/testsax.cxx @@ -135,7 +135,6 @@ sal_Int32 OSaxParserTest::test( testInvariant( TestName , TestObject ); } else { - Reference < XParser > parser( TestObject , UNO_QUERY ); if( 1 == hTestHandle ) { @@ -291,7 +290,6 @@ public: const Reference< XAttributeList > & xAttribs) throw (SAXException,RuntimeException) { - if( m_rLocator.is() ) { if( m_bPrint ) { diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index 66d424913eeb..cd78739dfaac 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -87,6 +87,8 @@ struct SdParaAndPos sal_uInt16 nPos; }; +// - OutlineView - + TYPEINIT1( OutlineView, ::sd::View ); OutlineView::OutlineView( DrawDocShell& rDocSh, ::Window* pWindow, OutlineViewShell& rOutlineViewSh) @@ -1844,7 +1846,7 @@ void OutlineView::OnEndPasteOrDrop( PasteOrDropInfos* pInfos ) } } -// ==================================================================== +// - OutlineViewModelChangeGuard - OutlineViewModelChangeGuard::OutlineViewModelChangeGuard( OutlineView& rView ) : mrView( rView ) @@ -1857,6 +1859,8 @@ OutlineViewModelChangeGuard::~OutlineViewModelChangeGuard() mrView.EndModelChange(); } +// - OutlineViewPageChangesGuard - + OutlineViewPageChangesGuard::OutlineViewPageChangesGuard( OutlineView* pView ) : mpView( pView ) { diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index 686af9752d7d..c6a4afad7b39 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -73,6 +73,7 @@ class SfxPrinterController : public vcl::PrinterController, public SfxListener Sequence< beans::PropertyValue > getMergedOptions() const; const Any& getSelectionObject() const; + public: SfxPrinterController( const boost::shared_ptr<Printer>& i_rPrinter, const Any& i_rComplete, diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx index e3d04dec9949..a7368e1601ed 100644 --- a/svtools/source/control/fmtfield.cxx +++ b/svtools/source/control/fmtfield.cxx @@ -983,7 +983,6 @@ sal_Bool FormattedField::ImplGetValue(double& dNewVal) if (!ImplGetFormatter()->IsNumberFormat(sText, nFormatKey, dNewVal)) return sal_False; - if (m_bHasMin && (dNewVal<m_dMinValue)) dNewVal = m_dMinValue; if (m_bHasMax && (dNewVal>m_dMaxValue)) diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 90c5905e9e0c..4806a912eba7 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -203,7 +203,6 @@ public: virtual void disposing(const EventObject& _rEvent, sal_Int16 _nId) throw( RuntimeException ) { m_rParent.disposing(_nId, _rEvent); } }; - DBG_NAME(DisposeListenerGridBridge) DisposeListenerGridBridge::DisposeListenerGridBridge(DbGridControl& _rParent, const Reference< XComponent >& _rxObject, sal_Int16 _rId) :FmXDisposeListener(m_aMutex) @@ -2309,7 +2308,6 @@ sal_Bool DbGridControl::SeekCursor(long nRow, sal_Bool bAbsolute) m_nSeekPos = nRow; else { - sal_Bool bSuccess=sal_False; long nSteps = 0; try diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index d116719111a1..2fa8e6070116 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -55,8 +55,6 @@ #include <svx/xlnstwit.hxx> #include <svx/xtextit0.hxx> -//////////////////////////////////////////////////////////////////////////////////////////////////// - #define ITEMBROWSER_WHICHCOL_ID 1 #define ITEMBROWSER_STATECOL_ID 2 #define ITEMBROWSER_TYPECOL_ID 3 @@ -72,6 +70,8 @@ enum ItemType { ITEM_FONT, ITEM_FONTHEIGHT, ITEM_FONTWIDTH, ITEM_FIELD }; +// - ImpItemListRow - + class ImpItemListRow { public: @@ -156,7 +156,7 @@ bool ImpItemListRow::operator==(const ImpItemListRow& rEntry) const && nMax==rEntry.nMax); } -//////////////////////////////////////////////////////////////////////////////////////////////////// +// - ImpItemEdit - class ImpItemEdit: public Edit { @@ -202,7 +202,7 @@ void ImpItemEdit::KeyInput(const KeyEvent& rKEvt) Edit::KeyInput(rKEvt); } -//////////////////////////////////////////////////////////////////////////////////////////////////// +// - _SdrItemBrowserControl - #define MYBROWSEMODE (BROWSER_THUMBDRAGGING|BROWSER_KEEPHIGHLIGHT|BROWSER_NO_HSCROLL|BROWSER_HIDECURSOR) @@ -1040,7 +1040,7 @@ void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItem SetMode(MYBROWSEMODE); } -//////////////////////////////////////////////////////////////////////////////////////////////////// +// - _SdrItemBrowserWindow - _SdrItemBrowserWindow::_SdrItemBrowserWindow(Window* pParent, WinBits nBits): FloatingWindow(pParent,nBits), @@ -1065,7 +1065,7 @@ void _SdrItemBrowserWindow::GetFocus() aBrowse.GrabFocus(); } -//////////////////////////////////////////////////////////////////////////////////////////////////// +// - SdrItemBrowser - SdrItemBrowser::SdrItemBrowser(SdrView& rView): _SdrItemBrowserWindow(ImpGetViewWin(rView)), diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index 6406435542ce..206c2a0584d3 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -2134,7 +2134,7 @@ SdrHdl* SdrPathObj::GetPlusHdl(const SdrHdl& rHdl, sal_uInt32 nPlusNum) const return pHdl; } -//////////////////////////////////////////////////////////////////////////////////////////////////// +// dragging bool SdrPathObj::hasSpecialDrag() const { @@ -2213,7 +2213,7 @@ basegfx::B2DPolyPolygon SdrPathObj::getSpecialDragPoly(const SdrDragStat& rDrag) return aRetval; } -//////////////////////////////////////////////////////////////////////////////////////////////////// +// creation bool SdrPathObj::BegCreate(SdrDragStat& rStat) { @@ -2284,6 +2284,8 @@ void SdrPathObj::BrkCreate(SdrDragStat& rStat) impDeleteDAC(); } +// polygons + basegfx::B2DPolyPolygon SdrPathObj::TakeCreatePoly(const SdrDragStat& rDrag) const { basegfx::B2DPolyPolygon aRetval; diff --git a/sw/source/filter/html/parcss1.hxx b/sw/source/filter/html/parcss1.hxx index ad047d2e45df..8497051773e7 100644 --- a/sw/source/filter/html/parcss1.hxx +++ b/sw/source/filter/html/parcss1.hxx @@ -145,7 +145,6 @@ public: inline sal_Int32 GetSLength() const; sal_Unicode GetOp() const { return cOp; } - sal_Bool GetURL( OUString& rURL ) const; sal_Bool GetColor( Color &rRGB ) const; diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx index ce6805476dc9..f5787b420b01 100644 --- a/tubes/source/manager.cxx +++ b/tubes/source/manager.cxx @@ -140,6 +140,8 @@ static void TeleManager_DBusChannelHandler( } } +// - TeleManager - + void TeleManager::addConference( TeleConference* pConference ) { MutexGuard aGuard( GetMutex()); @@ -358,6 +360,8 @@ static void TeleManager_FileTransferHandler( } } +// - TeleManagerImpl - + void TeleManagerImpl::ChannelReadyHandler( GObject* pSourceObject, GAsyncResult* pResult, @@ -411,6 +415,8 @@ void TeleManagerImpl::AccountManagerReadyHandler( mbAccountManagerReadyHandlerInvoked = true; } +// - TeleManager - + bool TeleManager::init( bool bListen ) { if (createAccountManager()) @@ -854,7 +860,7 @@ void TeleManager::addSuffixToNames( const char* pName ) pImpl->msNameSuffix = pName; } -// =========================================================================== +// - TeleManagerImpl - TeleManagerImpl::TeleManagerImpl() : diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 11211621c00e..bd282b9988f1 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -2254,7 +2254,7 @@ ImplFontEntry* ImplPdfBuiltinFontData::CreateFontInstance( FontSelectPattern& rF return pEntry; } -// ----------------------------------------------------------------------- +// - PDFWriterImpl - sal_Int32 PDFWriterImpl::newPage( sal_Int32 nPageWidth, sal_Int32 nPageHeight, PDFWriter::Orientation eOrientation ) { @@ -5136,7 +5136,6 @@ void PDFWriterImpl::createDefaultRadioButtonAppearance( PDFWidget& rBox, const P bool PDFWriterImpl::emitAppearances( PDFWidget& rWidget, OStringBuffer& rAnnotDict ) { - // TODO: check and insert default streams OString aStandardAppearance; switch( rWidget.m_eType ) @@ -5838,6 +5837,7 @@ bool PDFWriterImpl::emitCatalog() else aLine.append( "/NeedAppearances true>>\n" ); } + //--->i59651 //check if there is a Metadata object if( nOutputIntentObject ) @@ -5846,6 +5846,7 @@ bool PDFWriterImpl::emitCatalog() aLine.append( nOutputIntentObject ); aLine.append( " 0 R]" ); } + if( nMetadataObject ) { aLine.append("/Metadata "); @@ -6408,7 +6409,6 @@ static void escapeStringXML( const OUString& rStr, OUString &rValue) } // emits the document metadata -// sal_Int32 PDFWriterImpl::emitDocumentMetadata() { if( !m_bIsPDF_A1 ) diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx index d154dbe2fc26..fb9d299dbdd1 100644 --- a/vcl/win/source/gdi/salprn.cxx +++ b/vcl/win/source/gdi/salprn.cxx @@ -90,8 +90,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::ui::dialogs; -// ======================================================================= - static char aImplWindows[] = "windows"; static char aImplDevice[] = "device"; @@ -104,8 +102,6 @@ static LPDEVMODEW SAL_DEVMODE_W( const ImplJobSetup* pSetupData ) return pRet; } -// ======================================================================= - static sal_uLong ImplWinQueueStatusToSal( DWORD nWinStatus ) { sal_uLong nStatus = 0; @@ -162,6 +158,8 @@ static sal_uLong ImplWinQueueStatusToSal( DWORD nWinStatus ) return nStatus; } +// - WinSalInstance - + void WinSalInstance::GetPrinterQueueInfo( ImplPrnQueueList* pList ) { DWORD i; @@ -360,8 +358,6 @@ static sal_Bool ImplTestSalJobSetup( WinSalInfoPrinter* pPrinter, return FALSE; } -// ----------------------------------------------------------------------- - static sal_Bool ImplUpdateSalJobSetup( WinSalInfoPrinter* pPrinter, ImplJobSetup* pSetupData, sal_Bool bIn, WinSalFrame* pVisibleDlgParent ) { @@ -455,8 +451,6 @@ static sal_Bool ImplUpdateSalJobSetup( WinSalInfoPrinter* pPrinter, ImplJobSetup return TRUE; } -// ----------------------------------------------------------------------- - #define DECLARE_DEVMODE( i )\ DEVMODEW* pDevModeW = SAL_DEVMODE_W(i);\ if( pDevModeW == NULL )\ @@ -1084,7 +1078,7 @@ static sal_Bool ImplUpdateSalPrnIC( WinSalInfoPrinter* pPrinter, ImplJobSetup* p return TRUE; } -// ======================================================================= +// - WinSalInstance - SalInfoPrinter* WinSalInstance::CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo, ImplJobSetup* pSetupData ) @@ -1123,6 +1117,8 @@ void WinSalInstance::DestroyInfoPrinter( SalInfoPrinter* pPrinter ) delete pPrinter; } +// - WinSalInfoPrinter - + WinSalInfoPrinter::WinSalInfoPrinter() : mpGraphics( NULL ), mhDC( 0 ), @@ -1312,7 +1308,7 @@ void WinSalInfoPrinter::GetPageInfo( const ImplJobSetup*, rPageHeight = GetDeviceCaps( hDC, PHYSICALHEIGHT ); } -// ======================================================================= +// - WinSalInstance - SalPrinter* WinSalInstance::CreatePrinter( SalInfoPrinter* pInfoPrinter ) { @@ -1326,8 +1322,6 @@ void WinSalInstance::DestroyPrinter( SalPrinter* pPrinter ) delete pPrinter; } -// ======================================================================= - BOOL CALLBACK SalPrintAbortProc( HDC hPrnDC, int /* nError */ ) { SalData* pSalData = GetSalData(); @@ -1391,6 +1385,8 @@ static LPDEVMODEW ImplSalSetCopies( LPDEVMODEW pDevMode, sal_uLong nCopies, sal_ return pNewDevMode; } +// - WinSalPrinter - + WinSalPrinter::WinSalPrinter() : mpGraphics( NULL ), mpInfoPrinter( NULL ), @@ -1440,15 +1436,11 @@ WinSalPrinter::~WinSalPrinter() mbValid = false; } -// ----------------------------------------------------------------------- - void WinSalPrinter::markInvalid() { mbValid = false; } -// ----------------------------------------------------------------------- - // need wrappers for StarTocW/A to use structured exception handling // since SEH does not mix with standard exception handling's cleanup static int lcl_StartDocW( HDC hDC, DOCINFOW* pInfo, WinSalPrinter* pPrt ) |