summaryrefslogtreecommitdiff
path: root/sw/inc/swdbdata.hxx
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-06-03 18:54:08 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-06-03 19:29:06 +0200
commitb79017f49a487a3981b1cd9f488ed5062eeb880b (patch)
tree1c8cff3b899221fcd2f1a50e8121c6e0363493fe /sw/inc/swdbdata.hxx
parent1096ca46a23fc4df30865c243e10881157fe4840 (diff)
sw: move name of the embedded data source def from SwDBData to SwDBManager
The problem is that SwDBData just describes the current data source, and when changing that, the embedded name doesn't change, so they should be separate. Change-Id: I2dd7e0a97b9f7d6a3a74a5752467515a0a09171a
Diffstat (limited to 'sw/inc/swdbdata.hxx')
-rw-r--r--sw/inc/swdbdata.hxx6
1 files changed, 2 insertions, 4 deletions
diff --git a/sw/inc/swdbdata.hxx b/sw/inc/swdbdata.hxx
index 02ccf6807815..6d91e2b85558 100644
--- a/sw/inc/swdbdata.hxx
+++ b/sw/inc/swdbdata.hxx
@@ -28,16 +28,14 @@ struct SwDBData
OUString sDataSource;
OUString sCommand; //table, query or statement
sal_Int32 nCommandType; //com::sun::star::sdb::CommandType
- /// Name of the embedded database that's included in the current document.
- OUString sEmbeddedName;
SwDBData() :
nCommandType(0){}
void dumpAsXml(struct _xmlTextWriter* pWriter) const;
bool operator !=(const SwDBData& rCmp) const
- {return rCmp.sDataSource != sDataSource || rCmp.sCommand != sCommand || rCmp.nCommandType != nCommandType || rCmp.sEmbeddedName != sEmbeddedName;}
+ {return rCmp.sDataSource != sDataSource || rCmp.sCommand != sCommand || rCmp.nCommandType != nCommandType;}
bool operator ==(const SwDBData& rCmp) const
- {return rCmp.sDataSource == sDataSource && rCmp.sCommand == sCommand && rCmp.nCommandType == nCommandType && rCmp.sEmbeddedName == sEmbeddedName;}
+ {return rCmp.sDataSource == sDataSource && rCmp.sCommand == sCommand && rCmp.nCommandType == nCommandType;}
};
#endif