diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-12-02 12:43:00 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-12-03 21:04:45 +0100 |
| commit | eef7c4d30bdf4b8250b2de4186ba58fcaebe4993 (patch) | |
| tree | 2ecb2d124aa50ebe8246d02b53e5896fab24d40e /svx | |
| parent | 1f0c54c250c2390962105128dcf871aad0689323 (diff) | |
weld OAddFieldWindow
Change-Id: I1e0ca144943fd37769c7b6cfc7e77c4f001b31a0
Reviewed-on: https://gerrit.libreoffice.org/84233
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/fmcomp/dbaexchange.cxx | 15 | ||||
| -rw-r--r-- | svx/uiconfig/ui/formfielddialog.ui | 2 |
2 files changed, 9 insertions, 8 deletions
diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx index 698a7e6e6055..8316e7eea6f3 100644 --- a/svx/source/fmcomp/dbaexchange.cxx +++ b/svx/source/fmcomp/dbaexchange.cxx @@ -49,6 +49,8 @@ namespace svx void OColumnTransferable::setDescriptor(const ODataAccessDescriptor& rDescriptor) { + ClearFormats(); + OUString sDataSource, sDatabaseLocation, sConnectionResource, sCommand, sFieldName; if ( rDescriptor.has( DataAccessDescriptorProperty::DataSource ) ) rDescriptor[ DataAccessDescriptorProperty::DataSource ] >>= sDataSource; if ( rDescriptor.has( DataAccessDescriptorProperty::DatabaseLocation ) ) rDescriptor[ DataAccessDescriptorProperty::DatabaseLocation ] >>= sDatabaseLocation; @@ -59,7 +61,6 @@ namespace svx sal_Int32 nCommandType = CommandType::TABLE; OSL_VERIFY( rDescriptor[ DataAccessDescriptorProperty::CommandType ] >>= nCommandType ); - implConstruct( sDataSource.isEmpty() ? sDatabaseLocation : sDataSource, sConnectionResource, nCommandType, sCommand, sFieldName ); @@ -558,9 +559,14 @@ namespace svx m_sCompatibleObjectDescription += sSeparator; } + OMultiColumnTransferable::OMultiColumnTransferable() + { + } - OMultiColumnTransferable::OMultiColumnTransferable(const Sequence< PropertyValue >& _aDescriptors) : m_aDescriptors(_aDescriptors) + void OMultiColumnTransferable::setDescriptors(const Sequence< PropertyValue >& rDescriptors) { + ClearFormats(); + m_aDescriptors = rDescriptors; } SotClipboardFormatId OMultiColumnTransferable::getDescriptorFormatId() @@ -590,7 +596,6 @@ namespace svx return false; } - bool OMultiColumnTransferable::canExtractDescriptor(const DataFlavorExVector& _rFlavors) { const SotClipboardFormatId nFormatId = getDescriptorFormatId(); @@ -598,7 +603,6 @@ namespace svx [&nFormatId](const DataFlavorEx& rCheck) { return nFormatId == rCheck.mnSotId; }); } - Sequence< PropertyValue > OMultiColumnTransferable::extractDescriptor(const TransferableDataHelper& _rData) { Sequence< PropertyValue > aList; @@ -619,9 +623,6 @@ namespace svx { m_aDescriptors.realloc(0); } - - } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/uiconfig/ui/formfielddialog.ui b/svx/uiconfig/ui/formfielddialog.ui index 3a3d56441852..d77c2ce7856c 100644 --- a/svx/uiconfig/ui/formfielddialog.ui +++ b/svx/uiconfig/ui/formfielddialog.ui @@ -15,7 +15,7 @@ <property name="border_width">6</property> <property name="default_width">0</property> <property name="default_height">0</property> - <property name="type_hint">dialog</property> + <property name="type_hint">utility</property> <child> <placeholder/> </child> |