[Libreoffice-commits] .: 3 commits - connectivity/source framework/inc framework/source sc/source sw/inc sw/source tools/inc tools/source unusedcode.easy vcl/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Dec 14 03:37:45 PST 2012
connectivity/source/drivers/mork/MColumnAlias.cxx | 4
connectivity/source/drivers/mork/MColumnAlias.hxx | 1
framework/inc/xml/menudocumenthandler.hxx | 4
framework/source/fwe/xml/menuconfiguration.cxx | 2
framework/source/fwe/xml/menudocumenthandler.cxx | 9 -
sc/source/filter/inc/formulabase.hxx | 10 -
sc/source/filter/oox/formulabase.cxx | 5
sw/inc/globals.hrc | 1
sw/inc/helpid.h | 1
sw/source/ui/app/app.src | 7
sw/source/ui/config/optdlg.src | 184 ----------------------
sw/source/ui/frmdlg/cption.cxx | 27 +--
sw/source/ui/inc/cption.hxx | 2
tools/inc/tools/string.hxx | 4
tools/source/string/tustring.cxx | 54 ------
unusedcode.easy | 7
vcl/source/window/builder.cxx | 2
17 files changed, 25 insertions(+), 299 deletions(-)
New commits:
commit 32e7b29f51c4f6bce08a23e454ec47b83849c9df
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Dec 14 11:12:22 2012 +0000
drop converted TP_OPTPRINT_PAGE page
Change-Id: Ieac443b40fd5fa3b1b13b492e1b97a5df35835b5
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index d443b6d..8ad0db0 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -161,7 +161,6 @@
#define HID_COLUMN "SW_HID_COLUMN"
#define HID_DOC_STAT "SW_HID_DOC_STAT"
#define HID_FOOTNOTE_PAGE "SW_HID_FOOTNOTE_PAGE"
-#define HID_OPTPRINT_PAGE "SW_HID_OPTPRINT_PAGE"
#define HID_FORMAT_TABLE "SW_HID_FORMAT_TABLE"
#define HID_TABLE_COLUMN "SW_HID_TABLE_COLUMN"
#define HID_LAB_LAB "SW_HID_LAB_LAB"
diff --git a/sw/source/ui/config/optdlg.src b/sw/source/ui/config/optdlg.src
index b15c1c5..16f80af 100644
--- a/sw/source/ui/config/optdlg.src
+++ b/sw/source/ui/config/optdlg.src
@@ -187,190 +187,6 @@ TabPage TP_CONTENT_OPT
};
};
-TabPage TP_OPTPRINT_PAGE
-{
- HelpID = HID_OPTPRINT_PAGE ;
- Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
- Hide = TRUE ;
- FixedLine FL_1
- {
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 78 , 8 ) ;
- Text [ en-US ] = "Contents" ;
- Group = TRUE ;
- };
- CheckBox CB_PGRF /*functionally merged with CB_PDRAW*/
- {
- HelpID = "sw:CheckBox:TP_OPTPRINT_PAGE:CB_PGRF";
- Pos = MAP_APPFONT ( 12 , 14 ) ;
- Size = MAP_APPFONT ( 70 , 10 ) ;
- Text [ en-US ] = "~Pictures and objects" ;
- TabStop = TRUE ;
- Group = TRUE ;
- };
- CheckBox CB_CTRLFLD
- {
- HelpID = "sw:CheckBox:TP_OPTPRINT_PAGE:CB_CTRLFLD";
- Pos = MAP_APPFONT ( 12 , 27 ) ;
- Size = MAP_APPFONT ( 70 , 10 ) ;
- Text [ en-US ] = "Form control~s" ;
- };
- CheckBox CB_BACKGROUND
- {
- HelpID = "sw:CheckBox:TP_OPTPRINT_PAGE:CB_BACKGROUND";
- Pos = MAP_APPFONT ( 12 , 40 ) ;
- Size = MAP_APPFONT ( 70 , 10 ) ;
- Text [ en-US ] = "Page ba~ckground" ;
- };
- CheckBox CB_BLACK_FONT
- {
- HelpID = "sw:CheckBox:TP_OPTPRINT_PAGE:CB_BLACK_FONT";
- Pos = MAP_APPFONT ( 12 , 53 ) ;
- Size = MAP_APPFONT ( 70 , 10 ) ;
- Text [ en-US ] = "Print text in blac~k" ;
- };
- CheckBox CB_HIDDEN_TEXT
- {
- HelpID = "sw:CheckBox:TP_OPTPRINT_PAGE:CB_HIDDEN_TEXT";
- Pos = MAP_APPFONT ( 12 , 66 ) ;
- Size = MAP_APPFONT ( 70 , 10 ) ;
- Text [ en-US ] = "Hidden te~xt" ;
- };
- CheckBox CB_TEXT_PLACEHOLDER
- {
- HelpID = "sw:CheckBox:TP_OPTPRINT_PAGE:CB_TEXT_PLACEHOLDER";
- Pos = MAP_APPFONT ( 12 , 79 ) ;
- Size = MAP_APPFONT ( 70 , 10 ) ;
- Text [ en-US ] = "Text ~placeholder" ;
- };
- FixedLine FL_SEP_PRT_LEFT
- {
- Pos = MAP_APPFONT ( 85 , 14 ) ;
- Size = MAP_APPFONT ( 4 , 78 ) ;
- Vert = TRUE;
- };
- FixedLine FL_2
- {
- Pos = MAP_APPFONT ( 90 , 3 ) ;
- Size = MAP_APPFONT ( 78 , 8 ) ;
- Text [ en-US ] = "Pages" ;
- Group = TRUE ;
- };
- CheckBox CB_LEFTP
- {
- HelpID = "sw:CheckBox:TP_OPTPRINT_PAGE:CB_LEFTP";
- Pos = MAP_APPFONT ( 96 , 14 ) ;
- Size = MAP_APPFONT ( 70 , 10 ) ;
- Text [ en-US ] = "~Left pages" ;
- TabStop = TRUE ;
- Group = TRUE ;
- };
- CheckBox CB_RIGHTP
- {
- HelpID = "sw:CheckBox:TP_OPTPRINT_PAGE:CB_RIGHTP";
- Pos = MAP_APPFONT ( 96 , 27 ) ;
- Size = MAP_APPFONT ( 70 , 10 ) ;
- Text [ en-US ] = "~Right pages" ;
- };
- CheckBox CB_PROSPECT
- {
- HelpID = "sw:CheckBox:TP_OPTPRINT_PAGE:CB_PROSPECT";
- Pos = MAP_APPFONT ( 96 , 40 ) ;
- Size = MAP_APPFONT ( 70 , 10 ) ;
- Text [ en-US ] = "Broch~ure" ;
- };
- CheckBox CB_PROSPECT_RTL
- {
- HelpID = "sw:CheckBox:TP_OPTPRINT_PAGE:CB_PROSPECT_RTL";
- Pos = MAP_APPFONT ( 103 , 53 ) ;
- Size = MAP_APPFONT ( 70 , 10 ) ;
- Text [ en-US ] = "Right to Left" ;
- };
- RadioButton RB_NO
- {
- HelpID = "sw:RadioButton:TP_OPTPRINT_PAGE:RB_NO";
- Pos = MAP_APPFONT ( 180 , 14 ) ;
- Size = MAP_APPFONT ( 74 , 10 ) ;
- Text [ en-US ] = "~None" ;
- TabStop = TRUE ;
- Group = TRUE ;
- };
- RadioButton RB_ONLY
- {
- HelpID = "sw:RadioButton:TP_OPTPRINT_PAGE:RB_ONLY";
- Pos = MAP_APPFONT ( 180 , 27 ) ;
- Size = MAP_APPFONT ( 74 , 10 ) ;
- Text [ en-US ] = "Comments ~only" ;
- };
- RadioButton RB_END
- {
- HelpID = "sw:RadioButton:TP_OPTPRINT_PAGE:RB_END";
- Pos = MAP_APPFONT ( 180 , 40 ) ;
- Size = MAP_APPFONT ( 74 , 10 ) ;
- Text [ en-US ] = "End of docu~ment" ;
- };
- RadioButton RB_PAGEEND
- {
- HelpID = "sw:RadioButton:TP_OPTPRINT_PAGE:RB_PAGEEND";
- Pos = MAP_APPFONT ( 180 , 53 ) ;
- Size = MAP_APPFONT ( 74 , 10 ) ;
- Text [ en-US ] = "~End of page" ;
- };
- FixedLine FL_SEP_PRT_RIGHT
- {
- Pos = MAP_APPFONT ( 169 , 14 ) ;
- Size = MAP_APPFONT ( 4 , 78 ) ;
- Vert = TRUE;
- };
- FixedLine FL_3
- {
- Pos = MAP_APPFONT ( 174 , 3 ) ;
- Size = MAP_APPFONT ( 80 , 8 ) ;
- Text [ en-US ] = "Comments" ;
- Group = TRUE ;
- };
- FixedLine FL_4
- {
- Pos = MAP_APPFONT ( 6 , 95 ) ;
- Size = MAP_APPFONT ( 248 , 8 ) ;
- Group = TRUE ;
- Text [ en-US ] = "Other";
- };
- CheckBox CB_PRINTEMPTYPAGES
- {
- HelpID = "sw:CheckBox:TP_OPTPRINT_PAGE:CB_PRINTEMPTYPAGES";
- Pos = MAP_APPFONT ( 12 , 106 ) ;
- Size = MAP_APPFONT ( 200 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "Print ~automatically inserted blank pages";
- };
- CheckBox CB_PAPERFROMSETUP
- {
- HelpID = "sw:CheckBox:TP_OPTPRINT_PAGE:CB_PAPERFROMSETUP";
- Pos = MAP_APPFONT ( 12 , 119 ) ;
- Size = MAP_APPFONT ( 200 , 10 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "~Paper tray from printer settings";
- };
- FixedText FT_FAX
- {
- Pos = MAP_APPFONT ( 12 , 134 ) ;
- Size = MAP_APPFONT ( 50 , 8 ) ;
- Group = TRUE ;
- Text [ en-US ] = "~Fax";
- };
- ListBox LB_FAX
- {
- HelpID = "sw:ListBox:TP_OPTPRINT_PAGE:LB_FAX";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 70 , 132 ) ;
- Size = MAP_APPFONT ( 184 , 70 ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- Group = TRUE ;
- };
-};
-
TabPage TP_STD_FONT
{
HelpID = HID_STD_FONT ;
commit 4409350a017bb0c455593fbb08270f4783e5c28e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Dec 14 09:51:23 2012 +0000
merge NONE strings
Change-Id: I4a2babc74c39579c26ac89445769a6f52ae68221
diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index 1b79466..2d87edf 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -73,7 +73,6 @@
#define STR_CAPTION_END (RC_GLOBALS_BEGIN + 43)
#define STR_CAPTION_ABOVE (RC_GLOBALS_BEGIN + 44)
#define STR_CAPTION_BELOW (RC_GLOBALS_BEGIN + 45)
-#define STR_CAPTION_NONE (RC_GLOBALS_BEGIN + 46)
// DIALOGS -----------------------------------------------------------
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index 0239ddf..236af10 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -244,22 +244,21 @@ String STR_CAPTION_BEGINNING
{
Text [ en-US ] = "Start" ;
};
+
String STR_CAPTION_END
{
Text [ en-US ] = "End" ;
};
+
String STR_CAPTION_ABOVE
{
Text [ en-US ] = "Above" ;
};
+
String STR_CAPTION_BELOW
{
Text [ en-US ] = "Below" ;
};
-String STR_CAPTION_NONE
-{
- Text [ en-US ] = "<None>" ;
-};
InfoBox MSG_ERROR_SEND_MAIL
{
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index 3585ded..5751aca 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -88,7 +88,7 @@ String SwCaptionDialog::our_aSepTextSave = rtl::OUString(": "); // Caption separ
SwCaptionDialog::SwCaptionDialog( Window *pParent, SwView &rV ) :
SvxStandardDialog( pParent, "InsertCaptionDialog", "modules/swriter/ui/insertcaption.ui" ),
- sNone( SW_RES( STR_CAPTION_NONE )),
+ m_sNone( SW_RESSTR(SW_STR_NONE) ),
rView( rV ),
pMgr( new SwFldMgr(rView.GetWrtShellPtr()) ),
bCopyAttributes( sal_False ),
@@ -134,7 +134,7 @@ SwCaptionDialog::SwCaptionDialog( Window *pParent, SwView &rV ) :
m_pOptionButton->SetClickHdl( LINK( this, SwCaptionDialog, OptionHdl ) );
m_pAutoCaptionButton->SetClickHdl(LINK(this, SwCaptionDialog, CaptionHdl));
- m_pCategoryBox->InsertEntry( sNone );
+ m_pCategoryBox->InsertEntry( m_sNone );
sal_uInt16 i, nCount = pMgr->GetFldTypeCount();
for (i = 0; i < nCount; i++)
{
@@ -256,8 +256,8 @@ void SwCaptionDialog::Apply()
{
InsCaptionOpt aOpt;
aOpt.UseCaption() = sal_True;
- String aName( m_pCategoryBox->GetText() );
- if ( aName == sNone )
+ OUString aName( m_pCategoryBox->GetText() );
+ if ( aName == m_sNone )
{
aOpt.SetCategory( aEmptyStr );
aOpt.SetNumSeparator( aEmptyStr );
@@ -280,8 +280,8 @@ void SwCaptionDialog::Apply()
IMPL_LINK_INLINE_START( SwCaptionDialog, OptionHdl, Button*, pButton )
{
- String sFldTypeName = m_pCategoryBox->GetText();
- if(sFldTypeName == sNone)
+ OUString sFldTypeName = m_pCategoryBox->GetText();
+ if(sFldTypeName == m_sNone)
sFldTypeName = aEmptyStr;
SwSequenceOptionDialog aDlg( pButton, rView, sFldTypeName );
aDlg.SetApplyBorderAndShadow(bCopyAttributes);
@@ -312,16 +312,15 @@ IMPL_LINK_NOARG_INLINE_END(SwCaptionDialog, SelectHdl)
IMPL_LINK_NOARG(SwCaptionDialog, ModifyHdl)
{
SwWrtShell &rSh = rView.GetWrtShell();
- String sFldTypeName = m_pCategoryBox->GetText();
- sal_Bool bCorrectFldName = sFldTypeName.Len() > 0;
- sal_Bool bNone = sFldTypeName == sNone;
+ OUString sFldTypeName = m_pCategoryBox->GetText();
+ bool bCorrectFldName = !sFldTypeName.isEmpty();
+ bool bNone = sFldTypeName == m_sNone;
SwFieldType* pType = (bCorrectFldName && !bNone)
? rSh.GetFldType( RES_SETEXPFLD, sFldTypeName )
: 0;
m_pOKButton->Enable( bCorrectFldName &&
(!pType ||
- ((SwSetExpFieldType*)pType)->GetType() == nsSwGetSetExpType::GSE_SEQ)
- && 0 != sFldTypeName.Len() );
+ ((SwSetExpFieldType*)pType)->GetType() == nsSwGetSetExpType::GSE_SEQ) );
m_pOptionButton->Enable( m_pOKButton->IsEnabled() && !bNone );
m_pNumberingSeparatorFT->Enable( bOrderNumberingFirst && !bNone );
m_pNumberingSeparatorED->Enable( bOrderNumberingFirst && !bNone );
@@ -348,8 +347,8 @@ void SwCaptionDialog::DrawSample()
String sCaption = m_pTextEdit->GetText();
// number
- String sFldTypeName = m_pCategoryBox->GetText();
- sal_Bool bNone = sFldTypeName == sNone;
+ OUString sFldTypeName = m_pCategoryBox->GetText();
+ bool bNone = sFldTypeName == m_sNone;
if( !bNone )
{
sal_uInt16 nNumFmt = (sal_uInt16)(sal_uIntPtr)m_pFormatBox->GetEntryData(
@@ -428,7 +427,7 @@ SwSequenceOptionDialog::SwSequenceOptionDialog( Window *pParent, SwView &rV,
SwWrtShell &rSh = rView.GetWrtShell();
- String sNone(SW_RES(STR_CAPTION_NONE));
+ OUString sNone(SW_RESSTR(SW_STR_NONE));
m_pLbLevel->InsertEntry(sNone);
for( sal_uInt16 n = 0; n < MAXLEVEL; ++n )
diff --git a/sw/source/ui/inc/cption.hxx b/sw/source/ui/inc/cption.hxx
index ca73685..487cf26 100644
--- a/sw/source/ui/inc/cption.hxx
+++ b/sw/source/ui/inc/cption.hxx
@@ -79,7 +79,7 @@ class SwCaptionDialog : public SvxStandardDialog
SwCaptionPreview* m_pPreview;
- String sNone;
+ OUString m_sNone;
SwView &rView; // search per active, avoid ::com::sun::star::sdbcx::View
SwFldMgr *pMgr; // pointer to save the include
commit 55b379495007d3d694fb3533baa0d607c710d582
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Dec 14 09:44:22 2012 +0000
callcatcher: update unused code list
Change-Id: Ie975cd2df17461de1bb94a23d4daf081f6588fe7
diff --git a/connectivity/source/drivers/mork/MColumnAlias.cxx b/connectivity/source/drivers/mork/MColumnAlias.cxx
index ba653c3..624b5ab 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 21f2196..4f50a44 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 de1bbd9..b3f3ddd 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 0cd54b6..61fd130 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 3f253b5..9e498de 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 404554b..342e533 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 3aca87f..ca6d46f 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 b98899e..674c36d 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 898d2d8..0beac79 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 fd01545..6b829c4 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 6308b06..6f39548 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());
}
More information about the Libreoffice-commits
mailing list