[Libreoffice-commits] .: 30 commits - accessibility/source automation/source basctl/source comphelper/source cppcanvas/source cui/source dbaccess/source editeng/inc editeng/source forms/source linguistic/source sc/source sfx2/inc sfx2/Library_sfx.mk sfx2/source slideshow/source svl/inc svl/source svx/inc svx/source sw/inc sw/source tools/inc tools/source unusedcode.easy vcl/inc vcl/source vcl/unx
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Sep 12 01:10:38 PDT 2011
accessibility/source/extended/AccessibleGridControl.cxx | 4
accessibility/source/extended/AccessibleGridControlBase.cxx | 2
accessibility/source/extended/AccessibleGridControlHeader.cxx | 2
accessibility/source/extended/AccessibleGridControlTable.cxx | 2
accessibility/source/extended/AccessibleGridControlTableBase.cxx | 2
automation/source/mozillaserver/makefile.mk | 121 --
automation/source/mozillaserver/mozillatesttoolserver.idl | 52 -
automation/source/mozillaserver/xmozillatesttoolserver.idl | 157 ---
basctl/source/dlged/dlgedobj.cxx | 12
basctl/source/inc/basobj.hxx | 1
basctl/source/inc/dlgedobj.hxx | 2
comphelper/source/misc/componentmodule.cxx | 9
cppcanvas/source/mtfrenderer/emfplus.cxx | 1
cui/source/dialogs/scriptdlg.cxx | 7
cui/source/inc/scriptdlg.hxx | 1
cui/source/tabpages/autocdlg.cxx | 18
dbaccess/source/core/api/RowSetBase.cxx | 6
dbaccess/source/core/api/RowSetBase.hxx | 1
editeng/inc/editeng/AccessibleEditableTextPara.hxx | 17
editeng/inc/editeng/AccessibleImageBullet.hxx | 9
editeng/inc/editeng/AccessibleParaManager.hxx | 2
editeng/inc/editeng/AccessibleStaticTextBase.hxx | 3
editeng/source/accessibility/AccessibleEditableTextPara.cxx | 41
editeng/source/accessibility/AccessibleImageBullet.cxx | 7
editeng/source/accessibility/AccessibleParaManager.cxx | 6
editeng/source/accessibility/AccessibleStaticTextBase.cxx | 37
editeng/source/editeng/editdbg.cxx | 22
editeng/source/editeng/editdbg.hxx | 1
editeng/source/editeng/editeng.cxx | 10
editeng/source/editeng/editobj2.hxx | 13
editeng/source/editeng/impedit4.cxx | 2
forms/source/component/DatabaseForm.cxx | 4
linguistic/source/dlistimp.cxx | 10
sc/source/filter/excel/xltools.cxx | 7
sc/source/filter/inc/xltools.hxx | 2
sfx2/Library_sfx.mk | 1
sfx2/inc/macro.hxx | 178 ---
sfx2/inc/sfx2/request.hxx | 3
sfx2/inc/sfx2/viewfrm.hxx | 1
sfx2/source/control/macro.cxx | 520 ----------
sfx2/source/control/request.cxx | 21
sfx2/source/view/viewfrm.cxx | 1
slideshow/source/engine/shapes/shapeimporter.cxx | 4
svl/inc/svl/svldata.hxx | 3
svl/source/misc/adrparse.cxx | 8
svl/source/misc/inettype.cxx | 11
svl/source/misc/svldata.cxx | 45
svx/inc/svx/AccessibleShapeTreeInfo.hxx | 13
svx/inc/svx/DescriptionGenerator.hxx | 10
svx/inc/svx/ShapeTypeHandler.hxx | 10
svx/inc/tbunosearchcontrollers.hxx | 4
svx/source/accessibility/AccessibleShapeTreeInfo.cxx | 24
svx/source/accessibility/AccessibleTextEventQueue.cxx | 10
svx/source/accessibility/AccessibleTextEventQueue.hxx | 5
svx/source/accessibility/ChildrenManagerImpl.cxx | 39
svx/source/accessibility/ChildrenManagerImpl.hxx | 29
svx/source/accessibility/DGColorNameLookUp.cxx | 31
svx/source/accessibility/DescriptionGenerator.cxx | 31
svx/source/accessibility/ShapeTypeHandler.cxx | 8
svx/source/inc/DGColorNameLookUp.hxx | 25
svx/source/tbxctrls/tbunosearchcontrollers.cxx | 33
sw/inc/doc.hxx | 10
sw/source/core/doc/docfmt.cxx | 2
sw/source/core/doc/docnew.cxx | 108 +-
tools/inc/tools/solarmutex.hxx | 1
tools/source/misc/solarmutex.cxx | 5
unusedcode.easy | 55 -
vcl/inc/vcl/dialog.hxx | 1
vcl/source/window/dialog.cxx | 7
vcl/unx/generic/printergfx/psputil.cxx | 22
vcl/unx/generic/printergfx/psputil.hxx | 2
vcl/unx/generic/printergfx/text_gfx.cxx | 4
72 files changed, 194 insertions(+), 1684 deletions(-)
New commits:
commit 3df2068878b62a0eccc07ec356be44e0b499ad19
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Sep 12 00:26:02 2011 +0100
ditch distracting CHARSET_ANSI comment
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index c09e9f6..52c85ad 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -970,10 +970,6 @@ void ODatabaseForm::Encode( ::rtl::OUString& rString ) const
{
::rtl::OUString aResult;
- // Immer ANSI #58641
-// rString.Convert(CHARSET_SYSTEM, CHARSET_ANSI);
-
-
// Zeilenendezeichen werden als CR dargestellt
UniString sConverter = rString;
sConverter.ConvertLineEnd( LINEEND_CR );
commit 84bbf6d107c19ccea85ca02861783824b9f5d6d2
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Sep 12 00:00:24 2011 +0100
ByteString->rtl::OString
diff --git a/editeng/source/editeng/editdbg.cxx b/editeng/source/editeng/editdbg.cxx
index 14c45f5..80193d0 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -311,8 +311,8 @@ void DbgOutItemSet( FILE* fp, const SfxItemSet& rSet, sal_Bool bSearchInParent,
continue;
const SfxPoolItem& rItem = rSet.Get( nWhich, bSearchInParent );
- ByteString aDebStr = DbgOutItem( *rSet.GetPool(), rItem );
- fprintf( fp, "%s", aDebStr.GetBuffer() );
+ rtl::OString aDebStr = DbgOutItem( *rSet.GetPool(), rItem );
+ fprintf( fp, "%s", aDebStr.getStr() );
}
}
@@ -338,11 +338,11 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, sal_Bool bInfoBox )
{
ParaPortion* pPPortion = pEE->pImpEditEngine->GetParaPortions().GetObject(nPortion );
- fprintf( fp, "\nParagraph %i: Length = %i, Invalid = %i\nText = '%s'", nPortion, pPPortion->GetNode()->Len(), pPPortion->IsInvalid(), ByteString( *pPPortion->GetNode(), RTL_TEXTENCODING_ASCII_US ).GetBuffer() );
+ fprintf( fp, "\nParagraph %i: Length = %i, Invalid = %i\nText = '%s'", nPortion, pPPortion->GetNode()->Len(), pPPortion->IsInvalid(), rtl::OUStringToOString( *pPPortion->GetNode(), RTL_TEXTENCODING_ASCII_US ).getStr() );
fprintf( fp, "\nVorlage:" );
SfxStyleSheet* pStyle = pPPortion->GetNode()->GetStyleSheet();
if ( pStyle )
- fprintf( fp, " %s", ByteString( pStyle->GetName(), RTL_TEXTENCODING_ASCII_US ).GetBuffer() );
+ fprintf( fp, " %s", rtl::OUStringToOString( pStyle->GetName(), RTL_TEXTENCODING_ASCII_US ).getStr() );
fprintf( fp, "\nParagraph attribute:" );
DbgOutItemSet( fp, pPPortion->GetNode()->GetContentAttribs().GetItems(), sal_False, sal_False );
@@ -365,8 +365,8 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, sal_Bool bInfoBox )
bZeroAttr = sal_True;
fprintf(fp, "%s => ", aCharAttribs.getStr());
- ByteString aDebStr = DbgOutItem( rPool, *pAttr->GetItem() );
- fprintf( fp, "%s", aDebStr.GetBuffer() );
+ rtl::OString aDebStr = DbgOutItem( rPool, *pAttr->GetItem() );
+ fprintf( fp, "%s", aDebStr.getStr() );
}
if ( bZeroAttr )
fprintf( fp, "\nNULL-Attribute!" );
@@ -413,8 +413,8 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, sal_Bool bInfoBox )
{
EditLine* pLine = pPPortion->GetLines().GetObject( nLine );
- ByteString aLine( pPPortion->GetNode()->Copy(pLine->GetStart(), pLine->GetEnd() - pLine->GetStart()), RTL_TEXTENCODING_ASCII_US );
- fprintf( fp, "\nLine %i\t>%s<", nLine, aLine.GetBuffer() );
+ rtl::OString aLine(rtl::OUStringToOString(pPPortion->GetNode()->Copy(pLine->GetStart(), pLine->GetEnd() - pLine->GetStart()), RTL_TEXTENCODING_ASCII_US));
+ fprintf( fp, "\nLine %i\t>%s<", nLine, aLine.getStr() );
}
// then the internal data ...
for ( nLine = 0; nLine < pPPortion->GetLines().Count(); nLine++ )
@@ -438,9 +438,9 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, sal_Bool bInfoBox )
SfxStyleSheetBase* pStyle = aIter.First();
while ( pStyle )
{
- fprintf( fp, "\nTemplate: %s", ByteString( pStyle->GetName(), RTL_TEXTENCODING_ASCII_US ).GetBuffer() );
- fprintf( fp, "\nParent: %s", ByteString( pStyle->GetParent(), RTL_TEXTENCODING_ASCII_US ).GetBuffer() );
- fprintf( fp, "\nFollow: %s", ByteString( pStyle->GetFollow(), RTL_TEXTENCODING_ASCII_US ).GetBuffer() );
+ fprintf( fp, "\nTemplate: %s", rtl::OUStringToOString( pStyle->GetName(), RTL_TEXTENCODING_ASCII_US ).getStr() );
+ fprintf( fp, "\nParent: %s", rtl::OUStringToOString( pStyle->GetParent(), RTL_TEXTENCODING_ASCII_US ).getStr() );
+ fprintf( fp, "\nFollow: %s", rtl::OUStringToOString( pStyle->GetFollow(), RTL_TEXTENCODING_ASCII_US ).getStr() );
DbgOutItemSet( fp, pStyle->GetItemSet(), sal_False, sal_False );
fprintf( fp, "\n----------------------------------" );
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 64547e6..97cfc74 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -82,6 +82,7 @@
#include <editeng/unolingu.hxx>
#include <linguistic/lngprops.hxx>
#include <i18npool/mslangid.hxx>
+#include <rtl/strbuf.hxx>
#include <vcl/help.hxx>
#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
#include <com/sun/star/i18n/InputSequenceCheckMode.hpp>
@@ -890,9 +891,10 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie
if ( rKeyEvent.GetKeyCode().IsMod1() && rKeyEvent.GetKeyCode().IsMod2() )
{
bDebugPaint = !bDebugPaint;
- ByteString aInfo( "DebugPaint: " );
- aInfo += bDebugPaint ? "On" : "Off";
- InfoBox( NULL, String( aInfo, RTL_TEXTENCODING_ASCII_US ) ).Execute();
+ rtl::OStringBuffer aInfo(RTL_CONSTASCII_STRINGPARAM(
+ "DebugPaint: "));
+ aInfo.append(bDebugPaint ? "On" : "Off");
+ InfoBox(NULL, rtl::OStringToOUString(aInfo.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US)).Execute();
}
bDone = sal_False;
}
@@ -2603,7 +2605,7 @@ sal_uInt32 EditEngine::RegisterClipboardFormatName()
{
static sal_uInt32 nFormat = 0;
if ( !nFormat )
- nFormat = SotExchange::RegisterFormatName( String( RTL_CONSTASCII_USTRINGPARAM( "EditEngineFormat" ) ) );
+ nFormat = SotExchange::RegisterFormatName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EditEngineFormat")) );
return nFormat;
}
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index d3f78ef..80dcedc 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -521,7 +521,7 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel )
rOutput.WriteNumber( nNumber );
// Name of the template ...
- rOutput << " " << ByteString( pStyle->GetName(), eDestEnc ).GetBuffer();
+ rOutput << " " << rtl::OUStringToOString(pStyle->GetName(), eDestEnc).getStr();
rOutput << ";}";
}
rOutput << '}';
commit d8cb328ef20387939594f15f8b270a99d509b7a3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Sep 11 23:50:44 2011 +0100
don't comment it's removed, remove it
diff --git a/editeng/source/editeng/editobj2.hxx b/editeng/source/editeng/editobj2.hxx
index 4b07d10..893c2ac 100644
--- a/editeng/source/editeng/editobj2.hxx
+++ b/editeng/source/editeng/editobj2.hxx
@@ -135,19 +135,6 @@ public:
sal_uInt16 GetStretchY() const { return nStretchY; }
};
-/* cl removed because not needed anymore since binfilter
-struct LoadStoreTempInfos
-{
- ByteString aOrgString_Load;
-
- FontToSubsFontConverter hOldSymbolConv_Store;
- sal_Bool bSymbolParagraph_Store;
-
-
- LoadStoreTempInfos() { bSymbolParagraph_Store = sal_False; hOldSymbolConv_Store = NULL; }
-};
-*/
-
class ContentInfo
{
friend class BinTextObject;
commit be6d3ac2b00edc4df3902eac84aa0729810a47bc
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Sep 11 23:49:52 2011 +0100
declared but not defined
diff --git a/editeng/source/editeng/editdbg.hxx b/editeng/source/editeng/editdbg.hxx
index 46e76f7..c7f6e98 100644
--- a/editeng/source/editeng/editdbg.hxx
+++ b/editeng/source/editeng/editdbg.hxx
@@ -48,7 +48,6 @@ class EditDbg
{
public:
static void ShowEditEngineData( EditEngine* pEditEngine, sal_Bool bInfoBox = sal_True );
- static ByteString GetUndoDebStr( EditUndoList* pUndoList );
};
#endif // _EDITDBG_HXX
commit 11de7b8ec7f849819ebe288a1d0897bc7b9b361b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Sep 11 23:47:46 2011 +0100
regenerate list
diff --git a/svl/inc/svl/svldata.hxx b/svl/inc/svl/svldata.hxx
index 1a869b5..ab4ccc0 100644
--- a/svl/inc/svl/svldata.hxx
+++ b/svl/inc/svl/svldata.hxx
@@ -30,6 +30,7 @@
#define _SVL_SVLDATA_HXX
#include <tools/simplerm.hxx>
+#include <rtl/instance.hxx>
class SfxItemPool;
@@ -45,6 +46,8 @@ public:
// For the simple resmgr we have a mgr for each language ever requested).
private:
+ template<class> friend class rtl::Static;
+
ImpSvlData():
pStoringPool(0), m_pThreadsafeRMs(NULL)
{}
diff --git a/svl/source/misc/svldata.cxx b/svl/source/misc/svldata.cxx
index 5d227e9..c03ee02 100644
--- a/svl/source/misc/svldata.cxx
+++ b/svl/source/misc/svldata.cxx
@@ -33,7 +33,6 @@
#include <tools/resmgr.hxx>
#include <tools/shl.hxx>
#include <svl/svldata.hxx>
-#include <rtl/instance.hxx>
namespace
{
diff --git a/unusedcode.easy b/unusedcode.easy
index 4504bb3..ec4a337 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,3 +1,4 @@
+(anonymous namespace)::Registration::~Registration()
(anonymous namespace)::getState(std::vector<cppcanvas::internal::OutDevState, std::allocator<cppcanvas::internal::OutDevState> > const&)
(anonymous namespace)::writeInfo(com::sun::star::uno::Reference<com::sun::star::registry::XRegistryKey> const&, rtl::OUString const&, rtl::OUString const&)
BasicPrinter::BasicPrinter()
@@ -231,7 +232,6 @@ ImpDefaultMapper::ImpDefaultMapper(com::sun::star::uno::Reference<com::sun::star
ImpEditEngine::Repeat(EditView*)
ImpEditView::CalcSelectedRegion()
ImpSvMEdit::SetInsertMode(unsigned char)
-ImpSvlData::~ImpSvlData()
ImpSvtData::~ImpSvtData()
ImplBorderWindow::ImplBorderWindow(Window*, long, unsigned short, com::sun::star::uno::Any const&)
ImplBorderWindow::SetHelpButton(unsigned char)
@@ -2124,7 +2124,6 @@ comphelper::OComposedPropertySet::OComposedPropertySet(com::sun::star::uno::Sequ
comphelper::OContainerListenerAdapter::lock()
comphelper::OContainerListenerAdapter::unlock()
comphelper::OInteractionRequest::clearContinuations()
-comphelper::OModuleImpl::~OModuleImpl()
comphelper::OPropertyContainerHelper::modifyAttributes(int, int, int)
comphelper::OSelectionChangeListener::disposeAdapter()
comphelper::OStorageHelper::GetStorageAtPath(com::sun::star::uno::Reference<com::sun::star::embed::XStorage> const&, rtl::OUString const&, unsigned int, comphelper::OStorageHelper::LifecycleProxy&)
@@ -2204,7 +2203,6 @@ cppcanvas::VCLFactory::createPolyPolygon(boost::shared_ptr<cppcanvas::Canvas> co
cppcanvas::VCLFactory::createRenderer(boost::shared_ptr<cppcanvas::Canvas> const&, Graphic const&, cppcanvas::Renderer::Parameters const&) const
cppcanvas::VCLFactory::createText(boost::shared_ptr<cppcanvas::Canvas> const&, rtl::OUString const&) const
cppcanvas::VCLFactory::~VCLFactory()
-cppcanvas::internal::EMFPBrush::~EMFPBrush()
cppcanvas::internal::ImplRenderer::Map(basegfx::B2DPoint&)
cppcanvas::internal::ImplRenderer::MapRectangle(double, double, double, double)
cppcanvas::internal::ImplSprite::getGraphicDevice() const
@@ -2723,7 +2721,6 @@ pdfi::DrawXmlEmitter::GetBreakIterator()
pdfi::PDFIProcessor::sortDocument(bool)
pdfi::PDFIRawAdaptor::odfConvert(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::io::XOutputStream> const&, com::sun::star::uno::Reference<com::sun::star::task::XStatusIndicator> const&)
pdfparse::PDFReader::read(char const*, unsigned int)
-psp::ConverterFactory::~ConverterFactory()
psp::GetCommandLineTokenCount(rtl::OString const&)
psp::GlyphSet::GlyphSet()
psp::GlyphSet::SetFont(int, unsigned char)
@@ -2933,7 +2930,6 @@ sdr::table::TableLayouter::setRowHeight(int, int)
sfx2::TaskPaneWrapper::GetChildWindowId()
svgi::(anonymous namespace)::appendChar(std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, char)
svgi::getTokenName(int)
-svx::SearchToolbarControllersManager::~SearchToolbarControllersManager()
svx::SvxShowCharSetItem::~SvxShowCharSetItem()
svxform::DataNavigatorManager::GetChildWindowId()
svxform::FmFilterNavigatorWinMgr::GetChildWindowId()
@@ -2965,7 +2961,6 @@ unicode::isBase(unsigned short)
unicode::isPunctuation(unsigned short)
unicode::isTitle(unsigned short)
unicode::isUnicodeScriptType(unsigned short, short)
-unnamed_svl_inettype::Registration::~Registration()
unographic::GraphicDescriptor::isValid() const
utl::AccessibleStateSetHelper::Compare(utl::AccessibleStateSetHelper const&, utl::AccessibleStateSetHelper&, utl::AccessibleStateSetHelper&)
utl::AtomServer::AtomServer()
commit 77cdf953482bb3a8489a4429d813b96ac24b79a6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Sep 11 23:16:05 2011 +0100
missing header
diff --git a/svl/source/misc/svldata.cxx b/svl/source/misc/svldata.cxx
index c03ee02..5d227e9 100644
--- a/svl/source/misc/svldata.cxx
+++ b/svl/source/misc/svldata.cxx
@@ -33,6 +33,7 @@
#include <tools/resmgr.hxx>
#include <tools/shl.hxx>
#include <svl/svldata.hxx>
+#include <rtl/instance.hxx>
namespace
{
commit 64541bfe53137af1a5532c334c4bb65bc0dc54bd
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Sep 11 23:07:40 2011 +0100
can return a ref instead of a pointer, ensure dtor on singleton
diff --git a/svx/inc/tbunosearchcontrollers.hxx b/svx/inc/tbunosearchcontrollers.hxx
index 47d1897..2bfa265 100644
--- a/svx/inc/tbunosearchcontrollers.hxx
+++ b/svx/inc/tbunosearchcontrollers.hxx
@@ -80,7 +80,7 @@ public:
SearchToolbarControllersManager();
~SearchToolbarControllersManager();
- static SearchToolbarControllersManager* createControllersManager();
+ static SearchToolbarControllersManager& createControllersManager();
void registryController( const css::uno::Reference< css::frame::XFrame >& xFrame, const css::uno::Reference< css::frame::XStatusListener >& xStatusListener, const ::rtl::OUString& sCommandURL );
void freeController ( const css::uno::Reference< css::frame::XFrame >& xFrame, const css::uno::Reference< css::frame::XStatusListener >& xStatusListener, const ::rtl::OUString& sCommandURL );
@@ -88,8 +88,6 @@ public:
private:
- static SearchToolbarControllersManager* m_pInstance;
-
typedef ::comphelper::SequenceAsVector< css::beans::PropertyValue > SearchToolbarControllersVec;
typedef ::std::map< css::uno::Reference< css::frame::XFrame >, SearchToolbarControllersVec > SearchToolbarControllersMap;
SearchToolbarControllersMap aSearchToolbarControllersMap;
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index 02bc2a2..07d2bc9 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -42,6 +42,7 @@
#include <vcl/toolbox.hxx>
#include <vcl/svapp.hxx>
#include <osl/mutex.hxx>
+#include <rtl/instance.hxx>
namespace svx
{
@@ -208,8 +209,6 @@ long FindTextFieldControl::PreNotify( NotifyEvent& rNEvt )
//-----------------------------------------------------------------------------------------------------------
// SearchToolbarControllersManager
-SearchToolbarControllersManager* SearchToolbarControllersManager::m_pInstance = 0;
-
SearchToolbarControllersManager::SearchToolbarControllersManager()
{
}
@@ -218,12 +217,18 @@ SearchToolbarControllersManager::~SearchToolbarControllersManager()
{
}
-SearchToolbarControllersManager* SearchToolbarControllersManager::createControllersManager()
+namespace
{
- if (!m_pInstance)
- m_pInstance = new SearchToolbarControllersManager();
+ class theSearchToolbarControllersManager
+ : public rtl::Static<SearchToolbarControllersManager,
+ theSearchToolbarControllersManager>
+ {
+ };
+}
- return m_pInstance;
+SearchToolbarControllersManager& SearchToolbarControllersManager::createControllersManager()
+{
+ return theSearchToolbarControllersManager::get();
}
void SearchToolbarControllersManager::registryController( const css::uno::Reference< css::frame::XFrame >& xFrame, const css::uno::Reference< css::frame::XStatusListener >& xStatusListener, const ::rtl::OUString& sCommandURL )
@@ -359,7 +364,7 @@ void SAL_CALL FindTextToolbarController::dispose() throw ( css::uno::RuntimeExce
{
SolarMutexGuard aSolarMutexGuard;
- SearchToolbarControllersManager::createControllersManager()->freeController(m_xFrame, css::uno::Reference< css::frame::XStatusListener >(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY), m_aCommandURL);
+ SearchToolbarControllersManager::createControllersManager().freeController(m_xFrame, css::uno::Reference< css::frame::XStatusListener >(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY), m_aCommandURL);
svt::ToolboxController::dispose();
delete m_pFindTextFieldControl;
@@ -386,7 +391,7 @@ void SAL_CALL FindTextToolbarController::initialize( const css::uno::Sequence< :
}
}
- SearchToolbarControllersManager::createControllersManager()->registryController(m_xFrame, css::uno::Reference< css::frame::XStatusListener >(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY), m_aCommandURL);
+ SearchToolbarControllersManager::createControllersManager().registryController(m_xFrame, css::uno::Reference< css::frame::XStatusListener >(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY), m_aCommandURL);
}
// XToolbarController
@@ -523,7 +528,7 @@ void SAL_CALL DownSearchToolboxController::dispose() throw ( css::uno::RuntimeEx
{
SolarMutexGuard aSolarMutexGuard;
- SearchToolbarControllersManager::createControllersManager()->freeController(m_xFrame, css::uno::Reference< css::frame::XStatusListener >(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY), m_aCommandURL);
+ SearchToolbarControllersManager::createControllersManager().freeController(m_xFrame, css::uno::Reference< css::frame::XStatusListener >(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY), m_aCommandURL);
svt::ToolboxController::dispose();
}
@@ -532,7 +537,7 @@ void SAL_CALL DownSearchToolboxController::dispose() throw ( css::uno::RuntimeEx
void SAL_CALL DownSearchToolboxController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException )
{
svt::ToolboxController::initialize( aArguments );
- SearchToolbarControllersManager::createControllersManager()->registryController(m_xFrame, css::uno::Reference< css::frame::XStatusListener >(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY), m_aCommandURL);
+ SearchToolbarControllersManager::createControllersManager().registryController(m_xFrame, css::uno::Reference< css::frame::XStatusListener >(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY), m_aCommandURL);
}
// XToolbarController
@@ -572,7 +577,7 @@ void SAL_CALL DownSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ )
css::frame::FeatureStateEvent aEvent;
aEvent.FeatureURL.Complete = COMMAND_APPENDSEARCHHISTORY;
- css::uno::Reference< css::frame::XStatusListener > xStatusListener = SearchToolbarControllersManager::createControllersManager()->findController(m_xFrame, COMMAND_FINDTEXT);
+ css::uno::Reference< css::frame::XStatusListener > xStatusListener = SearchToolbarControllersManager::createControllersManager().findController(m_xFrame, COMMAND_FINDTEXT);
if (xStatusListener.is())
xStatusListener->statusChanged( aEvent );
}
@@ -654,7 +659,7 @@ void SAL_CALL UpSearchToolboxController::dispose() throw ( css::uno::RuntimeExce
{
SolarMutexGuard aSolarMutexGuard;
- SearchToolbarControllersManager::createControllersManager()->freeController(m_xFrame, css::uno::Reference< css::frame::XStatusListener >(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY), m_aCommandURL);
+ SearchToolbarControllersManager::createControllersManager().freeController(m_xFrame, css::uno::Reference< css::frame::XStatusListener >(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY), m_aCommandURL);
svt::ToolboxController::dispose();
}
@@ -663,7 +668,7 @@ void SAL_CALL UpSearchToolboxController::dispose() throw ( css::uno::RuntimeExce
void SAL_CALL UpSearchToolboxController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException )
{
svt::ToolboxController::initialize( aArguments );
- SearchToolbarControllersManager::createControllersManager()->registryController(m_xFrame, css::uno::Reference< css::frame::XStatusListener >(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY), m_aCommandURL);
+ SearchToolbarControllersManager::createControllersManager().registryController(m_xFrame, css::uno::Reference< css::frame::XStatusListener >(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY), m_aCommandURL);
}
// XToolbarController
@@ -703,7 +708,7 @@ void SAL_CALL UpSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ ) th
css::frame::FeatureStateEvent aEvent;
aEvent.FeatureURL.Complete = COMMAND_APPENDSEARCHHISTORY;
- css::uno::Reference< css::frame::XStatusListener > xStatusListener = SearchToolbarControllersManager::createControllersManager()->findController(m_xFrame, COMMAND_FINDTEXT);
+ css::uno::Reference< css::frame::XStatusListener > xStatusListener = SearchToolbarControllersManager::createControllersManager().findController(m_xFrame, COMMAND_FINDTEXT);
if (xStatusListener.is())
xStatusListener->statusChanged( aEvent );
}
commit 06e0aff60a7ac8b3a92253ff30dec55f71e437de
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Sep 11 22:49:36 2011 +0100
can return a ref, not a pointer, and make local static instead of global leak
diff --git a/vcl/unx/generic/printergfx/psputil.cxx b/vcl/unx/generic/printergfx/psputil.cxx
index 9a5de44..e0f82d3 100644
--- a/vcl/unx/generic/printergfx/psputil.cxx
+++ b/vcl/unx/generic/printergfx/psputil.cxx
@@ -28,13 +28,11 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
-
#include <string.h>
-
+#include <tools/debug.hxx>
+#include <rtl/instance.hxx>
#include "psputil.hxx"
-#include "tools/debug.hxx"
-
namespace psp {
/*
@@ -254,15 +252,17 @@ ConverterFactory::Convert (const sal_Unicode *pText, int nTextLen,
return nSize;
}
-ConverterFactory*
-GetConverterFactory ()
+namespace
{
- static ConverterFactory* pCvt = NULL;
-
- if (pCvt == NULL)
- pCvt = new ConverterFactory;
+ class theConverterFactory
+ : public rtl::Static<ConverterFactory, theConverterFactory>
+ {
+ };
+}
- return pCvt;
+ConverterFactory& GetConverterFactory()
+{
+ return theConverterFactory::get();
}
diff --git a/vcl/unx/generic/printergfx/psputil.hxx b/vcl/unx/generic/printergfx/psputil.hxx
index 878fd9c..2aaffda 100644
--- a/vcl/unx/generic/printergfx/psputil.hxx
+++ b/vcl/unx/generic/printergfx/psputil.hxx
@@ -71,7 +71,7 @@ private:
std::map< rtl_TextEncoding, rtl_UnicodeToTextConverter > m_aConverters;
};
-ConverterFactory* GetConverterFactory ();
+ConverterFactory& GetConverterFactory ();
} /* namespace psp */
diff --git a/vcl/unx/generic/printergfx/text_gfx.cxx b/vcl/unx/generic/printergfx/text_gfx.cxx
index 3cad66e..14dd8c3 100644
--- a/vcl/unx/generic/printergfx/text_gfx.cxx
+++ b/vcl/unx/generic/printergfx/text_gfx.cxx
@@ -583,8 +583,8 @@ PrinterGfx::LicenseWarning(const Point& rPoint, const sal_Unicode* pStr,
sal_Size nSize = 4 * nLen;
sal_uChar* pBuffer = (sal_uChar*)alloca (nSize* sizeof(sal_uChar));
- ConverterFactory* pCvt = GetConverterFactory ();
- nSize = pCvt->Convert (pStr, nLen, pBuffer, nSize, RTL_TEXTENCODING_ISO_8859_1);
+ ConverterFactory &rCvt = GetConverterFactory ();
+ nSize = rCvt.Convert (pStr, nLen, pBuffer, nSize, RTL_TEXTENCODING_ISO_8859_1);
PSMoveTo (rPoint);
PSShowText (pBuffer, nLen, nSize, pDeltaArray);
commit 90e9a26aa5be3cbb286fd8363623284d49b6edc9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Sep 11 22:42:00 2011 +0100
make base class dtor virtual
otherwise calling delete on a base class pointer to an instantiation of a
derived class doesn't call the derived class's dtor
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx
index b8e0a5c..88755c5 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -120,6 +120,7 @@ namespace cppcanvas
struct EMFPObject
{
+ virtual ~EMFPObject() {}
};
struct EMFPPath : public EMFPObject
commit b55910d9ba6b57b621be638917b934300b8f7df3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Sep 11 22:34:03 2011 +0100
why leak m_pImpl
diff --git a/comphelper/source/misc/componentmodule.cxx b/comphelper/source/misc/componentmodule.cxx
index c42308c..0130cbb 100644
--- a/comphelper/source/misc/componentmodule.cxx
+++ b/comphelper/source/misc/componentmodule.cxx
@@ -84,12 +84,15 @@ namespace comphelper
//=========================================================================
//-------------------------------------------------------------------------
OModule::OModule()
- :m_nClients( 0 )
- ,m_pImpl( new OModuleImpl )
+ : m_nClients(0)
+ , m_pImpl(new OModuleImpl)
{
}
- OModule::~OModule() {}
+ OModule::~OModule()
+ {
+ delete m_pImpl;
+ }
//-------------------------------------------------------------------------
void OModule::registerClient( OModule::ClientAccess )
commit 6022aab435c48bbfc29bd2c0826dae25bf8655a3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Sep 11 22:18:08 2011 +0100
ensure dtor gets called, and fix dtor and namespaces
diff --git a/svl/source/misc/adrparse.cxx b/svl/source/misc/adrparse.cxx
index b6aa9d9..7a288a1 100644
--- a/svl/source/misc/adrparse.cxx
+++ b/svl/source/misc/adrparse.cxx
@@ -31,12 +31,8 @@
#include <tools/inetmime.hxx>
#include <svl/adrparse.hxx>
-namespace unnamed_svl_adrparse {}
-using namespace unnamed_svl_adrparse;
- // unnamed namespaces don't work well yet
-
-//============================================================================
-namespace unnamed_svl_adrparse {
+namespace
+{
enum ElementType { ELEMENT_START, ELEMENT_DELIM, ELEMENT_ITEM, ELEMENT_END };
diff --git a/svl/source/misc/inettype.cxx b/svl/source/misc/inettype.cxx
index 6234bc0..686056e 100644
--- a/svl/source/misc/inettype.cxx
+++ b/svl/source/misc/inettype.cxx
@@ -40,12 +40,8 @@
#undef _SVSTDARR_STRINGSSORT
#endif
-namespace unnamed_svl_inettype {}
-using namespace unnamed_svl_inettype;
- // unnamed namespaces don't work well yet
-
-//============================================================================
-namespace unnamed_svl_inettype {
+namespace
+{
//============================================================================
struct MediaTypeEntry
@@ -790,7 +786,8 @@ INetContentType Registration::GetContentType4Extension(UniString const &
//
//============================================================================
-namespace unnamed_svl_inettype {
+namespace
+{
MediaTypeEntry const * seekEntry(UniString const & rTypeName,
MediaTypeEntry const * pMap, sal_Size nSize)
diff --git a/svl/source/misc/svldata.cxx b/svl/source/misc/svldata.cxx
index b76c1c0..c03ee02 100644
--- a/svl/source/misc/svldata.cxx
+++ b/svl/source/misc/svldata.cxx
@@ -34,32 +34,24 @@
#include <tools/shl.hxx>
#include <svl/svldata.hxx>
-namespace unnamed_svl_svldata {}
-using namespace unnamed_svl_svldata;
- // unnamed namespaces don't work well yet
-
-//============================================================================
-namespace unnamed_svl_svldata {
-
-typedef std::map< rtl::OUString, SimpleResMgr * > SimpleResMgrMap;
-
+namespace
+{
+ typedef std::map< rtl::OUString, SimpleResMgr * > SimpleResMgrMap;
}
-//============================================================================
-//
-// ImpSvlData
-//
-//============================================================================
-
-static ImpSvlData* pSvlData = 0;
-
ImpSvlData::~ImpSvlData()
{
- for (SimpleResMgrMap::iterator t
- = static_cast< SimpleResMgrMap * >(m_pThreadsafeRMs)->begin();
- t != static_cast< SimpleResMgrMap * >(m_pThreadsafeRMs)->end(); ++t)
- delete t->second;
- delete static_cast< SimpleResMgrMap * >(m_pThreadsafeRMs);
+ if (m_pThreadsafeRMs)
+ {
+ SimpleResMgrMap *pThreadsafeRMs =
+ static_cast<SimpleResMgrMap*>(m_pThreadsafeRMs);
+ for (SimpleResMgrMap::iterator t = pThreadsafeRMs->begin(),
+ end = pThreadsafeRMs->end(); t != end; ++t)
+ {
+ delete t->second;
+ }
+ delete pThreadsafeRMs;
+ }
}
//============================================================================
@@ -80,13 +72,16 @@ SimpleResMgr* ImpSvlData::GetSimpleRM(const ::com::sun::star::lang::Locale& rLoc
return rResMgr;
}
+namespace
+{
+ class theSvlData : public rtl::Static< ImpSvlData, theSvlData > {};
+}
+
//============================================================================
// static
ImpSvlData & ImpSvlData::GetSvlData()
{
- if (!pSvlData)
- pSvlData= new ImpSvlData;
- return *pSvlData;
+ return theSvlData::get();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 4f675d31b5d8e82d052dcc3e8d8785087d4e3c90
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Sep 11 21:57:48 2011 +0100
callcatcher: drop unused methods
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index cff3e08..11a892c 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -1141,18 +1141,6 @@ void DlgEdObj::SetDefaults()
//----------------------------------------------------------------------------
-IMPL_LINK(DlgEdObj, OnCreate, void*, EMPTYTAG)
-{
- (void)EMPTYTAG;
- /*
- if (pTempView)
- pTempView->ObjectCreated(this);
- */
- return 0;
-}
-
-//----------------------------------------------------------------------------
-
void DlgEdObj::StartListening()
{
DBG_ASSERT(!isListening(), "DlgEdObj::StartListening: already listening!");
diff --git a/basctl/source/inc/dlgedobj.hxx b/basctl/source/inc/dlgedobj.hxx
index cbb6b6b..cf4aa35 100644
--- a/basctl/source/inc/dlgedobj.hxx
+++ b/basctl/source/inc/dlgedobj.hxx
@@ -71,8 +71,6 @@ protected:
virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact);
virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd);
- DECL_LINK(OnCreate, void* );
-
using SfxListener::StartListening;
void StartListening();
using SfxListener::EndListening;
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 182e5bb..2072b29 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -662,13 +662,6 @@ void SvxScriptOrgDialog::CheckButtons( Reference< browse::XBrowseNode >& node )
}
}
-IMPL_LINK_INLINE_START( SvxScriptOrgDialog, MacroDoubleClickHdl, SvTreeListBox *, EMPTYARG )
-{
- return 0;
-}
-
-IMPL_LINK_INLINE_END( SvxScriptOrgDialog, MacroDoubleClickHdl, SvTreeListBox *, EMPTYARG )
-
IMPL_LINK( SvxScriptOrgDialog, ScriptSelectHdl, SvTreeListBox *, pBox )
{
if ( !pBox->IsSelected( pBox->GetHdlEntry() ) )
diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx
index a435068..860a2c3 100644
--- a/cui/source/inc/scriptdlg.hxx
+++ b/cui/source/inc/scriptdlg.hxx
@@ -179,7 +179,6 @@ protected:
const String m_renameErrTitleStr;
DECL_LINK( MacroSelectHdl, SvTreeListBox * );
- DECL_LINK( MacroDoubleClickHdl, SvTreeListBox * );
DECL_LINK( ScriptSelectHdl, SvTreeListBox * );
DECL_LINK( ButtonHdl, Button * );
sal_Bool getBoolProperty( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xProps, ::rtl::OUString& propName );
diff --git a/sc/source/filter/excel/xltools.cxx b/sc/source/filter/excel/xltools.cxx
index 0ad5ffa..a710ee4 100644
--- a/sc/source/filter/excel/xltools.cxx
+++ b/sc/source/filter/excel/xltools.cxx
@@ -719,13 +719,6 @@ OUString XclTools::GetSbMacroUrl( const OUString& rMacroName, SfxObjectShell* pD
return OUString();
}
-OUString XclTools::GetSbMacroUrl( const OUString& rModuleName, const OUString& rMacroName, SfxObjectShell* pDocShell )
-{
- OSL_ENSURE( rModuleName.getLength() > 0, "XclTools::GetSbMacroUrl - module name is empty" );
- OSL_ENSURE( rMacroName.getLength() > 0, "XclTools::GetSbMacroUrl - macro name is empty" );
- return GetSbMacroUrl( rModuleName + OUString( sal_Unicode( '.' ) ) + rMacroName, pDocShell );
-}
-
OUString XclTools::GetXclMacroName( const OUString& rSbMacroUrl )
{
sal_Int32 nSbMacroUrlLen = rSbMacroUrl.getLength();
diff --git a/sc/source/filter/inc/xltools.hxx b/sc/source/filter/inc/xltools.hxx
index 92e4fac..54f5b54 100644
--- a/sc/source/filter/inc/xltools.hxx
+++ b/sc/source/filter/inc/xltools.hxx
@@ -241,8 +241,6 @@ public:
/** Returns the full StarBasic macro URL from an Excel macro name. */
static ::rtl::OUString GetSbMacroUrl( const rtl::OUString& rMacroName, SfxObjectShell* pDocShell = 0 );
- /** Returns the full StarBasic macro URL from an Excel module and macro name. */
- static ::rtl::OUString GetSbMacroUrl( const rtl::OUString& rModuleName, const rtl::OUString& rMacroName, SfxObjectShell* pDocShell = 0 );
/** Returns the Excel macro name from a full StarBasic macro URL. */
static ::rtl::OUString GetXclMacroName( const ::rtl::OUString& rSbMacroUrl );
diff --git a/unusedcode.easy b/unusedcode.easy
index 04753dc..4504bb3 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -102,9 +102,7 @@ DdeTopic::DdeTopic(String const&)
DdeTopic::RemoveItem(DdeItem const&)
DffPropSet::SetPropertyValue(unsigned int, unsigned int) const
Dialog::Dialog(Window*, ResId const&)
-Dialog::IsStartedModal() const
DirEntry::GetDevice() const
-DlgEdObj::LinkStubOnCreate(void*, void*)
EECharAttribArray::Insert(EECharAttribArray const*, unsigned short, unsigned short, unsigned short)
EECharAttribArray::Replace(EECharAttrib const&, unsigned short)
EECharAttribArray::Replace(EECharAttrib const*, unsigned short, unsigned short)
@@ -768,14 +766,6 @@ SfxItemPropertySetInfo::getMap() const
SfxItemSetHint::SfxItemSetHint(SfxItemSet*)
SfxListener::EndListening(unsigned short)
SfxLockBytesItem::SfxLockBytesItem(unsigned short, SvLockBytes*)
-SfxMacro::GetMode() const
-SfxMacro::Record(SfxMacroStatement*)
-SfxMacro::Remove()
-SfxMacro::Replace(SfxMacroStatement*)
-SfxMacro::SfxMacro(SfxMacroMode)
-SfxMacroStatement::SfxMacroStatement(SfxShell const&, String const&, unsigned char, SfxSlot const&, unsigned char, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>&)
-SfxMacroStatement::SfxMacroStatement(String const&)
-SfxMacroStatement::SfxMacroStatement(String const&, SfxSlot const&, unsigned char, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>&)
SfxMailModel::GetCount() const
SfxMedium::GetHdl()
SfxMedium::GetReferer() const
@@ -1179,7 +1169,6 @@ SvxRelativeField::SvxRelativeField(Window*, long)
SvxReloadControllerItem::RegisterControl(unsigned short, SfxModule*)
SvxRubyChildWindow::GetChildWindowId()
SvxRuler::GetDefTabDist() const
-SvxScriptOrgDialog::LinkStubMacroDoubleClickHdl(void*, void*)
SvxSearchDialog::GetReplaceItems(SfxItemSet&)
SvxSearchDialog::GetSearchItems(SfxItemSet&)
SvxSearchDialog::SvxSearchDialog(Window*, SfxBindings&)
@@ -1499,7 +1488,6 @@ XclRoot::GetPixelYFromHmm(int) const
XclTokenArray::XclTokenArray(std::vector<unsigned char, std::allocator<unsigned char> >&, bool)
XclTokenArrayIterator::Init()
XclTools::GetBuiltInStyleName(rtl::OUString const&)
-XclTools::GetSbMacroUrl(rtl::OUString const&, rtl::OUString const&, SfxObjectShell*)
XclXFBase::HasUsedFlags() const
XmlSec::GetDateTimeString(rtl::OUString const&, rtl::OUString const&)
XmlSecStatusBarControl::GetDefItemWidth(StatusBar&)
@@ -1558,7 +1546,6 @@ _ZSortFlys::Remove(_ZSortFly const&, unsigned short)
_ZSortFlys_SAR::Replace(_ZSortFly const&, unsigned short)
_ZSortFlys_SAR::Replace(_ZSortFly const*, unsigned short, unsigned short)
_ZSortFlys_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(_ZSortFly const&, void*), void*)
-accessibility::DGColorNameLookUp::~DGColorNameLookUp()
basebmp::debugDump(boost::shared_ptr<basebmp::BitmapDevice> const&, std::basic_ostream<char, std::char_traits<char> >&)
basegfx::B1DRange::B1DRange(basegfx::B1IRange const&)
basegfx::B2DCubicBezier::B2DCubicBezier(basegfx::B2DPoint const&, basegfx::B2DPoint const&)
@@ -1750,13 +1737,6 @@ binfilter::CharPosArray::Insert(binfilter::CharPosArray const*, unsigned short,
binfilter::CharPosArray::Replace(int const&, unsigned short)
binfilter::CharPosArray::Replace(int const*, unsigned short, unsigned short)
binfilter::CharPosArray::_ForEach(unsigned short, unsigned short, unsigned char (*)(int const&, void*), void*)
-binfilter::DbgName_CntBoolItem()
-binfilter::DbgName_CntEnumItem()
-binfilter::DbgName_SfxEnumItemInterface()
-binfilter::DbgName_SfxFilter()
-binfilter::DbgName_SfxFrameSetDescriptor()
-binfilter::DbgName_SfxStringListItem()
-binfilter::DbgName_SvxMacroItem()
binfilter::Dictionary::~Dictionary()
binfilter::EECharAttribArray::Insert(binfilter::EECharAttrib const&, unsigned short)
binfilter::EECharAttribArray::Insert(binfilter::EECharAttribArray const*, unsigned short, unsigned short, unsigned short)
diff --git a/vcl/inc/vcl/dialog.hxx b/vcl/inc/vcl/dialog.hxx
index bb41799..97c34f3 100644
--- a/vcl/inc/vcl/dialog.hxx
+++ b/vcl/inc/vcl/dialog.hxx
@@ -98,7 +98,6 @@ public:
public:
// Link impl: DECL_LINK( MyEndDialogHdl, Dialog* ); <= param is dialog just ended
virtual void StartExecuteModal( const Link& rEndDialogHdl );
- sal_Bool IsStartedModal() const;
long GetResult() const;
private:
sal_Bool ImplStartExecuteModal();
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index e057c4e..6a3331d 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -723,13 +723,6 @@ void Dialog::StartExecuteModal( const Link& rEndDialogHdl )
// -----------------------------------------------------------------------
-sal_Bool Dialog::IsStartedModal() const
-{
- return mpDialogImpl->mbStartedModal;
-}
-
-// -----------------------------------------------------------------------
-
void Dialog::EndDialog( long nResult )
{
if ( mbInExecute )
commit 0009579f578e7c751057170ab788080e1190802a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Sep 11 00:25:28 2011 +0100
why insert a '.' just to then erase it ?
diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx
index 075cb88..191e809 100644
--- a/linguistic/source/dlistimp.cxx
+++ b/linguistic/source/dlistimp.cxx
@@ -848,10 +848,10 @@ static void AddInternal(
{
//! TL TODO: word iterator should be used to break up the text
static const char aDefWordDelim[] =
- "!\"#$%&'()*+,-./:;<=>?[]\\_^`{|}~\t \n";
- String aDelim =
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(aDefWordDelim));
- aDelim.EraseAllChars( '.' );
+ "!\"#$%&'()*+,-/:;<=>?[]\\_^`{|}~\t \n";
+ rtl::OUString aDelim(RTL_CONSTASCII_USTRINGPARAM(aDefWordDelim));
+ OSL_ENSURE(aDelim.indexOf(static_cast<sal_Unicode>('.')) == -1,
+ "ensure no '.'");
String aToken;
xub_StrLen nPos = 0;
commit 7a9ee7168f7700d10968bdaef58e3e52a54684c4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Sep 11 00:20:42 2011 +0100
using osl_getThreadTextEncoding is a disaster waiting to happen
diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx
index 319cd9d..075cb88 100644
--- a/linguistic/source/dlistimp.cxx
+++ b/linguistic/source/dlistimp.cxx
@@ -847,10 +847,10 @@ static void AddInternal(
if (rDic.is())
{
//! TL TODO: word iterator should be used to break up the text
- static const char *pDefWordDelim =
+ static const char aDefWordDelim[] =
"!\"#$%&'()*+,-./:;<=>?[]\\_^`{|}~\t \n";
- ByteString aDummy( pDefWordDelim );
- String aDelim( aDummy, osl_getThreadTextEncoding() );
+ String aDelim =
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(aDefWordDelim));
aDelim.EraseAllChars( '.' );
String aToken;
commit f95720bbb781f4a39fd032c158a3865f5f770b75
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Sep 10 23:42:38 2011 +0100
remove last remnents of archaic SfxMacro based stuff
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index dea5d32..afd60a0 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -140,7 +140,6 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\
sfx2/source/control/bindings \
sfx2/source/control/ctrlitem \
sfx2/source/control/dispatch \
- sfx2/source/control/macro \
sfx2/source/control/minfitem \
sfx2/source/control/msg \
sfx2/source/control/msgpool \
diff --git a/sfx2/inc/macro.hxx b/sfx2/inc/macro.hxx
deleted file mode 100644
index 6d683a2..0000000
--- a/sfx2/inc/macro.hxx
+++ /dev/null
@@ -1,150 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#ifndef _SFXMACRO_HXX
-#define _SFXMACRO_HXX
-
-//====================================================================
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/uno/Sequence.hxx>
-
-#include <tools/string.hxx>
-
-class SfxSlot;
-class SfxShell;
-
-//====================================================================
-
-class SfxMacroStatement
-{
- sal_uInt16 nSlotId; // performed Slot-Id or 0, if manually
- ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue > aArgs; // current Parameter, in case nSlotId != 0
- String aStatement; // Statement in BASIC-Syntax (if necessary with CR/LF)
- sal_Bool bDone; // comment out if no Done() is called
- void* pDummy; // for all cases, to remain compatible
-
-#ifdef _SFXMACRO_HXX
-private:
- void GenerateNameAndArgs_Impl( const SfxSlot &rSlot,
- sal_Bool bRequestDone,
- ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& aArgs );
-#endif
-
-public:
- SfxMacroStatement( const SfxMacroStatement &rOrig );
-
- SfxMacroStatement( const String &rTarget,
- const SfxSlot &rSlot,
- sal_Bool bRequestDone,
- ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& aArgs );
-
- SfxMacroStatement( const SfxShell &rShell,
- const String &rTarget,
- sal_Bool bAbsolute,
- const SfxSlot &rSlot,
- sal_Bool bRequestDone,
- ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& aArgs );
-
- SfxMacroStatement( const String &rStatment );
- ~SfxMacroStatement();
-
- sal_uInt16 GetSlotId() const;
- const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& GetArgs() const;
- sal_Bool IsDone() const;
- const String& GetStatement() const;
-};
-
-//--------------------------------------------------------------------
-
-inline sal_uInt16 SfxMacroStatement::GetSlotId() const
-
-/* [Description]
-
- Returns the Slot-Id which the Statement should redo when called or 0
- if the Statement (<SFX_SLOT_RECORDMANUAL>) was recorded manually.
-*/
-
-{
- return nSlotId;
-}
-
-//--------------------------------------------------------------------
-
-inline const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& SfxMacroStatement::GetArgs() const
-
-/* [Description]
-
- Returns the Parameter which was used in the call of the Statement or 0
- if the Statement (<SFX_SLOT_RECORDMANUAL>) was recorded manually
-
- The returned value belongs to the SfxMacroStatement and is only valid
- to the Stackframe.
-*/
-
-{
- return aArgs;
-}
-
-//--------------------------------------------------------------------
-
-inline sal_Bool SfxMacroStatement::IsDone() const
-
-/* [Description]
-
- Returns TRUE only if the Statement really was excecuted, so for instance
- not if it was canceled by the user. If it was not excecuted the
- BASIC-Source would be commented out.
-*/
-
-{
- return bDone;
-}
-
-//--------------------------------------------------------------------
-
-/* [Description]
-
- Returns the Statement in BASIC-Syntax. If the Macro was created manually,
- the string will be returned exactly as given in the constructor, else the
- generated Source-Code is returned.
-
- It is possible in both of the above cases that several BASIC-Statements,
- each contains CR / LF separators in the string, since a SFx statement
- is translated if necessary into several BASIC statements.
-
- Statements for which <SfxRequest::Done()> was not called are marked
- with a preceding 'rem'.
-*/
-
-inline const String& SfxMacroStatement::GetStatement() const
-{
- return aStatement;
-}
-
-//====================================================================
-
-enum SfxMacroMode
-
-/* [Description]
-
- By using this enum it is determined, if a <SfxMacro>-Instance was created
- by absolute or relative recording, or to create a reference to a existing
- macro.
-*/
-
-{
- SFX_MACRO_EXISTING, /* Indicates that it is a existing
- macro, which will only referenced */
-
- SFX_MACRO_RECORDINGABSOLUTE, /* This macro shall be recorded so that the
- affected objects are to be addressed as
- directly as possible (example: "[doc.sdc]") */
-
- SFX_MACRO_RECORDINGRELATIVE /* This macro is recorded and the affected
- objects are addressed in such a way so
- that when running the macro it refers to
- a vaild selection
- (example:" active document () ") */
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/control/macro.cxx b/sfx2/source/control/macro.cxx
deleted file mode 100644
index a9f9798..0000000
--- a/sfx2/source/control/macro.cxx
+++ /dev/null
@@ -1,352 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sfx2.hxx"
-
-#if OSL_DEBUG_LEVEL > 1
-#include <tools/stream.hxx>
-#endif
-
-#include "macro.hxx"
-#include <sfx2/request.hxx>
-#include <sfx2/msg.hxx>
-
-//====================================================================
-
-SV_DECL_PTRARR_DEL( SfxStatements_Impl, SfxMacroStatement*, 16, 8 )
-SV_IMPL_PTRARR( SfxStatements_Impl, SfxMacroStatement* );
-
-//--------------------------------------------------------------------
-
-struct SfxMacro_Impl
-
-/* [Description]
-
- Implementation structure for the <SfxMacro> class.
-*/
-
-{
- SfxMacroMode eMode; /* purpose of the <SfxMacro> instance,
- for meaning see enum <SfxMacroMode> */
- SfxStatements_Impl aList; /* List of recorded Statements */
-};
-
-//====================================================================
-
-SfxMacroStatement::SfxMacroStatement
-(
- const SfxShell& /*rShell*/, // <SfxShell> which excexutes the Request
- const String& /*rTarget*/, // Name of the target object for the
- // excecution
- sal_Bool /*bAbsolute*/, // obsolete
- const SfxSlot& rSlot, // the <SfxSlot>, which can read the
- // statement
- sal_Bool bRequestDone, // Was the Request really excecuted
- ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rArgs
-)
-
-/* [Description]
-
- This constructor of the SfxMacroStatement class generates a statement in
- which an object is brought up, which is given by 'rShell'. Thus It is
- addressing the always after 'bAbsolute' absolute, for example, as
- '[mydoc.sdc]', or relative, that is 'active document'.
-
- Depending on the subclass of 'rShell', the following terms:
-
- | absolute relative
- -----------------------------------------------------------------------
- SfxApplication' | 'StarCalc' 'Application'
- SfxViewFrame' | '[mydoc.sdc:1]' 'ActiveWindow'
- SfxViewShell' | '[mydoc.sdc:1]' 'AvtiveWindow'
- SfxObjectShell' | '[mydoc.sdc]' 'ActiveDocument'
- Other (Sub-Shells) | '[mydoc.sdc:1]' 'ActiveWindow'
-
- Thus 'StarCalc' is a proxy for the name of the application
- (Application::GetAppName()const). In the absolute sense of the selection
- could be addressed as descriptive as in 'cell selection ("A5-D8")'), to do this
- the application programmer must however use the constructor
- <SfxMacroStatement::SfxMacroStatement(const String&,
- const SfxSlot&,sal_Bool,SfxArguments*)>.
-
- For the so-called object is then, depending on the type of slots,
- expressed as an assignment to one of its properties or calling its methods.
-
- [Example]
-
- absolute:
- SCalc3.OpenDocument( "\docs\mydoc.sdd", "StarDraw Presentation", 0, 0 )
- [mydoc.sdd].Activate()
- [mydoc.sdd:1].SwitchToView( 2 )
- [mydoc.sdc:1:1].CellSelection( "A5-D8" ).LineColor = 192357
-
- relative:
- ActiveWindow.LineColor = 192357
-
- [Cross-reference]
-
- <SfxMacroStatement::SfxMacroStatement(const String&,const SfxSlot&,sal_Bool,SfxArguments*)>
- <SfxMacroStatement::SfxMacroStatement(const String&)>
-*/
-
-: nSlotId( rSlot.GetSlotId() ),
- aArgs( rArgs ),
- bDone( bRequestDone ),
- pDummy( 0 )
-{
- // Workaround Recording non exported Slots
- if ( !rSlot.pName )
- return;
-
- aStatement = DEFINE_CONST_UNICODE("Selection");
-
- // to these object expression of the Method-/Property-Name and parameters
- GenerateNameAndArgs_Impl( rSlot, bRequestDone, aArgs);
-}
-
-//--------------------------------------------------------------------
-
-SfxMacroStatement::SfxMacroStatement
-(
- const String& rTarget, // The Object which is addressed while playing
- const SfxSlot& rSlot, // The <SfxSlot>, which can playback the statement
- sal_Bool bRequestDone, // was the Request actually performed
- ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rArgs
-)
-
-/* [Description]
-
-
- [Cross-reference]
-
- <SfxMacroStatement::SfxMacroStatement(const String&)>
- <SfxMacroStatement::SfxMacroStatement(const SfxShell&,sal_Bool,const SfxSlot&,sal_Bool,SfxArguments*)>
-*/
-
-: nSlotId( rSlot.GetSlotId() ),
- aArgs( rArgs ),
- bDone( bRequestDone ),
- pDummy( 0 )
-{
- aStatement = rTarget;
- aStatement += '.';
- GenerateNameAndArgs_Impl( rSlot, bRequestDone, aArgs);
-}
-
-//--------------------------------------------------------------------
-
-SfxMacroStatement::SfxMacroStatement
-(
- const String& rStatement // manually generated statement(s)
-)
-
-/* [Description]
-
- This constructor creates a SfxMacroStatement instance, its structure is
- determined completely by the application developer. Because the specified
- string may contain several statements separated with CR/LF, which enables
- a extensive in the recording of BASIC-macros, in order to handle special
- cases.
-
- [Cross-reference]
-
- <SfxMacroStatement::SfxMacroStatement(const String&,const SfxSlot&,sal_Bool,SfxArguments*)>
- <SfxMacroStatement::SfxMacroStatement(const SfxShell&,sal_Bool,const SfxSlot&,sal_Bool,SfxArguments*)>
-*/
-
-: nSlotId( 0 ),
- aStatement( rStatement ),
- bDone( sal_True ),
- pDummy( 0 )
-{
-}
-
-//--------------------------------------------------------------------
-
-SfxMacroStatement::SfxMacroStatement
-(
- const SfxMacroStatement& rOrig // Original, from which it will be copied
-)
-
-/* [Description]
-
- Copy constructor of the sSfxMacroStatement class.
-*/
-
-: nSlotId( rOrig.nSlotId ),
- aStatement( rOrig.aStatement ),
- bDone( rOrig.bDone ),
- pDummy( 0 )
-{
- aArgs = rOrig.aArgs;
-}
-
-//--------------------------------------------------------------------
-
-SfxMacroStatement::~SfxMacroStatement()
-
-/* [Description]
-
- Destructor of the SfxMacroStatement class. Frees the list of the
- current parameters.
-*/
-
-{
-}
-
-//--------------------------------------------------------------------
-
-void SfxMacroStatement::GenerateNameAndArgs_Impl
-(
- const SfxSlot& rSlot, // the slot, which can playback the statement
- sal_Bool bRequestDone, // TRUE=was executed, FALSE=cancelled
- ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& /*rArgs*/
-)
-
-/* [Description]
-
- Internal utility method for generating the functions-/property-names as
- well as the parameter. This method is only used if the application
- programmer has not attached his own source to the <SfxRequest>.
-*/
-
-{
- if ( aStatement.Len() && aStatement.GetChar( aStatement.Len() - 1 ) != '.'
- && rSlot.pName[0] != '.' )
- aStatement += '.';
-
- // The name of the slots is the name of the method or properties
- aStatement += String::CreateFromAscii(rSlot.pName);
- if ( rSlot.IsMode(SFX_SLOT_METHOD) )
- aStatement += DEFINE_CONST_UNICODE("( ");
- else
- aStatement += DEFINE_CONST_UNICODE(" = ");
-
- // Print all required Parameters
- if ( aArgs.getLength() )
- for ( sal_uInt16 nArg = 0; nArg < aArgs.getLength(); ++nArg )
- {
- // represent the parameters textually
- String aArg;
- ::com::sun::star::uno::Any& rValue = aArgs[nArg].Value;
- ::com::sun::star::uno::Type pType = rValue.getValueType();
- if ( pType == ::getBooleanCppuType() )
- {
- sal_Bool bTemp = false;
- rValue >>= bTemp;
- aArg = bTemp ? DEFINE_CONST_UNICODE("TRUE") : DEFINE_CONST_UNICODE("FALSE");
- }
- else if ( pType == ::getCppuType((const sal_Int16*)0) )
- {
- sal_uInt16 nTemp = 0;
- rValue >>= nTemp;
- aArg = String::CreateFromInt32( (sal_Int32) nTemp );
- }
- else if ( pType == ::getCppuType((const sal_Int32*)0) )
- {
- sal_uInt32 nTemp = 0;
- rValue >>= nTemp;
- aArg = String::CreateFromInt32( nTemp );
- }
- else if ( pType == ::getCppuType((const ::rtl::OUString*)0) )
- {
- ::rtl::OUString sTemp;
- rValue >>= sTemp;
-
- // Quotation marks are doubled
- XubString aRecordable( sTemp );
- sal_uInt16 nPos = 0;
- while ( sal_True )
- {
- nPos = aRecordable.SearchAndReplace( String('"'), DEFINE_CONST_UNICODE("\"\""), nPos );
- if ( STRING_NOTFOUND == nPos )
- break;
- nPos += 2;
- }
-
- // non-printable characters are written as chr $(...)
- bool bPrevReplaced = false;
- for ( sal_uInt16 n = 0; n < aRecordable.Len(); ++n )
- {
- sal_Unicode cChar = aRecordable.GetChar(n);
- if ( !( cChar>=32 && cChar!=127 ) ) // As replacement for String::IsPrintable()!
- {
- XubString aReplacement( DEFINE_CONST_UNICODE("+chr$(") );
- aReplacement += cChar;
-
- if ( bPrevReplaced )
- {
- aRecordable.Insert( aReplacement, n - 2 );
- n = n + aReplacement.Len();
- aRecordable.SetChar((unsigned short) (n-2), 0x0029);// ')' = 29h
- aRecordable.Replace( n-1, 2, DEFINE_CONST_UNICODE("+\"") );
- }
- else
- {
- aReplacement += DEFINE_CONST_UNICODE(")+\"");
- aRecordable.SetChar(n, 0x0022 );// '"' = 22h
- aRecordable.Insert( aReplacement, n + 1 );
- n = n + aReplacement.Len();
- }
- bPrevReplaced = true;
- }
- else
- bPrevReplaced = false;
-
- // Argument in quotation marks
- aArg = '"';
- aArg += aRecordable;
- aArg += '"';
- }
- }
- else
- {
- OSL_ENSURE(
- pType == ::getVoidCppuType(), "Unknown Type in recorder!" );
- }
-
- // Attach the parameter
- aStatement += aArg;
- aStatement += DEFINE_CONST_UNICODE(", ");
- }
-
- // End statement
- if ( aArgs.getLength() )
- aStatement.Erase( aStatement.Len() - 2, 1 );
- else
- aStatement.Erase( aStatement.Len() - 1, 1 );
- if ( rSlot.IsMode(SFX_SLOT_METHOD) )
- aStatement += ')';
-
- if ( !bRequestDone )
- // not comment out the "Done ()" marked statements
- aStatement.InsertAscii( "rem ", 0 );
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx
index 6f9c03a..9845cca 100644
--- a/sfx2/source/control/request.cxx
+++ b/sfx2/source/control/request.cxx
@@ -50,7 +50,6 @@
#include <sfx2/dispatch.hxx>
#include <sfx2/msg.hxx>
#include <sfx2/viewfrm.hxx>
-#include "macro.hxx"
#include <sfx2/objface.hxx>
#include <sfx2/appuno.hxx>
#include <rtl/strbuf.hxx>
@@ -351,10 +350,8 @@ void SfxRequest_Impl::Record
/* [Description]
- Internal helper method to create a <SfxMacroStatement> Instance, which
- repeatable describes the just executed SfxRequest. The ownership of thr
- created instance, to which a pointer is returned, is handed over to the
- caller.
+ Internal helper method to create a repeatable description of the just
+ executed SfxRequest.
*/
{
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index cafb0db..aef93fc 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -146,7 +146,6 @@ namespace css = ::com::sun::star;
#include <sfx2/progress.hxx>
#include "workwin.hxx"
#include "helper.hxx"
-#include "macro.hxx"
#include "sfx2/minfitem.hxx"
#include "../appl/app.hrc"
#include "impviewframe.hxx"
commit de2785f9d5fbfe84e728f3549e8883e84780a076
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Sep 10 23:33:39 2011 +0100
SfxMacro is useless
diff --git a/sfx2/inc/macro.hxx b/sfx2/inc/macro.hxx
index a25a654..6d683a2 100644
--- a/sfx2/inc/macro.hxx
+++ b/sfx2/inc/macro.hxx
@@ -145,28 +145,6 @@ enum SfxMacroMode
(example:" active document () ") */
};
-//====================================================================
-
-struct SfxMacro_Impl;
-
-class SfxMacro
-
-/* [Description]
-
- Through using this class (and in fact its subclasses) the location of a
- BASIC function will be discribed (also in which Library, in which module
- and the Function name) as well as temporary storing a macro during the
- recording.
-*/
-
-{
- SfxMacro_Impl* pImp;
-
-public:
- SfxMacro( SfxMacroMode eMode = SFX_MACRO_RECORDINGRELATIVE );
- virtual ~SfxMacro();
-};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/control/macro.cxx b/sfx2/source/control/macro.cxx
index 4016042..a9f9798 100644
--- a/sfx2/source/control/macro.cxx
+++ b/sfx2/source/control/macro.cxx
@@ -349,52 +349,4 @@ void SfxMacroStatement::GenerateNameAndArgs_Impl
aStatement.InsertAscii( "rem ", 0 );
}
-//--------------------------------------------------------------------
-
-SfxMacro::SfxMacro
-(
- SfxMacroMode eMode // Purpose of the instance, see <SfxMacroMode>
-)
-
-/* [Description]
-
- Constructor of the SfxMacro class. Instances of this class are required
- for two purposes in SFx:
-
- 1. for recording macros
- In this cas is th constructor called with SFX_MACRO_RECORDINGABSOLUTE or
- SFX_MACRO_RECORDINGRELATIVE. Should be an instance of a derived class,
- in order to acommodate the derivation of information, where the macro
- should be saved. Such a macro should, in its destructor, be saved at the
- location specified by the user.
-
- 2. Assignment of exisiting macros
- In this case the constructor is called with SFX_MACRO_EXISTING.
- Such a instance is for example needed when macros are to be configured for
- events or <SfxControllerItem>s.
-*/
-
-: pImp( new SfxMacro_Impl )
-
-{
- pImp->eMode = eMode;
-}
-
-//--------------------------------------------------------------------
-
-SfxMacro::~SfxMacro()
-
-/* [Description]
-
- Virtual Destructor of the SfxMacro class. This should be overloaded in
- the derived classes to save the recorded source in the mode
- SFX_MACRO_RECORDINGABSOLUTE and SFX_MACRO_RECORDINGRELATIVE.
-*/
-
-{
- delete pImp;
-}
-
-//--------------------------------------------------------------------
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit a7ca9000aa52737f71add64cfd5560e5511acdd9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Sep 10 23:30:39 2011 +0100
pointless forward decls
diff --git a/sfx2/inc/sfx2/request.hxx b/sfx2/inc/sfx2/request.hxx
index eb5ae95..7bebb73 100644
--- a/sfx2/inc/sfx2/request.hxx
+++ b/sfx2/inc/sfx2/request.hxx
@@ -38,14 +38,12 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/frame/XDispatchRecorder.hpp>
-class SfxMacro;
class SfxPoolItem;
class SfxAllItemSet;
class SfxItemSet;
class SfxItemPool;
class SfxShell;
class SfxSlot;
-class SfxMacroStatement;
class SfxArguments;
class String;
class SfxViewFrame;
diff --git a/sfx2/inc/sfx2/viewfrm.hxx b/sfx2/inc/sfx2/viewfrm.hxx
index 0c66d27..8916d14 100644
--- a/sfx2/inc/sfx2/viewfrm.hxx
+++ b/sfx2/inc/sfx2/viewfrm.hxx
@@ -43,7 +43,6 @@
#include <tools/svborder.hxx>
-class SfxMacro;
class SvBorder;
class SfxDispatcher;
class SfxObjectShell;
commit 154fd181f9c6909090e3dc5ee64645fc5d8fd9be
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Sep 10 23:27:22 2011 +0100
so now SfxRequest::GetRecordingMacro NULL returning stub can be removed
diff --git a/sfx2/inc/macro.hxx b/sfx2/inc/macro.hxx
index 09a6a34..a25a654 100644
--- a/sfx2/inc/macro.hxx
+++ b/sfx2/inc/macro.hxx
@@ -10,8 +10,6 @@
class SfxSlot;
class SfxShell;
-struct SfxMacro_Impl;
-class SfxMacro;
//====================================================================
@@ -149,6 +147,8 @@ enum SfxMacroMode
//====================================================================
+struct SfxMacro_Impl;
+
class SfxMacro
/* [Description]
diff --git a/sfx2/inc/sfx2/request.hxx b/sfx2/inc/sfx2/request.hxx
index d7c993b..eb5ae95 100644
--- a/sfx2/inc/sfx2/request.hxx
+++ b/sfx2/inc/sfx2/request.hxx
@@ -100,7 +100,6 @@ public:
void SetReturnValue(const SfxPoolItem &);
const SfxPoolItem* GetReturnValue() const;
- static SfxMacro* GetRecordingMacro();
static com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > GetMacroRecorder( SfxViewFrame* pFrame=NULL );
static sal_Bool HasMacroRecorder( SfxViewFrame* pFrame=NULL );
sal_uInt16 GetCallMode() const;
diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx
index bc5e03f..6f9c03a 100644
--- a/sfx2/source/control/request.cxx
+++ b/sfx2/source/control/request.cxx
@@ -824,20 +824,6 @@ sal_Bool SfxRequest::IsDone() const
//--------------------------------------------------------------------
-SfxMacro* SfxRequest::GetRecordingMacro()
-
-/* [Description]
-
- With this method it can be queried as to whether and to what <SfxMacro>
- the SfxRequests is being recorded.
-*/
-
-{
- return NULL;
-}
-
-//--------------------------------------------------------------------
-
com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > SfxRequest::GetMacroRecorder( SfxViewFrame* pView )
/* [Description]
commit 9d5fcd70e1bfdb66bb3e8ee7005ac723f1a5061f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Sep 10 23:24:35 2011 +0100
SfxMacro arg unused
diff --git a/sfx2/inc/macro.hxx b/sfx2/inc/macro.hxx
index 9b5146f..09a6a34 100644
--- a/sfx2/inc/macro.hxx
+++ b/sfx2/inc/macro.hxx
@@ -25,8 +25,7 @@ class SfxMacroStatement
#ifdef _SFXMACRO_HXX
private:
- void GenerateNameAndArgs_Impl( SfxMacro *pMacro,
- const SfxSlot &rSlot,
+ void GenerateNameAndArgs_Impl( const SfxSlot &rSlot,
sal_Bool bRequestDone,
::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& aArgs );
#endif
diff --git a/sfx2/source/control/macro.cxx b/sfx2/source/control/macro.cxx
index 26f6abc..4016042 100644
--- a/sfx2/source/control/macro.cxx
+++ b/sfx2/source/control/macro.cxx
@@ -127,7 +127,7 @@ SfxMacroStatement::SfxMacroStatement
aStatement = DEFINE_CONST_UNICODE("Selection");
// to these object expression of the Method-/Property-Name and parameters
- GenerateNameAndArgs_Impl( SfxRequest::GetRecordingMacro(), rSlot, bRequestDone, aArgs);
+ GenerateNameAndArgs_Impl( rSlot, bRequestDone, aArgs);
}
//--------------------------------------------------------------------
@@ -156,7 +156,7 @@ SfxMacroStatement::SfxMacroStatement
{
aStatement = rTarget;
aStatement += '.';
- GenerateNameAndArgs_Impl( SfxRequest::GetRecordingMacro(), rSlot, bRequestDone, aArgs);
+ GenerateNameAndArgs_Impl( rSlot, bRequestDone, aArgs);
}
//--------------------------------------------------------------------
@@ -224,7 +224,6 @@ SfxMacroStatement::~SfxMacroStatement()
void SfxMacroStatement::GenerateNameAndArgs_Impl
(
- SfxMacro* /*pMacro*/, // in this is recorded
const SfxSlot& rSlot, // the slot, which can playback the statement
sal_Bool bRequestDone, // TRUE=was executed, FALSE=cancelled
::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& /*rArgs*/
commit d7842b76d8fdef15a1019c99af322c0ae37cb8db
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Sep 10 23:23:22 2011 +0100
SfxMacro is unused, strip down to ctor/dtor
diff --git a/basctl/source/inc/basobj.hxx b/basctl/source/inc/basobj.hxx
index 95d2431..e168542 100644
--- a/basctl/source/inc/basobj.hxx
+++ b/basctl/source/inc/basobj.hxx
@@ -36,7 +36,6 @@
#include <com/sun/star/script/XLibraryContainer.hpp>
#include <com/sun/star/frame/XModel.hpp>
-class SfxMacro;
class SbMethod;
class SbModule;
class SbxObject;
diff --git a/sfx2/inc/macro.hxx b/sfx2/inc/macro.hxx
index 695becf..9b5146f 100644
--- a/sfx2/inc/macro.hxx
+++ b/sfx2/inc/macro.hxx
@@ -166,11 +166,6 @@ class SfxMacro
public:
SfxMacro( SfxMacroMode eMode = SFX_MACRO_RECORDINGRELATIVE );
virtual ~SfxMacro();
-
- SfxMacroMode GetMode() const;
- void Record( SfxMacroStatement *pStatement );
- void Replace( SfxMacroStatement *pStatement );
- void Remove();
};
#endif
diff --git a/sfx2/source/control/macro.cxx b/sfx2/source/control/macro.cxx
index db69545..26f6abc 100644
--- a/sfx2/source/control/macro.cxx
+++ b/sfx2/source/control/macro.cxx
@@ -398,123 +398,4 @@ SfxMacro::~SfxMacro()
//--------------------------------------------------------------------
-SfxMacroMode SfxMacro::GetMode() const
-
-/* [Description]
-
- Returns the mode, which indicates for what purpose this SfxMacro was
- constructed.
-
- [Cross-reference]
-
- enum <SfxMacroMode>
-*/
-
-{
- return pImp->eMode;
-}
-
-//--------------------------------------------------------------------
-
-void SfxMacro::Record
-(
- SfxMacroStatement* pStatement // the recordning <SfxMacroStatement>
-)
-
-/* [Description]
-
- This method features the parameters passed on as a Statement. The
- instance to which the pointer points is transfered to the ownership
- of SfxMacro.
-
- The call is only valid if it is about a SfxMacro, which was constructed
- with SFX_MACRO_RECORDINGRELATIVE or SFX_MACRO_RECORDINGABSOLUTE and is
- available as an already recorded statement.
-
- [Cross-reference]
-
- <SfxMacro::Replace(SfxMacroStatement*)>
- <SfxMacro::Remove()>
-*/
-
-{
- DBG_ASSERT( pImp->eMode != SFX_MACRO_EXISTING, "invalid call to non-recording SfxMacro" );
- pImp->aList.C40_INSERT( SfxMacroStatement, pStatement, pImp->aList.Count() );
-}
-
-//--------------------------------------------------------------------
-
-void SfxMacro::Replace
-(
- SfxMacroStatement* pStatement // the recording <SfxMacroStatement>
-)
-
-/* [Description]
-
- This method records the statement passed on as a parameter. This will
- overwrite the last recorded statement. The instance to which the passed
- pointer points is transfered to the ownership of the SfxMacro.
-
- With this method it is possible to combine statements. For example, instead
- of calling the 'CursorLeft()' five times could be summarized as
- 'CursorLeft (5)'. Or rather than building a word letter by letter, this
- could be done by a single statement 'InsertString("Hello")'.
-
- The call is only valid if it is about a SfxMacro, which was constructed
- with SFX_MACRO_RECORDINGRELATIVE or SFX_MACRO_RECORDINGABSOLUTE and is
- available as an already recorded statement.
-
- [Note]
-
- This method is typically called from the execute methods of
- <SfxSlot>s created by the application developers.
-
- [Cross-reference]
-
- <SfxMacro::Record(SfxMacroStatement*)>
- <SfxMacro::Remove()>
-*/
-
-{
- DBG_ASSERT( pImp->eMode != SFX_MACRO_EXISTING, "invalid call to non-recording SfxMacro" );
- DBG_ASSERT( pImp->aList.Count(), "no replaceable statement available" );
- pImp->aList.Remove( pImp->aList.Count() - 1 );
- pImp->aList.C40_INSERT( SfxMacroStatement,pStatement, pImp->aList.Count() );
-}
-
-//--------------------------------------------------------------------
-
-void SfxMacro::Remove()
-
-/* [Description]
-
- This method deletes the last recorded <SfxMacroStatement> and removes
- it from the macro.
-
- With this method it is possible to combine statements. For example, instead
- of calling the 'CursorLeft()' five times could be summarized as
- 'CursorLeft (5)'. Or rather than building a word letter by letter, this
- could be done by a single statement 'InsertString("Hello")'.
-
- The call is only valid if it is about a SfxMacro, which was constructed
- with SFX_MACRO_RECORDINGRELATIVE or SFX_MACRO_RECORDINGABSOLUTE and is
- available as an already recorded statement.
-
- [Note]
-
- This method is typically called from the the Execute methods of <SfxSlot>s
- by the application developer.
-
- [Cross-reference]
-
- <SfxMacro::Replace(SfxMacroStatement*)>
- <SfxMacro::Record(SfxMacroStatement*)>
-*/
-
-{
- DBG_ASSERT( pImp->eMode != SFX_MACRO_EXISTING, "invalid call to non-recording SfxMacro" );
- DBG_ASSERT( pImp->aList.Count(), "no replaceable statement available" );
- pImp->aList.Remove( pImp->aList.Count() - 1 );
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 051ded51b0818043c9c9b8ccd4c6fbfacd00408a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Sep 10 22:53:50 2011 +0100
this dir is unbuilt
diff --git a/automation/source/mozillaserver/makefile.mk b/automation/source/mozillaserver/makefile.mk
deleted file mode 100644
index fcd7e1c..0000000
--- a/automation/source/mozillaserver/makefile.mk
+++ /dev/null
@@ -1,121 +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
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=automation
-TARGET=xxx
-USE_DEFFILE=TRUE
-NO_BSYMBOLIC=TRUE
-ENABLE_EXCEPTIONS=TRUE
-LIBTARGET=NO
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# ------------------------------------------------------------------
-
-PACKAGE := com$/sun$/star$/testtool
-TARGET := com_sun_star_testtool
-
-RDB=$(BIN)$/mozillatesttool.rdb
-
-
-GENJAVACLASSFILES = \
- $(CLASSDIR)$/$(PACKAGE)$/XAction.class \
- $(CLASSDIR)$/$(PACKAGE)$/XActionControl.class \
- $(CLASSDIR)$/$(PACKAGE)$/XActionCommand.class \
- $(CLASSDIR)$/$(PACKAGE)$/XActionControl.class \
- $(CLASSDIR)$/$(PACKAGE)$/XActionFlow.class \
- $(CLASSDIR)$/$(PACKAGE)$/XResult.class \
- $(CLASSDIR)$/$(PACKAGE)$/ResultType.class \
- $(CLASSDIR)$/$(PACKAGE)$/XMozillaTesttoolServer.class
-
-
-TYPES={$(subst,.class, $(subst,$/,. $(subst,$(CLASSDIR)$/,-T $(GENJAVACLASSFILES))))}
-GENJAVAFILES = {$(subst,.class,.java $(subst,$/class, $(GENJAVACLASSFILES)))}
-
-
-UNOUCRDEP=$(RDB)
-UNOUCRRDB=$(RDB)
-
-UNOUCROUT=$(OUT)$/inc
-INCPRE+=$(OUT)$/inc
-
-UNOTYPES= \
- com.sun.star.uno.TypeClass \
- com.sun.star.uno.XAggregation \
- com.sun.star.uno.XWeak \
- com.sun.star.lang.XTypeProvider \
- com.sun.star.lang.XServiceInfo \
- com.sun.star.lang.XSingleServiceFactory \
- com.sun.star.lang.XMultiServiceFactory \
- com.sun.star.lang.XComponent \
- com.sun.star.lang.XMain \
- com.sun.star.loader.XImplementationLoader \
- com.sun.star.registry.XRegistryKey \
- com.sun.star.bridge.XUnoUrlResolver \
- com.sun.star.container.XSet \
- com.sun.star.testtool.XAction \
- com.sun.star.testtool.XActionControl \
- com.sun.star.testtool.XActionCommand \
- com.sun.star.testtool.XActionControl \
- com.sun.star.testtool.XActionFlow \
- com.sun.star.testtool.XResult \
- com.sun.star.testtool.ResultType \
- com.sun.star.testtool.XMozillaTesttoolServer
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-ALLTAR : $(GENJAVAFILES)
-
-ALLIDLFILES= \
- mozillatesttoolserver.idl \
- xmozillatesttoolserver.idl
-
-$(RDB): $(ALLIDLFILES)
- $(TOUCH) $@
- $(RM) $@
- unoidl -I$(PRJ) -I$(SOLARIDLDIR) -Burd -OH$(BIN) $?
- $(REGMERGE) $@ /UCR $(BIN)$/{$(ALLIDLFILES:f:s/.idl/.urd/)}
- $(REGMERGE) $@ / $(SOLARBINDIR)$/applicat.rdb
- $(REGCOMP) -register -r $@ -c $(DLLPRE)connectr$(DLLPOST)
- $(REGCOMP) -register -r $@ -c $(DLLPRE)acceptor$(DLLPOST)
- $(REGCOMP) -register -r $@ -c $(DLLPRE)brdgfctr$(DLLPOST)
- $(REGCOMP) -register -r $@ -c $(DLLPRE)remotebridge$(DLLPOST)
- $(TOUCH) $@
-
-
-$(GENJAVAFILES): $(RDB)
- @echo Types: $(TYPES)
- @echo Javafiles: $(GENJAVAFILES)
- $(JAVAMAKER) -BUCR -O$(OUT) $(TYPES) $(RDB)
-
-
diff --git a/automation/source/mozillaserver/mozillatesttoolserver.idl b/automation/source/mozillaserver/mozillatesttoolserver.idl
deleted file mode 100644
index 5b5b5ac..0000000
--- a/automation/source/mozillaserver/mozillatesttoolserver.idl
+++ /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
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef __com_sun_star_testtool_MozillaTesttoolServer_idl__
-#define __com_sun_star_testtool_MozillaTesttoolServer_idl__
-
-#include <xmozillatesttoolserver.idl>
-
-//=============================================================================
-
-module com { module sun { module star { module testtool {
-
-//=============================================================================
-/**
- * This service provides the ability to control Mozilla
- *<BR>
- */
-service MozillaTesttoolServer
-{
- /** resolve objects via this interface.
- */
- interface com::sun::star::testtool::XMozillaTesttoolServer;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
diff --git a/automation/source/mozillaserver/xmozillatesttoolserver.idl b/automation/source/mozillaserver/xmozillatesttoolserver.idl
deleted file mode 100644
index 51755a6..0000000
--- a/automation/source/mozillaserver/xmozillatesttoolserver.idl
+++ /dev/null
@@ -1,157 +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
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef __com_sun_star_testtool_XMozillaTesttoolServer_idl__
-#define __com_sun_star_testtool_XMozillaTesttoolServer_idl__
-
-#include <com/sun/star/uno/XInterface.idl>
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#include <com/sun/star/connection/NoConnectException.idl>
-
-//=============================================================================
-
-module com { module sun { module star { module testtool {
-
-//=============================================================================
-/** Service com.sun.star.devtools.IServerProxy implements this interface.
- */
-[ uik(E2423753-33D6-11D1-AABE00A0-259D5623), ident( "XMozillaTesttoolServer", 1.0 ) ]
-interface XAction : com::sun::star::uno::XInterface
-{
- /** execute one command
- <BR>
- */
- void execute();
-
-};
-
-//=============================================================================
-
-
-//=============================================================================
-/** Service com.sun.star.devtools.IServerProxy implements this interface.
- */
-[ uik(E2423753-33D6-11D1-AABE00A0-259D5623), ident( "XMozillaTesttoolServer", 1.0 ) ]
-interface XActionControl : XAction
-{
- /** execute one command
- <BR>
- */
- void execute();
-
-};
-
-//=============================================================================
-
-
-//=============================================================================
-/** Service com.sun.star.devtools.IServerProxy implements this interface.
- */
-[ uik(E2423753-33D6-11D1-AABE00A0-259D5623), ident( "XMozillaTesttoolServer", 1.0 ) ]
-interface XActionCommand : XAction
-{
- /** execute one command
- <BR>
- */
- void execute();
-
-};
-
-//=============================================================================
-/** Service com.sun.star.devtools.IServerProxy implements this interface.
- */
-[ uik(E2423743-33D6-11D1-AABE00A0-259D5623), ident( "XActionFlow", 1.0 ) ]
-interface XActionFlow : XAction
-{
- /** execute one command
- <BR>
- */
- void execute();
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-//=============================================================================
-
-module com { module sun { module star { module testtool {
-
-
-enum ResultType
- {
- SEQUENCE, /// command with SEQUENCE has been executed
- ERROR, /// An error has ocured
- RESULT, /// Result of a request
- ASSERTION, /// An Assertion has been captured
- UI_INFO /// Info about the UserInterfaace
- };
-
-//=============================================================================
-/** Service com.sun.star.devtools.IServerProxy implements this interface.
- */
-[ uik(E2426453-33D6-11D1-AABE00A0-259D5623), ident( "XResult", 1.0 ) ]
-interface XResult : com::sun::star::uno::XInterface
-{
- /** execute one command
- <BR>
- */
- void SetResultType( [in] ResultType aType );
- ResultType GetResultType();
-
- void SetValue( [in] any Value );
- any GetValue();
-};
-
-//=============================================================================
-
-}; }; }; };
-
-//=============================================================================
-
-module com { module sun { module star { module testtool {
-
-//=============================================================================
-/** Service com.sun.star.devtools.IServerProxy implements this interface.
- */
-[ uik(E2446735-33D6-11D1-AABE00A0-259D5623), ident( "XMozillaTesttoolServer", 1.0 ) ]
-interface XMozillaTesttoolServer : com::sun::star::uno::XInterface
-{
- /** Control the Mozilla Browser
- <BR>
- */
- [oneway] void execute( [in] XAction aAction );
-// sequence < XResult > getResults( [in] boolean bBlock ); /// bBoch = TRUE means to wait for at least 1 result
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-
-#endif
commit ea05a88c5d9935d2835ff0d42f1df731f687b1ba
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Sep 10 22:36:51 2011 +0100
use boost::noncopyable and rtl::Static
diff --git a/svx/source/accessibility/DGColorNameLookUp.cxx b/svx/source/accessibility/DGColorNameLookUp.cxx
index 844cd7f..ca67301 100644
--- a/svx/source/accessibility/DGColorNameLookUp.cxx
+++ b/svx/source/accessibility/DGColorNameLookUp.cxx
@@ -42,29 +42,18 @@ using namespace ::com::sun::star;
namespace accessibility {
-// Initialize the class instance with NULL. A true instance is created only
-// when the static <member>Instance</member> is called for the first time.
-DGColorNameLookUp* DGColorNameLookUp::mpInstance = NULL;
-
-DGColorNameLookUp& DGColorNameLookUp::Instance (void)
+namespace
{
- // Using double check pattern to make sure that exactly one instance of
- // the shape type handler is instantiated.
- if (mpInstance == NULL)
+ class theDGColorNameLookUp
+ : public rtl::Static< DGColorNameLookUp, theDGColorNameLookUp >
{
- SolarMutexGuard aGuard;
- if (mpInstance == NULL)
- {
- // Create the single instance of the color name look up.
- mpInstance = new DGColorNameLookUp();
- }
- }
-
- return *mpInstance;
+ };
}
-
-
+DGColorNameLookUp& DGColorNameLookUp::Instance()
+{
+ return theDGColorNameLookUp::get();
+}
OUString DGColorNameLookUp::LookUpColor (long int nColor) const
{
@@ -89,7 +78,7 @@ OUString DGColorNameLookUp::LookUpColor (long int nColor) const
-DGColorNameLookUp::DGColorNameLookUp (void)
+DGColorNameLookUp::DGColorNameLookUp()
{
uno::Sequence<OUString> aNames;
uno::Reference<container::XNameAccess> xNA;
@@ -141,7 +130,7 @@ DGColorNameLookUp::DGColorNameLookUp (void)
-DGColorNameLookUp::~DGColorNameLookUp (void)
+DGColorNameLookUp::~DGColorNameLookUp()
{
maColorValueToNameMap.clear();
}
diff --git a/svx/source/inc/DGColorNameLookUp.hxx b/svx/source/inc/DGColorNameLookUp.hxx
index 8ed8832..d3a04a2 100644
--- a/svx/source/inc/DGColorNameLookUp.hxx
+++ b/svx/source/inc/DGColorNameLookUp.hxx
@@ -30,7 +30,9 @@
#define _SVX_ACCESSIBILITY_DG_COLOR_NAME_LOOK_UP_HXX
#include <rtl/ustrbuf.hxx>
+#include <rtl/instance.hxx>
#include <boost/unordered_map.hpp>
+#include <boost/noncopyable.hpp>
namespace accessibility {
@@ -49,7 +51,7 @@ namespace accessibility {
its values may change during this time. Reacting to these changes
remains a task for the future.</p>
*/
-class DGColorNameLookUp
+class DGColorNameLookUp : private ::boost::noncopyable
{
public:
/** Return the single instance of this class. Use this to look up
@@ -77,22 +79,11 @@ private:
/// This ma translates from numerical color values to names.
tColorValueToNameMap maColorValueToNameMap;
- /** The pointer to the only instance of this class. It is NULL until
- the <member>Instance</member> is called for the first time.
- */
- static DGColorNameLookUp* mpInstance;
-
+private:
+ template<class> friend class rtl::Static;
/// Create a new (the only) instance of this class.
DGColorNameLookUp();
-
- /// The destructor is never called.
~DGColorNameLookUp();
-
- /// The copy constructor is not implemented.
- DGColorNameLookUp (const DGColorNameLookUp&);
-
- /// The assignment operator is not implemented.
- DGColorNameLookUp& operator= (const DGColorNameLookUp&);
};
} // end of namespace accessibility
commit 6bc7ca66d938f4e02b084fe4ab215a370058ff2a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Sep 10 22:00:29 2011 +0100
c++ defaults to void
diff --git a/svx/source/inc/DGColorNameLookUp.hxx b/svx/source/inc/DGColorNameLookUp.hxx
index 9c766d0..8ed8832 100644
--- a/svx/source/inc/DGColorNameLookUp.hxx
+++ b/svx/source/inc/DGColorNameLookUp.hxx
@@ -55,7 +55,7 @@ public:
/** Return the single instance of this class. Use this to look up
color names with the <member>LookUpColor()</member> method.
*/
- static DGColorNameLookUp& Instance (void);
+ static DGColorNameLookUp& Instance();
/** Return the color name of the color expressed by the given integer.
@param nColor
@@ -83,10 +83,10 @@ private:
static DGColorNameLookUp* mpInstance;
/// Create a new (the only) instance of this class.
- DGColorNameLookUp (void);
+ DGColorNameLookUp();
/// The destructor is never called.
- ~DGColorNameLookUp (void);
+ ~DGColorNameLookUp();
/// The copy constructor is not implemented.
DGColorNameLookUp (const DGColorNameLookUp&);
commit 07f9a847f027139d75ac5eb7c8b48a8bb8cb1324
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Sep 10 21:57:41 2011 +0100
callcatcher: various unused methods
diff --git a/accessibility/source/extended/AccessibleGridControl.cxx b/accessibility/source/extended/AccessibleGridControl.cxx
index f48415e..7c815c4 100644
--- a/accessibility/source/extended/AccessibleGridControl.cxx
+++ b/accessibility/source/extended/AccessibleGridControl.cxx
@@ -74,8 +74,6 @@ public:
AccessibleGridControlHeader* m_pColumnHeaderBar;
};
-DBG_NAME( AccessibleGridControl )
-
AccessibleGridControl::AccessibleGridControl(
const Reference< XAccessible >& _rxParent, const Reference< XAccessible >& _rxCreator,
IAccessibleTable& _rTable )
@@ -320,7 +318,7 @@ AccessibleGridControlTable* AccessibleGridControl::createAccessibleTable()
// ============================================================================
// = AccessibleGridControlAccess
// ============================================================================
-DBG_NAME( AccessibleGridControlAccess )
+
// -----------------------------------------------------------------------------
AccessibleGridControlAccess::AccessibleGridControlAccess( const Reference< XAccessible >& _rxParent, IAccessibleTable& _rTable )
:m_xParent( _rxParent )
diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx
index c3af90e..32ae873 100644
--- a/accessibility/source/extended/AccessibleGridControlBase.cxx
+++ b/accessibility/source/extended/AccessibleGridControlBase.cxx
@@ -58,8 +58,6 @@ namespace accessibility {
using namespace com::sun::star::accessibility::AccessibleStateType;
// ============================================================================
-DBG_NAME( AccessibleGridControlBase )
-
AccessibleGridControlBase::AccessibleGridControlBase(
const Reference< XAccessible >& rxParent,
svt::table::IAccessibleTable& rTable,
diff --git a/accessibility/source/extended/AccessibleGridControlHeader.cxx b/accessibility/source/extended/AccessibleGridControlHeader.cxx
index a46a380..1a50289 100644
--- a/accessibility/source/extended/AccessibleGridControlHeader.cxx
+++ b/accessibility/source/extended/AccessibleGridControlHeader.cxx
@@ -58,8 +58,6 @@ namespace accessibility {
// ============================================================================
-DBG_NAME( AccessibleGridControlHeader )
-
AccessibleGridControlHeader::AccessibleGridControlHeader(
const Reference< XAccessible >& rxParent,
::svt::table::IAccessibleTable& rTable,
diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx
index 70976a1..02c5806 100644
--- a/accessibility/source/extended/AccessibleGridControlTable.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTable.cxx
@@ -52,8 +52,6 @@ namespace accessibility {
// ============================================================================
-DBG_NAME( AccessibleGridControlTable )
-
AccessibleGridControlTable::AccessibleGridControlTable(
const Reference< XAccessible >& rxParent,
IAccessibleTable& rTable,
diff --git a/accessibility/source/extended/AccessibleGridControlTableBase.cxx b/accessibility/source/extended/AccessibleGridControlTableBase.cxx
index 6b034b9..16585e7 100644
--- a/accessibility/source/extended/AccessibleGridControlTableBase.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTableBase.cxx
@@ -55,8 +55,6 @@ namespace accessibility {
// ============================================================================
-DBG_NAME( AccessibleGridControlTableBase )
-
AccessibleGridControlTableBase::AccessibleGridControlTableBase(
const Reference< XAccessible >& rxParent,
IAccessibleTable& rTable,
diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx
index 33b0371..4dbe052 100644
--- a/dbaccess/source/core/api/RowSetBase.cxx
+++ b/dbaccess/source/core/api/RowSetBase.cxx
@@ -1553,12 +1553,6 @@ void ORowSetNotifier::fire()
return m_pImpl->aChangedColumns;
}
-::std::vector<Any>& ORowSetNotifier::getChangedBookmarks() const
-{
- OSL_ENSURE(m_pImpl.get(),"Illegal CTor call, use the other one!");
- return m_pImpl->aChangedBookmarks;
-}
-
void ORowSetNotifier::firePropertyChange()
{
OSL_ENSURE(m_pImpl.get(),"Illegal CTor call, use the other one!");
diff --git a/dbaccess/source/core/api/RowSetBase.hxx b/dbaccess/source/core/api/RowSetBase.hxx
index 2a931d5..c7f8bce 100644
--- a/dbaccess/source/core/api/RowSetBase.hxx
+++ b/dbaccess/source/core/api/RowSetBase.hxx
@@ -416,7 +416,6 @@ namespace dbaccess
/** use this one to store the inde of the changed column values
*/
::std::vector<sal_Int32>& getChangedColumns() const;
- ::std::vector<com::sun::star::uno::Any>& getChangedBookmarks() const;
};
diff --git a/editeng/inc/editeng/AccessibleEditableTextPara.hxx b/editeng/inc/editeng/AccessibleEditableTextPara.hxx
index dac131a..e87fb1a 100644
--- a/editeng/inc/editeng/AccessibleEditableTextPara.hxx
+++ b/editeng/inc/editeng/AccessibleEditableTextPara.hxx
@@ -246,8 +246,6 @@ namespace accessibility
/// Calls all Listener objects to tell them the change. Don't hold locks when calling this!
virtual void FireEvent(const sal_Int16 nEventId, const ::com::sun::star::uno::Any& rNewValue = ::com::sun::star::uno::Any(), const ::com::sun::star::uno::Any& rOldValue = ::com::sun::star::uno::Any() ) const;
- /// Queries the given state on the internal state set
- bool HasState( const sal_Int16 nStateId );
/// Sets the given state on the internal state set and fires STATE_CHANGE event. Don't hold locks when calling this!
void SetState( const sal_Int16 nStateId );
/// Unsets the given state on the internal state set and fires STATE_CHANGE event. Don't hold locks when calling this!
@@ -326,29 +324,14 @@ namespace accessibility
void GotPropertyEvent( const ::com::sun::star::uno::Any& rNewValue, const sal_Int16 nEventId ) const;
void LostPropertyEvent( const ::com::sun::star::uno::Any& rOldValue, const sal_Int16 nEventId ) const;
- /** Query the visibility state
-
- @attention This method does not lock the SolarMutex,
- leaving that to the calling code. This is because only
- there potential deadlock situations can be resolved. Thus,
- make sure SolarMutex is locked when calling this.
-
- @return the visibility state. Per definition, a defunc object is no longer visible
- */
- sal_Bool IsVisible() const;
-
int getNotifierClientId() const;
/// Do we have children? This is the case for image bullets
sal_Bool HaveChildren();
- /// Is the underlying object in edit mode
- sal_Bool IsActive() const SAL_THROW((::com::sun::star::uno::RuntimeException));
-
const Point& GetEEOffset() const;
// Get text from forwarder
- String GetText( sal_Int32 nIndex ) SAL_THROW((::com::sun::star::uno::RuntimeException));
String GetTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) SAL_THROW((::com::sun::star::uno::RuntimeException));
sal_uInt16 GetTextLen() const SAL_THROW((::com::sun::star::uno::RuntimeException));
diff --git a/editeng/inc/editeng/AccessibleImageBullet.hxx b/editeng/inc/editeng/AccessibleImageBullet.hxx
index aa470ea..50ee57e 100644
--- a/editeng/inc/editeng/AccessibleImageBullet.hxx
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list