summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--connectivity/source/drivers/mork/MColumnAlias.cxx4
-rw-r--r--connectivity/source/drivers/mork/MColumnAlias.hxx1
-rw-r--r--framework/inc/xml/menudocumenthandler.hxx4
-rw-r--r--framework/source/fwe/xml/menuconfiguration.cxx2
-rw-r--r--framework/source/fwe/xml/menudocumenthandler.cxx9
-rw-r--r--sc/source/filter/inc/formulabase.hxx10
-rw-r--r--sc/source/filter/oox/formulabase.cxx5
-rw-r--r--tools/inc/tools/string.hxx4
-rw-r--r--tools/source/string/tustring.cxx54
-rwxr-xr-xunusedcode.easy7
-rw-r--r--vcl/source/window/builder.cxx2
11 files changed, 8 insertions, 94 deletions
diff --git a/connectivity/source/drivers/mork/MColumnAlias.cxx b/connectivity/source/drivers/mork/MColumnAlias.cxx
index ba653c3e9009..624b5ab88e43 100644
--- a/connectivity/source/drivers/mork/MColumnAlias.cxx
+++ b/connectivity/source/drivers/mork/MColumnAlias.cxx
@@ -87,10 +87,6 @@ OColumnAlias::OColumnAlias( const ::com::sun::star::uno::Reference< ::com::sun::
initialize( _rxORB );
}
-OColumnAlias::OColumnAlias()
-{
-}
-
//------------------------------------------------------------------------------
void OColumnAlias::initialize( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB )
{
diff --git a/connectivity/source/drivers/mork/MColumnAlias.hxx b/connectivity/source/drivers/mork/MColumnAlias.hxx
index 21f21963fc81..4f50a44ef954 100644
--- a/connectivity/source/drivers/mork/MColumnAlias.hxx
+++ b/connectivity/source/drivers/mork/MColumnAlias.hxx
@@ -57,7 +57,6 @@ namespace connectivity
public:
OColumnAlias( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & );
- OColumnAlias();
inline bool hasAlias( const ::rtl::OUString& _rAlias ) const
{
diff --git a/framework/inc/xml/menudocumenthandler.hxx b/framework/inc/xml/menudocumenthandler.hxx
index de1bbd98387e..b3f3ddd54095 100644
--- a/framework/inc/xml/menudocumenthandler.hxx
+++ b/framework/inc/xml/menudocumenthandler.hxx
@@ -102,12 +102,9 @@ class FWE_DLLPUBLIC OReadMenuDocumentHandler : public ReadMenuDocumentHandlerBas
{
public:
OReadMenuDocumentHandler(
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
const com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer >& rItemContainer );
virtual ~OReadMenuDocumentHandler();
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& getServiceFactory();
-
// XDocumentHandler
virtual void SAL_CALL startDocument(void)
throw ( ::com::sun::star::xml::sax::SAXException,
@@ -136,7 +133,6 @@ class FWE_DLLPUBLIC OReadMenuDocumentHandler : public ReadMenuDocumentHandlerBas
sal_Bool m_bMenuBarMode;
com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > m_xMenuBarContainer;
com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory > m_xContainerFactory;
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& mxServiceFactory;
}; // OReadMenuDocumentHandler
diff --git a/framework/source/fwe/xml/menuconfiguration.cxx b/framework/source/fwe/xml/menuconfiguration.cxx
index 0cd54b6d055f..61fd1302a15f 100644
--- a/framework/source/fwe/xml/menuconfiguration.cxx
+++ b/framework/source/fwe/xml/menuconfiguration.cxx
@@ -72,7 +72,7 @@ throw ( WrappedTargetException )
// create namespace filter and set menudocument handler inside to support xml namespaces
- Reference< XDocumentHandler > xDocHandler( new OReadMenuDocumentHandler( m_rxServiceManager, xItemContainer ));
+ Reference< XDocumentHandler > xDocHandler( new OReadMenuDocumentHandler( xItemContainer ));
Reference< XDocumentHandler > xFilter( new SaxNamespaceFilter( xDocHandler ));
diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx
index 3f253b5b4a61..9e498de9e6cb 100644
--- a/framework/source/fwe/xml/menudocumenthandler.cxx
+++ b/framework/source/fwe/xml/menudocumenthandler.cxx
@@ -228,21 +228,14 @@ void ReadMenuDocumentHandlerBase::initPropertyCommon(
// -----------------------------------------------------------------------------
OReadMenuDocumentHandler::OReadMenuDocumentHandler(
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
const Reference< XIndexContainer >& rMenuBarContainer )
: m_nElementDepth( 0 ),
m_bMenuBarMode( sal_False ),
m_xMenuBarContainer( rMenuBarContainer ),
- m_xContainerFactory( rMenuBarContainer, UNO_QUERY ),
- mxServiceFactory(xServiceFactory)
+ m_xContainerFactory( rMenuBarContainer, UNO_QUERY )
{
}
-const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& OReadMenuDocumentHandler::getServiceFactory()
-{
- return mxServiceFactory;
-}
-
OReadMenuDocumentHandler::~OReadMenuDocumentHandler()
{
}
diff --git a/sc/source/filter/inc/formulabase.hxx b/sc/source/filter/inc/formulabase.hxx
index 404554ba67d3..342e5338791b 100644
--- a/sc/source/filter/inc/formulabase.hxx
+++ b/sc/source/filter/inc/formulabase.hxx
@@ -653,16 +653,6 @@ public:
const BinAddress& rAddress,
bool bAbsolute );
- /** Generates a cell range string in A1:A1 notation from the passed cell
- range address.
-
- @param rRange The cell range address containing column and row indexes.
- @param bAbsolute True = adds dollar signs before columns and rows.
- */
- static ::rtl::OUString generateRange2dString(
- const ::com::sun::star::table::CellRangeAddress& rRange,
- bool bAbsolute );
-
/** Generates a cell range string in A1:A1 notation from the passed binary
cell range address.
diff --git a/sc/source/filter/oox/formulabase.cxx b/sc/source/filter/oox/formulabase.cxx
index 3aca87f57049..ca6d46f85695 100644
--- a/sc/source/filter/oox/formulabase.cxx
+++ b/sc/source/filter/oox/formulabase.cxx
@@ -1433,11 +1433,6 @@ OUString FormulaProcessorBase::generateAddress2dString( const BinAddress& rAddre
return aBuffer.makeStringAndClear();
}
-OUString FormulaProcessorBase::generateRange2dString( const CellRangeAddress& rRange, bool bAbsolute )
-{
- return generateRange2dString( BinRange( rRange ), bAbsolute );
-}
-
OUString FormulaProcessorBase::generateRange2dString( const BinRange& rRange, bool bAbsolute )
{
OUStringBuffer aBuffer( generateAddress2dString( rRange.maFirst, bAbsolute ) );
diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx
index b98899ef502f..674c36d46f65 100644
--- a/tools/inc/tools/string.hxx
+++ b/tools/inc/tools/string.hxx
@@ -131,6 +131,8 @@ private:
sal_uInt32 nCvtFlags = BYTESTRING_TO_UNISTRING_CVTFLAGS );
TOOLS_DLLPRIVATE UniString( const sal_Unicode* pCharStr );
TOOLS_DLLPRIVATE UniString( const sal_Unicode* pCharStr, xub_StrLen nLen );
+ TOOLS_DLLPRIVATE UniString( sal_Unicode c );
+ TOOLS_DLLPRIVATE UniString& Assign( const sal_Unicode* pCharStr, xub_StrLen nLen );
TOOLS_DLLPRIVATE UniString& Expand( xub_StrLen nCount, sal_Unicode cExpandChar );
public:
UniString();
@@ -138,7 +140,6 @@ public:
UniString( const UniString& rStr );
UniString( const UniString& rStr, xub_StrLen nPos, xub_StrLen nLen );
UniString( const rtl::OUString& rStr );
- UniString( sal_Unicode c );
UniString(char c); // ...but allow "UniString('a')"
UniString( const sal_Char* pByteStr,
rtl_TextEncoding eTextEncoding,
@@ -174,7 +175,6 @@ public:
UniString& Assign( const UniString& rStr );
UniString& Assign( const rtl::OUString& rStr );
UniString& Assign( const sal_Unicode* pCharStr );
- UniString& Assign( const sal_Unicode* pCharStr, xub_StrLen nLen );
UniString& Assign( sal_Unicode c );
inline UniString & Assign(char c) // ...but allow "Assign('a')"
{ return Assign(static_cast< sal_Unicode >(c)); }
diff --git a/tools/source/string/tustring.cxx b/tools/source/string/tustring.cxx
index 898d2d899597..0beac79dba6a 100644
--- a/tools/source/string/tustring.cxx
+++ b/tools/source/string/tustring.cxx
@@ -320,16 +320,6 @@ STRCODE* STRING::AllocBuffer( xub_StrLen nLen )
return mpData->maStr;
}
-STRING::STRING( STRCODE c )
-{
- DBG_CTOR( STRING, DBGCHECKSTRING );
- DBG_ASSERT( c, "String::String() - c is 0" );
-
- // Initalize maintenance data
- mpData = ImplAllocData( 1 );
- mpData->maStr[0] = c;
-}
-
STRING& STRING::Insert( STRCODE c, xub_StrLen nIndex )
{
DBG_CHKTHIS( STRING, DBGCHECKSTRING );
@@ -677,50 +667,6 @@ STRING& STRING::Append( STRCODE c )
return *this;
}
-STRING& STRING::Assign( const STRCODE* pCharStr, xub_StrLen nLen )
-{
- DBG_CHKTHIS( STRING, DBGCHECKSTRING );
- DBG_ASSERT( pCharStr, "String::Assign() - pCharStr is NULL" );
-
- if ( nLen == STRING_LEN )
- nLen = ImplStringLen( pCharStr );
-
-#ifdef DBG_UTIL
- if ( DbgIsAssert() )
- {
- for ( xub_StrLen i = 0; i < nLen; i++ )
- {
- if ( !pCharStr[i] )
- {
- OSL_FAIL( "String::Assign() : nLen is wrong" );
- }
- }
- }
-#endif
-
- if ( !nLen )
- {
- STRING_NEW((STRING_TYPE **)&mpData);
- }
- else
- {
- // copy without allocation if string length is identical
- if ( (nLen == mpData->mnLen) && (mpData->mnRefCount == 1) )
- memcpy( mpData->maStr, pCharStr, nLen*sizeof( STRCODE ) );
- else
- {
- // free old string
- STRING_RELEASE((STRING_TYPE *)mpData);
-
- // allocate string of new size and copy
- mpData = ImplAllocData( nLen );
- memcpy( mpData->maStr, pCharStr, nLen*sizeof( STRCODE ) );
- }
- }
-
- return *this;
-}
-
STRING& STRING::Assign( STRCODE c )
{
DBG_CHKTHIS( STRING, DBGCHECKSTRING );
diff --git a/unusedcode.easy b/unusedcode.easy
index fd01545b6b85..6b829c4c22a1 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,3 +1,4 @@
+Application::GetDisplayScreenName(unsigned int)
CompressGraphicsDialog::CompressGraphicsDialog(Window*, Graphic const&, Size&, Rectangle&, SfxBindings&)
CompressGraphicsDialog::GetCompressedGraphic()
FontSelectPattern::FontSelectPattern(PhysicalFontFace const&, Size const&, float, int, bool)
@@ -10,13 +11,11 @@ ScMenuFloatingWindow::getDoc()
ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent()
ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any const&)
SfxDocumentTemplateDlg::SfxDocumentTemplateDlg(Window*, SfxDocumentTemplates*)
-String::Assign(unsigned short const*, unsigned short)
-String::String(unsigned short)
SvListView::HasEntryFocus(SvTreeListEntry*) const
SvTreeList::GetChildIterators(SvTreeListEntry const*) const
SvViewDataEntry::SetCursored(bool)
TextEngine::GetLeftMargin() const
-ThumbnailView::CalcWindowSizePixel(unsigned short, unsigned short, unsigned short, unsigned short, unsigned short)
+ThumbnailView::GetScrollWidth() const
ThumbnailViewItemAcc::FireAccessibleEvent(short, com::sun::star::uno::Any const&, com::sun::star::uno::Any const&)
TransitionScene::clear()
UnoControl::UnoControl()
@@ -47,10 +46,8 @@ comphelper::detail::ConfigurationWrapper::getGroupReadWrite(boost::shared_ptr<co
comphelper::detail::ConfigurationWrapper::getLocalizedPropertyValue(rtl::OUString const&) const
comphelper::detail::ConfigurationWrapper::setLocalizedPropertyValue(boost::shared_ptr<comphelper::ConfigurationChanges> const&, rtl::OUString const&, com::sun::star::uno::Any const&) const
connectivity::file::OStatement_Base::reset()
-connectivity::mork::OColumnAlias::OColumnAlias()
connectivity::sdbcx::OGroup::OGroup(rtl::OUString const&, unsigned char)
connectivity::sdbcx::OGroup::OGroup(unsigned char)
-framework::OReadMenuDocumentHandler::getServiceFactory()
jfw_plugin::VendorBase::createInstance()
oox::drawingml::TextListStyle::dump() const
oox::xls::BiffDrawingObjectBase::BiffDrawingObjectBase(oox::xls::WorksheetHelper const&)
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 6308b06a2434..6f3954835e4b 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1618,6 +1618,8 @@ void VclBuilder::insertMenuObject(PopupMenu *pParent, const OString &rClass, con
pParent->SetTipHelpText(nNewId, OStringToOUString(rValue, RTL_TEXTENCODING_UTF8));
else if (rKey == "visible")
pParent->ShowItem(nNewId, toBool(rValue));
+ else if (rKey == "has-default" && toBool(rValue))
+ pParent->SetSelectedEntry(nNewId);
else
SAL_INFO("vcl.layout", "unhandled property: " << rKey.getStr());
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-24 11:18:53 +0000