[Libreoffice-commits] core.git: 2 commits - scripting/java sw/qa tools/source ucb/source wizards/com
Noel Grandin
noel at peralex.com
Mon Nov 9 03:15:05 PST 2015
scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java | 1
sw/qa/complex/writer/TextPortionEnumerationTest.java | 1
tools/source/datetime/tdate.cxx | 2
tools/source/datetime/ttime.cxx | 4
tools/source/debug/debug.cxx | 6
tools/source/ref/globname.cxx | 6
ucb/source/cacher/cachedcontentresultset.cxx | 32
ucb/source/cacher/cachedcontentresultset.hxx | 350 +++---
ucb/source/cacher/cachedcontentresultsetstub.cxx | 10
ucb/source/cacher/cachedcontentresultsetstub.hxx | 91 -
ucb/source/cacher/cacheddynamicresultset.hxx | 52
ucb/source/cacher/cacheddynamicresultsetstub.hxx | 56 -
ucb/source/cacher/contentresultsetwrapper.cxx | 8
ucb/source/cacher/contentresultsetwrapper.hxx | 366 +++----
ucb/source/cacher/dynamicresultsetwrapper.hxx | 118 +-
ucb/source/core/FileAccess.cxx | 56 -
ucb/source/core/cmdenv.hxx | 58 -
ucb/source/core/providermap.hxx | 22
ucb/source/core/provprox.hxx | 68 -
ucb/source/core/ucb.cxx | 34
ucb/source/core/ucb.hxx | 139 +-
ucb/source/core/ucbprops.hxx | 19
ucb/source/core/ucbstore.cxx | 2
ucb/source/core/ucbstore.hxx | 198 +--
ucb/source/inc/regexpmap.hxx | 2
ucb/source/sorter/sortdynres.cxx | 2
ucb/source/ucp/cmis/auth_provider.cxx | 6
ucb/source/ucp/cmis/auth_provider.hxx | 13
ucb/source/ucp/cmis/certvalidation_handler.hxx | 10
ucb/source/ucp/cmis/children_provider.hxx | 2
ucb/source/ucp/cmis/cmis_content.cxx | 8
ucb/source/ucp/cmis/cmis_content.hxx | 139 +-
ucb/source/ucp/cmis/cmis_datasupplier.hxx | 14
ucb/source/ucp/cmis/cmis_provider.cxx | 15
ucb/source/ucp/cmis/cmis_provider.hxx | 13
ucb/source/ucp/cmis/cmis_repo_content.cxx | 8
ucb/source/ucp/cmis/cmis_repo_content.hxx | 52
ucb/source/ucp/cmis/cmis_resultset.hxx | 9
ucb/source/ucp/ext/ucpext_content.hxx | 46
ucb/source/ucp/ext/ucpext_datasupplier.hxx | 10
ucb/source/ucp/ext/ucpext_provider.hxx | 14
ucb/source/ucp/ext/ucpext_resultset.hxx | 12
ucb/source/ucp/file/bc.hxx | 177 +--
ucb/source/ucp/file/filcmd.hxx | 32
ucb/source/ucp/file/filglob.hxx | 3
ucb/source/ucp/file/filid.hxx | 22
ucb/source/ucp/file/filinl.hxx | 10
ucb/source/ucp/file/filinpstr.hxx | 71 -
ucb/source/ucp/file/filinsreq.hxx | 12
ucb/source/ucp/file/filnot.cxx | 4
ucb/source/ucp/file/filnot.hxx | 49
ucb/source/ucp/file/filprp.hxx | 18
ucb/source/ucp/file/filrow.cxx | 2
ucb/source/ucp/file/filrow.hxx | 112 +-
ucb/source/ucp/file/filrset.hxx | 334 +++---
ucb/source/ucp/file/filstr.cxx | 2
ucb/source/ucp/file/filstr.hxx | 102 -
ucb/source/ucp/file/filtask.hxx | 20
ucb/source/ucp/file/prov.cxx | 24
ucb/source/ucp/file/prov.hxx | 112 +-
ucb/source/ucp/file/shell.cxx | 16
ucb/source/ucp/file/shell.hxx | 110 +-
ucb/source/ucp/ftp/ftpcontentidentifier.cxx | 4
ucb/source/ucp/ftp/ftpcontentidentifier.hxx | 34
ucb/source/ucp/ftp/ftpdirp.hxx | 4
ucb/source/ucp/ftp/ftpdynresultset.hxx | 11
ucb/source/ucp/ftp/ftpintreq.hxx | 2
ucb/source/ucp/ftp/ftpresultsetI.hxx | 12
ucb/source/ucp/ftp/ftpresultsetbase.hxx | 428 +++-----
ucb/source/ucp/ftp/ftpstrcont.hxx | 10
ucb/source/ucp/gio/gio_content.hxx | 134 +-
ucb/source/ucp/gio/gio_datasupplier.hxx | 22
ucb/source/ucp/gio/gio_inputstream.hxx | 40
ucb/source/ucp/gio/gio_mount.cxx | 2
ucb/source/ucp/gio/gio_mount.hxx | 4
ucb/source/ucp/gio/gio_outputstream.cxx | 2
ucb/source/ucp/gio/gio_outputstream.hxx | 30
ucb/source/ucp/gio/gio_provider.cxx | 15
ucb/source/ucp/gio/gio_provider.hxx | 13
ucb/source/ucp/gio/gio_resultset.hxx | 19
ucb/source/ucp/gio/gio_seekable.hxx | 26
ucb/source/ucp/hierarchy/dynamicresultset.hxx | 5
ucb/source/ucp/hierarchy/hierarchycontent.hxx | 155 +-
ucb/source/ucp/hierarchy/hierarchydata.hxx | 18
ucb/source/ucp/hierarchy/hierarchydatasource.cxx | 2
ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx | 14
ucb/source/ucp/hierarchy/hierarchyprovider.hxx | 40
ucb/source/ucp/package/pkgcontent.hxx | 198 +--
ucb/source/ucp/package/pkgdatasupplier.hxx | 12
ucb/source/ucp/package/pkgprovider.hxx | 16
ucb/source/ucp/package/pkgresultset.hxx | 11
ucb/source/ucp/tdoc/tdoc_content.hxx | 198 +--
ucb/source/ucp/tdoc/tdoc_datasupplier.hxx | 14
ucb/source/ucp/tdoc/tdoc_docmgr.hxx | 74 -
ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx | 36
ucb/source/ucp/tdoc/tdoc_passwordrequest.hxx | 2
ucb/source/ucp/tdoc/tdoc_provider.hxx | 46
ucb/source/ucp/tdoc/tdoc_resultset.hxx | 5
ucb/source/ucp/tdoc/tdoc_stgelems.hxx | 522 ++++------
ucb/source/ucp/tdoc/tdoc_storage.hxx | 120 +-
ucb/source/ucp/webdav-neon/ContentProperties.cxx | 2
ucb/source/ucp/webdav-neon/ContentProperties.hxx | 30
ucb/source/ucp/webdav-neon/DAVAuthListenerImpl.hxx | 6
ucb/source/ucp/webdav-neon/DAVResource.hxx | 6
ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx | 101 -
ucb/source/ucp/webdav-neon/DAVSession.hxx | 27
ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx | 2
ucb/source/ucp/webdav-neon/DAVTypes.hxx | 6
ucb/source/ucp/webdav-neon/DateTimeHelper.hxx | 6
ucb/source/ucp/webdav-neon/LinkSequence.hxx | 6
ucb/source/ucp/webdav-neon/LockEntrySequence.hxx | 3
ucb/source/ucp/webdav-neon/LockSequence.hxx | 3
ucb/source/ucp/webdav-neon/NeonInputStream.cxx | 58 -
ucb/source/ucp/webdav-neon/NeonInputStream.hxx | 65 -
ucb/source/ucp/webdav-neon/NeonSession.hxx | 37
ucb/source/ucp/webdav-neon/PropertyMap.hxx | 8
ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.hxx | 6
ucb/source/ucp/webdav-neon/webdavcontent.hxx | 203 +--
ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx | 12
ucb/source/ucp/webdav-neon/webdavprovider.hxx | 15
ucb/source/ucp/webdav-neon/webdavresultset.hxx | 11
ucb/source/ucp/webdav/ContentProperties.cxx | 2
ucb/source/ucp/webdav/ContentProperties.hxx | 28
ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx | 6
ucb/source/ucp/webdav/DAVRequestEnvironment.hxx | 6
ucb/source/ucp/webdav/DAVResource.hxx | 4
ucb/source/ucp/webdav/DAVResourceAccess.hxx | 99 -
ucb/source/ucp/webdav/DAVSession.hxx | 25
ucb/source/ucp/webdav/DAVSessionFactory.hxx | 4
ucb/source/ucp/webdav/DAVTypes.hxx | 6
ucb/source/ucp/webdav/DateTimeHelper.hxx | 6
ucb/source/ucp/webdav/PropertyMap.hxx | 8
ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx | 8
ucb/source/ucp/webdav/SerfGetReqProcImpl.hxx | 12
ucb/source/ucp/webdav/SerfInputStream.cxx | 58 -
ucb/source/ucp/webdav/SerfInputStream.hxx | 65 -
ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx | 4
ucb/source/ucp/webdav/SerfPostReqProcImpl.hxx | 8
ucb/source/ucp/webdav/SerfPropFindReqProcImpl.hxx | 2
ucb/source/ucp/webdav/SerfRequestProcessor.cxx | 12
ucb/source/ucp/webdav/SerfRequestProcessor.hxx | 12
ucb/source/ucp/webdav/SerfSession.hxx | 62 -
ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx | 6
ucb/source/ucp/webdav/webdavcontent.cxx | 2
ucb/source/ucp/webdav/webdavcontent.hxx | 204 +--
ucb/source/ucp/webdav/webdavdatasupplier.hxx | 12
ucb/source/ucp/webdav/webdavprovider.hxx | 15
ucb/source/ucp/webdav/webdavresponseparser.cxx | 2
ucb/source/ucp/webdav/webdavresultset.hxx | 11
wizards/com/sun/star/wizards/common/PlaceholderTextElement.java | 1
wizards/com/sun/star/wizards/common/TextElement.java | 1
wizards/com/sun/star/wizards/db/RecordParser.java | 1
wizards/com/sun/star/wizards/db/TableDescriptor.java | 1
wizards/com/sun/star/wizards/document/TimeStampControl.java | 3
wizards/com/sun/star/wizards/form/CallFormWizard.java | 2
wizards/com/sun/star/wizards/form/FieldLinker.java | 5
wizards/com/sun/star/wizards/form/FormWizard.java | 4
wizards/com/sun/star/wizards/query/QueryWizard.java | 3
wizards/com/sun/star/wizards/report/CallReportWizard.java | 2
wizards/com/sun/star/wizards/report/GroupFieldHandler.java | 2
wizards/com/sun/star/wizards/report/ReportWizard.java | 5
wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarSingleColumn.java | 2
wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarThreeColumns.java | 3
wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarTwoColumns.java | 2
wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java | 4
wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsLeft.java | 4
wizards/com/sun/star/wizards/reportbuilder/layout/SectionEmptyObject.java | 1
wizards/com/sun/star/wizards/reportbuilder/layout/SectionLabel.java | 1
wizards/com/sun/star/wizards/reportbuilder/layout/SectionTextField.java | 1
wizards/com/sun/star/wizards/reportbuilder/layout/Tabular.java | 2
wizards/com/sun/star/wizards/table/CallTableWizard.java | 2
wizards/com/sun/star/wizards/table/ScenarioSelector.java | 1
wizards/com/sun/star/wizards/table/TableWizard.java | 4
wizards/com/sun/star/wizards/ui/AggregateComponent.java | 3
wizards/com/sun/star/wizards/ui/TitlesComponent.java | 3
wizards/com/sun/star/wizards/ui/WizardDialog.java | 2
176 files changed, 3180 insertions(+), 3793 deletions(-)
New commits:
commit b5df54c5bcaa376117832e39f63a379e7b8ba201
Author: Noel Grandin <noel at peralex.com>
Date: Mon Nov 9 11:25:04 2015 +0200
java: add some @Override annotations
Change-Id: I291db1dff5ab3ce40fda6f822a0e3ff1e6ef36c1
Reviewed-on: https://gerrit.libreoffice.org/19855
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
Tested-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
index b77394d..755086d 100644
--- a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
+++ b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
@@ -240,6 +240,7 @@ public class ScriptEditorForJavaScript implements ScriptEditor {
});
Context.addContextListener(sdb);
sdb.setScopeProvider(new ScopeProvider() {
+ @Override
public Scriptable getScope() {
return org.mozilla.javascript.tools.shell.Main.getScope();
}
diff --git a/sw/qa/complex/writer/TextPortionEnumerationTest.java b/sw/qa/complex/writer/TextPortionEnumerationTest.java
index 694d2f3..e36fc65 100644
--- a/sw/qa/complex/writer/TextPortionEnumerationTest.java
+++ b/sw/qa/complex/writer/TextPortionEnumerationTest.java
@@ -3466,6 +3466,7 @@ public class TextPortionEnumerationTest
throws Exception {
return inserter.makeMeta();
}
+ @Override
void postInserted(TreeNode node, XTextContent xContent)
throws Exception {
XMetadatable xMetadatable = UnoRuntime.queryInterface(XMetadatable.class, xContent);
diff --git a/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java b/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java
index 60ec7eb..72778d5 100644
--- a/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java
+++ b/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java
@@ -38,6 +38,7 @@ public class PlaceholderTextElement extends TextElement
xmsf = xmsf_;
}
+ @Override
public void write(Object textRange)
{
super.write(textRange);
diff --git a/wizards/com/sun/star/wizards/common/TextElement.java b/wizards/com/sun/star/wizards/common/TextElement.java
index 08afd2d..a8ee641 100644
--- a/wizards/com/sun/star/wizards/common/TextElement.java
+++ b/wizards/com/sun/star/wizards/common/TextElement.java
@@ -37,6 +37,7 @@ public class TextElement extends ParaStyled
text = text_;
}
+ @Override
public void write(Object textRange)
{
UnoRuntime.queryInterface(XTextRange.class, textRange).setString(text);
diff --git a/wizards/com/sun/star/wizards/db/RecordParser.java b/wizards/com/sun/star/wizards/db/RecordParser.java
index 21be84a..c065668 100644
--- a/wizards/com/sun/star/wizards/db/RecordParser.java
+++ b/wizards/com/sun/star/wizards/db/RecordParser.java
@@ -232,6 +232,7 @@ public class RecordParser extends QueryMetaData
return true;
}
+ @Override
public void dispose()
{
if (xRowSetComponent != null)
diff --git a/wizards/com/sun/star/wizards/db/TableDescriptor.java b/wizards/com/sun/star/wizards/db/TableDescriptor.java
index 2db69f5..c2ce80c 100644
--- a/wizards/com/sun/star/wizards/db/TableDescriptor.java
+++ b/wizards/com/sun/star/wizards/db/TableDescriptor.java
@@ -95,6 +95,7 @@ public class TableDescriptor extends CommandMetaData implements XContainerListen
}
}
+ @Override
public boolean getConnection(PropertyValue[] _curPropertyValue)
{
if (super.getConnection(_curPropertyValue))
diff --git a/wizards/com/sun/star/wizards/document/TimeStampControl.java b/wizards/com/sun/star/wizards/document/TimeStampControl.java
index 555e164..bd4bd8a 100644
--- a/wizards/com/sun/star/wizards/document/TimeStampControl.java
+++ b/wizards/com/sun/star/wizards/document/TimeStampControl.java
@@ -85,17 +85,20 @@ public class TimeStampControl extends DatabaseControl
oTimeControl = new DatabaseControl(_oGridControl, _curfieldcolumn, DataType.TIME, _curfieldcolumn.getFieldTitle() + PropertyNames.SPACE + sTimeAppendix);
}
+ @Override
public void setPropertyValue(String _sPropertyName, Object _aPropertyValue) throws Exception
{
oDateControl.setPropertyValue(_sPropertyName, _aPropertyValue);
oTimeControl.setPropertyValue(_sPropertyName, _aPropertyValue);
}
+ @Override
public int getPreferredWidth()
{
return nDBWidth;
}
+ @Override
public int getControlType()
{
return FormHandler.SODATETIMECONTROL;
diff --git a/wizards/com/sun/star/wizards/form/CallFormWizard.java b/wizards/com/sun/star/wizards/form/CallFormWizard.java
index 5aedc27..297ce57 100644
--- a/wizards/com/sun/star/wizards/form/CallFormWizard.java
+++ b/wizards/com/sun/star/wizards/form/CallFormWizard.java
@@ -126,6 +126,7 @@ public class CallFormWizard
return booleanSupportsService;
}
+ @Override
public byte[] getImplementationId()
{
return new byte[0];
@@ -144,6 +145,7 @@ public class CallFormWizard
* @return Sequence of all types (usually interface types) provided by the
* service.
*/
+ @Override
public Type[] getTypes()
{
Type[] typeReturn =
diff --git a/wizards/com/sun/star/wizards/form/FieldLinker.java b/wizards/com/sun/star/wizards/form/FieldLinker.java
index 2a0c3d3..3384f02 100644
--- a/wizards/com/sun/star/wizards/form/FieldLinker.java
+++ b/wizards/com/sun/star/wizards/form/FieldLinker.java
@@ -48,6 +48,7 @@ public class FieldLinker extends DBLimitedFieldSelection
super(_CurUnoDialog, iStep, iCompPosY, _firsthelpid);
}
+ @Override
protected void insertControlGroup(int i)
{
try
@@ -154,6 +155,7 @@ public class FieldLinker extends DBLimitedFieldSelection
}
}
+ @Override
protected void enableNextControlRow(int curindex)
{
boolean bSlaveField = lstSlaveFields[curindex].getSelectedItemPos() > 0;
@@ -169,6 +171,7 @@ public class FieldLinker extends DBLimitedFieldSelection
}
}
+ @Override
protected int getMaxSelIndex()
{
int MaxSelIndex = -1;
@@ -182,6 +185,7 @@ public class FieldLinker extends DBLimitedFieldSelection
return MaxSelIndex;
}
+ @Override
protected void toggleControlRow(int i, boolean bDoEnable)
{
if (i < rowcount)
@@ -198,6 +202,7 @@ public class FieldLinker extends DBLimitedFieldSelection
}
}
+ @Override
protected void updateFromNextControlRow(int curindex)
{
short iNextMasterItemPos = lstMasterFields[curindex + 1].getSelectedItemPos();
diff --git a/wizards/com/sun/star/wizards/form/FormWizard.java b/wizards/com/sun/star/wizards/form/FormWizard.java
index 5247f61a..106d3cc 100644
--- a/wizards/com/sun/star/wizards/form/FormWizard.java
+++ b/wizards/com/sun/star/wizards/form/FormWizard.java
@@ -93,6 +93,7 @@ public class FormWizard extends DatabaseObjectWizard
}
// @Override
+ @Override
protected void enterStep(int nOldStep, int nNewStep)
{
try
@@ -167,6 +168,7 @@ public class FormWizard extends DatabaseObjectWizard
}
// @Override
+ @Override
protected void leaveStep(int nOldStep, int nNewStep)
{
switch (nOldStep)
@@ -270,6 +272,7 @@ public class FormWizard extends DatabaseObjectWizard
}
// @Override
+ @Override
public boolean finishWizard()
{
int ncurStep = getCurrentStep();
@@ -302,6 +305,7 @@ public class FormWizard extends DatabaseObjectWizard
}
// @Override
+ @Override
public void cancelWizard()
{
m_success = false;
diff --git a/wizards/com/sun/star/wizards/query/QueryWizard.java b/wizards/com/sun/star/wizards/query/QueryWizard.java
index a067ffb..1a76ca7 100644
--- a/wizards/com/sun/star/wizards/query/QueryWizard.java
+++ b/wizards/com/sun/star/wizards/query/QueryWizard.java
@@ -252,6 +252,7 @@ public class QueryWizard extends DatabaseObjectWizard
}
}
+ @Override
public boolean finishWizard()
{
int ncurStep = getCurrentStep();
@@ -269,6 +270,7 @@ public class QueryWizard extends DatabaseObjectWizard
return false;
}
+ @Override
protected void enterStep(int nOldStep, int nNewStep)
{
try
@@ -316,6 +318,7 @@ public class QueryWizard extends DatabaseObjectWizard
}
}
+ @Override
protected void leaveStep(int nOldStep, int nNewStep)
{
switch (nOldStep)
diff --git a/wizards/com/sun/star/wizards/report/CallReportWizard.java b/wizards/com/sun/star/wizards/report/CallReportWizard.java
index 47e2a53..08ca4bf8 100644
--- a/wizards/com/sun/star/wizards/report/CallReportWizard.java
+++ b/wizards/com/sun/star/wizards/report/CallReportWizard.java
@@ -158,6 +158,7 @@ public class CallReportWizard
return booleanSupportsService;
}
+ @Override
public byte[] getImplementationId()
{
return new byte[0];
@@ -176,6 +177,7 @@ public class CallReportWizard
* @return Sequence of all types (usually interface types) provided by the
* service.
*/
+ @Override
public Type[] getTypes()
{
Type[] typeReturn =
diff --git a/wizards/com/sun/star/wizards/report/GroupFieldHandler.java b/wizards/com/sun/star/wizards/report/GroupFieldHandler.java
index 1619748..3130fbe 100644
--- a/wizards/com/sun/star/wizards/report/GroupFieldHandler.java
+++ b/wizards/com/sun/star/wizards/report/GroupFieldHandler.java
@@ -115,6 +115,7 @@ public class GroupFieldHandler extends FieldSelection
CurDBMetaData.GroupFieldNames = GroupFieldNames;
}
// @Override
+ @Override
protected void toggleListboxButtons(short iFieldsSelIndex, short iSelFieldsSelIndex)
{
super.toggleListboxButtons(iFieldsSelIndex, iSelFieldsSelIndex);
@@ -125,6 +126,7 @@ public class GroupFieldHandler extends FieldSelection
}
}
+ @Override
public void selectFields(boolean bMoveAll)
{
int iSelCount = xSelectedFieldsListBox.getItemCount();
diff --git a/wizards/com/sun/star/wizards/report/ReportWizard.java b/wizards/com/sun/star/wizards/report/ReportWizard.java
index 469680e..6a2acb2 100644
--- a/wizards/com/sun/star/wizards/report/ReportWizard.java
+++ b/wizards/com/sun/star/wizards/report/ReportWizard.java
@@ -114,6 +114,7 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener
}
}
+ @Override
protected void enterStep(int nOldStep, int nNewStep)
{
if ((nOldStep >= SOTEMPLATEPAGE) && (nNewStep < SOTEMPLATEPAGE))
@@ -157,6 +158,7 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener
}
}
+ @Override
protected void leaveStep(int nOldStep, int nNewStep)
{
@@ -325,6 +327,7 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener
enableNavigationButtons(false, false, false);
}
+ @Override
public boolean finishWizard()
{
final int ncurStep = getCurrentStep();
@@ -344,6 +347,7 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener
return false;
}
+ @Override
public void cancelWizard()
{
xDialog.endExecute();
@@ -602,6 +606,7 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener
}
}
+ @Override
public void disposing(EventObject EventObject)
{
}
diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarSingleColumn.java b/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarSingleColumn.java
index ac16608..d553d24 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarSingleColumn.java
+++ b/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarSingleColumn.java
@@ -41,6 +41,7 @@ public class ColumnarSingleColumn extends ReportBuilderLayouter
return getResource().getResText(UIConsts.RID_REPORT + 81);
}
+ @Override
protected void insertDetailFields()
{
copyDetailProperties();
@@ -82,6 +83,7 @@ public class ColumnarSingleColumn extends ReportBuilderLayouter
doNotBreakInTable(xSection);
}
+ @Override
protected void insertDetailFieldTitles(int lastGroupPostion)
{
// we won't extra field titles
diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarThreeColumns.java b/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarThreeColumns.java
index 82281f5..e12d870 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarThreeColumns.java
+++ b/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarThreeColumns.java
@@ -29,16 +29,19 @@ public class ColumnarThreeColumns extends ColumnarTwoColumns
super(_xDefinitionAccess, _aResource);
}
+ @Override
public String getName()
{
return "ColumnarThreeColumnsLayoutOfData";
}
+ @Override
public String getLocalizedName()
{
return getResource().getResText(UIConsts.RID_REPORT + 83);
}
+ @Override
protected void insertDetailFields()
{
insertDetailFields(3);
diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarTwoColumns.java b/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarTwoColumns.java
index e75eefc..2d5b618 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarTwoColumns.java
+++ b/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarTwoColumns.java
@@ -41,6 +41,7 @@ public class ColumnarTwoColumns extends ReportBuilderLayouter
return getResource().getResText(UIConsts.RID_REPORT + 82);
}
+ @Override
protected void insertDetailFields()
{
insertDetailFields(2);
@@ -114,6 +115,7 @@ public class ColumnarTwoColumns extends ReportBuilderLayouter
doNotBreakInTable(xSection);
}
+ @Override
protected void insertDetailFieldTitles(int lastGroupPostion)
{
// we won't extra field titles
diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java b/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java
index fb1687a..8ae01e9 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java
+++ b/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java
@@ -31,16 +31,19 @@ public class InBlocksLabelsAbove extends ColumnarTwoColumns
super(_xDefinitionAccess, _aResource);
}
+ @Override
public String getName()
{
return "InBlocksLabelsAboveLayoutOfData";
}
+ @Override
public String getLocalizedName()
{
return getResource().getResText(UIConsts.RID_REPORT + 85);
}
+ @Override
protected void insertDetailFields()
{
copyDetailProperties();
@@ -137,6 +140,7 @@ public class InBlocksLabelsAbove extends ColumnarTwoColumns
doNotBreakInTable(xSection);
}
+ @Override
protected void insertDetailFieldTitles(int lastGroupPostion)
{
// we won't extra field titles
diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsLeft.java b/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsLeft.java
index f7fef36..5fea096 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsLeft.java
+++ b/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsLeft.java
@@ -32,16 +32,19 @@ public class InBlocksLabelsLeft extends ColumnarTwoColumns
super(_xDefinitionAccess, _aResource);
}
+ @Override
public String getName()
{
return "InBlocksLabelsLeftLayoutOfData";
}
+ @Override
public String getLocalizedName()
{
return getResource().getResText(UIConsts.RID_REPORT + 84);
}
+ @Override
protected void insertDetailFields()
{
copyDetailProperties();
@@ -108,6 +111,7 @@ public class InBlocksLabelsLeft extends ColumnarTwoColumns
doNotBreakInTable(xSection);
}
+ @Override
protected void insertDetailFieldTitles(int lastGroupPostion)
{
// we won't extra field titles
diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/SectionEmptyObject.java b/wizards/com/sun/star/wizards/reportbuilder/layout/SectionEmptyObject.java
index 27c30f8..f8f03c4 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/layout/SectionEmptyObject.java
+++ b/wizards/com/sun/star/wizards/reportbuilder/layout/SectionEmptyObject.java
@@ -32,6 +32,7 @@ public class SectionEmptyObject extends SectionObject
return new SectionEmptyObject();
}
+ @Override
public FontDescriptor getFontDescriptor()
{
return null;
diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/SectionLabel.java b/wizards/com/sun/star/wizards/reportbuilder/layout/SectionLabel.java
index 8ee85ff..8a40270 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/layout/SectionLabel.java
+++ b/wizards/com/sun/star/wizards/reportbuilder/layout/SectionLabel.java
@@ -36,6 +36,7 @@ public class SectionLabel extends SectionObject
/**
* Return the current FontDescriptor
*/
+ @Override
public FontDescriptor getFontDescriptor()
{
FontDescriptor a = null;
diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/SectionTextField.java b/wizards/com/sun/star/wizards/reportbuilder/layout/SectionTextField.java
index 46a42a0..bc7be4e 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/layout/SectionTextField.java
+++ b/wizards/com/sun/star/wizards/reportbuilder/layout/SectionTextField.java
@@ -34,6 +34,7 @@ public class SectionTextField extends SectionObject
return new SectionTextField(_aFormattedField);
}
+ @Override
public FontDescriptor getFontDescriptor()
{
FontDescriptor a = null;
diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/Tabular.java b/wizards/com/sun/star/wizards/reportbuilder/layout/Tabular.java
index fe9f4db..ed676f1 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/layout/Tabular.java
+++ b/wizards/com/sun/star/wizards/reportbuilder/layout/Tabular.java
@@ -44,6 +44,7 @@ public class Tabular extends ReportBuilderLayouter
return getResource().getResText(UIConsts.RID_REPORT + 80);
}
+ @Override
protected void insertDetailFields()
{
copyDetailProperties();
@@ -76,6 +77,7 @@ public class Tabular extends ReportBuilderLayouter
xSection.setHeight(nHeight);
}
+ @Override
protected void insertDetailFieldTitles(int lastGroupPostion)
{
final String[] aFieldTitleNames = getFieldTitleNames();
diff --git a/wizards/com/sun/star/wizards/table/CallTableWizard.java b/wizards/com/sun/star/wizards/table/CallTableWizard.java
index 365f70e..1a437b5 100644
--- a/wizards/com/sun/star/wizards/table/CallTableWizard.java
+++ b/wizards/com/sun/star/wizards/table/CallTableWizard.java
@@ -131,6 +131,7 @@ public class CallTableWizard
return booleanSupportsService;
}
+ @Override
public byte[] getImplementationId()
{
return new byte[0];
@@ -149,6 +150,7 @@ public class CallTableWizard
* @return Sequence of all types (usually interface types) provided by the
* service.
*/
+ @Override
public Type[] getTypes()
{
Type[] typeReturn =
diff --git a/wizards/com/sun/star/wizards/table/ScenarioSelector.java b/wizards/com/sun/star/wizards/table/ScenarioSelector.java
index 6cd094c..f0a41de 100644
--- a/wizards/com/sun/star/wizards/table/ScenarioSelector.java
+++ b/wizards/com/sun/star/wizards/table/ScenarioSelector.java
@@ -197,6 +197,7 @@ public class ScenarioSelector extends FieldSelection implements XItemListener, X
super.initialize(oCGTable.getFieldNames(bcolumnnameislimited, imaxcolumnchars), true);
}
+ @Override
public String[] getSelectedFieldNames()
{
String[] displayfieldnames = super.getSelectedFieldNames();
diff --git a/wizards/com/sun/star/wizards/table/TableWizard.java b/wizards/com/sun/star/wizards/table/TableWizard.java
index 6063276..f23647d 100644
--- a/wizards/com/sun/star/wizards/table/TableWizard.java
+++ b/wizards/com/sun/star/wizards/table/TableWizard.java
@@ -82,6 +82,7 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener
}
}
+ @Override
protected void leaveStep(int nOldStep, int nNewStep)
{
switch (nOldStep)
@@ -104,6 +105,7 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener
}
}
+ @Override
protected void enterStep(int nOldStep, int nNewStep)
{
switch (nNewStep)
@@ -255,6 +257,7 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener
return bIsSuccessfull;
}
+ @Override
public boolean finishWizard()
{
super.switchToStep(super.getCurrentStep(), SOFINALPAGE);
@@ -311,6 +314,7 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener
}
}
+ @Override
public void cancelWizard()
{
xDialog.endExecute();
diff --git a/wizards/com/sun/star/wizards/ui/AggregateComponent.java b/wizards/com/sun/star/wizards/ui/AggregateComponent.java
index 584ab57..2b4646d 100644
--- a/wizards/com/sun/star/wizards/ui/AggregateComponent.java
+++ b/wizards/com/sun/star/wizards/ui/AggregateComponent.java
@@ -175,6 +175,7 @@ public class AggregateComponent extends ControlScroller
}
}
+ @Override
protected void insertControlGroup(int i, int ypos)
{
if (i == 0)
@@ -197,6 +198,7 @@ public class AggregateComponent extends ControlScroller
ControlRowVector.add(oControlRow);
}
+ @Override
protected void setControlGroupVisible(int _index, boolean _bIsVisible)
{
ControlRow oControlRow = ControlRowVector.get(_index);
@@ -411,6 +413,7 @@ public class AggregateComponent extends ControlScroller
CurUnoDialog.repaintDialogStep();
}
+ @Override
protected void initializeScrollFields()
{
ControlRow curControlRow;
diff --git a/wizards/com/sun/star/wizards/ui/TitlesComponent.java b/wizards/com/sun/star/wizards/ui/TitlesComponent.java
index 1041568..b9003f6 100644
--- a/wizards/com/sun/star/wizards/ui/TitlesComponent.java
+++ b/wizards/com/sun/star/wizards/ui/TitlesComponent.java
@@ -56,6 +56,7 @@ public class TitlesComponent extends ControlScroller
});
}
+ @Override
protected void insertControlGroup(int i, int ypos)
{
iLabelPosX = iCompPosX + iRelLabelPosXDist;
@@ -64,6 +65,7 @@ public class TitlesComponent extends ControlScroller
}
+ @Override
protected void setControlGroupVisible(int _index, boolean _bIsVisible)
{
CurUnoDialog.setControlVisible(getColumnName(_index), _bIsVisible);
@@ -125,6 +127,7 @@ public class TitlesComponent extends ControlScroller
return SOTITLEPREFIX + Integer.toString(_index + 1);
}
+ @Override
protected void initializeScrollFields()
{
for (int i = 0; i < fieldnames.length; i++)
diff --git a/wizards/com/sun/star/wizards/ui/WizardDialog.java b/wizards/com/sun/star/wizards/ui/WizardDialog.java
index 915bf44..93633d6 100644
--- a/wizards/com/sun/star/wizards/ui/WizardDialog.java
+++ b/wizards/com/sun/star/wizards/ui/WizardDialog.java
@@ -75,6 +75,7 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL
oWizardResource.getResText(UIConsts.RID_DB_COMMON + 33);
}
+ @Override
public Resource getResource()
{
return oWizardResource;
@@ -201,6 +202,7 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL
XControl xRoadmapControl = this.xDlgContainer.getControl("rdmNavi");
XItemEventBroadcaster xRoadmapBroadcaster = UnoRuntime.queryInterface(XItemEventBroadcaster.class, xRoadmapControl);
xRoadmapBroadcaster.addItemListener(new XItemListenerAdapter() {
+ @Override
public void itemStateChanged(com.sun.star.awt.ItemEvent itemEvent) {
try
{
commit a3db4959b07d2454fba7774f04c7658ae4fba783
Author: Noel Grandin <noel at peralex.com>
Date: Mon Nov 9 11:05:53 2015 +0200
com::sun::star->css in tools/ and ucb/
Change-Id: I695ff721efd63b8ca0dd3c61ba5a4fef2c43cde6
Reviewed-on: https://gerrit.libreoffice.org/19854
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
Tested-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/tools/source/datetime/tdate.cxx b/tools/source/datetime/tdate.cxx
index 808ac48..b6790b0 100644
--- a/tools/source/datetime/tdate.cxx
+++ b/tools/source/datetime/tdate.cxx
@@ -169,7 +169,7 @@ Date::Date( DateInitSystem )
#endif
}
-Date::Date( const ::com::sun::star::util::DateTime& rDateTime )
+Date::Date( const css::util::DateTime& rDateTime )
{
setDateFromDMY( rDateTime.Day, rDateTime.Month, rDateTime.Year );
}
diff --git a/tools/source/datetime/ttime.cxx b/tools/source/datetime/ttime.cxx
index 47dd81b..3b4a809 100644
--- a/tools/source/datetime/ttime.cxx
+++ b/tools/source/datetime/ttime.cxx
@@ -149,11 +149,11 @@ Time::Time( sal_uInt32 nHour, sal_uInt32 nMin, sal_uInt32 nSec, sal_uInt64 nNano
{
init(nHour, nMin, nSec, nNanoSec);
}
-Time::Time( const ::com::sun::star::util::Time &_rTime )
+Time::Time( const css::util::Time &_rTime )
{
init(_rTime.Hours, _rTime.Minutes, _rTime.Seconds, _rTime.NanoSeconds);
}
-Time::Time( const ::com::sun::star::util::DateTime &_rDateTime )
+Time::Time( const css::util::DateTime &_rDateTime )
{
init(_rDateTime.Hours, _rDateTime.Minutes, _rDateTime.Seconds, _rDateTime.NanoSeconds);
}
diff --git a/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx
index 4006b51..ce7e089 100644
--- a/tools/source/debug/debug.cxx
+++ b/tools/source/debug/debug.cxx
@@ -87,7 +87,7 @@ void DbgUnhandledException(const css::uno::Any & caught, const char* currentFunc
sMessage += currentFunction;
sMessage += "\ntype: ";
sMessage += OUStringToOString( caught.getValueTypeName(), osl_getThreadTextEncoding() );
- ::com::sun::star::uno::Exception exception;
+ css::uno::Exception exception;
caught >>= exception;
if ( !exception.Message.isEmpty() )
{
@@ -101,7 +101,7 @@ void DbgUnhandledException(const css::uno::Any & caught, const char* currentFunc
sMessage += pContext;
}
{
- ::com::sun::star::configuration::CorruptedConfigurationException
+ css::configuration::CorruptedConfigurationException
specialized;
if ( caught >>= specialized )
{
@@ -111,7 +111,7 @@ void DbgUnhandledException(const css::uno::Any & caught, const char* currentFunc
}
}
{
- ::com::sun::star::task::ErrorCodeIOException specialized;
+ css::task::ErrorCodeIOException specialized;
if ( caught >>= specialized )
{
sMessage += "\ndetails: ";
diff --git a/tools/source/ref/globname.cxx b/tools/source/ref/globname.cxx
index b11e21f..edaf705 100644
--- a/tools/source/ref/globname.cxx
+++ b/tools/source/ref/globname.cxx
@@ -77,7 +77,7 @@ SvGlobalName::SvGlobalName( sal_uInt32 n1, sal_uInt16 n2, sal_uInt16 n3,
{
}
-SvGlobalName::SvGlobalName( const com::sun::star::uno::Sequence < sal_Int8 >& aSeq )
+SvGlobalName::SvGlobalName( const css::uno::Sequence < sal_Int8 >& aSeq )
{
// create SvGlobalName from a platform independent representation
SvGUID aResult;
@@ -269,11 +269,11 @@ OUString SvGlobalName::GetHexName() const
return OStringToOUString(aHexBuffer.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US);
}
-com::sun::star::uno::Sequence < sal_Int8 > SvGlobalName::GetByteSequence() const
+css::uno::Sequence < sal_Int8 > SvGlobalName::GetByteSequence() const
{
// platform independent representation of a "GlobalName"
// maybe transported remotely
- com::sun::star::uno::Sequence< sal_Int8 > aResult( 16 );
+ css::uno::Sequence< sal_Int8 > aResult( 16 );
aResult[ 0] = (sal_Int8) (pImp->szData.Data1 >> 24);
aResult[ 1] = (sal_Int8) ((pImp->szData.Data1 << 8 ) >> 24);
diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx
index 6e593b0..7a39ce2 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -299,7 +299,7 @@ const Any& SAL_CALL CachedContentResultSet::CCRS_Cache
const OUString& SAL_CALL CachedContentResultSet::CCRS_Cache
::getContentIdentifierString( sal_Int32 nRow )
- throw( com::sun::star::uno::RuntimeException )
+ throw( css::uno::RuntimeException )
{
try
{
@@ -322,7 +322,7 @@ const OUString& SAL_CALL CachedContentResultSet::CCRS_Cache
const Reference< XContentIdentifier >& SAL_CALL CachedContentResultSet::CCRS_Cache
::getContentIdentifier( sal_Int32 nRow )
- throw( com::sun::star::uno::RuntimeException )
+ throw( css::uno::RuntimeException )
{
try
{
@@ -345,7 +345,7 @@ const Reference< XContentIdentifier >& SAL_CALL CachedContentResultSet::CCRS_Cac
const Reference< XContent >& SAL_CALL CachedContentResultSet::CCRS_Cache
::getContent( sal_Int32 nRow )
- throw( com::sun::star::uno::RuntimeException )
+ throw( css::uno::RuntimeException )
{
try
{
@@ -374,13 +374,13 @@ const Reference< XContent >& SAL_CALL CachedContentResultSet::CCRS_Cache
class CCRS_PropertySetInfo :
public cppu::OWeakObject,
- public com::sun::star::lang::XTypeProvider,
- public com::sun::star::beans::XPropertySetInfo
+ public css::lang::XTypeProvider,
+ public css::beans::XPropertySetInfo
{
friend class CachedContentResultSet;
//my Properties
- Sequence< com::sun::star::beans::Property >*
+ Sequence< css::beans::Property >*
m_pProperties;
//some helping variables ( names for my special properties )
@@ -399,7 +399,7 @@ private:
bool SAL_CALL
impl_queryProperty(
const OUString& rName
- , com::sun::star::beans::Property& rProp ) const;
+ , css::beans::Property& rProp ) const;
sal_Int32 SAL_CALL
impl_getPos( const OUString& rName ) const;
@@ -423,17 +423,17 @@ public:
// XTypeProvider
virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes()
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
throw( css::uno::RuntimeException, std::exception ) override;
// XPropertySetInfo
- virtual Sequence< com::sun::star::beans::Property > SAL_CALL
+ virtual Sequence< css::beans::Property > SAL_CALL
getProperties()
throw( RuntimeException, std::exception ) override;
- virtual com::sun::star::beans::Property SAL_CALL
+ virtual css::beans::Property SAL_CALL
getPropertyByName( const OUString& aName )
- throw( com::sun::star::beans::UnknownPropertyException, RuntimeException, std::exception ) override;
+ throw( css::beans::UnknownPropertyException, RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL
hasPropertyByName( const OUString& Name )
@@ -852,7 +852,7 @@ if( bIsFinalCount && !bCurIsFinalCount ) \
void SAL_CALL CachedContentResultSet
::impl_fetchData( sal_Int32 nRow
, sal_Int32 nFetchSize, sal_Int32 nFetchDirection )
- throw( com::sun::star::uno::RuntimeException )
+ throw( css::uno::RuntimeException )
{
FETCH_XXX( m_aCache, m_xFetchProvider, fetch );
}
@@ -2072,7 +2072,7 @@ DateTime SAL_CALL CachedContentResultSet
}
//virtual
-Reference< com::sun::star::io::XInputStream >
+Reference< css::io::XInputStream >
SAL_CALL CachedContentResultSet
::getBinaryStream( sal_Int32 columnIndex )
throw( SQLException,
@@ -2083,7 +2083,7 @@ Reference< com::sun::star::io::XInputStream >
}
//virtual
-Reference< com::sun::star::io::XInputStream >
+Reference< css::io::XInputStream >
SAL_CALL CachedContentResultSet
::getCharacterStream( sal_Int32 columnIndex )
throw( SQLException,
@@ -2097,7 +2097,7 @@ Reference< com::sun::star::io::XInputStream >
Any SAL_CALL CachedContentResultSet
::getObject( sal_Int32 columnIndex,
const Reference<
- com::sun::star::container::XNameAccess >& typeMap )
+ css::container::XNameAccess >& typeMap )
throw( SQLException,
RuntimeException, std::exception )
{
@@ -2271,7 +2271,7 @@ Reference< XResultSet > SAL_CALL CachedContentResultSetFactory
::createCachedContentResultSet(
const Reference< XResultSet > & xSource,
const Reference< XContentIdentifierMapping > & xMapping )
- throw( com::sun::star::uno::RuntimeException, std::exception )
+ throw( css::uno::RuntimeException, std::exception )
{
Reference< XResultSet > xRet;
xRet = new CachedContentResultSet( m_xContext, xSource, xMapping );
diff --git a/ucb/source/cacher/cachedcontentresultset.hxx b/ucb/source/cacher/cachedcontentresultset.hxx
index 775a287..ba5c80d 100644
--- a/ucb/source/cacher/cachedcontentresultset.hxx
+++ b/ucb/source/cacher/cachedcontentresultset.hxx
@@ -41,8 +41,8 @@ namespace com { namespace sun { namespace star { namespace script {
class CCRS_PropertySetInfo;
class CachedContentResultSet
: public ContentResultSetWrapper
- , public com::sun::star::lang::XTypeProvider
- , public com::sun::star::lang::XServiceInfo
+ , public css::lang::XTypeProvider
+ , public css::lang::XServiceInfo
{
// class CCRS_Cache
@@ -50,17 +50,16 @@ class CachedContentResultSet
class CCRS_Cache
{
private:
- com::sun::star::ucb::FetchResult* m_pResult;
- com::sun::star::uno::Reference<
- com::sun::star::ucb::XContentIdentifierMapping >
- m_xContentIdentifierMapping;
- com::sun::star::uno::Sequence< sal_Bool >* m_pMappedReminder;
+ css::ucb::FetchResult* m_pResult;
+ css::uno::Reference< css::ucb::XContentIdentifierMapping >
+ m_xContentIdentifierMapping;
+ css::uno::Sequence< sal_Bool >* m_pMappedReminder;
private:
- com::sun::star::uno::Any& SAL_CALL
+ css::uno::Any& SAL_CALL
getRowAny( sal_Int32 nRow )
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException );
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException );
void SAL_CALL clear();
@@ -68,15 +67,15 @@ class CachedContentResultSet
void SAL_CALL remindMapped( sal_Int32 nRow );
bool SAL_CALL isRowMapped( sal_Int32 nRow );
void SAL_CALL clearMappedReminder();
- com::sun::star::uno::Sequence< sal_Bool >* SAL_CALL getMappedReminder();
+ css::uno::Sequence< sal_Bool >* SAL_CALL getMappedReminder();
public:
- CCRS_Cache( const com::sun::star::uno::Reference<
- com::sun::star::ucb::XContentIdentifierMapping > & xMapping );
+ CCRS_Cache( const css::uno::Reference<
+ css::ucb::XContentIdentifierMapping > & xMapping );
~CCRS_Cache();
void SAL_CALL loadData(
- const com::sun::star::ucb::FetchResult& rResult );
+ const css::ucb::FetchResult& rResult );
bool SAL_CALL
hasRow( sal_Int32 nRow );
@@ -91,63 +90,61 @@ class CachedContentResultSet
hasKnownLast();
- const com::sun::star::uno::Any& SAL_CALL
+ const css::uno::Any& SAL_CALL
getAny( sal_Int32 nRow, sal_Int32 nColumnIndex )
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException );
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException );
const OUString& SAL_CALL
getContentIdentifierString( sal_Int32 nRow )
- throw( com::sun::star::uno::RuntimeException );
+ throw( css::uno::RuntimeException );
- const com::sun::star::uno::Reference<
- com::sun::star::ucb::XContentIdentifier >& SAL_CALL
+ const css::uno::Reference< css::ucb::XContentIdentifier >& SAL_CALL
getContentIdentifier( sal_Int32 nRow )
- throw( com::sun::star::uno::RuntimeException );
+ throw( css::uno::RuntimeException );
- const com::sun::star::uno::Reference<
- com::sun::star::ucb::XContent >& SAL_CALL
+ const css::uno::Reference< css::ucb::XContent >& SAL_CALL
getContent( sal_Int32 nRow )
- throw( com::sun::star::uno::RuntimeException );
+ throw( css::uno::RuntimeException );
};
//members
- com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
+ css::uno::Reference< css::uno::XComponentContext >
m_xContext;
//different Interfaces from Origin:
- com::sun::star::uno::Reference< com::sun::star::ucb::XFetchProvider >
+ css::uno::Reference< css::ucb::XFetchProvider >
m_xFetchProvider; //XFetchProvider-interface from m_xOrigin
- com::sun::star::uno::Reference< com::sun::star::ucb::XFetchProviderForContentAccess >
+ css::uno::Reference< css::ucb::XFetchProviderForContentAccess >
m_xFetchProviderForContentAccess; //XFetchProviderForContentAccess-interface from m_xOrigin
//my PropertySetInfo
- com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo >
+ css::uno::Reference< css::beans::XPropertySetInfo >
m_xMyPropertySetInfo;//holds m_pMyPropSetInfo alive
CCRS_PropertySetInfo* m_pMyPropSetInfo;
- com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifierMapping >
+ css::uno::Reference< css::ucb::XContentIdentifierMapping >
m_xContentIdentifierMapping;// can be used for remote optimized ContentAccess
//some Properties and helping variables
sal_Int32 m_nRow;
- bool m_bAfterLast; // TRUE, if m_nRow is after final count; can be TRUE without knowing the exact final count
+ bool m_bAfterLast; // TRUE, if m_nRow is after final count; can be TRUE without knowing the exact final count
sal_Int32 m_nLastAppliedPos;
- bool m_bAfterLastApplied;
+ bool m_bAfterLastApplied;
sal_Int32 m_nKnownCount; // count we know from the Origin
- bool m_bFinalCount; // TRUE if the Origin has reached final count and we got that count in m_nKnownCount
+ bool m_bFinalCount; // TRUE if the Origin has reached final count and we got that count in m_nKnownCount
sal_Int32 m_nFetchSize;
sal_Int32 m_nFetchDirection;
- bool m_bLastReadWasFromCache;
- bool m_bLastCachedReadWasNull;
+ bool m_bLastReadWasFromCache;
+ bool m_bLastCachedReadWasNull;
//cache:
CCRS_Cache m_aCache;
@@ -165,13 +162,13 @@ private:
bool SAL_CALL
applyPositionToOrigin( sal_Int32 nRow )
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException );
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException );
void SAL_CALL
impl_fetchData( sal_Int32 nRow, sal_Int32 nCount
, sal_Int32 nFetchDirection )
- throw( com::sun::star::uno::RuntimeException );
+ throw( css::uno::RuntimeException );
bool SAL_CALL
impl_isKnownValidPosition( sal_Int32 nRow );
@@ -187,14 +184,9 @@ private:
public:
CachedContentResultSet(
- const com::sun::star::uno::Reference<
- com::sun::star::uno::XComponentContext > &
- rxContext,
- const com::sun::star::uno::Reference<
- com::sun::star::sdbc::XResultSet > & xOrigin,
- const com::sun::star::uno::Reference<
- com::sun::star::ucb::XContentIdentifierMapping > &
- xContentIdentifierMapping );
+ const css::uno::Reference< css::uno::XComponentContext > & rxContext,
+ const css::uno::Reference< css::sdbc::XResultSet > & xOrigin,
+ const css::uno::Reference< css::ucb::XContentIdentifierMapping > & xContentIdentifierMapping );
virtual ~CachedContentResultSet();
@@ -230,239 +222,232 @@ public:
virtual void SAL_CALL
setPropertyValue( const OUString& aPropertyName,
- const com::sun::star::uno::Any& aValue )
- throw( com::sun::star::beans::UnknownPropertyException,
- com::sun::star::beans::PropertyVetoException,
- com::sun::star::lang::IllegalArgumentException,
- com::sun::star::lang::WrappedTargetException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
-
- virtual com::sun::star::uno::Any SAL_CALL
+ const css::uno::Any& aValue )
+ throw( css::beans::UnknownPropertyException,
+ css::beans::PropertyVetoException,
+ css::lang::IllegalArgumentException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception ) override;
+
+ virtual css::uno::Any SAL_CALL
getPropertyValue( const OUString& PropertyName )
- throw( com::sun::star::beans::UnknownPropertyException,
- com::sun::star::lang::WrappedTargetException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception ) override;
// own inherited
virtual void SAL_CALL
- impl_disposing( const com::sun::star::lang::EventObject& Source )
- throw( com::sun::star::uno::RuntimeException ) override;
+ impl_disposing( const css::lang::EventObject& Source )
+ throw( css::uno::RuntimeException ) override;
virtual void SAL_CALL
- impl_propertyChange( const com::sun::star::beans::PropertyChangeEvent& evt )
- throw( com::sun::star::uno::RuntimeException ) override;
+ impl_propertyChange( const css::beans::PropertyChangeEvent& evt )
+ throw( css::uno::RuntimeException ) override;
virtual void SAL_CALL
- impl_vetoableChange( const com::sun::star::beans::PropertyChangeEvent& aEvent )
- throw( com::sun::star::beans::PropertyVetoException,
- com::sun::star::uno::RuntimeException ) override;
+ impl_vetoableChange( const css::beans::PropertyChangeEvent& aEvent )
+ throw( css::beans::PropertyVetoException,
+ css::uno::RuntimeException ) override;
// XContentAccess inherited
virtual OUString SAL_CALL
queryContentIdentifierString()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
- virtual com::sun::star::uno::Reference<
- com::sun::star::ucb::XContentIdentifier > SAL_CALL
+ virtual css::uno::Reference<
+ css::ucb::XContentIdentifier > SAL_CALL
queryContentIdentifier()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
- virtual com::sun::star::uno::Reference<
- com::sun::star::ucb::XContent > SAL_CALL
+ virtual css::uno::Reference<
+ css::ucb::XContent > SAL_CALL
queryContent()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
// XResultSet inherited
virtual sal_Bool SAL_CALL
next()
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL
isBeforeFirst()
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL
isAfterLast()
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL
isFirst()
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL
isLast()
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL
beforeFirst()
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL
afterLast()
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL
first()
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL
last()
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException, std::exception ) override;
virtual sal_Int32 SAL_CALL
getRow()
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL
absolute( sal_Int32 row )
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL
relative( sal_Int32 rows )
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL
previous()
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL
refreshRow()
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL
rowUpdated()
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL
rowInserted()
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL
rowDeleted()
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual com::sun::star::uno::Reference<
- com::sun::star::uno::XInterface > SAL_CALL
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Reference<
+ css::uno::XInterface > SAL_CALL
getStatement()
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException, std::exception ) override;
// XRow inherited
virtual sal_Bool SAL_CALL
wasNull()
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException, std::exception ) override;
virtual OUString SAL_CALL
getString( sal_Int32 columnIndex )
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL
getBoolean( sal_Int32 columnIndex )
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException, std::exception ) override;
virtual sal_Int8 SAL_CALL
getByte( sal_Int32 columnIndex )
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException, std::exception ) override;
virtual sal_Int16 SAL_CALL
getShort( sal_Int32 columnIndex )
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException, std::exception ) override;
virtual sal_Int32 SAL_CALL
getInt( sal_Int32 columnIndex )
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException, std::exception ) override;
virtual sal_Int64 SAL_CALL
getLong( sal_Int32 columnIndex )
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException, std::exception ) override;
virtual float SAL_CALL
getFloat( sal_Int32 columnIndex )
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException, std::exception ) override;
virtual double SAL_CALL
getDouble( sal_Int32 columnIndex )
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException, std::exception ) override;
- virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL
getBytes( sal_Int32 columnIndex )
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException, std::exception ) override;
- virtual com::sun::star::util::Date SAL_CALL
+ virtual css::util::Date SAL_CALL
getDate( sal_Int32 columnIndex )
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException, std::exception ) override;
- virtual com::sun::star::util::Time SAL_CALL
+ virtual css::util::Time SAL_CALL
getTime( sal_Int32 columnIndex )
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException, std::exception ) override;
- virtual com::sun::star::util::DateTime SAL_CALL
+ virtual css::util::DateTime SAL_CALL
getTimestamp( sal_Int32 columnIndex )
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException, std::exception ) override;
- virtual com::sun::star::uno::Reference<
- com::sun::star::io::XInputStream > SAL_CALL
+ virtual css::uno::Reference< css::io::XInputStream > SAL_CALL
getBinaryStream( sal_Int32 columnIndex )
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException, std::exception ) override;
- virtual com::sun::star::uno::Reference<
- com::sun::star::io::XInputStream > SAL_CALL
+ virtual css::uno::Reference< css::io::XInputStream > SAL_CALL
getCharacterStream( sal_Int32 columnIndex )
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException, std::exception ) override;
- virtual com::sun::star::uno::Any SAL_CALL
+ virtual css::uno::Any SAL_CALL
getObject( sal_Int32 columnIndex,
- const com::sun::star::uno::Reference<
- com::sun::star::container::XNameAccess >& typeMap )
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ const css::uno::Reference< css::container::XNameAccess >& typeMap )
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException, std::exception ) override;
- virtual com::sun::star::uno::Reference<
- com::sun::star::sdbc::XRef > SAL_CALL
+ virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL
getRef( sal_Int32 columnIndex )
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException, std::exception ) override;
- virtual com::sun::star::uno::Reference<
- com::sun::star::sdbc::XBlob > SAL_CALL
+ virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL
getBlob( sal_Int32 columnIndex )
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException, std::exception ) override;
- virtual com::sun::star::uno::Reference<
- com::sun::star::sdbc::XClob > SAL_CALL
+ virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL
getClob( sal_Int32 columnIndex )
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException, std::exception ) override;
- virtual com::sun::star::uno::Reference<
- com::sun::star::sdbc::XArray > SAL_CALL
+ virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL
getArray( sal_Int32 columnIndex )
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException, std::exception ) override;
// Type Converter support
@@ -470,11 +455,10 @@ public:
private:
bool m_bTriedToGetTypeConverter;
- com::sun::star::uno::Reference<
- com::sun::star::script::XTypeConverter > m_xTypeConverter;
+ css::uno::Reference< css::script::XTypeConverter > m_xTypeConverter;
- const com::sun::star::uno::Reference<
- com::sun::star::script::XTypeConverter >& getTypeConverter();
+ const css::uno::Reference<
+ css::script::XTypeConverter >& getTypeConverter();
template<typename T> T rowOriginGet(
T (SAL_CALL css::sdbc::XRow::* f)(sal_Int32), sal_Int32 columnIndex);
@@ -484,19 +468,16 @@ private:
class CachedContentResultSetFactory
: public cppu::OWeakObject
- , public com::sun::star::lang::XTypeProvider
- , public com::sun::star::lang::XServiceInfo
- , public com::sun::star::ucb::XCachedContentResultSetFactory
+ , public css::lang::XTypeProvider
+ , public css::lang::XServiceInfo
+ , public css::ucb::XCachedContentResultSetFactory
{
protected:
- com::sun::star::uno::Reference<
- com::sun::star::uno::XComponentContext > m_xContext;
+ css::uno::Reference< css::uno::XComponentContext > m_xContext;
public:
- CachedContentResultSetFactory(
- const com::sun::star::uno::Reference<
- com::sun::star::uno::XComponentContext > & rxContext);
+ CachedContentResultSetFactory( const css::uno::Reference< css::uno::XComponentContext > & rxContext);
virtual ~CachedContentResultSetFactory();
@@ -532,14 +513,11 @@ public:
// XCachedContentResultSetFactory
- virtual com::sun::star::uno::Reference<
- com::sun::star::sdbc::XResultSet > SAL_CALL
+ virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL
createCachedContentResultSet(
- const com::sun::star::uno::Reference<
- com::sun::star::sdbc::XResultSet > & xSource,
- const com::sun::star::uno::Reference<
- com::sun::star::ucb::XContentIdentifierMapping > & xMapping )
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ const css::uno::Reference< css::sdbc::XResultSet > & xSource,
+ const css::uno::Reference< css::ucb::XContentIdentifierMapping > & xMapping )
+ throw( css::uno::RuntimeException, std::exception ) override;
};
#endif
diff --git a/ucb/source/cacher/cachedcontentresultsetstub.cxx b/ucb/source/cacher/cachedcontentresultsetstub.cxx
index 0a3b491..efa4d14 100644
--- a/ucb/source/cacher/cachedcontentresultsetstub.cxx
+++ b/ucb/source/cacher/cachedcontentresultsetstub.cxx
@@ -412,7 +412,7 @@ void SAL_CALL CachedContentResultSetStub
{
setPropertyValue( m_aPropertyNameForFetchSize, aValue );
}
- catch( com::sun::star::uno::Exception& ) {}
+ catch( css::uno::Exception& ) {}
}
if( bSetDirection )
{
@@ -425,7 +425,7 @@ void SAL_CALL CachedContentResultSetStub
{
setPropertyValue( m_aPropertyNameForFetchDirection, aValue );
}
- catch( com::sun::star::uno::Exception& ) {}
+ catch( css::uno::Exception& ) {}
}
}
@@ -463,7 +463,7 @@ void SAL_CALL CachedContentResultSetStub
FetchResult SAL_CALL CachedContentResultSetStub
::fetchContentIdentifierStrings( sal_Int32 nRowStartPosition
, sal_Int32 nRowCount, sal_Bool bDirection )
- throw( com::sun::star::uno::RuntimeException, std::exception )
+ throw( css::uno::RuntimeException, std::exception )
{
impl_init_xContentAccessOrigin();
FETCH_XXX( impl_getCurrentContentIdentifierString, m_xContentAccessOrigin );
@@ -473,7 +473,7 @@ FetchResult SAL_CALL CachedContentResultSetStub
FetchResult SAL_CALL CachedContentResultSetStub
::fetchContentIdentifiers( sal_Int32 nRowStartPosition
, sal_Int32 nRowCount, sal_Bool bDirection )
- throw( com::sun::star::uno::RuntimeException, std::exception )
+ throw( css::uno::RuntimeException, std::exception )
{
impl_init_xContentAccessOrigin();
FETCH_XXX( impl_getCurrentContentIdentifier, m_xContentAccessOrigin );
@@ -483,7 +483,7 @@ FetchResult SAL_CALL CachedContentResultSetStub
FetchResult SAL_CALL CachedContentResultSetStub
::fetchContents( sal_Int32 nRowStartPosition
, sal_Int32 nRowCount, sal_Bool bDirection )
- throw( com::sun::star::uno::RuntimeException, std::exception )
+ throw( css::uno::RuntimeException, std::exception )
{
impl_init_xContentAccessOrigin();
FETCH_XXX( impl_getCurrentContent, m_xContentAccessOrigin );
diff --git a/ucb/source/cacher/cachedcontentresultsetstub.hxx b/ucb/source/cacher/cachedcontentresultsetstub.hxx
index 66c3bc1..72fa170 100644
--- a/ucb/source/cacher/cachedcontentresultsetstub.hxx
+++ b/ucb/source/cacher/cachedcontentresultsetstub.hxx
@@ -34,10 +34,10 @@
class CachedContentResultSetStub
: public ContentResultSetWrapper
- , public com::sun::star::lang::XTypeProvider
- , public com::sun::star::lang::XServiceInfo
- , public com::sun::star::ucb::XFetchProvider
- , public com::sun::star::ucb::XFetchProviderForContentAccess
+ , public css::lang::XTypeProvider
+ , public css::lang::XServiceInfo
+ , public css::ucb::XFetchProvider
+ , public css::ucb::XFetchProviderForContentAccess
{
private:
sal_Int32 m_nColumnCount;
@@ -54,43 +54,38 @@ private:
void SAL_CALL
impl_getCurrentRowContent(
- com::sun::star::uno::Any& rRowContent,
- com::sun::star::uno::Reference<
- com::sun::star::sdbc::XRow > xRow )
- throw ( com::sun::star::sdbc::SQLException
- , com::sun::star::uno::RuntimeException );
+ css::uno::Any& rRowContent,
+ css::uno::Reference< css::sdbc::XRow > xRow )
+ throw ( css::sdbc::SQLException
+ , css::uno::RuntimeException );
sal_Int32 SAL_CALL
impl_getColumnCount();
static void SAL_CALL
impl_getCurrentContentIdentifierString(
- com::sun::star::uno::Any& rAny
- , com::sun::star::uno::Reference<
- com::sun::star::ucb::XContentAccess > xContentAccess )
- throw ( com::sun::star::uno::RuntimeException );
+ css::uno::Any& rAny
+ , css::uno::Reference< css::ucb::XContentAccess > xContentAccess )
+ throw ( css::uno::RuntimeException );
static void SAL_CALL
impl_getCurrentContentIdentifier(
- com::sun::star::uno::Any& rAny
- , com::sun::star::uno::Reference<
- com::sun::star::ucb::XContentAccess > xContentAccess )
- throw ( com::sun::star::uno::RuntimeException );
+ css::uno::Any& rAny
+ , css::uno::Reference< css::ucb::XContentAccess > xContentAccess )
+ throw ( css::uno::RuntimeException );
static void SAL_CALL
impl_getCurrentContent(
- com::sun::star::uno::Any& rAny
- , com::sun::star::uno::Reference<
- com::sun::star::ucb::XContentAccess > xContentAccess )
- throw ( com::sun::star::uno::RuntimeException );
+ css::uno::Any& rAny
+ , css::uno::Reference< css::ucb::XContentAccess > xContentAccess )
+ throw ( css::uno::RuntimeException );
void SAL_CALL
impl_propagateFetchSizeAndDirection( sal_Int32 nFetchSize, bool bFetchDirection )
- throw ( com::sun::star::uno::RuntimeException );
+ throw ( css::uno::RuntimeException );
public:
- CachedContentResultSetStub( com::sun::star::uno::Reference<
- com::sun::star::sdbc::XResultSet > xOrigin );
+ CachedContentResultSetStub( css::uno::Reference< css::sdbc::XResultSet > xOrigin );
virtual ~CachedContentResultSetStub();
@@ -107,13 +102,13 @@ public:
// own inherited
virtual void SAL_CALL
- impl_propertyChange( const com::sun::star::beans::PropertyChangeEvent& evt )
- throw( com::sun::star::uno::RuntimeException ) override;
+ impl_propertyChange( const css::beans::PropertyChangeEvent& evt )
+ throw( css::uno::RuntimeException ) override;
virtual void SAL_CALL
- impl_vetoableChange( const com::sun::star::beans::PropertyChangeEvent& aEvent )
- throw( com::sun::star::beans::PropertyVetoException,
- com::sun::star::uno::RuntimeException ) override;
+ impl_vetoableChange( const css::beans::PropertyChangeEvent& aEvent )
+ throw( css::beans::PropertyVetoException,
+ css::uno::RuntimeException ) override;
// XTypeProvider
@@ -136,47 +131,45 @@ public:
// XFetchProvider
- virtual com::sun::star::ucb::FetchResult SAL_CALL
+ virtual css::ucb::FetchResult SAL_CALL
fetch( sal_Int32 nRowStartPosition
, sal_Int32 nRowCount, sal_Bool bDirection )
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
// XFetchProviderForContentAccess
- virtual com::sun::star::ucb::FetchResult SAL_CALL
+ virtual css::ucb::FetchResult SAL_CALL
fetchContentIdentifierStrings( sal_Int32 nRowStartPosition
, sal_Int32 nRowCount, sal_Bool bDirection )
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
- virtual com::sun::star::ucb::FetchResult SAL_CALL
+ virtual css::ucb::FetchResult SAL_CALL
fetchContentIdentifiers( sal_Int32 nRowStartPosition
, sal_Int32 nRowCount, sal_Bool bDirection )
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
- virtual com::sun::star::ucb::FetchResult SAL_CALL
+ virtual css::ucb::FetchResult SAL_CALL
fetchContents( sal_Int32 nRowStartPosition
, sal_Int32 nRowCount, sal_Bool bDirection )
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
};
class CachedContentResultSetStubFactory
: public cppu::OWeakObject
- , public com::sun::star::lang::XTypeProvider
- , public com::sun::star::lang::XServiceInfo
- , public com::sun::star::ucb::XCachedContentResultSetStubFactory
+ , public css::lang::XTypeProvider
+ , public css::lang::XServiceInfo
+ , public css::ucb::XCachedContentResultSetStubFactory
{
protected:
- com::sun::star::uno::Reference<
- com::sun::star::lang::XMultiServiceFactory > m_xSMgr;
+ css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMgr;
public:
CachedContentResultSetStubFactory(
- const com::sun::star::uno::Reference<
- com::sun::star::lang::XMultiServiceFactory > & rSMgr);
+ const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr);
virtual ~CachedContentResultSetStubFactory();
@@ -192,7 +185,7 @@ public:
// XTypeProvider
virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes()
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
throw( css::uno::RuntimeException, std::exception ) override;
@@ -213,12 +206,10 @@ public:
// XCachedContentResultSetStubFactory
- virtual com::sun::star::uno::Reference<
- com::sun::star::sdbc::XResultSet > SAL_CALL
+ virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL
createCachedContentResultSetStub(
- const com::sun::star::uno::Reference<
- com::sun::star::sdbc::XResultSet > & xSource )
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ const css::uno::Reference< css::sdbc::XResultSet > & xSource )
+ throw( css::uno::RuntimeException, std::exception ) override;
};
#endif
diff --git a/ucb/source/cacher/cacheddynamicresultset.hxx b/ucb/source/cacher/cacheddynamicresultset.hxx
index ee04a83..0a65f3b 100644
--- a/ucb/source/cacher/cacheddynamicresultset.hxx
+++ b/ucb/source/cacher/cacheddynamicresultset.hxx
@@ -31,27 +31,22 @@
class CachedDynamicResultSet
: public DynamicResultSetWrapper
- , public com::sun::star::lang::XTypeProvider
- , public com::sun::star::lang::XServiceInfo
+ , public css::lang::XTypeProvider
+ , public css::lang::XServiceInfo
{
- com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifierMapping >
+ css::uno::Reference< css::ucb::XContentIdentifierMapping >
m_xContentIdentifierMapping;
protected:
virtual void SAL_CALL
- impl_InitResultSetOne( const com::sun::star::uno::Reference<
- com::sun::star::sdbc::XResultSet >& xResultSet ) override;
+ impl_InitResultSetOne( const css::uno::Reference< css::sdbc::XResultSet >& xResultSet ) override;
virtual void SAL_CALL
- impl_InitResultSetTwo( const com::sun::star::uno::Reference<
- com::sun::star::sdbc::XResultSet >& xResultSet ) override;
+ impl_InitResultSetTwo( const css::uno::Reference< css::sdbc::XResultSet >& xResultSet ) override;
public:
- CachedDynamicResultSet( com::sun::star::uno::Reference<
- com::sun::star::ucb::XDynamicResultSet > xOrigin
- , const com::sun::star::uno::Reference<
- com::sun::star::ucb::XContentIdentifierMapping > & xContentMapping
- , const com::sun::star::uno::Reference<
- com::sun::star::uno::XComponentContext > & xContext );
+ CachedDynamicResultSet( css::uno::Reference< css::ucb::XDynamicResultSet > xOrigin
+ , const css::uno::Reference< css::ucb::XContentIdentifierMapping > & xContentMapping
+ , const css::uno::Reference< css::uno::XComponentContext > & xContext );
virtual ~CachedDynamicResultSet();
@@ -86,27 +81,25 @@ public:
// own methods ( inherited )
virtual void SAL_CALL
- impl_disposing( const com::sun::star::lang::EventObject& Source )
- throw( com::sun::star::uno::RuntimeException ) override;
+ impl_disposing( const css::lang::EventObject& Source )
+ throw( css::uno::RuntimeException ) override;
};
class CachedDynamicResultSetFactory
: public cppu::OWeakObject
- , public com::sun::star::lang::XTypeProvider
- , public com::sun::star::lang::XServiceInfo
- , public com::sun::star::ucb::XCachedDynamicResultSetFactory
+ , public css::lang::XTypeProvider
+ , public css::lang::XServiceInfo
+ , public css::ucb::XCachedDynamicResultSetFactory
{
protected:
- com::sun::star::uno::Reference<
- com::sun::star::uno::XComponentContext > m_xContext;
+ css::uno::Reference< css::uno::XComponentContext > m_xContext;
public:
CachedDynamicResultSetFactory(
- const com::sun::star::uno::Reference<
- com::sun::star::uno::XComponentContext > & xContext);
+ const css::uno::Reference< css::uno::XComponentContext > & xContext);
virtual ~CachedDynamicResultSetFactory();
@@ -122,7 +115,7 @@ public:
// XTypeProvider
virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes()
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
throw( css::uno::RuntimeException, std::exception ) override;
@@ -143,17 +136,12 @@ public:
// XCachedDynamicResultSetFactory
- virtual com::sun::star::uno::Reference<
- com::sun::star::ucb::XDynamicResultSet > SAL_CALL
+ virtual css::uno::Reference< css::ucb::XDynamicResultSet > SAL_CALL
createCachedDynamicResultSet(
- const com::sun::star::uno::Reference<
- com::sun::star::ucb::XDynamicResultSet > &
- SourceStub
- , const com::sun::star::uno::Reference<
- com::sun::star::ucb::XContentIdentifierMapping > &
- ContentIdentifierMapping
+ const css::uno::Reference< css::ucb::XDynamicResultSet > & SourceStub
+ , const css::uno::Reference< css::ucb::XContentIdentifierMapping > & ContentIdentifierMapping
)
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
};
#endif
diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.hxx b/ucb/source/cacher/cacheddynamicresultsetstub.hxx
index 60dfd9f..bd619cb 100644
--- a/ucb/source/cacher/cacheddynamicresultsetstub.hxx
+++ b/ucb/source/cacher/cacheddynamicresultsetstub.hxx
@@ -30,22 +30,18 @@
class CachedDynamicResultSetStub
: public DynamicResultSetWrapper
- , public com::sun::star::lang::XTypeProvider
- , public com::sun::star::lang::XServiceInfo
+ , public css::lang::XTypeProvider
+ , public css::lang::XServiceInfo
{
protected:
virtual void SAL_CALL
- impl_InitResultSetOne( const com::sun::star::uno::Reference<
- com::sun::star::sdbc::XResultSet >& xResultSet ) override;
+ impl_InitResultSetOne( const css::uno::Reference< css::sdbc::XResultSet >& xResultSet ) override;
virtual void SAL_CALL
- impl_InitResultSetTwo( const com::sun::star::uno::Reference<
- com::sun::star::sdbc::XResultSet >& xResultSet ) override;
+ impl_InitResultSetTwo( const css::uno::Reference< css::sdbc::XResultSet >& xResultSet ) override;
public:
- CachedDynamicResultSetStub( com::sun::star::uno::Reference<
- com::sun::star::ucb::XDynamicResultSet > xOrigin
- , const com::sun::star::uno::Reference<
- com::sun::star::uno::XComponentContext > & rxContext );
+ CachedDynamicResultSetStub( css::uno::Reference< css::ucb::XDynamicResultSet > xOrigin
+ , const css::uno::Reference< css::uno::XComponentContext > & rxContext );
virtual ~CachedDynamicResultSetStub();
@@ -82,19 +78,17 @@ public:
class CachedDynamicResultSetStubFactory
: public cppu::OWeakObject
- , public com::sun::star::lang::XTypeProvider
- , public com::sun::star::lang::XServiceInfo
- , public com::sun::star::ucb::XCachedDynamicResultSetStubFactory
+ , public css::lang::XTypeProvider
+ , public css::lang::XServiceInfo
+ , public css::ucb::XCachedDynamicResultSetStubFactory
{
protected:
- com::sun::star::uno::Reference<
- com::sun::star::uno::XComponentContext > m_xContext;
+ css::uno::Reference< css::uno::XComponentContext > m_xContext;
public:
CachedDynamicResultSetStubFactory(
- const com::sun::star::uno::Reference<
- com::sun::star::uno::XComponentContext > & rxContext);
+ const css::uno::Reference< css::uno::XComponentContext > & rxContext);
virtual ~CachedDynamicResultSetStubFactory();
@@ -109,7 +103,7 @@ public:
// XTypeProvider
virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes()
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
throw( css::uno::RuntimeException, std::exception ) override;
// XServiceInfo
@@ -129,28 +123,22 @@ public:
// XCachedDynamicResultSetStubFactory
- virtual com::sun::star::uno::Reference<
- com::sun::star::ucb::XDynamicResultSet > SAL_CALL
+ virtual css::uno::Reference< css::ucb::XDynamicResultSet > SAL_CALL
createCachedDynamicResultSetStub(
- const com::sun::star::uno::Reference<
- com::sun::star::ucb::XDynamicResultSet > & Source )
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ const css::uno::Reference< css::ucb::XDynamicResultSet > & Source )
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL connectToCache(
- const com::sun::star::uno::Reference<
- com::sun::star::ucb::XDynamicResultSet > & Source
- , const com::sun::star::uno::Reference<
- com::sun::star::ucb::XDynamicResultSet > & TargetCache
- , const com::sun::star::uno::Sequence<
- com::sun::star::ucb::NumberedSortingInfo > & SortingInfo
- , const com::sun::star::uno::Reference<
- com::sun::star::ucb::XAnyCompareFactory > & CompareFactory
+ const css::uno::Reference< css::ucb::XDynamicResultSet > & Source
+ , const css::uno::Reference< css::ucb::XDynamicResultSet > & TargetCache
+ , const css::uno::Sequence< css::ucb::NumberedSortingInfo > & SortingInfo
+ , const css::uno::Reference< css::ucb::XAnyCompareFactory > & CompareFactory
)
throw (
- com::sun::star::ucb::ListenerAlreadySetException
- , com::sun::star::ucb::AlreadyInitializedException
- , com::sun::star::uno::RuntimeException, std::exception
+ css::ucb::ListenerAlreadySetException
+ , css::ucb::AlreadyInitializedException
+ , css::uno::RuntimeException, std::exception
) override;
};
diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx b/ucb/source/cacher/contentresultsetwrapper.cxx
index f592ea5..e606b36 100644
--- a/ucb/source/cacher/contentresultsetwrapper.cxx
+++ b/ucb/source/cacher/contentresultsetwrapper.cxx
@@ -1249,7 +1249,7 @@ DateTime SAL_CALL ContentResultSetWrapper::getTimestamp( sal_Int32 columnIndex )
}
//virtual
-Reference< com::sun::star::io::XInputStream > SAL_CALL ContentResultSetWrapper::getBinaryStream( sal_Int32 columnIndex )
+Reference< css::io::XInputStream > SAL_CALL ContentResultSetWrapper::getBinaryStream( sal_Int32 columnIndex )
throw( SQLException,
RuntimeException, std::exception )
{
@@ -1257,7 +1257,7 @@ Reference< com::sun::star::io::XInputStream > SAL_CALL ContentResultSetWrapper::
}
//virtual
-Reference< com::sun::star::io::XInputStream > SAL_CALL ContentResultSetWrapper::getCharacterStream( sal_Int32 columnIndex )
+Reference< css::io::XInputStream > SAL_CALL ContentResultSetWrapper::getCharacterStream( sal_Int32 columnIndex )
throw( SQLException,
RuntimeException, std::exception )
{
@@ -1265,7 +1265,7 @@ Reference< com::sun::star::io::XInputStream > SAL_CALL ContentResultSetWrapper::
}
//virtual
-Any SAL_CALL ContentResultSetWrapper::getObject( sal_Int32 columnIndex, const Reference< com::sun::star::container::XNameAccess >& typeMap )
+Any SAL_CALL ContentResultSetWrapper::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& typeMap )
throw( SQLException,
RuntimeException, std::exception )
{
@@ -1345,7 +1345,7 @@ void SAL_CALL ContentResultSetWrapperListener::release()
}
css::uno::Any SAL_CALL ContentResultSetWrapperListener::queryInterface( const css::uno::Type & rType )
- throw( com::sun::star::uno::RuntimeException, std::exception )
+ throw( css::uno::RuntimeException, std::exception )
{
//list all interfaces inclusive baseclasses of interfaces
css::uno::Any aRet = cppu::queryInterface( rType,
diff --git a/ucb/source/cacher/contentresultsetwrapper.hxx b/ucb/source/cacher/contentresultsetwrapper.hxx
index b62f62dc..2767b87 100644
--- a/ucb/source/cacher/contentresultsetwrapper.hxx
+++ b/ucb/source/cacher/contentresultsetwrapper.hxx
@@ -39,13 +39,13 @@
class ContentResultSetWrapperListener;
class ContentResultSetWrapper
: public cppu::OWeakObject
- , public com::sun::star::lang::XComponent
- , public com::sun::star::sdbc::XCloseable
- , public com::sun::star::sdbc::XResultSetMetaDataSupplier
- , public com::sun::star::beans::XPropertySet
- , public com::sun::star::ucb::XContentAccess
- , public com::sun::star::sdbc::XResultSet
- , public com::sun::star::sdbc::XRow
+ , public css::lang::XComponent
+ , public css::sdbc::XCloseable
+ , public css::sdbc::XResultSetMetaDataSupplier
+ , public css::beans::XPropertySet
+ , public css::ucb::XContentAccess
+ , public css::sdbc::XResultSet
+ , public css::sdbc::XRow
{
protected:
typedef cppu::OMultiTypeInterfaceContainerHelperVar<OUString>
@@ -101,31 +101,31 @@ protected:
osl::Mutex m_aMutex;
//different Interfaces from Origin:
- com::sun::star::uno::Reference< com::sun::star::sdbc::XResultSet >
+ css::uno::Reference< css::sdbc::XResultSet >
m_xResultSetOrigin;
- com::sun::star::uno::Reference< com::sun::star::sdbc::XRow >
+ css::uno::Reference< css::sdbc::XRow >
m_xRowOrigin; //XRow-interface from m_xOrigin
//!! call impl_init_xRowOrigin() bevor you access this member
- com::sun::star::uno::Reference< com::sun::star::ucb::XContentAccess >
+ css::uno::Reference< css::ucb::XContentAccess >
m_xContentAccessOrigin; //XContentAccess-interface from m_xOrigin
//!! call impl_init_xContentAccessOrigin() bevor you access this member
- com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >
+ css::uno::Reference< css::beans::XPropertySet >
m_xPropertySetOrigin; //XPropertySet-interface from m_xOrigin
//!! call impl_init_xPropertySetOrigin() bevor you access this member
- com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo >
+ css::uno::Reference< css::beans::XPropertySetInfo >
m_xPropertySetInfo;
//call impl_initPropertySetInfo() bevor you access this member
sal_Int32 m_nForwardOnly;
private:
- com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >
+ css::uno::Reference< css::beans::XPropertyChangeListener >
m_xMyListenerImpl;
ContentResultSetWrapperListener*
m_pMyListenerImpl;
- com::sun::star::uno::Reference< com::sun::star::sdbc::XResultSetMetaData >
+ css::uno::Reference< css::sdbc::XResultSetMetaData >
m_xMetaDataFromOrigin; //XResultSetMetaData from m_xOrigin
//management of listeners
@@ -151,8 +151,7 @@ private:
protected:
- ContentResultSetWrapper( com::sun::star::uno::Reference<
- com::sun::star::sdbc::XResultSet > xOrigin );
+ ContentResultSetWrapper( css::uno::Reference< css::sdbc::XResultSet > xOrigin );
virtual ~ContentResultSetWrapper();
@@ -171,18 +170,18 @@ protected:
void SAL_CALL
impl_EnsureNotDisposed()
- throw( com::sun::star::lang::DisposedException,
- com::sun::star::uno::RuntimeException );
+ throw( css::lang::DisposedException,
+ css::uno::RuntimeException );
void SAL_CALL
impl_notifyPropertyChangeListeners(
- const com::sun::star::beans::PropertyChangeEvent& rEvt );
+ const css::beans::PropertyChangeEvent& rEvt );
void SAL_CALL
impl_notifyVetoableChangeListeners(
- const com::sun::star::beans::PropertyChangeEvent& rEvt )
- throw( com::sun::star::beans::PropertyVetoException,
- com::sun::star::uno::RuntimeException );
+ const css::beans::PropertyChangeEvent& rEvt )
+ throw( css::beans::PropertyVetoException,
+ css::uno::RuntimeException );
bool SAL_CALL impl_isForwardOnly();
@@ -191,326 +190,309 @@ public:
// XInterface
- virtual com::sun::star::uno::Any SAL_CALL
- queryInterface( const com::sun::star::uno::Type & rType )
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Any SAL_CALL
+ queryInterface( const css::uno::Type & rType )
+ throw( css::uno::RuntimeException, std::exception ) override;
// XComponent
virtual void SAL_CALL
- dispose() throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ dispose() throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL
- addEventListener( const com::sun::star::uno::Reference<
- com::sun::star::lang::XEventListener >& Listener )
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener )
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL
- removeEventListener( const com::sun::star::uno::Reference<
- com::sun::star::lang::XEventListener >& Listener )
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener )
+ throw( css::uno::RuntimeException, std::exception ) override;
//XCloseable
virtual void SAL_CALL
close()
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException, std::exception ) override;
//XResultSetMetaDataSupplier
- virtual com::sun::star::uno::Reference<
- com::sun::star::sdbc::XResultSetMetaData > SAL_CALL
+ virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL
getMetaData()
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException, std::exception ) override;
// XPropertySet
- virtual com::sun::star::uno::Reference<
- com::sun::star::beans::XPropertySetInfo > SAL_CALL
+ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
getPropertySetInfo()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL
setPropertyValue( const OUString& aPropertyName,
- const com::sun::star::uno::Any& aValue )
- throw( com::sun::star::beans::UnknownPropertyException,
- com::sun::star::beans::PropertyVetoException,
- com::sun::star::lang::IllegalArgumentException,
- com::sun::star::lang::WrappedTargetException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
-
- virtual com::sun::star::uno::Any SAL_CALL
+ const css::uno::Any& aValue )
+ throw( css::beans::UnknownPropertyException,
+ css::beans::PropertyVetoException,
+ css::lang::IllegalArgumentException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception ) override;
+
+ virtual css::uno::Any SAL_CALL
getPropertyValue( const OUString& PropertyName )
- throw( com::sun::star::beans::UnknownPropertyException,
- com::sun::star::lang::WrappedTargetException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL
addPropertyChangeListener( const OUString& aPropertyName,
- const com::sun::star::uno::Reference<
- com::sun::star::beans::XPropertyChangeListener >& xListener )
- throw( com::sun::star::beans::UnknownPropertyException,
- com::sun::star::lang::WrappedTargetException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
+ throw( css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL
removePropertyChangeListener( const OUString& aPropertyName,
- const com::sun::star::uno::Reference<
- com::sun::star::beans::XPropertyChangeListener >& aListener )
- throw( com::sun::star::beans::UnknownPropertyException,
- com::sun::star::lang::WrappedTargetException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
+ throw( css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL
addVetoableChangeListener( const OUString& PropertyName,
- const com::sun::star::uno::Reference<
- com::sun::star::beans::XVetoableChangeListener >& aListener )
- throw( com::sun::star::beans::UnknownPropertyException,
- com::sun::star::lang::WrappedTargetException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
+ throw( css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL
removeVetoableChangeListener( const OUString& PropertyName,
- const com::sun::star::uno::Reference<
- com::sun::star::beans::XVetoableChangeListener >& aListener )
- throw( com::sun::star::beans::UnknownPropertyException,
- com::sun::star::lang::WrappedTargetException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
+ throw( css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception ) override;
// own methods
virtual void SAL_CALL
- impl_disposing( const com::sun::star::lang::EventObject& Source )
- throw( com::sun::star::uno::RuntimeException );
+ impl_disposing( const css::lang::EventObject& Source )
+ throw( css::uno::RuntimeException );
virtual void SAL_CALL
- impl_propertyChange( const com::sun::star::beans::PropertyChangeEvent& evt )
- throw( com::sun::star::uno::RuntimeException );
+ impl_propertyChange( const css::beans::PropertyChangeEvent& evt )
+ throw( css::uno::RuntimeException );
virtual void SAL_CALL
- impl_vetoableChange( const com::sun::star::beans::PropertyChangeEvent& aEvent )
- throw( com::sun::star::beans::PropertyVetoException,
- com::sun::star::uno::RuntimeException );
+ impl_vetoableChange( const css::beans::PropertyChangeEvent& aEvent )
+ throw( css::beans::PropertyVetoException,
+ css::uno::RuntimeException );
// XContentAccess
virtual OUString SAL_CALL
queryContentIdentifierString()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
- virtual com::sun::star::uno::Reference<
- com::sun::star::ucb::XContentIdentifier > SAL_CALL
+ virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL
queryContentIdentifier()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
- virtual com::sun::star::uno::Reference<
- com::sun::star::ucb::XContent > SAL_CALL
+ virtual css::uno::Reference< css::ucb::XContent > SAL_CALL
queryContent()
- throw( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::uno::RuntimeException, std::exception ) override;
// XResultSet
virtual sal_Bool SAL_CALL
next()
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL
isBeforeFirst()
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL
isAfterLast()
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL
isFirst()
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL
isLast()
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL
beforeFirst()
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL
afterLast()
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL
first()
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL
last()
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException, std::exception ) override;
virtual sal_Int32 SAL_CALL
getRow()
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL
absolute( sal_Int32 row )
- throw( com::sun::star::sdbc::SQLException,
- com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::sdbc::SQLException,
+ css::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL
relative( sal_Int32 rows )
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list