summaryrefslogtreecommitdiff
path: root/cui/source
diff options
context:
space:
mode:
Diffstat (limited to 'cui/source')
-rw-r--r--cui/source/customize/cfg.cxx4
-rw-r--r--cui/source/options/optfltr.cxx13
-rw-r--r--cui/source/options/optfltr.hrc1
-rw-r--r--cui/source/options/optfltr.hxx2
-rw-r--r--cui/source/options/optfltr.src17
5 files changed, 30 insertions, 7 deletions
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 171f8f44c..8a1874c29 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -5711,7 +5711,7 @@ bool SvxIconSelectorDialog::ReplaceGraphicItem(
if ( bOK && ((aSize.Width != m_nExpectedSize) || (aSize.Height != m_nExpectedSize)) )
{
BitmapEx aBitmap = aImage.GetBitmapEx();
- BitmapEx aBitmapex = AutoScaleBitmap(aBitmap, m_nExpectedSize);
+ BitmapEx aBitmapex = BitmapEx::AutoScaleBitmap(aBitmap, m_nExpectedSize);
aImage = Image( aBitmapex);
}
aTbSymbol.InsertItem( nId,aImage, aURL, 0, 0 ); //modify
@@ -5875,7 +5875,7 @@ bool SvxIconSelectorDialog::ImportGraphic( const OUString& aURL )
if ( bOK && ((aSize.Width != m_nExpectedSize) || (aSize.Height != m_nExpectedSize)) )
{
BitmapEx aBitmap = aImage.GetBitmapEx();
- BitmapEx aBitmapex = AutoScaleBitmap(aBitmap, m_nExpectedSize);
+ BitmapEx aBitmapex = BitmapEx::AutoScaleBitmap(aBitmap, m_nExpectedSize);
aImage = Image( aBitmapex);
}
if ( bOK && !!aImage )
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index 51034c944..34a97e012 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -54,6 +54,7 @@ OfaMSFilterTabPage::OfaMSFilterTabPage(Window* pParent, const SfxItemSet& rSet)
: SfxTabPage( pParent, CUI_RES( RID_OFAPAGE_MSFILTEROPT ), rSet ),
aMSWordGB ( this, CUI_RES( GB_WORD ) ),
aWBasicCodeCB ( this, CUI_RES( CB_WBAS_CODE ) ),
+ aWBasicWbctblCB ( this, CUI_RES( CB_WBAS_WBCTBL ) ),
aWBasicStgCB ( this, CUI_RES( CB_WBAS_STG ) ),
aMSExcelGB ( this, CUI_RES( GB_EXCEL ) ),
aEBasicCodeCB ( this, CUI_RES( CB_EBAS_CODE ) ),
@@ -65,6 +66,7 @@ OfaMSFilterTabPage::OfaMSFilterTabPage(Window* pParent, const SfxItemSet& rSet)
{
FreeResource();
+ aWBasicCodeCB.SetClickHdl( LINK( this, OfaMSFilterTabPage, LoadWordBasicCheckHdl_Impl ) );
aEBasicCodeCB.SetClickHdl( LINK( this, OfaMSFilterTabPage, LoadExcelBasicCheckHdl_Impl ) );
}
@@ -72,6 +74,12 @@ OfaMSFilterTabPage::~OfaMSFilterTabPage()
{
}
+IMPL_LINK( OfaMSFilterTabPage, LoadWordBasicCheckHdl_Impl, CheckBox*, EMPTYARG )
+{
+ aWBasicWbctblCB.Enable( aWBasicCodeCB.IsChecked() );
+ return 0;
+}
+
IMPL_LINK( OfaMSFilterTabPage, LoadExcelBasicCheckHdl_Impl, CheckBox*, EMPTYARG )
{
aEBasicExectblCB.Enable( aEBasicCodeCB.IsChecked() );
@@ -91,6 +99,8 @@ BOOL OfaMSFilterTabPage::FillItemSet( SfxItemSet& )
BOOL bFlag;
if( aWBasicCodeCB.GetSavedValue() != (bFlag = aWBasicCodeCB.IsChecked()))
pOpt->SetLoadWordBasicCode( bFlag );
+ if( aWBasicWbctblCB.GetSavedValue() != (bFlag = aWBasicWbctblCB.IsChecked()))
+ pOpt->SetLoadWordBasicExecutable( bFlag );
if( aWBasicStgCB.GetSavedValue() != (bFlag = aWBasicStgCB.IsChecked()))
pOpt->SetLoadWordBasicStorage( bFlag );
@@ -119,8 +129,11 @@ void OfaMSFilterTabPage::Reset( const SfxItemSet& )
aWBasicCodeCB.Check( pOpt->IsLoadWordBasicCode() );
aWBasicCodeCB.SaveValue();
+ aWBasicWbctblCB.Check( pOpt->IsLoadWordBasicExecutable() );
+ aWBasicWbctblCB.SaveValue();
aWBasicStgCB.Check( pOpt->IsLoadWordBasicStorage() );
aWBasicStgCB.SaveValue();
+ LoadWordBasicCheckHdl_Impl( &aWBasicCodeCB );
aEBasicCodeCB.Check( pOpt->IsLoadExcelBasicCode() );
aEBasicCodeCB.SaveValue();
diff --git a/cui/source/options/optfltr.hrc b/cui/source/options/optfltr.hrc
index 593860460..40204b717 100644
--- a/cui/source/options/optfltr.hrc
+++ b/cui/source/options/optfltr.hrc
@@ -40,6 +40,7 @@
#define CB_EBAS_STG 5
#define CB_PBAS_CODE 6
#define CB_PBAS_STG 7
+#define CB_WBAS_WBCTBL 8
#define CLB_SETTINGS 1
#define ST_CHG_MATH 1
diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx
index 994a4b23a..4f9b36b3f 100644
--- a/cui/source/options/optfltr.hxx
+++ b/cui/source/options/optfltr.hxx
@@ -39,6 +39,7 @@ class OfaMSFilterTabPage : public SfxTabPage
{
FixedLine aMSWordGB;
CheckBox aWBasicCodeCB;
+ CheckBox aWBasicWbctblCB;
CheckBox aWBasicStgCB;
FixedLine aMSExcelGB;
CheckBox aEBasicCodeCB;
@@ -51,6 +52,7 @@ class OfaMSFilterTabPage : public SfxTabPage
OfaMSFilterTabPage( Window* pParent, const SfxItemSet& rSet );
virtual ~OfaMSFilterTabPage();
+ DECL_LINK( LoadWordBasicCheckHdl_Impl, CheckBox* );
DECL_LINK( LoadExcelBasicCheckHdl_Impl, CheckBox* );
public:
diff --git a/cui/source/options/optfltr.src b/cui/source/options/optfltr.src
index e24da54e6..d9ff1c83a 100644
--- a/cui/source/options/optfltr.src
+++ b/cui/source/options/optfltr.src
@@ -51,9 +51,16 @@ TabPage RID_OFAPAGE_MSFILTEROPT
TabStop = TRUE ;
Text [ en-US ] = "Load Basic ~code";
};
+ CheckBox CB_WBAS_WBCTBL
+ {
+ Pos = MAP_APPFONT ( 22 , 28 ) ;
+ Size = MAP_APPFONT ( 236 , 10 ) ;
+ TabStop = TRUE ;
+ Text [ en-US ] = "E~xecutable code";
+ };
CheckBox CB_WBAS_STG
{
- Pos = MAP_APPFONT ( 12 , 28 ) ;
+ Pos = MAP_APPFONT ( 12 , 42 ) ;
Size = MAP_APPFONT ( 236 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "Save ~original Basic code";
@@ -61,27 +68,27 @@ TabPage RID_OFAPAGE_MSFILTEROPT
FixedLine GB_EXCEL
{
- Pos = MAP_APPFONT ( 6 , 44 ) ;
+ Pos = MAP_APPFONT ( 6 , 58 ) ;
Size = MAP_APPFONT ( 248 , 8 ) ;
Text [ en-US ] = "Microsoft Excel 97/2000/XP";
};
CheckBox CB_EBAS_CODE
{
- Pos = MAP_APPFONT ( 12 , 55 ) ;
+ Pos = MAP_APPFONT ( 12 , 69 ) ;
Size = MAP_APPFONT ( 236 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "Lo~ad Basic code";
};
CheckBox CB_EBAS_EXECTBL
{
- Pos = MAP_APPFONT ( 22 , 69 ) ;
+ Pos = MAP_APPFONT ( 22 , 83 ) ;
Size = MAP_APPFONT ( 236 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "E~xecutable code";
};
CheckBox CB_EBAS_STG
{
- Pos = MAP_APPFONT ( 12 , 83 ) ;
+ Pos = MAP_APPFONT ( 12 , 97 ) ;
Size = MAP_APPFONT ( 236 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "Sa~ve original Basic code";
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-23 01:30:13 +0000