[Libreoffice-commits] .: basic/source editeng/inc editeng/source oovbaapi/ooo scripting/source sfx2/source svx/inc svx/source vbahelper/source xmloff/source
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Tue Oct 19 21:52:15 PDT 2010
basic/source/classes/sbxmod.cxx | 12 ++++-----
editeng/inc/editeng/svxacorr.hxx | 2 -
editeng/source/misc/svxacorr.cxx | 2 -
oovbaapi/ooo/vba/excel/XApplication.idl | 8 +++---
oovbaapi/ooo/vba/excel/XPageSetup.idl | 2 -
oovbaapi/ooo/vba/excel/XWorksheet.idl | 2 -
oovbaapi/ooo/vba/msforms/XListBox.idl | 2 -
scripting/source/vbaevents/eventhelper.cxx | 36 +++++++++++++--------------
sfx2/source/appl/newhelp.cxx | 4 +--
sfx2/source/appl/newhelp.hxx | 2 -
sfx2/source/dialog/templdlg.cxx | 6 ++--
svx/inc/svx/dbtoolsclient.hxx | 2 -
svx/source/form/dbtoolsclient.cxx | 2 -
svx/source/form/fmshimp.cxx | 4 +--
svx/source/inc/sqlparserclient.hxx | 2 -
svx/source/unodraw/unoshap2.cxx | 4 +--
vbahelper/source/msforms/vbacontrol.cxx | 6 ++--
vbahelper/source/msforms/vbaframe.cxx | 4 +--
vbahelper/source/msforms/vbaframe.hxx | 4 +--
vbahelper/source/msforms/vbalistbox.cxx | 2 -
vbahelper/source/msforms/vbalistbox.hxx | 4 +--
vbahelper/source/msforms/vbatextbox.cxx | 4 +--
vbahelper/source/msforms/vbatogglebutton.cxx | 4 +--
xmloff/source/forms/elementimport.cxx | 2 -
xmloff/source/forms/elementimport.hxx | 2 -
xmloff/source/forms/propertyexport.cxx | 4 +--
xmloff/source/style/adjushdl.cxx | 2 -
27 files changed, 65 insertions(+), 65 deletions(-)
New commits:
commit f0fbd8e821571d548d46d89fe9516b25ee93753f
Author: Trevor Murphy <trevor.m.murphy at gmail.com>
Date: Tue Oct 19 23:45:24 2010 -0500
Minor libs-core comment clean-up
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 813db18..caa41ba 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -2187,7 +2187,7 @@ public:
}
}
- //liuchen 2009-7-21, support Excel VBA Form_QueryClose event
+
virtual void SAL_CALL windowClosing( const lang::EventObject& e ) throw (uno::RuntimeException)
{
uno::Reference< awt::XDialog > xDialog( e.Source, uno::UNO_QUERY );
@@ -2218,7 +2218,7 @@ public:
mpUserForm->triggerMethod( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Userform_QueryClose") ) );
}
- //liuchen 2009-7-21
+
virtual void SAL_CALL windowClosed( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException)
{
@@ -2320,7 +2320,7 @@ void SbUserFormModule::triggerMethod( const String& aMethodToRun, Sequence< Any
SbxVariable* pMeth = SbObjModule::Find( aMethodToRun, SbxCLASS_METHOD );
if( pMeth )
{
- //liuchen 2009-7-21, support Excel VBA UserForm_QueryClose event with parameters
+
if ( aArguments.getLength() > 0 ) // Setup parameters
{
SbxArrayRef xArray = new SbxArray;
@@ -2348,7 +2348,7 @@ void SbUserFormModule::triggerMethod( const String& aMethodToRun, Sequence< Any
pMeth->SetParameters( NULL );
}
else
-//liuchen 2009-7-21
+
{
SbxValues aVals;
pMeth->Get( aVals );
@@ -2434,7 +2434,7 @@ void SbUserFormModule::Load()
InitObject();
}
-//liuchen 2009-7-21 change to accmordate VBA's beheavior
+
void SbUserFormModule::Unload()
{
OSL_TRACE("** Unload() ");
@@ -2484,7 +2484,7 @@ void SbUserFormModule::Unload()
OSL_TRACE("UnloadObject completed ( we hope )");
}
}
-//liuchen
+
void SbUserFormModule::InitObject()
{
diff --git a/editeng/inc/editeng/svxacorr.hxx b/editeng/inc/editeng/svxacorr.hxx
index d344e26..325af34 100644
--- a/editeng/inc/editeng/svxacorr.hxx
+++ b/editeng/inc/editeng/svxacorr.hxx
@@ -237,7 +237,7 @@ protected:
// koennen aus der Wortliste herausgeholt werden!)
// rShort ist der Stream-Name - gecryptet!
public:
- //The method below is changed from private to public by BerryJia for Bug95846 Time:2002-8-13 15:50
+
sal_Unicode GetQuote( sal_Unicode cInsChar, BOOL bSttQuote,
LanguageType eLang ) const;
virtual BOOL GetLongText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rStg, const String& rFileName, const String& rShort, String& rLong );
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index d9c15b0..81834b7 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1118,7 +1118,7 @@ bool SvxAutoCorrect::FnCorrectCapsLock( SvxAutoCorrDoc& rDoc, const String& rTxt
return true;
}
-//The method below is renamed from _GetQuote to GetQuote by BerryJia for Bug95846 Time:2002-8-13 15:50
+
sal_Unicode SvxAutoCorrect::GetQuote( sal_Unicode cInsChar, BOOL bSttQuote,
LanguageType eLang ) const
{
diff --git a/oovbaapi/ooo/vba/excel/XApplication.idl b/oovbaapi/ooo/vba/excel/XApplication.idl
index 0096b04..16bb415 100644
--- a/oovbaapi/ooo/vba/excel/XApplication.idl
+++ b/oovbaapi/ooo/vba/excel/XApplication.idl
@@ -66,7 +66,7 @@ interface XApplication
[attribute, readonly] XWindow ActiveWindow;
[attribute, readonly] XWorksheet ActiveSheet;
[attribute, readonly] ooo::vba::XAssistant Assistant;
- [attribute, readonly] ooo::vba::XFileSearch FileSearch; //liuchen 2009-8-18, add the support of VBA Application.FileSearch
+ [attribute, readonly] ooo::vba::XFileSearch FileSearch;
[attribute] long Calculation;
[attribute, readonly] XWorkbook ThisWorkbook;
[attribute, readonly] ooo::vba::XFileDialog FileDialog;
@@ -78,8 +78,8 @@ interface XApplication
[attribute] long Cursor;
[attribute] boolean EnableEvents;
[attribute] boolean Visible;
- [attribute] boolean Iteration; //liuchen 2009-11-25
- [attribute] long EnableCancelKey; //liuchen 2009-11-26
+ [attribute] boolean Iteration;
+ [attribute] long EnableCancelKey;
void setDefaultFilePath([in] string DefaultFilePath) raises(com::sun::star::script::BasicErrorException);
@@ -110,7 +110,7 @@ interface XApplication
void Volatile([in] any Volatile);
any Caller( [in] any aIndex );
any MenuBars( [in] any aIndex );
- any International([in] long Index); //liuchen 2009-11-26
+ any International([in] long Index);
any GetSaveAsFilename( [in] any InitialFilename, [in] any FileFilter, [in] any FilterIndex, [in] any Title,[in] any ButtonText);
void Undo(); //2009-10-11 limingl
double InchesToPoints([in] double Inches);
diff --git a/oovbaapi/ooo/vba/excel/XPageSetup.idl b/oovbaapi/ooo/vba/excel/XPageSetup.idl
index 31ad1a5..694526e 100644
--- a/oovbaapi/ooo/vba/excel/XPageSetup.idl
+++ b/oovbaapi/ooo/vba/excel/XPageSetup.idl
@@ -65,7 +65,7 @@ interface XPageSetup : com::sun::star::uno::XInterface
[attribute] boolean CenterVertically;
[attribute] boolean CenterHorizontally;
[attribute] boolean PrintHeadings;
- [attribute] long PaperSize; //liuchen 2009-12-11
+ [attribute] long PaperSize;
};
diff --git a/oovbaapi/ooo/vba/excel/XWorksheet.idl b/oovbaapi/ooo/vba/excel/XWorksheet.idl
index 8b0aee0..2f8ba6a 100644
--- a/oovbaapi/ooo/vba/excel/XWorksheet.idl
+++ b/oovbaapi/ooo/vba/excel/XWorksheet.idl
@@ -78,7 +78,7 @@ interface XWorksheet
void Activate();
void Calculate( );
- void Select([in] any Replace); //liuchen 2009-9-2, add the input parameter to support expand selection
+ void Select([in] any Replace);
void Move([in] any Before,[in] any After );
void Copy([in] any Before,[in] any After );
void Paste([in] any Destination,[in] any Link);
diff --git a/oovbaapi/ooo/vba/msforms/XListBox.idl b/oovbaapi/ooo/vba/msforms/XListBox.idl
index 6ee5450..8012803 100644
--- a/oovbaapi/ooo/vba/msforms/XListBox.idl
+++ b/oovbaapi/ooo/vba/msforms/XListBox.idl
@@ -40,7 +40,7 @@ interface XListBox: com::sun::star::uno::XInterface
{
[attribute] any Value;
[attribute] string Text;
- [attribute] long MultiSelect; //liuchen 2009-7-31 MultiSelect property in Excel VBA is type long
+ [attribute] long MultiSelect;
[attribute] any ListIndex;
[attribute, readonly ] long ListCount;
void AddItem( [in] any pvargItem, [in] any pvargIndex );
diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx
index ef86782..f8edf6e 100644
--- a/scripting/source/vbaevents/eventhelper.cxx
+++ b/scripting/source/vbaevents/eventhelper.cxx
@@ -65,10 +65,10 @@
#include <com/sun/star/awt/XDialog.hpp>
#include <com/sun/star/awt/KeyEvent.hpp>
#include <com/sun/star/awt/MouseEvent.hpp>
-#include <com/sun/star/awt/XFixedText.hpp> //liuchen 2009-6-5
-#include <com/sun/star/awt/XTextComponent.hpp> //liuchen 2009-6-5
-#include <com/sun/star/awt/XComboBox.hpp> //liuchen 2009-6-18
-#include <com/sun/star/awt/XRadioButton.hpp> //liuchen 2009-7-30
+#include <com/sun/star/awt/XFixedText.hpp>
+#include <com/sun/star/awt/XTextComponent.hpp>
+#include <com/sun/star/awt/XComboBox.hpp>
+#include <com/sun/star/awt/XRadioButton.hpp>
#include <com/sun/star/awt/XListBox.hpp>
#include "vbamsformreturntypes.hxx"
@@ -112,7 +112,7 @@ using namespace ::com::sun::star::script;
using namespace ::com::sun::star::uno;
using namespace ::ooo::vba;
-#define MAP_CHAR_LEN(x) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(x))//liuchen 2009-6-8
+#define MAP_CHAR_LEN(x) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(x))
#define GET_TYPE(x) ::getCppuType((uno::Reference< x > *)0);
// Some constants
@@ -241,7 +241,7 @@ Sequence< Any > ooFocusLostToVBAExit( const Sequence< Any >& params )
typedef Sequence< Any > (*Translator)(const Sequence< Any >&);
-//liuchen 2009-6-23
+
//expand the "TranslateInfo" struct to support more kinds of events
struct TranslateInfo
{
@@ -257,7 +257,7 @@ std::list< TranslateInfo >,
::rtl::OUStringHash,
::std::equal_to< ::rtl::OUString > > EventInfoHash;
-//liuchen 2009-6-23
+
struct TranslatePropMap
{
rtl::OUString sEventInfo; //OO event name
@@ -292,12 +292,12 @@ TypeList listBoxList = {&typeXListBox, 1};
//this array stores the OO event to VBA event translation info
static TranslatePropMap aTranslatePropMap_Impl[] =
{
- { MAP_CHAR_LEN("actionPerformed"), { MAP_CHAR_LEN("_Change"), NULL, DenyType, (void*)(&radioButtonList) } }, //liuchen 2009-7-30, OptionalButton_Change event is not the same as OptionalButton_Click event
+ { MAP_CHAR_LEN("actionPerformed"), { MAP_CHAR_LEN("_Change"), NULL, DenyType, (void*)(&radioButtonList) } },
// actionPerformed ooo event
{ MAP_CHAR_LEN("actionPerformed"), { MAP_CHAR_LEN("_Click"), NULL, ApproveAll, NULL } },
- { MAP_CHAR_LEN("itemStateChanged"), { MAP_CHAR_LEN("_Change"), NULL, ApproveType, (void*)(&radioButtonList) } }, //liuchen 2009-7-30, OptionalButton_Change event should be triggered when the button state is changed
+ { MAP_CHAR_LEN("itemStateChanged"), { MAP_CHAR_LEN("_Change"), NULL, ApproveType, (void*)(&radioButtonList) } },
// itemStateChanged ooo event
- { MAP_CHAR_LEN("itemStateChanged"), { MAP_CHAR_LEN("_Click"), NULL, ApproveType, (void*)(&comboBoxList) } }, //liuchen, add to support VBA ComboBox_Click event
+ { MAP_CHAR_LEN("itemStateChanged"), { MAP_CHAR_LEN("_Click"), NULL, ApproveType, (void*)(&comboBoxList) } },
{ MAP_CHAR_LEN("itemStateChanged"), { MAP_CHAR_LEN("_Click"), NULL, ApproveType, (void*)(&listBoxList) } },
// changed ooo event
@@ -308,7 +308,7 @@ static TranslatePropMap aTranslatePropMap_Impl[] =
// focusLost ooo event
{ MAP_CHAR_LEN("focusLost"), { MAP_CHAR_LEN("_LostFocus"), NULL, ApproveAll, NULL } },
- { MAP_CHAR_LEN("focusLost"), { MAP_CHAR_LEN("_Exit"), ooFocusLostToVBAExit, ApproveType, (void*)(&textCompList) } }, //liuchen, add to support VBA TextBox_Exit event
+ { MAP_CHAR_LEN("focusLost"), { MAP_CHAR_LEN("_Exit"), ooFocusLostToVBAExit, ApproveType, (void*)(&textCompList) } },
// adjustmentValueChanged ooo event
{ MAP_CHAR_LEN("adjustmentValueChanged"), { MAP_CHAR_LEN("_Scroll"), NULL, ApproveAll, NULL } },
@@ -321,7 +321,7 @@ static TranslatePropMap aTranslatePropMap_Impl[] =
{ MAP_CHAR_LEN("keyReleased"), { MAP_CHAR_LEN("_KeyUp"), ooKeyPressedToVBAKeyUpDown, ApproveAll, NULL } },
// mouseReleased ooo event
- { MAP_CHAR_LEN("mouseReleased"), { MAP_CHAR_LEN("_Click"), ooMouseEvtToVBAMouseEvt, ApproveType, (void*)(&fixedTextList) } }, //liuchen, add to support VBA Label_Click event
+ { MAP_CHAR_LEN("mouseReleased"), { MAP_CHAR_LEN("_Click"), ooMouseEvtToVBAMouseEvt, ApproveType, (void*)(&fixedTextList) } },
{ MAP_CHAR_LEN("mouseReleased"), { MAP_CHAR_LEN("_MouseUp"), ooMouseEvtToVBAMouseEvt, ApproveAll, NULL } },
// mousePressed ooo event
@@ -330,7 +330,7 @@ static TranslatePropMap aTranslatePropMap_Impl[] =
// mouseMoved ooo event
{ MAP_CHAR_LEN("mouseMoved"), { MAP_CHAR_LEN("_MouseMove"), ooMouseEvtToVBAMouseEvt, ApproveAll, NULL } },
- { MAP_CHAR_LEN("mouseDragged"), { MAP_CHAR_LEN("_MouseMove"), ooMouseEvtToVBAMouseEvt, DenyMouseDrag, NULL } }, //liuchen, add to support VBA MouseMove event when the "Shift" key is pressed
+ { MAP_CHAR_LEN("mouseDragged"), { MAP_CHAR_LEN("_MouseMove"), ooMouseEvtToVBAMouseEvt, DenyMouseDrag, NULL } },
// keyPressed ooo event
{ MAP_CHAR_LEN("keyPressed"), { MAP_CHAR_LEN("_KeyDown"), ooKeyPressedToVBAKeyUpDown, ApproveAll, NULL } },
@@ -364,7 +364,7 @@ EventInfoHash& getEventTransInfo()
}
return eventTransInfo;
}
-//liuchen 2009-6-23 end
+
// Helper class
@@ -831,7 +831,7 @@ EventListener::getPropertySetInfo( ) throw (RuntimeException)
return xInfo;
}
-//liuchen 2009-6-23
+
//decide if the control should execute the event
bool ApproveAll(const ScriptEvent&, void* )
{
@@ -907,7 +907,7 @@ bool DenyKeys(const ScriptEvent& evt, void* /*pPara*/)
-//liuchen 2009-6-23
+
// EventListener
void
@@ -1027,12 +1027,12 @@ EventListener::firing_Impl(const ScriptEvent& evt, Any* pRet ) throw(RuntimeExce
ooo::vba::VBAMacroResolvedInfo aMacroResolvedInfo = ooo::vba::resolveVBAMacro( mpShell, sToResolve );
if ( aMacroResolvedInfo.IsResolved() )
{
- //liuchen 2009-6-8
+
if (! txInfo->ApproveRule(evt, txInfo->pPara) )
{
continue;
}
- //liuchen 2009-6-8
+
// !! translate arguments & emulate events where necessary
Sequence< Any > aArguments;
if ( (*txInfo).toVBA )
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 27a4a02..8d8ca17 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -901,7 +901,7 @@ sal_Bool IndexTabPage_Impl::HasKeyword() const
}
// -----------------------------------------------------------------------
-//added by BerryJia for fixing Bug98251, 2002-12-11
+
sal_Bool IndexTabPage_Impl::HasKeywordIgnoreCase()
{
sal_Bool bRet = sal_False;
@@ -1785,7 +1785,7 @@ IMPL_LINK( SfxHelpIndexWindow_Impl, KeywordHdl, IndexTabPage_Impl *, EMPTYARG )
{
// keyword found on index?
sal_Bool bIndex = pIPage->HasKeyword();
- //The following two lines are added by BerryJia for fixing Bug98251, 2002-12-11
+
if( !bIndex)
bIndex = pIPage->HasKeywordIgnoreCase();
// then set index or search page as current.
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index 1e0b83c..ad7510d 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -188,7 +188,7 @@ public:
inline void SetKeywordHdl( const Link& rLink ) { aKeywordLink = rLink; }
void SetKeyword( const String& rKeyword );
sal_Bool HasKeyword() const;
- sal_Bool HasKeywordIgnoreCase(); //added by BerryJia for fixing Bug98251, 2002-12-11
+ sal_Bool HasKeywordIgnoreCase();
void OpenKeyword();
inline void SelectExecutableEntry() { aIndexCB.SelectExecutableEntry(); }
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index fdf00b7..9b443e8 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -374,7 +374,7 @@ SfxActionListBox::SfxActionListBox( SfxCommonTemplateDialog_Impl* pParent,
PopupMenu* SfxActionListBox::CreateContextMenu( void )
{
- //added by BerryJia for fixing Bug102739 2002-9-9 17:00(Beijing Time)
+
if( !( GetSelectionCount() > 0 ) )
{
pDialog->EnableEdit( FALSE );
@@ -1111,7 +1111,7 @@ void SfxCommonTemplateDialog_Impl::SelectStyle(const String &rStr)
{
aFmtLb.MakeVisible( pEntry );
aFmtLb.Select( pEntry );
- bWaterDisabled = !HasSelectedStyle(); //added by BerryJia for fixing Bug76391 2003-1-22
+ bWaterDisabled = !HasSelectedStyle();
FmtSelectHdl( NULL );
}
}
@@ -1373,7 +1373,7 @@ void SfxCommonTemplateDialog_Impl::SetWaterCanState(const SfxBoolItem *pItem)
{
// EnableItem(SID_STYLE_WATERCAN, pItem != 0);
bWaterDisabled = pItem == 0;
-//added by BerryJia for fixing Bug76391 2003-1-7
+
if(!bWaterDisabled)
bWaterDisabled = !HasSelectedStyle();
diff --git a/svx/inc/svx/dbtoolsclient.hxx b/svx/inc/svx/dbtoolsclient.hxx
index 22e2ab8..f26a199 100644
--- a/svx/inc/svx/dbtoolsclient.hxx
+++ b/svx/inc/svx/dbtoolsclient.hxx
@@ -56,7 +56,7 @@ namespace svxform
static oslModule s_hDbtoolsModule;
static ::connectivity::simple::createDataAccessToolsFactoryFunction
s_pFactoryCreationFunc;
- //add by BerryJia for fixing Bug97420 Time:2002-9-12-11:00(PRC time)
+
mutable BOOL m_bCreateAlready;
private:
diff --git a/svx/source/form/dbtoolsclient.cxx b/svx/source/form/dbtoolsclient.cxx
index fec69bc..6f8c1d3 100644
--- a/svx/source/form/dbtoolsclient.cxx
+++ b/svx/source/form/dbtoolsclient.cxx
@@ -161,7 +161,7 @@ namespace svxform
}
//--------------------------------------------------------------------
- //add by BerryJia for fixing Bug97420 Time:2002-9-12-11:00(PRC time)
+
bool OStaticDataAccessTools::ensureLoaded() const
{
if ( !ODbtoolsClient::ensureLoaded() )
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 925e28c..7da82f9 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -1248,7 +1248,7 @@ bool FmXFormShell::executeControlConversionSlot( const Reference< XFormComponent
}
// replace the mdoel within the parent container
- Reference< XIndexContainer> xIndexParent(xChild->getParent(), UNO_QUERY); //Modified by BerryJia for fixing Bug102516 Time(China):2002-9-5 16:00
+ Reference< XIndexContainer> xIndexParent(xChild->getParent(), UNO_QUERY);
if (xIndexParent.is())
{
// the form container works with FormComponents
@@ -1257,7 +1257,7 @@ bool FmXFormShell::executeControlConversionSlot( const Reference< XFormComponent
Any aNewModel(makeAny(xComponent));
try
{
- //Modified by BerryJia for fixing Bug102516 Time(China):2002-9-5 16:00
+
sal_Int32 nIndex = getElementPos(xParent, xOldModel);
if (nIndex>=0 && nIndex<xParent->getCount())
xIndexParent->replaceByIndex(nIndex, aNewModel);
diff --git a/svx/source/inc/sqlparserclient.hxx b/svx/source/inc/sqlparserclient.hxx
index bd054e9..3dac415 100644
--- a/svx/source/inc/sqlparserclient.hxx
+++ b/svx/source/inc/sqlparserclient.hxx
@@ -44,7 +44,7 @@ namespace svxform
,public ::svxform::OParseContextClient
{
private:
- //add by BerryJia for fixing Bug97420 Time:2002-9-12-11:00(PRC time)
+
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB;
protected:
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index 10fd236..ffeb60b 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -35,8 +35,8 @@
#include <com/sun/star/style/VerticalAlignment.hpp>
#include <com/sun/star/drawing/TextVerticalAdjust.hpp>
#include <com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp>
-#include <com/sun/star/awt/TextAlign.hpp> //added by BerryJia for fixing Bug102407 2002-11-4
-#include <com/sun/star/style/ParagraphAdjust.hpp> //added by BerryJia for fixing Bug102407 2002-11-4
+#include <com/sun/star/awt/TextAlign.hpp>
+#include <com/sun/star/style/ParagraphAdjust.hpp>
#include <com/sun/star/drawing/PointSequenceSequence.hpp>
#include <com/sun/star/drawing/PointSequence.hpp>
#include <com/sun/star/graphic/XGraphic.hpp>
diff --git a/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx
index 8b0b640..599ef33 100644
--- a/vbahelper/source/msforms/vbacontrol.cxx
+++ b/vbahelper/source/msforms/vbacontrol.cxx
@@ -516,19 +516,19 @@ ScVbaControl* ScVbaControlFactory::createControl(const uno::Reference< drawing::
const static rtl::OUString sClassId( RTL_CONSTASCII_USTRINGPARAM("ClassId") );
xProps->getPropertyValue( sClassId ) >>= nClassId;
uno::Reference< XHelperInterface > xVbaParent; // #FIXME - should be worksheet I guess
- sal_Bool bToggle = sal_False; //liuchen 2009-8-11,
+ sal_Bool bToggle = sal_False;
switch( nClassId )
{
case form::FormComponentType::COMBOBOX:
return new ScVbaComboBox( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
case form::FormComponentType::COMMANDBUTTON:
- //liuchen 2009-8-11
+
xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Toggle") ) ) >>= bToggle;
if ( bToggle )
return new ScVbaToggleButton( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
else
return new ScVbaButton( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
- //liuchen 2009-8-11
+
case form::FormComponentType::FIXEDTEXT:
return new ScVbaLabel( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
case form::FormComponentType::TEXTFIELD:
diff --git a/vbahelper/source/msforms/vbaframe.cxx b/vbahelper/source/msforms/vbaframe.cxx
index 1b9945d..09d3b3c 100644
--- a/vbahelper/source/msforms/vbaframe.cxx
+++ b/vbahelper/source/msforms/vbaframe.cxx
@@ -65,7 +65,7 @@ ScVbaFrame::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::Run
_value >>= sCaption;
setCaption( sCaption );
}
-//liuchen 2009-7-6
+
::sal_Int32 SAL_CALL ScVbaFrame::getForeColor() throw (::com::sun::star::uno::RuntimeException)
{
return 0;
@@ -75,7 +75,7 @@ void SAL_CALL ScVbaFrame::setForeColor( ::sal_Int32 /*_forecolor*/ ) throw (::co
{
return;
}
-//liuchen 2009-7-6 end
+
rtl::OUString SAL_CALL
ScVbaFrame::getAccelerator() throw (css::uno::RuntimeException)
diff --git a/vbahelper/source/msforms/vbaframe.hxx b/vbahelper/source/msforms/vbaframe.hxx
index c92c007..dfc01e3 100644
--- a/vbahelper/source/msforms/vbaframe.hxx
+++ b/vbahelper/source/msforms/vbaframe.hxx
@@ -43,10 +43,10 @@ public:
virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
virtual rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException);
virtual void SAL_CALL setCaption( const rtl::OUString& _caption ) throw (css::uno::RuntimeException);
- //liuchen 2009-7-6
+
virtual ::sal_Int32 SAL_CALL getForeColor() throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setForeColor( ::sal_Int32 _forecolor ) throw (::com::sun::star::uno::RuntimeException);
- //liuchen 2009-7-6 end
+
virtual rtl::OUString SAL_CALL getAccelerator() throw (css::uno::RuntimeException);
virtual void SAL_CALL setAccelerator( const rtl::OUString& _accelerator ) throw (css::uno::RuntimeException);
//XHelperInterface
diff --git a/vbahelper/source/msforms/vbalistbox.cxx b/vbahelper/source/msforms/vbalistbox.cxx
index 57dceac..d830e10 100644
--- a/vbahelper/source/msforms/vbalistbox.cxx
+++ b/vbahelper/source/msforms/vbalistbox.cxx
@@ -115,7 +115,7 @@ ScVbaListBox::setValue( const uno::Any& _value ) throw (uno::RuntimeException)
m_xProps->setPropertyValue( SELECTEDITEMS, uno::makeAny( nSelectedIndices ) );
if ( nSelectedIndices != nOldSelectedIndices )
fireClickEvent();
- //m_xProps->setPropertyValue( TEXT, uno::makeAny( sValue ) ); //liuchen 2009-8-12 solve the problem that ListBox.Text and ListBox.Value cannot be set
+ //m_xProps->setPropertyValue( TEXT, uno::makeAny( sValue ) );
}
::rtl::OUString SAL_CALL
diff --git a/vbahelper/source/msforms/vbalistbox.hxx b/vbahelper/source/msforms/vbalistbox.hxx
index d540102..adb0a09 100644
--- a/vbahelper/source/msforms/vbalistbox.hxx
+++ b/vbahelper/source/msforms/vbalistbox.hxx
@@ -58,8 +58,8 @@ public:
virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
virtual rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException);
virtual void SAL_CALL setText( const ::rtl::OUString& _text ) throw (css::uno::RuntimeException);
- virtual ::sal_Int32 SAL_CALL getMultiSelect() throw (css::uno::RuntimeException); //liuchen 2009-7-31
- virtual void SAL_CALL setMultiSelect( ::sal_Int32 _multiselect ) throw (css::uno::RuntimeException); //liuchen 2009-7-31
+ virtual ::sal_Int32 SAL_CALL getMultiSelect() throw (css::uno::RuntimeException);
+ virtual void SAL_CALL setMultiSelect( ::sal_Int32 _multiselect ) throw (css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL Selected( ::sal_Int32 index ) throw (css::uno::RuntimeException);
// Methods
diff --git a/vbahelper/source/msforms/vbatextbox.cxx b/vbahelper/source/msforms/vbatextbox.cxx
index 88b0958..3fc94c7 100644
--- a/vbahelper/source/msforms/vbatextbox.cxx
+++ b/vbahelper/source/msforms/vbatextbox.cxx
@@ -98,8 +98,8 @@ ScVbaTextBox::getMaxLength() throw (css::uno::RuntimeException)
void SAL_CALL
ScVbaTextBox::setMaxLength( sal_Int32 _maxlength ) throw (css::uno::RuntimeException)
{
- sal_Int16 _maxlength16 = static_cast<sal_Int16> (_maxlength); //liuchen 2009-7-24, resolve the problem that MaxLength cannot be set correctly
- uno::Any aValue( _maxlength16 ); //liuchen 2009-7-24, resolve the problem that MaxLength cannot be set correctly
+ sal_Int16 _maxlength16 = static_cast<sal_Int16> (_maxlength);
+ uno::Any aValue( _maxlength16 );
m_xProps->setPropertyValue
(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MaxTextLen" ) ), aValue);
}
diff --git a/vbahelper/source/msforms/vbatogglebutton.cxx b/vbahelper/source/msforms/vbatogglebutton.cxx
index 7337b83..297e30c 100644
--- a/vbahelper/source/msforms/vbatogglebutton.cxx
+++ b/vbahelper/source/msforms/vbatogglebutton.cxx
@@ -69,7 +69,7 @@ ScVbaToggleButton::getValue() throw (uno::RuntimeException)
return uno::makeAny( nState ? sal_Int16( -1 ) : sal_Int16( 0 ) );
}
-//liuchen 2009-7-23, resolve the defect that ToggleButton.Value cannot be set correctly
+
void SAL_CALL
ScVbaToggleButton::setValue( const uno::Any& _value ) throw (uno::RuntimeException)
{
@@ -95,7 +95,7 @@ ScVbaToggleButton::setValue( const uno::Any& _value ) throw (uno::RuntimeExcepti
}
m_xProps->setPropertyValue( STATE, uno::makeAny( nState ) );
}
-//liuchen 2009-7-23
+
rtl::OUString&
ScVbaToggleButton::getServiceImplName()
diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx
index 69f0b4e..9731e5f 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -950,7 +950,7 @@ namespace xmloff
}
//---------------------------------------------------------------------
- //added by BerryJia for fixing bug102407 2002-11-5
+
Reference< XPropertySet > OControlImport::createElement()
{
const Reference<XPropertySet> xPropSet = OElementImport::createElement();
diff --git a/xmloff/source/forms/elementimport.hxx b/xmloff/source/forms/elementimport.hxx
index a9a5857..a677180 100644
--- a/xmloff/source/forms/elementimport.hxx
+++ b/xmloff/source/forms/elementimport.hxx
@@ -261,7 +261,7 @@ namespace xmloff
virtual void doRegisterXFormsSubmission( const ::rtl::OUString& );
protected:
- //added by BerryJia for fixing bug102407 2002-11-5
+
// OElementImport overridables
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
createElement();
diff --git a/xmloff/source/forms/propertyexport.cxx b/xmloff/source/forms/propertyexport.cxx
index 560e570..3f00142 100644
--- a/xmloff/source/forms/propertyexport.cxx
+++ b/xmloff/source/forms/propertyexport.cxx
@@ -144,7 +144,7 @@ namespace xmloff
aExportType = aValue.getValueType();
// the type attribute
- // modified by BerryJia for Bug102407
+
bool bIsEmptyValue = TypeClass_VOID == aValue.getValueType().getTypeClass();
if ( bIsEmptyValue )
{
@@ -169,7 +169,7 @@ namespace xmloff
if( !bIsSequence && !bIsEmptyValue )
{ // the simple case
- //add by BerryJia for Bug102407
+
sValue = implConvertAny(aValue);
AddAttribute(XML_NAMESPACE_OFFICE, eValueAttName, sValue );
}
diff --git a/xmloff/source/style/adjushdl.cxx b/xmloff/source/style/adjushdl.cxx
index b470664..f909b8f 100644
--- a/xmloff/source/style/adjushdl.cxx
+++ b/xmloff/source/style/adjushdl.cxx
@@ -86,7 +86,7 @@ sal_Bool XMLParaAdjustPropHdl::importXML( const OUString& rStrImpValue, uno::Any
sal_Bool XMLParaAdjustPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& rValue, const SvXMLUnitConverter& ) const
{
if(!rValue.hasValue())
- return sal_False; //added by BerryJia for fixing Bug102407 2002-11-5
+ return sal_False;
OUStringBuffer aOut;
sal_Int16 nVal = 0;
More information about the Libreoffice-commits
mailing list