summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorAlexander O. Anisimov <alenyashka@gmail.com>2010-11-09 01:42:14 +0500
committerCaolán McNamara <caolanm@redhat.com>2010-11-09 11:50:47 +0000
commitdec234ba07197fcfde9bf4e240549ffaa3ba00b4 (patch)
tree590b035fe0575a06214b2a520887074963332a1e /framework
parent9569c88f3ba13115e6af4fca17805ef2fc8716e3 (diff)
Clean up the code
* Remove bogus comments * Refresh comments containing a reference to the bug tracker * Remove the comments such as "// add by zhaojianwei"
Diffstat (limited to 'framework')
-rw-r--r--framework/inc/services/substitutepathvars.hxx3
-rw-r--r--framework/source/layoutmanager/layoutmanager.cxx3
-rw-r--r--framework/source/services/substitutepathvars.cxx15
3 files changed, 7 insertions, 14 deletions
diff --git a/framework/inc/services/substitutepathvars.hxx b/framework/inc/services/substitutepathvars.hxx
index 63d7523b9e90..e575ff7ee469 100644
--- a/framework/inc/services/substitutepathvars.hxx
+++ b/framework/inc/services/substitutepathvars.hxx
@@ -192,10 +192,9 @@ enum PreDefVariable
PREDEFVAR_PROGURL,
PREDEFVAR_USERURL,
PREDEFVAR_WORKDIRURL,
- // --> PB 2004-10-27 #i32656# - new variable of hierachy service
+ // New variable of hierachy service (#i32656#)
PREDEFVAR_BASEINSTURL,
PREDEFVAR_USERDATAURL,
- // <--
PREDEFVAR_BRANDBASEURL,
PREDEFVAR_COUNT
};
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index 73fa53b6a3d6..6235ad016afc 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -292,12 +292,11 @@ static sal_Bool implts_isFrameOrWindowTop( const css::uno::Reference< css::frame
css::uno::Reference< css::awt::XTopWindow > xWindowCheck(xFrame->getContainerWindow(), css::uno::UNO_QUERY); // dont use _THROW here ... its a check only
if (xWindowCheck.is())
{
- // --> PB 2007-06-18 #i76867# top and system window is required.
+ // Top and system window is required (#i76867#)
SolarMutexGuard aGuard;
css::uno::Reference< css::awt::XWindow > xWindow( xWindowCheck, UNO_QUERY );
Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
return ( pWindow && pWindow->IsSystemWindow() );
- // <--
}
return sal_False;
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index 446e3aa9015f..29746ee42ce6 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -101,10 +101,9 @@
#define REPLACELENGTH_LANGID 9
#define REPLACELENGTH_VLANG 8
#define REPLACELENGTH_WORKDIRURL 13
-// --> PB 2004-10-27 #i32656# - new variable of hierachy service
+// New variable of hierachy service (#i32656#)
#define REPLACELENGTH_BASEINSTURL 14
#define REPLACELENGTH_USERDATAURL 14
-// <--
// Name of the pre defined path variables
#define VARIABLE_INST "$(inst)"
@@ -124,10 +123,9 @@
#define VARIABLE_PROGURL "$(progurl)"
#define VARIABLE_USERURL "$(userurl)"
#define VARIABLE_WORKDIRURL "$(workdirurl)"
-// --> PB 2004-10-27 #i32656# - new variable of hierachy service
+// New variable of hierachy service (#i32656#)
#define VARIABLE_BASEINSTURL "$(baseinsturl)"
#define VARIABLE_USERDATAURL "$(userdataurl)"
-// <--
using namespace com::sun::star::uno;
using namespace com::sun::star::beans;
@@ -214,10 +212,9 @@ static FixedVariable aFixedVarTable[] =
{ VARIABLE_PROGURL, PREDEFVAR_PROGURL, REPLACELENGTH_PROGURL },
{ VARIABLE_USERURL, PREDEFVAR_USERURL, REPLACELENGTH_USERURL },
{ VARIABLE_WORKDIRURL, PREDEFVAR_WORKDIRURL, REPLACELENGTH_WORKDIRURL }, // Special variable (transient) and don't use for resubstitution!
- // --> PB 2004-10-27 #i32656# - new variable of hierachy service
+ // New variable of hierachy service (#i32656#)
{ VARIABLE_BASEINSTURL, PREDEFVAR_BASEINSTURL, REPLACELENGTH_BASEINSTURL },
{ VARIABLE_USERDATAURL, PREDEFVAR_USERDATAURL, REPLACELENGTH_USERDATAURL },
- // <--
{ "$(brandbaseurl)", PREDEFVAR_BRANDBASEURL,
RTL_CONSTASCII_LENGTH("$(brandbaseurl)") }
};
@@ -1198,16 +1195,14 @@ void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable
// Set $(inst), $(instpath), $(insturl)
aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INSTURL ] = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INSTPATH ];
aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INST ] = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INSTPATH ];
- // --> PB 2004-10-27 #i32656# - new variable of hierachy service
+ // New variable of hierachy service (#i32656#)
aPreDefPathVariables.m_FixedVar[ PREDEFVAR_BASEINSTURL ]= aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INSTPATH ];
- // <--
// Set $(user), $(userpath), $(userurl)
aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USERURL ] = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USERPATH ];
aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USER ] = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USERPATH ];
- // --> PB 2004-11-11 #i32656# - new variable of hierachy service
+ // New variable of hierachy service (#i32656#)
aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USERDATAURL ]= aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USERPATH ];
- // <--
// Detect the program directory
// Set $(prog), $(progpath), $(progurl)