summaryrefslogtreecommitdiff
path: root/reportdesign/source/ui
diff options
context:
space:
mode:
Diffstat (limited to 'reportdesign/source/ui')
-rw-r--r--reportdesign/source/ui/dlg/DateTime.cxx2
-rw-r--r--reportdesign/source/ui/dlg/Formula.cxx2
-rw-r--r--reportdesign/source/ui/inspection/DataProviderHandler.cxx8
-rw-r--r--reportdesign/source/ui/inspection/DefaultInspection.cxx2
-rw-r--r--reportdesign/source/ui/inspection/GeometryHandler.cxx18
-rw-r--r--reportdesign/source/ui/misc/UITools.cxx2
-rw-r--r--reportdesign/source/ui/report/ReportController.cxx8
-rw-r--r--reportdesign/source/ui/report/propbrw.cxx4
8 files changed, 23 insertions, 23 deletions
diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx
index e2574d109280..5ad27abcdb6a 100644
--- a/reportdesign/source/ui/dlg/DateTime.cxx
+++ b/reportdesign/source/ui/dlg/DateTime.cxx
@@ -182,7 +182,7 @@ OUString ODateTimeDialog::getFormatStringByKey(::sal_Int32 _nNumberFormatKey,con
uno::Reference< beans::XPropertySet> xFormSet = _xFormats->getByKey(_nNumberFormatKey);
OSL_ENSURE(xFormSet.is(),"XPropertySet is null!");
OUString sFormat;
- xFormSet->getPropertyValue(OUString("FormatString")) >>= sFormat;
+ xFormSet->getPropertyValue("FormatString") >>= sFormat;
double nValue = 0;
if ( _bTime )
diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx
index cd92312151c8..84330da1ea85 100644
--- a/reportdesign/source/ui/dlg/Formula.cxx
+++ b/reportdesign/source/ui/dlg/Formula.cxx
@@ -64,7 +64,7 @@ FormulaDialog::FormulaDialog(Window* pParent
else
m_sFormula = _sFormula;
}
- m_xParser.set(_xServiceFactory->createInstance(OUString("org.libreoffice.report.pentaho.SOFormulaParser")),uno::UNO_QUERY);
+ m_xParser.set(_xServiceFactory->createInstance("org.libreoffice.report.pentaho.SOFormulaParser"),uno::UNO_QUERY);
if ( m_xParser.is() )
m_xOpCodeMapper = m_xParser->getFormulaOpCodeMapper();
fill();
diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
index 261c6b573e7a..de062e880fc0 100644
--- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx
+++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
@@ -150,7 +150,7 @@ void SAL_CALL DataProviderHandler::inspect(const uno::Reference< uno::XInterface
}
}
m_xDataProvider.set(m_xFormComponent,uno::UNO_QUERY);
- m_xReportComponent.set( xNameCont->getByName( OUString( "ReportComponent" ) ), uno::UNO_QUERY );
+ m_xReportComponent.set( xNameCont->getByName("ReportComponent"), uno::UNO_QUERY );
if ( m_xDataProvider.is() )
{
::boost::shared_ptr<AnyConverter> aNoConverter(new AnyConverter());
@@ -242,7 +242,7 @@ void DataProviderHandler::impl_updateChartTitle_throw(const uno::Any& _aValue)
uno::Reference<chart2::XTitle> xTitle = xTitled->getTitleObject();
if ( !xTitle.is() )
{
- xTitle.set(m_xContext->getServiceManager()->createInstanceWithContext(OUString("com.sun.star.chart2.Title"),m_xContext),uno::UNO_QUERY);
+ xTitle.set(m_xContext->getServiceManager()->createInstanceWithContext("com.sun.star.chart2.Title",m_xContext),uno::UNO_QUERY);
xTitled->setTitleObject(xTitle);
}
if ( xTitle.is() )
@@ -496,7 +496,7 @@ bool DataProviderHandler::impl_dialogLinkedFields_nothrow( ::osl::ClearableMutex
uno::Sequence<uno::Any> aSeq(6);
beans::PropertyValue aParam;
aParam.Name = OUString("ParentWindow");
- aParam.Value <<= m_xContext->getValueByName( OUString("DialogParentWindow"));
+ aParam.Value <<= m_xContext->getValueByName("DialogParentWindow");
aSeq[0] <<= aParam;
aParam.Name = OUString("Detail");
aParam.Value <<= m_xDataProvider;
@@ -529,7 +529,7 @@ bool DataProviderHandler::impl_dialogChartType_nothrow( ::osl::ClearableMutexGua
uno::Sequence<uno::Any> aSeq(2);
beans::PropertyValue aParam;
aParam.Name = OUString("ParentWindow");
- aParam.Value <<= m_xContext->getValueByName( OUString("DialogParentWindow"));
+ aParam.Value <<= m_xContext->getValueByName("DialogParentWindow");
aSeq[0] <<= aParam;
aParam.Name = OUString("ChartModel");
aParam.Value <<= m_xChartModel;
diff --git a/reportdesign/source/ui/inspection/DefaultInspection.cxx b/reportdesign/source/ui/inspection/DefaultInspection.cxx
index bb5088dc365a..0fb154686b65 100644
--- a/reportdesign/source/ui/inspection/DefaultInspection.cxx
+++ b/reportdesign/source/ui/inspection/DefaultInspection.cxx
@@ -251,7 +251,7 @@ namespace rptui
if ( !m_xComponent.is() )
try
{
- m_xComponent.set(m_xContext->getServiceManager()->createInstanceWithContext(OUString("com.sun.star.form.inspection.DefaultFormComponentInspectorModel"),m_xContext),UNO_QUERY_THROW);
+ m_xComponent.set(m_xContext->getServiceManager()->createInstanceWithContext("com.sun.star.form.inspection.DefaultFormComponentInspectorModel",m_xContext),UNO_QUERY_THROW);
}
catch(const Exception &)
{
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index 3c9339bc61e1..db31b307098d 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -336,7 +336,7 @@ void SAL_CALL GeometryHandler::inspect( const uno::Reference< uno::XInterface >
m_xReportComponent->removePropertyChangeListener(PROPERTY_DATAFIELD,static_cast< beans::XPropertyChangeListener* >( this ));
const uno::Reference< container::XNameContainer > xObjectAsContainer( _rxInspectee, uno::UNO_QUERY );
- m_xReportComponent.set( xObjectAsContainer->getByName( OUString( "ReportComponent" ) ), uno::UNO_QUERY );
+ m_xReportComponent.set( xObjectAsContainer->getByName("ReportComponent"), uno::UNO_QUERY );
const OUString sRowSet("RowSet");
if ( xObjectAsContainer->hasByName( sRowSet ) )
@@ -1408,7 +1408,7 @@ inspection::InteractiveSelectionResult SAL_CALL GeometryHandler::onInteractivePr
::osl::ClearableMutexGuard aGuard( m_aMutex );
inspection::InteractiveSelectionResult eResult = inspection::InteractiveSelectionResult_Cancelled;
- const uno::Reference< awt::XWindow> xInspectorWindow(m_xContext->getValueByName( OUString("DialogParentWindow")) ,uno::UNO_QUERY);
+ const uno::Reference< awt::XWindow> xInspectorWindow(m_xContext->getValueByName("DialogParentWindow") ,uno::UNO_QUERY);
const uno::Reference< report::XReportControlFormat> xReportControlFormat(m_xReportComponent,uno::UNO_QUERY);
aGuard.clear();
@@ -1430,7 +1430,7 @@ inspection::InteractiveSelectionResult SAL_CALL GeometryHandler::onInteractivePr
OUString sFormula;
m_xReportComponent->getPropertyValue(PropertyName) >>= sFormula;
- const uno::Reference< awt::XWindow> xInspectorWindow(m_xContext->getValueByName( OUString("DialogParentWindow")) ,uno::UNO_QUERY);
+ const uno::Reference< awt::XWindow> xInspectorWindow(m_xContext->getValueByName("DialogParentWindow") ,uno::UNO_QUERY);
uno::Reference< uno::XComponentContext > xContext = m_xContext;
uno::Reference< beans::XPropertySet > xRowSet( m_xRowSet,uno::UNO_QUERY);
aGuard.clear();
@@ -1448,7 +1448,7 @@ inspection::InteractiveSelectionResult SAL_CALL GeometryHandler::onInteractivePr
::osl::ClearableMutexGuard aGuard( m_aMutex );
inspection::InteractiveSelectionResult eResult = inspection::InteractiveSelectionResult_Cancelled;
- const uno::Reference< awt::XWindow> xInspectorWindow(m_xContext->getValueByName( OUString("DialogParentWindow")) ,uno::UNO_QUERY);
+ const uno::Reference< awt::XWindow> xInspectorWindow(m_xContext->getValueByName("DialogParentWindow") ,uno::UNO_QUERY);
const uno::Reference< report::XShape> xShape(m_xReportComponent,uno::UNO_QUERY);
aGuard.clear();
@@ -1565,15 +1565,15 @@ bool GeometryHandler::impl_dialogFilter_nothrow( OUString& _out_rSelectedClause,
try
{
xFactory = m_xContext->getServiceManager();
- xInspectorWindow.set(m_xContext->getValueByName( OUString("DialogParentWindow")) ,uno::UNO_QUERY);
- uno::Reference<sdbc::XConnection> xCon(m_xContext->getValueByName( OUString("ActiveConnection")) ,uno::UNO_QUERY);
+ xInspectorWindow.set(m_xContext->getValueByName("DialogParentWindow") ,uno::UNO_QUERY);
+ uno::Reference<sdbc::XConnection> xCon(m_xContext->getValueByName("ActiveConnection") ,uno::UNO_QUERY);
if ( !xCon.is() )
return false;
uno::Reference< beans::XPropertySet> xRowSetProp(m_xRowSet,uno::UNO_QUERY);
if ( !m_xRowSet.is() )
{
- m_xRowSet.set(xFactory->createInstanceWithContext(OUString("com.sun.star.sdb.RowSet"),m_xContext),uno::UNO_QUERY);
+ m_xRowSet.set(xFactory->createInstanceWithContext("com.sun.star.sdb.RowSet",m_xContext),uno::UNO_QUERY);
xRowSetProp.set(m_xRowSet,uno::UNO_QUERY);
xRowSetProp->setPropertyValue(PROPERTY_ACTIVECONNECTION,uno::makeAny(xCon));
::comphelper::copyProperties(m_xReportComponent,xRowSetProp);
@@ -2045,7 +2045,7 @@ void GeometryHandler::impl_initFieldList_nothrow( uno::Sequence< OUString >& _rF
_rFieldNames.realloc(0);
try
{
- uno::Reference< awt::XWindow> xInspectorWindow(m_xContext->getValueByName( OUString("DialogParentWindow")) ,uno::UNO_QUERY);
+ uno::Reference< awt::XWindow> xInspectorWindow(m_xContext->getValueByName("DialogParentWindow") ,uno::UNO_QUERY);
Window* pInspectorWindow = VCLUnoHelper::GetWindow( xInspectorWindow );
WaitObject aWaitCursor( pInspectorWindow );
@@ -2059,7 +2059,7 @@ void GeometryHandler::impl_initFieldList_nothrow( uno::Sequence< OUString >& _rF
OUString sObjectName;
OSL_VERIFY( xFormSet->getPropertyValue( PROPERTY_COMMAND ) >>= sObjectName );
// when there is no command we don't need to ask for columns
- uno::Reference<sdbc::XConnection> xCon(m_xContext->getValueByName( OUString("ActiveConnection")) ,uno::UNO_QUERY);
+ uno::Reference<sdbc::XConnection> xCon(m_xContext->getValueByName("ActiveConnection") ,uno::UNO_QUERY);
if ( !sObjectName.isEmpty() && xCon.is() )
{
sal_Int32 nObjectType = sdb::CommandType::COMMAND;
diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx
index 43f67fcb4123..725d3f9ff5cd 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -1023,7 +1023,7 @@ bool openDialogFormula_nothrow( OUString& _in_out_rFormula
xServiceFactory.set(xFactory,uno::UNO_QUERY);
Window* pParent = VCLUnoHelper::GetWindow( _xInspectorWindow );
- uno::Reference< report::meta::XFunctionManager> xMgr(xFactory->createInstanceWithContext(OUString("org.libreoffice.report.pentaho.SOFunctionManager"),_xContext),uno::UNO_QUERY);
+ uno::Reference< report::meta::XFunctionManager> xMgr(xFactory->createInstanceWithContext("org.libreoffice.report.pentaho.SOFunctionManager",_xContext),uno::UNO_QUERY);
if ( xMgr.is() )
{
::boost::shared_ptr< formula::IFunctionManager > pFormulaManager(new FunctionManager(xMgr) );
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 66fe96caffa3..220f31e61276 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -1692,7 +1692,7 @@ void OReportController::impl_initialize( )
::comphelper::MediaDescriptor aDescriptor( m_xReportDefinition->getArgs() );
OUString sHierarchicalDocumentName;
- sHierarchicalDocumentName = aDescriptor.getUnpackedValueOrDefault(OUString("HierarchicalDocumentName"),sHierarchicalDocumentName);
+ sHierarchicalDocumentName = aDescriptor.getUnpackedValueOrDefault("HierarchicalDocumentName",sHierarchicalDocumentName);
if ( sHierarchicalDocumentName.isEmpty() && getConnection().is() )
{
@@ -3331,7 +3331,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs)
}
::svx::ODataAccessDescriptor aDescriptor(aValue);
SequenceAsHashMap aMap(aValue);
- uno::Reference<report::XSection> xSection = aMap.getUnpackedValueOrDefault(OUString("Section"),xCurrentSection);
+ uno::Reference<report::XSection> xSection = aMap.getUnpackedValueOrDefault("Section",xCurrentSection);
uno::Reference<report::XReportDefinition> xReportDefinition = xSection->getReportDefinition();
getDesignView()->setMarked(xSection,sal_True);
@@ -3343,7 +3343,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs)
aPos.X = nLeftMargin;
// LLA: new feature, add the Label in dependency of the given DND_ACTION one section up, normal or one section down
- sal_Int8 nDNDAction = aMap.getUnpackedValueOrDefault(OUString("DNDAction"), sal_Int8(0));
+ sal_Int8 nDNDAction = aMap.getUnpackedValueOrDefault("DNDAction", sal_Int8(0));
pSectionWindow[1] = pSectionWindow[0];
sal_Bool bLabelAboveTextField = nDNDAction == DND_ACTION_COPY;
if ( bLabelAboveTextField || nDNDAction == DND_ACTION_LINK )
@@ -3416,7 +3416,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs)
{
uno::Reference< beans::XPropertySet > xParamCol( xParams->getByIndex(i), uno::UNO_QUERY_THROW );
OUString sParamName;
- OSL_VERIFY( xParamCol->getPropertyValue( OUString( "Name" ) ) >>= sParamName );
+ OSL_VERIFY( xParamCol->getPropertyValue("Name") >>= sParamName );
if ( sParamName == sColumnName )
{
xField = xParamCol;
diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx
index 17809a41db67..bd8a5a325aed 100644
--- a/reportdesign/source/ui/report/propbrw.cxx
+++ b/reportdesign/source/ui/report/propbrw.cxx
@@ -110,7 +110,7 @@ PropBrw::PropBrw(const Reference< XComponentContext >& _xORB, Window* pParent, O
// create a frame wrapper for myself
m_xMeAsFrame = Frame::create( m_xORB );
m_xMeAsFrame->initialize( VCLUnoHelper::GetInterface ( this ) );
- m_xMeAsFrame->setName( OUString("report property browser") ); // change name!
+ m_xMeAsFrame->setName("report property browser"); // change name!
}
catch (Exception&)
{
@@ -344,7 +344,7 @@ OUString PropBrw::GetHeadlineName( const uno::Sequence< Reference<uno::XInterfac
aName = String(ModuleRes(RID_STR_BRWTITLE_PROPERTIES));
uno::Reference< container::XNameContainer > xNameCont(_aObjects[0],uno::UNO_QUERY);
- Reference< lang::XServiceInfo > xServiceInfo( xNameCont->getByName(OUString("ReportComponent")), UNO_QUERY );
+ Reference< lang::XServiceInfo > xServiceInfo( xNameCont->getByName("ReportComponent"), UNO_QUERY );
if ( xServiceInfo.is() )
{
sal_uInt16 nResId = 0;