diff options
Diffstat (limited to 'sw/source/uibase')
| -rw-r--r-- | sw/source/uibase/app/apphdl.cxx | 3 | ||||
| -rw-r--r-- | sw/source/uibase/dbui/dbtree.cxx | 5 | ||||
| -rw-r--r-- | sw/source/uibase/docvw/srcedtw.cxx | 2 |
3 files changed, 1 insertions, 9 deletions
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx index 061a44513e64..0288b37d61b4 100644 --- a/sw/source/uibase/app/apphdl.cxx +++ b/sw/source/uibase/app/apphdl.cxx @@ -262,12 +262,9 @@ std::shared_ptr<SwMailMergeConfigItem> SwView::EnsureMailMergeConfigItem(const S aDescriptor[svx::DataAccessDescriptorProperty::Command] >>= aDBData.sCommand; aDescriptor[svx::DataAccessDescriptorProperty::CommandType] >>= aDBData.nCommandType; - uno::Sequence< uno::Any > aSelection; uno::Reference< sdbc::XConnection> xConnection; uno::Reference< sdbc::XDataSource> xSource; uno::Reference< sdbcx::XColumnsSupplier> xColumnsSupplier; - if (aDescriptor.has(svx::DataAccessDescriptorProperty::Selection)) - aDescriptor[svx::DataAccessDescriptorProperty::Selection] >>= aSelection; if (aDescriptor.has(svx::DataAccessDescriptorProperty::Connection)) aDescriptor[svx::DataAccessDescriptorProperty::Connection] >>= xConnection; uno::Reference<container::XChild> xChild(xConnection, uno::UNO_QUERY); diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx index b4d9d4494ef6..8daa167434f5 100644 --- a/sw/source/uibase/dbui/dbtree.cxx +++ b/sw/source/uibase/dbui/dbtree.cxx @@ -98,11 +98,8 @@ void SwDBTreeList_Impl::elementInserted( const ContainerEvent& ) // information not needed } -void SwDBTreeList_Impl::elementRemoved( const ContainerEvent& rEvent ) +void SwDBTreeList_Impl::elementRemoved( const ContainerEvent& ) { - SolarMutexGuard aGuard; - OUString sSource; - rEvent.Accessor >>= sSource; } void SwDBTreeList_Impl::disposing( const EventObject& ) diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx index f8f825abd129..1564e969b1a2 100644 --- a/sw/source/uibase/docvw/srcedtw.cxx +++ b/sw/source/uibase/docvw/srcedtw.cxx @@ -78,7 +78,6 @@ static void lcl_Highlight(const OUString& rSource, TextPortions& aPortionList) const sal_uInt16 nStrLen = rSource.getLength(); sal_uInt16 nInsert = 0; // number of inserted portions sal_uInt16 nActPos = 0; // position, where '<' was found - sal_uInt16 nOffset = 0; // Offset of nActPos to '<' sal_uInt16 nPortStart = USHRT_MAX; // for the TextPortion sal_uInt16 nPortEnd = 0; TextPortion aText; @@ -119,7 +118,6 @@ static void lcl_Highlight(const OUString& rSource, TextPortions& aPortionList) // "</" ignore slash nPortStart = nActPos; nActPos++; - nOffset++; } if(svtools::HTMLUNKNOWN == eFoundType) { |