[Libreoffice-commits] .: 3 commits - sfx2/inc sfx2/source ucb/source
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Jul 11 08:41:37 PDT 2011
sfx2/inc/sfx2/printopt.hxx | 21 ------
sfx2/inc/sfx2/viewfrm.hxx | 1
sfx2/source/dialog/dialog.hrc | 1
sfx2/source/dialog/printopt.cxx | 28 ---------
sfx2/source/dialog/printopt.hrc | 7 --
sfx2/source/dialog/printopt.src | 122 ----------------------------------------
sfx2/source/view/viewfrm.cxx | 14 ----
ucb/source/core/ucb.cxx | 14 ++--
8 files changed, 7 insertions(+), 201 deletions(-)
New commits:
commit 158281ebd2b6a563aa4787524742b51207f018b4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jul 11 14:43:58 2011 +0100
callcatcher: remove unused SfxViewFrame::CloseHiddenFrames_Impl
diff --git a/sfx2/inc/sfx2/viewfrm.hxx b/sfx2/inc/sfx2/viewfrm.hxx
index 835159f..6d34908 100644
--- a/sfx2/inc/sfx2/viewfrm.hxx
+++ b/sfx2/inc/sfx2/viewfrm.hxx
@@ -235,7 +235,6 @@ public:
SAL_DLLPRIVATE void SetActiveChildFrame_Impl( SfxViewFrame* );
SAL_DLLPRIVATE SfxViewFrame* GetActiveChildFrame_Impl() const;
SAL_DLLPRIVATE String GetActualPresentationURL_Impl() const;
- SAL_DLLPRIVATE static void CloseHiddenFrames_Impl();
SAL_DLLPRIVATE void MiscExec_Impl(SfxRequest &);
SAL_DLLPRIVATE void MiscState_Impl(SfxItemSet &);
SAL_DLLPRIVATE SfxWorkWindow* GetWorkWindow_Impl( sal_uInt16 nId );
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 0c815ab..de0ac90 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1616,20 +1616,6 @@ SfxViewFrame* SfxViewFrame::GetNext
return 0;
}
-void SfxViewFrame::CloseHiddenFrames_Impl()
-{
- SfxApplication *pSfxApp = SFX_APP();
- SfxViewFrameArr_Impl &rFrames = pSfxApp->GetViewFrames_Impl();
- for ( sal_uInt16 nPos=0; nPos<rFrames.Count(); )
- {
- SfxViewFrame *pFrame = rFrames.GetObject(nPos);
- if ( !pFrame->IsVisible() )
- pFrame->DoClose();
- else
- nPos++;
- }
-}
-
//--------------------------------------------------------------------
SfxProgress* SfxViewFrame::GetProgress() const
{
commit 9aa7950c4c8cf0c3473d84faeedf4811a6ca0103
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jul 11 14:36:47 2011 +0100
TransparencyPrintWarningBox and resource strings unused
diff --git a/sfx2/inc/sfx2/printopt.hxx b/sfx2/inc/sfx2/printopt.hxx
index bcbcbe0..902a05c 100644
--- a/sfx2/inc/sfx2/printopt.hxx
+++ b/sfx2/inc/sfx2/printopt.hxx
@@ -122,27 +122,6 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
};
-class TransparencyPrintWarningBox : public ModalDialog
-{
-private:
-
- FixedImage aWarnFI;
- FixedText aWarnFT;
- OKButton aYesBtn;
- PushButton aNoBtn;
- CancelButton aCancelBtn;
- CheckBox aNoWarnCB;
-
- DECL_LINK( ClickNoBtn, PushButton* );
-
-public:
-
- TransparencyPrintWarningBox( Window* pParent );
- ~TransparencyPrintWarningBox();
-
- sal_Bool IsNoWarningChecked() const { return aNoWarnCB.IsChecked(); }
-};
-
#endif // #ifndef _SFX_PRINTOPT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/dialog/dialog.hrc b/sfx2/source/dialog/dialog.hrc
index 993cbc4..9054c90 100755
--- a/sfx2/source/dialog/dialog.hrc
+++ b/sfx2/source/dialog/dialog.hrc
@@ -61,7 +61,6 @@
#define STR_APPLY ( RC_DIALOG_BEGIN + 87 )
#define TP_COMMONPRINTOPTIONS ( RC_DIALOG_BEGIN + 90 )
-#define RID_WARN_PRINTTRANSPARENCY ( RC_DIALOG_BEGIN + 91 )
#define RID_ERRBOX_MAIL_CONFIG ( RC_DIALOG_BEGIN + 92 )
diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx
index 90a5cfe..ae2e271 100644
--- a/sfx2/source/dialog/printopt.cxx
+++ b/sfx2/source/dialog/printopt.cxx
@@ -461,32 +461,4 @@ IMPL_LINK( SfxCommonPrintOptionsTabPage, ToggleOutputPrintFileRBHdl, RadioButton
return 0;
}
-TransparencyPrintWarningBox::TransparencyPrintWarningBox( Window* pParent ) :
- ModalDialog( pParent, SfxResId( RID_WARN_PRINTTRANSPARENCY ) ),
- aWarnFI ( this, SfxResId( FI_PRINTTRANSWARN ) ),
- aWarnFT ( this, SfxResId( FT_PRINTTRANSWARN ) ),
- aYesBtn ( this, SfxResId( BTN_PRINTTRANS_YES ) ),
- aNoBtn ( this, SfxResId( BTN_PRINTTRANS_NO ) ),
- aCancelBtn ( this, SfxResId( BTN_PRINTTRANS_CANCEL ) ),
- aNoWarnCB ( this, SfxResId( CBX_NOPRINTTRANSWARN ) )
-{
- FreeResource();
-
- aWarnFT.SetStyle( aWarnFT.GetStyle() | WB_INFO );
- aWarnFI.SetImage( WarningBox::GetStandardImage() );
-
- aNoBtn.SetClickHdl( LINK( this, TransparencyPrintWarningBox, ClickNoBtn ) );
-}
-
-TransparencyPrintWarningBox::~TransparencyPrintWarningBox()
-{
-}
-
-IMPL_LINK( TransparencyPrintWarningBox, ClickNoBtn, PushButton*, pButton )
-{
- (void)pButton; //unused
- EndDialog( RET_NO );
- return 0;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/dialog/printopt.hrc b/sfx2/source/dialog/printopt.hrc
index 2551baf..c98a858 100755
--- a/sfx2/source/dialog/printopt.hrc
+++ b/sfx2/source/dialog/printopt.hrc
@@ -55,10 +55,3 @@
#define CB_PAPERSIZE 51
#define CB_PAPERORIENTATION 52
#define CB_TRANSPARENCY 53
-
-#define FI_PRINTTRANSWARN 60
-#define FT_PRINTTRANSWARN 61
-#define BTN_PRINTTRANS_YES 62
-#define BTN_PRINTTRANS_NO 63
-#define BTN_PRINTTRANS_CANCEL 64
-#define CBX_NOPRINTTRANSWARN 65
diff --git a/sfx2/source/dialog/printopt.src b/sfx2/source/dialog/printopt.src
index 77aa0e4..c48b118 100644
--- a/sfx2/source/dialog/printopt.src
+++ b/sfx2/source/dialog/printopt.src
@@ -251,125 +251,3 @@ TabPage TP_COMMONPRINTOPTIONS
Text [ en-US ] = "~Transparency";
};
};
-
-// --------------
-// - WarningBox -
-// --------------
-
-ModalDialog RID_WARN_PRINTTRANSPARENCY
-{
- HelpID = "sfx2:ModalDialog:RID_WARN_PRINTTRANSPARENCY";
- OutputSize = TRUE ;
- Size = MAP_APPFONT ( 195 , 85 ) ;
- Text [ en-US ] = "Warning" ;
- Moveable = TRUE ;
- FixedImage FI_PRINTTRANSWARN
- {
- Pos = MAP_APPFONT ( 6 , 6 ) ;
- Size = MAP_APPFONT ( 20 , 20 ) ;
- };
- FixedText FT_PRINTTRANSWARN
- {
- Pos = MAP_APPFONT ( 29 , 6 ) ;
- Size = MAP_APPFONT ( 163 , 36 ) ;
- WordBreak = TRUE ;
- Text [ en-US ] = "Your document contains transparent objects.\nThis may lead to longer printing time on certain\nprinters. Should the aspect of transparency\nbe reduced?";
- };
- OKButton BTN_PRINTTRANS_YES
- {
- Pos = MAP_APPFONT ( 12 , 48 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- DefButton = TRUE;
- Text [ en-US ] = "~Yes" ;
- };
- PushButton BTN_PRINTTRANS_NO
- {
- HelpID = "sfx2:PushButton:RID_WARN_PRINTTRANSPARENCY:BTN_PRINTTRANS_NO";
- Pos = MAP_APPFONT ( 68 , 48 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- Text [ en-US ] = "~No" ;
- };
- CancelButton BTN_PRINTTRANS_CANCEL
- {
- Pos = MAP_APPFONT ( 124 , 48 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- Text [ en-US ] = "~Cancel" ;
- };
- CheckBox CBX_NOPRINTTRANSWARN
- {
- HelpID = "sfx2:CheckBox:RID_WARN_PRINTTRANSPARENCY:CBX_NOPRINTTRANSWARN";
- Pos = MAP_APPFONT ( 6 , 68 ) ;
- Size = MAP_APPFONT ( 183 , 10 ) ;
- Text [ en-US ] = "~Do not show warning again" ;
- };
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
commit 1f2bfc580f8eda99a373718a0de80c4bbfc30a36
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jul 11 10:57:56 2011 +0100
catch by const reference
diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx
index 0ec79b9..73dca16 100644
--- a/ucb/source/core/ucb.cxx
+++ b/ucb/source/core/ucb.cxx
@@ -204,7 +204,7 @@ bool createContentProviderData(
"Error getting item value!" );
}
}
- catch (container::NoSuchElementException &)
+ catch (const container::NoSuchElementException&)
{
return false;
}
@@ -408,7 +408,7 @@ UniversalContentBroker::registerContentProvider(
{
aIt = m_aProviders.find(Scheme);
}
- catch (IllegalArgumentException const &)
+ catch (const IllegalArgumentException&)
{
return 0; //@@@
}
@@ -422,7 +422,7 @@ UniversalContentBroker::registerContentProvider(
{
m_aProviders.add(Scheme, aList, false);
}
- catch (IllegalArgumentException const &)
+ catch (const IllegalArgumentException&)
{
return 0; //@@@
}
@@ -454,7 +454,7 @@ void SAL_CALL UniversalContentBroker::deregisterContentProvider(
{
aMapIt = m_aProviders.find(Scheme);
}
- catch (IllegalArgumentException const &)
+ catch (const IllegalArgumentException&)
{
return; //@@@
}
@@ -905,7 +905,7 @@ bool UniversalContentBroker::getContentProviderData(
rListToFill.push_back( aInfo );
}
- catch ( container::NoSuchElementException& )
+ catch (const container::NoSuchElementException&)
{
// getByHierarchicalName
OSL_FAIL( "UniversalContentBroker::getContentProviderData - "
@@ -914,12 +914,12 @@ bool UniversalContentBroker::getContentProviderData(
}
}
}
- catch ( uno::RuntimeException& )
+ catch (const uno::RuntimeException&)
{
OSL_FAIL( "UniversalContentBroker::getContentProviderData - caught RuntimeException!" );
return false;
}
- catch ( uno::Exception& )
+ catch (const uno::Exception&)
{
// createInstance, createInstanceWithArguments
More information about the Libreoffice-commits
mailing list