summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
Diffstat (limited to 'svtools')
-rw-r--r--svtools/source/contnr/fileview.cxx2
-rw-r--r--svtools/source/contnr/foldertree.cxx8
-rw-r--r--svtools/source/control/fmtfield.cxx8
-rw-r--r--svtools/source/filter/DocumentToGraphicRenderer.cxx3
-rw-r--r--svtools/source/misc/templatefoldercache.cxx2
-rw-r--r--svtools/source/uno/wizard/wizardpagecontroller.cxx3
-rw-r--r--svtools/source/uno/wizard/wizardpagecontroller.hxx1
7 files changed, 8 insertions, 19 deletions
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 764a389f3cc0..fc41f053337e 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -339,7 +339,6 @@ public:
IntlWrapper aIntlWrapper;
OUString maViewURL;
- OUString maAllFilter;
OUString maCurrentFilter;
Image maFolderImage;
Link<SvtFileView*,void> maOpenDoneLink;
@@ -1450,7 +1449,6 @@ SvtFileView_Impl::SvtFileView_Impl( SvtFileView* pAntiImpl, Reference < XCommand
,mxCmdEnv ( xEnv )
{
- maAllFilter = "*.*";
mpView = VclPtr<ViewTabListBox_Impl>::Create( mpAntiImpl, this, nFlags );
mpCurView = mpView;
mpIconView = VclPtr<IconView>::Create( mpAntiImpl, WB_TABSTOP );
diff --git a/svtools/source/contnr/foldertree.cxx b/svtools/source/contnr/foldertree.cxx
index b3ee18a60710..0384b0a47693 100644
--- a/svtools/source/contnr/foldertree.cxx
+++ b/svtools/source/contnr/foldertree.cxx
@@ -15,16 +15,16 @@
FolderTree::FolderTree( vcl::Window* pParent, WinBits nBits )
: SvTreeListBox( pParent, nBits | WB_SORT | WB_TABSTOP )
- , m_aFolderImage(BitmapEx(RID_BMP_FOLDER))
- , m_aFolderExpandedImage(BitmapEx(RID_BMP_FOLDER_OPEN))
{
Reference< XComponentContext > xContext = ::comphelper::getProcessComponentContext();
Reference< XInteractionHandler > xInteractionHandler(
InteractionHandler::createWithParent(xContext, VCLUnoHelper::GetInterface(GetParentDialog())), UNO_QUERY_THROW );
m_xEnv = new ::ucbhelper::CommandEnvironment( xInteractionHandler, Reference< XProgressHandler >() );
- SetDefaultCollapsedEntryBmp( m_aFolderImage );
- SetDefaultExpandedEntryBmp( m_aFolderExpandedImage );
+ Image aFolderImage(BitmapEx(RID_BMP_FOLDER));
+ Image aFolderExpandedImage(BitmapEx(RID_BMP_FOLDER_OPEN));
+ SetDefaultCollapsedEntryBmp( aFolderImage );
+ SetDefaultExpandedEntryBmp( aFolderExpandedImage );
}
void FolderTree::RequestingChildren( SvTreeListEntry* pEntry )
diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx
index d966e0850136..4d81dff3ea36 100644
--- a/svtools/source/control/fmtfield.cxx
+++ b/svtools/source/control/fmtfield.cxx
@@ -75,8 +75,6 @@ namespace validation
{
private:
TransitionTable m_aTransitions;
- const sal_Unicode m_cThSep;
- const sal_Unicode m_cDecSep;
public:
NumberValidator( const sal_Unicode _cThSep, const sal_Unicode _cDecSep );
@@ -122,8 +120,6 @@ namespace validation
}
NumberValidator::NumberValidator( const sal_Unicode _cThSep, const sal_Unicode _cDecSep )
- :m_cThSep( _cThSep )
- ,m_cDecSep( _cDecSep )
{
// build up our transition table
@@ -142,7 +138,7 @@ namespace validation
lcl_insertSignTransitions( rRow, DIGIT_PRE_COMMA );
// common transitions for the two pre-comma states
- lcl_insertCommonPreCommaTransitions( rRow, m_cThSep, m_cDecSep );
+ lcl_insertCommonPreCommaTransitions( rRow, _cThSep, _cDecSep );
// the exponent may start here
// (this would mean string like "_+e10_", but this is a valid fragment, though no valid number)
@@ -154,7 +150,7 @@ namespace validation
StateTransitions& rRow = m_aTransitions[ DIGIT_PRE_COMMA ];
// common transitions for the two pre-comma states
- lcl_insertCommonPreCommaTransitions( rRow, m_cThSep, m_cDecSep );
+ lcl_insertCommonPreCommaTransitions( rRow, _cThSep, _cDecSep );
// the exponent may start here
lcl_insertStartExponentTransition( rRow );
diff --git a/svtools/source/filter/DocumentToGraphicRenderer.cxx b/svtools/source/filter/DocumentToGraphicRenderer.cxx
index fd3ce0c39be8..1c11438473ea 100644
--- a/svtools/source/filter/DocumentToGraphicRenderer.cxx
+++ b/svtools/source/filter/DocumentToGraphicRenderer.cxx
@@ -48,7 +48,6 @@ DocumentToGraphicRenderer::DocumentToGraphicRenderer( const Reference<XComponent
mxController( mxModel->getCurrentController() ),
mxRenderable (mxDocument, uno::UNO_QUERY ),
mxToolkit( VCLUnoHelper::CreateToolkit() ),
- mbSelectionOnly( bSelectionOnly ),
mbIsWriter( false )
{
try
@@ -64,7 +63,7 @@ DocumentToGraphicRenderer::DocumentToGraphicRenderer( const Reference<XComponent
{
}
- if (!(mbSelectionOnly && mxController.is()))
+ if (!(bSelectionOnly && mxController.is()))
return;
try
diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx
index f27abc4e2071..41141d1ba0c9 100644
--- a/svtools/source/misc/templatefoldercache.cxx
+++ b/svtools/source/misc/templatefoldercache.cxx
@@ -105,7 +105,6 @@ namespace svt
private:
INetURLObject m_aURL;
- OUString m_sLocalName; // redundant - last segment of m_aURL
util::DateTime m_aLastModified; // date of last modification as reported by UCP
TemplateFolderContent m_aSubContents; // sorted (by name) list of the children
@@ -143,7 +142,6 @@ namespace svt
:m_aURL( _rURL )
{
DBG_ASSERT( INetProtocol::NotValid != m_aURL.GetProtocol(), "TemplateContent::TemplateContent: invalid URL!" );
- m_sLocalName = m_aURL.getName();
implResetDate();
}
diff --git a/svtools/source/uno/wizard/wizardpagecontroller.cxx b/svtools/source/uno/wizard/wizardpagecontroller.cxx
index 1cef7220476d..70364d67034e 100644
--- a/svtools/source/uno/wizard/wizardpagecontroller.cxx
+++ b/svtools/source/uno/wizard/wizardpagecontroller.cxx
@@ -49,14 +49,13 @@ namespace svt { namespace uno
const sal_Int16 i_nPageId )
:m_xController( i_rController )
,m_xWizardPage()
- ,m_nPageId( i_nPageId )
{
ENSURE_OR_THROW( m_xController.is(), "no controller" );
try
{
m_xWizardPage.set( m_xController->createPage(
Reference< XWindow >( i_rParent.GetComponentInterface(), UNO_QUERY_THROW ),
- m_nPageId
+ i_nPageId
), UNO_SET_THROW );
Reference< XWindow > xPageWindow( m_xWizardPage->getWindow(), UNO_SET_THROW );
diff --git a/svtools/source/uno/wizard/wizardpagecontroller.hxx b/svtools/source/uno/wizard/wizardpagecontroller.hxx
index f38d4a50b1bc..7d11c292cf8a 100644
--- a/svtools/source/uno/wizard/wizardpagecontroller.hxx
+++ b/svtools/source/uno/wizard/wizardpagecontroller.hxx
@@ -56,7 +56,6 @@ namespace svt { namespace uno
private:
const css::uno::Reference< css::ui::dialogs::XWizardController > m_xController;
css::uno::Reference< css::ui::dialogs::XWizardPage > m_xWizardPage;
- const sal_Int16 m_nPageId;
};
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-20 04:16:20 +0000