[Libreoffice-commits] core.git: fpicker/source include/svtools sc/source sfx2/source svtools/source svx/inc
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Fri Feb 7 14:31:22 UTC 2020
fpicker/source/office/iodlg.cxx | 2
include/svtools/inettbc.hxx | 33 -
sc/source/ui/inc/linkarea.hxx | 3
sfx2/source/inet/inettbc.cxx | 2
svtools/source/control/inettbc.cxx | 1080 +------------------------------------
svx/inc/pch/precompiled_svx.hxx | 4
6 files changed, 43 insertions(+), 1081 deletions(-)
New commits:
commit e982f2d4ad8956bc184b625b50fad4c3be117203
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Feb 7 12:01:55 2020 +0000
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Feb 7 15:30:46 2020 +0100
SvtURLBox is now unused
Change-Id: Iab78b3803272ceb62c4df74241b64f23b1437b03
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88184
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 4e592c5763c0..60dd893b34ae 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -713,7 +713,7 @@ void SvtFileDialog::OpenHdl_Impl(void const * pVoid)
INetURLObject aFileObject( aFileName );
if ( ( aFileObject.GetProtocol() == INetProtocol::NotValid ) && !aFileName.isEmpty() )
{
- OUString sCompleted = SvtURLBox::ParseSmart( aFileName, m_xFileView->GetViewURL() );
+ OUString sCompleted = URLBox::ParseSmart( aFileName, m_xFileView->GetViewURL() );
if ( !sCompleted.isEmpty() )
aFileName = sCompleted;
}
diff --git a/include/svtools/inettbc.hxx b/include/svtools/inettbc.hxx
index 8625df7e935d..08893b3e977d 100644
--- a/include/svtools/inettbc.hxx
+++ b/include/svtools/inettbc.hxx
@@ -25,45 +25,12 @@
#include <svtools/svtdllapi.h>
#include <tools/urlobj.hxx>
-#include <vcl/combobox.hxx>
#include <vcl/idle.hxx>
#include <vcl/weld.hxx>
class MatchContext_Impl;
class SvtMatchContext_Impl;
class SvtURLBox_Impl;
-class SVT_DLLPUBLIC SvtURLBox final : public ComboBox
-{
-friend class SvtMatchContext_Impl;
-friend class SvtURLBox_Impl;
- Link<SvtURLBox*,void> aOpenHdl;
- rtl::Reference< SvtMatchContext_Impl > pCtx;
- std::unique_ptr<SvtURLBox_Impl> pImpl;
- INetProtocol eSmartProtocol;
- bool bAutoCompleteMode : 1;
-
- SVT_DLLPRIVATE bool ProcessKey( const vcl::KeyCode& rCode );
- SVT_DLLPRIVATE void TryAutoComplete();
- SVT_DLLPRIVATE void UpdatePicklistForSmartProtocol_Impl();
- DECL_DLLPRIVATE_LINK( AutoCompleteHdl_Impl, Edit&, void );
- SVT_DLLPRIVATE void Init(bool bSetDefaultHelpID);
-
- virtual bool EventNotify( NotifyEvent& rNEvt ) override;
- virtual void Select() override;
- virtual bool PreNotify( NotifyEvent& rNEvt ) override;
-
-public:
- SvtURLBox( vcl::Window* pParent, INetProtocol eSmart = INetProtocol::NotValid, bool bSetDefaultHelpID = true );
- virtual ~SvtURLBox() override;
- virtual void dispose() override;
-
- void SetOpenHdl( const Link<SvtURLBox*,void>& rLink ) { aOpenHdl = rLink; }
- const Link<SvtURLBox*,void>& GetOpenHdl() const { return aOpenHdl; }
- INetProtocol GetSmartProtocol() const { return eSmartProtocol; }
- OUString GetURL();
-
- static OUString ParseSmart( const OUString& aText, const OUString& aBaseURL );
-};
class SVT_DLLPUBLIC URLBox
{
diff --git a/sc/source/ui/inc/linkarea.hxx b/sc/source/ui/inc/linkarea.hxx
index db95b5f9d90e..082ef439c3f3 100644
--- a/sc/source/ui/inc/linkarea.hxx
+++ b/sc/source/ui/inc/linkarea.hxx
@@ -20,8 +20,9 @@
#ifndef INCLUDED_SC_SOURCE_UI_INC_LINKAREA_HXX
#define INCLUDED_SC_SOURCE_UI_INC_LINKAREA_HXX
-#include <vcl/weld.hxx>
#include <sfx2/objsh.hxx>
+#include <tools/solar.h>
+#include <vcl/weld.hxx>
namespace sfx2 { class DocumentInserter; }
namespace sfx2 { class FileDialogHelper; }
diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx
index 283f0668cebd..5d9767f0b198 100644
--- a/sfx2/source/inet/inettbc.cxx
+++ b/sfx2/source/inet/inettbc.cxx
@@ -127,7 +127,7 @@ void SfxURLToolBoxControl_Impl::OpenURL( const OUString& rName ) const
INetURLObject aObj( rName );
if ( aObj.GetProtocol() == INetProtocol::NotValid )
{
- aName = SvtURLBox::ParseSmart( rName, "" );
+ aName = URLBox::ParseSmart( rName, "" );
}
else
aName = rName;
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index e9e4317c2719..6c80553014e1 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -44,7 +44,6 @@
#include <tools/debug.hxx>
#include <osl/file.hxx>
#include <osl/mutex.hxx>
-#include <vcl/builder.hxx>
#include <vcl/event.hxx>
#include <vcl/svapp.hxx>
#include <unotools/historyoptions.hxx>
@@ -83,36 +82,6 @@ public:
}
};
-class SvtMatchContext_Impl: public salhelper::Thread
-{
- static ::osl::Mutex* pDirMutex;
-
- std::vector<OUString> aPickList;
- std::vector<OUString> aCompletions;
- std::vector<OUString> aURLs;
- svtools::AsynchronLink aLink;
- OUString const aText;
- VclPtr<SvtURLBox> pBox;
-
- osl::Mutex mutex_;
- bool stopped_;
- css::uno::Reference< css::ucb::XCommandProcessor > processor_;
- sal_Int32 commandId_;
-
- DECL_LINK( Select_Impl, void*, void );
-
- virtual ~SvtMatchContext_Impl() override;
- virtual void execute() override;
- void doExecute();
- void Insert( const OUString& rCompletion, const OUString& rURL, bool bForce = false);
- void ReadFolder( const OUString& rURL, const OUString& rMatch, bool bSmart );
- static void FillPicklist(std::vector<OUString>& rPickList);
-
-public:
- SvtMatchContext_Impl( SvtURLBox* pBoxP, const OUString& rText );
- void Stop();
-};
-
class MatchContext_Impl: public salhelper::Thread
{
static ::osl::Mutex* pDirMutex;
@@ -152,12 +121,13 @@ namespace
: public rtl::Static< ::osl::Mutex, theSvtMatchContextMutex > {};
}
-SvtMatchContext_Impl::SvtMatchContext_Impl(
- SvtURLBox* pBoxP, const OUString& rText )
- : Thread( "SvtMatchContext_Impl" )
- , aLink( LINK( this, SvtMatchContext_Impl, Select_Impl ) )
+MatchContext_Impl::MatchContext_Impl(URLBox* pBoxP, const OUString& rText)
+ : Thread( "MatchContext_Impl" )
+ , aLink( LINK( this, MatchContext_Impl, Select_Impl ) )
, aText( rText )
, pBox( pBoxP )
+ , bOnlyDirectories( pBoxP->bOnlyDirectories )
+ , bNoSelection( pBoxP->bNoSelection )
, stopped_(false)
, commandId_(0)
{
@@ -166,12 +136,12 @@ SvtMatchContext_Impl::SvtMatchContext_Impl(
FillPicklist( aPickList );
}
-SvtMatchContext_Impl::~SvtMatchContext_Impl()
+MatchContext_Impl::~MatchContext_Impl()
{
aLink.ClearPendingCall();
}
-void SvtMatchContext_Impl::FillPicklist(std::vector<OUString>& rPickList)
+void MatchContext_Impl::FillPicklist(std::vector<OUString>& rPickList)
{
// Read the history of picks
Sequence< Sequence< PropertyValue > > seqPicklist = SvtHistoryOptions().GetList( ePICKLIST );
@@ -195,7 +165,7 @@ void SvtMatchContext_Impl::FillPicklist(std::vector<OUString>& rPickList)
}
}
-void SvtMatchContext_Impl::Stop()
+void MatchContext_Impl::Stop()
{
css::uno::Reference< css::ucb::XCommandProcessor > proc;
sal_Int32 id(0);
@@ -213,7 +183,7 @@ void SvtMatchContext_Impl::Stop()
terminate();
}
-void SvtMatchContext_Impl::execute( )
+void MatchContext_Impl::execute( )
{
doExecute();
aLink.Call( this );
@@ -226,7 +196,7 @@ void SvtMatchContext_Impl::execute( )
// Cancellable does not discard the information gained so far, it
// inserts all collected completions into the listbox.
-IMPL_LINK_NOARG( SvtMatchContext_Impl, Select_Impl, void*, void )
+IMPL_LINK_NOARG( MatchContext_Impl, Select_Impl, void*, void )
{
// avoid recursion through cancel button
{
@@ -237,14 +207,8 @@ IMPL_LINK_NOARG( SvtMatchContext_Impl, Select_Impl, void*, void )
}
}
- pBox->bAutoCompleteMode = true;
-
- // did we filter completions which otherwise would have been valid?
- // (to be filled below)
- bool bValidCompletionsFiltered = false;
-
// insert all completed strings into the listbox
- pBox->Clear();
+ pBox->clear();
for (auto const& completion : aCompletions)
{
@@ -262,21 +226,14 @@ IMPL_LINK_NOARG( SvtMatchContext_Impl, Select_Impl, void*, void )
pBox->pImpl->m_aFilters.end(),
FilterMatch( sUpperURL ) ) )
{ // this URL is not allowed
- bValidCompletionsFiltered = true;
continue;
}
}
- pBox->InsertEntry(completion);
+ pBox->append_text(completion);
}
- if( !aCompletions.empty() && !bValidCompletionsFiltered )
- {
- // select the first one
- OUString aTmp( pBox->GetEntry(0) );
- pBox->SetText( aTmp );
- pBox->SetSelection( Selection( aText.getLength(), aTmp.getLength() ) );
- }
+ pBox->EnableAutocomplete(!bNoSelection);
// transfer string lists to listbox and forget them
pBox->pImpl->aURLs = aURLs;
@@ -284,16 +241,12 @@ IMPL_LINK_NOARG( SvtMatchContext_Impl, Select_Impl, void*, void )
aURLs.clear();
aCompletions.clear();
- // force listbox to resize ( it may be open )
- pBox->Resize();
-
// the box has this control as a member so we have to set that member
// to zero before deleting ourself.
pBox->pCtx.clear();
}
-
-void SvtMatchContext_Impl::Insert( const OUString& rCompletion,
+void MatchContext_Impl::Insert( const OUString& rCompletion,
const OUString& rURL,
bool bForce )
{
@@ -309,7 +262,7 @@ void SvtMatchContext_Impl::Insert( const OUString& rCompletion,
}
-void SvtMatchContext_Impl::ReadFolder( const OUString& rURL,
+void MatchContext_Impl::ReadFolder( const OUString& rURL,
const OUString& rMatch,
bool bSmart )
{
@@ -375,10 +328,10 @@ void SvtMatchContext_Impl::ReadFolder( const OUString& rURL,
try
{
- uno::Reference< XDynamicResultSet > xDynResultSet;
ResultSetInclude eInclude = INCLUDE_FOLDERS_AND_DOCUMENTS;
-
- xDynResultSet = aCnt.createDynamicCursor( aProps, eInclude );
+ if ( bOnlyDirectories )
+ eInclude = INCLUDE_FOLDERS_ONLY;
+ uno::Reference< XDynamicResultSet > xDynResultSet = aCnt.createDynamicCursor( aProps, eInclude );
uno::Reference < XAnyCompareFactory > xCompare;
uno::Reference < XSortedDynamicResultSetFactory > xSRSFac =
@@ -471,670 +424,46 @@ void SvtMatchContext_Impl::ReadFolder( const OUString& rURL,
}
}
-MatchContext_Impl::MatchContext_Impl(URLBox* pBoxP, const OUString& rText)
- : Thread( "MatchContext_Impl" )
- , aLink( LINK( this, MatchContext_Impl, Select_Impl ) )
- , aText( rText )
- , pBox( pBoxP )
- , bOnlyDirectories( pBoxP->bOnlyDirectories )
- , bNoSelection( pBoxP->bNoSelection )
- , stopped_(false)
- , commandId_(0)
-{
- aLink.CreateMutex();
-
- FillPicklist( aPickList );
-}
-
-MatchContext_Impl::~MatchContext_Impl()
-{
- aLink.ClearPendingCall();
-}
-
-void MatchContext_Impl::FillPicklist(std::vector<OUString>& rPickList)
-{
- // Read the history of picks
- Sequence< Sequence< PropertyValue > > seqPicklist = SvtHistoryOptions().GetList( ePICKLIST );
- sal_uInt32 nCount = seqPicklist.getLength();
-
- for( sal_uInt32 nItem=0; nItem < nCount; nItem++ )
- {
- Sequence< PropertyValue > seqPropertySet = seqPicklist[ nItem ];
-
- auto pProperty = std::find_if(seqPropertySet.begin(), seqPropertySet.end(),
- [](const PropertyValue& rProperty) { return rProperty.Name == HISTORY_PROPERTYNAME_TITLE; });
- if (pProperty != seqPropertySet.end())
- {
- OUString sTitle;
- INetURLObject aURL;
-
- pProperty->Value >>= sTitle;
- aURL.SetURL( sTitle );
- rPickList.insert(rPickList.begin() + nItem, aURL.GetMainURL(INetURLObject::DecodeMechanism::WithCharset));
- }
- }
-}
-
-void MatchContext_Impl::Stop()
-{
- css::uno::Reference< css::ucb::XCommandProcessor > proc;
- sal_Int32 id(0);
- {
- osl::MutexGuard g(mutex_);
- if (!stopped_) {
- stopped_ = true;
- proc = processor_;
- id = commandId_;
- }
- }
- if (proc.is()) {
- proc->abort(id);
- }
- terminate();
-}
-
-void MatchContext_Impl::execute( )
-{
- doExecute();
- aLink.Call( this );
-}
-
-
-// This method is called via AsynchronLink, so it has the SolarMutex and
-// calling solar code ( VCL ... ) is safe. It is called when the thread is
-// terminated ( finished work or stopped ). Cancelling the thread via
-// Cancellable does not discard the information gained so far, it
-// inserts all collected completions into the listbox.
-
-IMPL_LINK_NOARG( MatchContext_Impl, Select_Impl, void*, void )
+void MatchContext_Impl::doExecute()
{
- // avoid recursion through cancel button
+ ::osl::MutexGuard aGuard( theSvtMatchContextMutex::get() );
{
+ // have we been stopped while we were waiting for the mutex?
osl::MutexGuard g(mutex_);
if (stopped_) {
- // Completion was stopped, no display:
return;
}
}
- // insert all completed strings into the listbox
- pBox->clear();
-
- for (auto const& completion : aCompletions)
- {
- // convert the file into a URL
- OUString sURL;
- osl::FileBase::getFileURLFromSystemPath(completion, sURL);
- // note: if this doesn't work, we're not interested in: we're checking the
- // untouched sCompletion then
-
- if ( !sURL.isEmpty() && !sURL.endsWith("/") )
- {
- OUString sUpperURL( sURL.toAsciiUpperCase() );
-
- if ( ::std::none_of( pBox->pImpl->m_aFilters.begin(),
- pBox->pImpl->m_aFilters.end(),
- FilterMatch( sUpperURL ) ) )
- { // this URL is not allowed
- continue;
- }
- }
-
- pBox->append_text(completion);
- }
-
- pBox->EnableAutocomplete(!bNoSelection);
-
- // transfer string lists to listbox and forget them
- pBox->pImpl->aURLs = aURLs;
- pBox->pImpl->aCompletions = aCompletions;
- aURLs.clear();
+ // Reset match lists
aCompletions.clear();
+ aURLs.clear();
- // the box has this control as a member so we have to set that member
- // to zero before deleting ourself.
- pBox->pCtx.clear();
-}
-
-void MatchContext_Impl::Insert( const OUString& rCompletion,
- const OUString& rURL,
- bool bForce )
-{
- if( !bForce )
- {
- // avoid doubles
- if(find(aCompletions.begin(), aCompletions.end(), rCompletion) != aCompletions.end())
- return;
- }
-
- aCompletions.push_back(rCompletion);
- aURLs.push_back(rURL);
-}
-
-
-void MatchContext_Impl::ReadFolder( const OUString& rURL,
- const OUString& rMatch,
- bool bSmart )
-{
- // check folder to scan
- if( !UCBContentHelper::IsFolder( rURL ) )
+ // check for input
+ if ( aText.isEmpty() )
return;
- bool bPureHomePath = false;
-#ifdef UNX
- bPureHomePath = aText.startsWith( "~" ) && aText.indexOf( '/' ) == -1;
-#endif
-
- bool bExectMatch = bPureHomePath
- || aText == "."
- || aText.endsWith("/.")
- || aText.endsWith("/..");
-
- // for pure home paths ( ~username ) the '.' at the end of rMatch
- // means that it points to root catalog
- // this is done only for file contents since home paths parsing is useful only for them
- if ( bPureHomePath && rMatch == "file:///." )
- {
- // a home that refers to /
-
- OUString aNewText = aText + "/";
- Insert( aNewText, rURL, true );
-
+ if( aText.indexOf( '*' ) != -1 || aText.indexOf( '?' ) != -1 )
+ // no autocompletion for wildcards
return;
- }
-
- // string to match with
- INetURLObject aMatchObj( rMatch );
- OUString aMatchName;
-
- if ( rURL != aMatchObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ) )
- {
- aMatchName = aMatchObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DecodeMechanism::WithCharset );
-
- // matching is always done case insensitive, but completion will be case sensitive and case preserving
- aMatchName = aMatchName.toAsciiLowerCase();
-
- // if the matchstring ends with a slash, we must search for this also
- if ( rMatch.endsWith("/") )
- aMatchName += "/";
- }
-
- sal_Int32 nMatchLen = aMatchName.getLength();
- INetURLObject aFolderObj( rURL );
- DBG_ASSERT( aFolderObj.GetProtocol() != INetProtocol::NotValid, "Invalid URL!" );
+ OUString aMatch;
+ INetProtocol eProt = INetURLObject::CompareProtocolScheme( aText );
+ INetProtocol eBaseProt = INetURLObject::CompareProtocolScheme( pBox->aBaseURL );
+ if ( pBox->aBaseURL.isEmpty() )
+ eBaseProt = INetURLObject::CompareProtocolScheme( SvtPathOptions().GetWorkPath() );
+ INetProtocol eSmartProt = pBox->GetSmartProtocol();
- try
- {
- Content aCnt( aFolderObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ),
- new ::ucbhelper::CommandEnvironment( uno::Reference< XInteractionHandler >(),
- uno::Reference< XProgressHandler >() ),
- comphelper::getProcessComponentContext() );
- uno::Reference< XResultSet > xResultSet;
- Sequence< OUString > aProps(2);
- OUString* pProps = aProps.getArray();
- pProps[0] = "Title";
- pProps[1] = "IsFolder";
-
- try
- {
- ResultSetInclude eInclude = INCLUDE_FOLDERS_AND_DOCUMENTS;
- if ( bOnlyDirectories )
- eInclude = INCLUDE_FOLDERS_ONLY;
- uno::Reference< XDynamicResultSet > xDynResultSet = aCnt.createDynamicCursor( aProps, eInclude );
-
- uno::Reference < XAnyCompareFactory > xCompare;
- uno::Reference < XSortedDynamicResultSetFactory > xSRSFac =
- SortedDynamicResultSetFactory::create( ::comphelper::getProcessComponentContext() );
-
- Sequence< NumberedSortingInfo > aSortInfo( 2 );
- NumberedSortingInfo* pInfo = aSortInfo.getArray();
- pInfo[ 0 ].ColumnIndex = 2;
- pInfo[ 0 ].Ascending = false;
- pInfo[ 1 ].ColumnIndex = 1;
- pInfo[ 1 ].Ascending = true;
-
- uno::Reference< XDynamicResultSet > xDynamicResultSet =
- xSRSFac->createSortedDynamicResultSet( xDynResultSet, aSortInfo, xCompare );
-
- if ( xDynamicResultSet.is() )
- {
- xResultSet = xDynamicResultSet->getStaticResultSet();
- }
- }
- catch( css::uno::Exception& ) {}
-
- if ( xResultSet.is() )
- {
- uno::Reference< XRow > xRow( xResultSet, UNO_QUERY );
- uno::Reference< XContentAccess > xContentAccess( xResultSet, UNO_QUERY );
-
- try
- {
- while ( schedule() && xResultSet->next() )
- {
- OUString aURL = xContentAccess->queryContentIdentifierString();
- OUString aTitle = xRow->getString(1);
- bool bIsFolder = xRow->getBoolean(2);
-
- // matching is always done case insensitive, but completion will be case sensitive and case preserving
- aTitle = aTitle.toAsciiLowerCase();
-
- if (
- !nMatchLen ||
- (bExectMatch && aMatchName == aTitle) ||
- (!bExectMatch && aTitle.startsWith(aMatchName))
- )
- {
- // all names fit if matchstring is empty
- INetURLObject aObj( aURL );
- sal_Unicode aDelimiter = '/';
- if ( bSmart )
- // when parsing is done "smart", the delimiter must be "guessed"
- aObj.getFSysPath( static_cast<FSysStyle>(FSysStyle::Detect & ~FSysStyle::Vos), &aDelimiter );
-
- if ( bIsFolder )
- aObj.setFinalSlash();
-
- // get the last name of the URL
- OUString aMatch = aObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DecodeMechanism::WithCharset );
- OUString aInput( aText );
- if ( nMatchLen )
- {
- if (aText.endsWith(".") || bPureHomePath)
- {
- // if a "special folder" URL was typed, don't touch the user input
- aMatch = aMatch.copy( nMatchLen );
- }
- else
- {
- // make the user input case preserving
- DBG_ASSERT( aInput.getLength() >= nMatchLen, "Suspicious Matching!" );
- aInput = aInput.copy( 0, aInput.getLength() - nMatchLen );
- }
- }
-
- aInput += aMatch;
-
- // folders should get a final slash automatically
- if ( bIsFolder )
- aInput += OUStringChar(aDelimiter);
-
- Insert( aInput, aObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ), true );
- }
- }
- }
- catch( css::uno::Exception& )
- {
- }
- }
- }
- catch( css::uno::Exception& )
- {
- }
-}
-
-OUString SvtURLBox::ParseSmart( const OUString& _aText, const OUString& _aBaseURL )
-{
- OUString aMatch;
- OUString aText = _aText;
- OUString aBaseURL = _aBaseURL;
-
- // parse ~ for Unix systems
- // does nothing for Windows
- if( !SvtURLBox_Impl::TildeParsing( aText, aBaseURL ) )
- return OUString();
-
- if( !aBaseURL.isEmpty() )
- {
- INetProtocol eBaseProt = INetURLObject::CompareProtocolScheme( aBaseURL );
-
- // if a base URL is set the string may be parsed relative
- if( aText.startsWith( "/" ) )
- {
- // text starting with slashes means absolute file URLs
- OUString aTemp = INetURLObject::GetScheme( eBaseProt );
-
- // file URL must be correctly encoded!
- OUString aTextURL = INetURLObject::encode( aText, INetURLObject::PART_FPATH,
- INetURLObject::EncodeMechanism::All );
- aTemp += aTextURL;
-
- INetURLObject aTmp( aTemp );
- if ( !aTmp.HasError() && aTmp.GetProtocol() != INetProtocol::NotValid )
- aMatch = aTmp.GetMainURL( INetURLObject::DecodeMechanism::NONE );
- }
- else
- {
- OUString aSmart( aText );
- INetURLObject aObj( aBaseURL );
-
- // HRO: I suppose this hack should only be done for Windows !!!???
-#ifdef _WIN32
- // HRO: INetURLObject::smatRel2Abs does not recognize '\\' as a relative path
- // but in case of "\\\\" INetURLObject is right - this is an absolute path !
-
- if( aText.startsWith("\\") && (aText.getLength() < 2 || aText[ 1 ] != '\\') )
- {
- // cut to first segment
- OUString aTmp = INetURLObject::GetScheme( eBaseProt ) + "/";
- aTmp += aObj.getName( 0, true, INetURLObject::DecodeMechanism::WithCharset );
- aObj.SetURL( aTmp );
-
- aSmart = aSmart.copy(1);
- }
-#endif
- // base URL must be a directory !
- aObj.setFinalSlash();
-
- // take base URL and append current input
- bool bWasAbsolute = false;
-#ifdef UNX
- // encode file URL correctly
- aSmart = INetURLObject::encode( aSmart, INetURLObject::PART_FPATH, INetURLObject::EncodeMechanism::All );
-#endif
- INetURLObject aTmp( aObj.smartRel2Abs( aSmart, bWasAbsolute ) );
-
- if ( aText.endsWith(".") )
- // INetURLObject appends a final slash for the directories "." and "..", this is a bug!
- // Remove it as a workaround
- aTmp.removeFinalSlash();
- if ( !aTmp.HasError() && aTmp.GetProtocol() != INetProtocol::NotValid )
- aMatch = aTmp.GetMainURL( INetURLObject::DecodeMechanism::NONE );
- }
- }
- else
- {
- OUString aTmpMatch;
- osl::FileBase::getFileURLFromSystemPath( aText, aTmpMatch );
- aMatch = aTmpMatch;
- }
-
- return aMatch;
-}
-
-void SvtMatchContext_Impl::doExecute()
-{
- ::osl::MutexGuard aGuard( theSvtMatchContextMutex::get() );
- {
- // have we been stopped while we were waiting for the mutex?
- osl::MutexGuard g(mutex_);
- if (stopped_) {
- return;
- }
- }
-
- // Reset match lists
- aCompletions.clear();
- aURLs.clear();
-
- // check for input
- if ( aText.isEmpty() )
- return;
-
- if( aText.indexOf( '*' ) != -1 || aText.indexOf( '?' ) != -1 )
- // no autocompletion for wildcards
- return;
-
- OUString aMatch;
- INetProtocol eProt = INetURLObject::CompareProtocolScheme( aText );
- INetProtocol eBaseProt = INetURLObject::CompareProtocolScheme( SvtPathOptions().GetWorkPath() );
- INetProtocol eSmartProt = pBox->GetSmartProtocol();
-
- // if the user input is a valid URL, go on with it
- // otherwise it could be parsed smart with a predefined smart protocol
- // ( or if this is not set with the protocol of a predefined base URL )
- if( eProt == INetProtocol::NotValid || eProt == eSmartProt || (eSmartProt == INetProtocol::NotValid && eProt == eBaseProt) )
- {
- // not stopped yet ?
- if( schedule() )
- {
- if ( eProt == INetProtocol::NotValid )
- aMatch = SvtURLBox::ParseSmart( aText, "" );
- else
- aMatch = aText;
- if ( !aMatch.isEmpty() )
- {
- INetURLObject aURLObject( aMatch );
- OUString aMainURL( aURLObject.GetMainURL( INetURLObject::DecodeMechanism::NONE ) );
- // Disable autocompletion for anything but the (local) file
- // system (for which access is hopefully fast), as the logic of
- // how MatchContext_Impl is used requires this code to run to
- // completion before further user input is processed, and even
- // MatchContext_Impl::Stop does not guarantee a speedy
- // return:
- if ( !aMainURL.isEmpty()
- && aURLObject.GetProtocol() == INetProtocol::File )
- {
- // if text input is a directory, it must be part of the match list! Until then it is scanned
- bool folder = false;
- if (aURLObject.hasFinalSlash()) {
- try {
- css::uno::Reference< css::uno::XComponentContext >
- ctx(comphelper::getProcessComponentContext());
- css::uno::Reference<
- css::ucb::XUniversalContentBroker > ucb(
- css::ucb::UniversalContentBroker::create(
- ctx));
- css::uno::Sequence< css::beans::Property > prop(1);
- prop[0].Name = "IsFolder";
- prop[0].Handle = -1;
- prop[0].Type = cppu::UnoType< bool >::get();
- css::uno::Any res;
- css::uno::Reference< css::ucb::XCommandProcessor >
- proc(
- ucb->queryContent(
- ucb->createContentIdentifier(aMainURL)),
- css::uno::UNO_QUERY_THROW);
- css::uno::Reference< css::ucb::XCommandProcessor2 >
- proc2(proc, css::uno::UNO_QUERY);
- sal_Int32 id = proc->createCommandIdentifier();
- try {
- {
- osl::MutexGuard g(mutex_);
- processor_ = proc;
- commandId_ = id;
- }
- res = proc->execute(
- css::ucb::Command(
- "getPropertyValues", -1,
- css::uno::makeAny(prop)),
- id,
- css::uno::Reference<
- css::ucb::XCommandEnvironment >());
- } catch (...) {
- if (proc2.is()) {
- try {
- proc2->releaseCommandIdentifier(id);
- } catch (css::uno::RuntimeException &) {
- TOOLS_WARN_EXCEPTION("svtools.control", "ignoring");
- }
- }
- throw;
- }
- if (proc2.is()) {
- proc2->releaseCommandIdentifier(id);
- }
- {
- osl::MutexGuard g(mutex_);
- processor_.clear();
- // At least the neon-based WebDAV UCP does not
- // properly support aborting commands, so return
- // anyway now if an abort request had been
- // ignored and the command execution only
- // returned "successfully" after some timeout:
- if (stopped_) {
- return;
- }
- }
- css::uno::Reference< css::sdbc::XRow > row(
- res, css::uno::UNO_QUERY_THROW);
- folder = row->getBoolean(1) && !row->wasNull();
- } catch (css::uno::Exception &) {
- TOOLS_WARN_EXCEPTION("svtools.control", "ignoring");
- return;
- }
- }
- if ( folder )
- Insert( aText, aMatch );
- else
- // otherwise the parent folder will be taken
- aURLObject.removeSegment();
-
- // scan directory and insert all matches
- ReadFolder( aURLObject.GetMainURL( INetURLObject::DecodeMechanism::NONE ), aMatch, eProt == INetProtocol::NotValid );
- }
- }
- }
- }
-
- bool bFull = false;
-
- INetURLObject aCurObj;
- OUString aCurString, aCurMainURL;
- INetURLObject aObj;
- aObj.SetSmartProtocol( eSmartProt == INetProtocol::NotValid ? INetProtocol::Http : eSmartProt );
- for( ;; )
- {
- for(const auto& rPick : aPickList)
- {
- if (!schedule())
- break;
-
- aCurObj.SetURL(rPick);
- aCurObj.SetSmartURL( aCurObj.GetURLNoPass());
- aCurMainURL = aCurObj.GetMainURL( INetURLObject::DecodeMechanism::NONE );
-
- if( eProt != INetProtocol::NotValid && aCurObj.GetProtocol() != eProt )
- continue;
-
- if( eSmartProt != INetProtocol::NotValid && aCurObj.GetProtocol() != eSmartProt )
- continue;
-
- switch( aCurObj.GetProtocol() )
- {
- case INetProtocol::Http:
- case INetProtocol::Https:
- case INetProtocol::Ftp:
- {
- if( eProt == INetProtocol::NotValid && !bFull )
- {
- aObj.SetSmartURL( aText );
- if( aObj.GetURLPath().getLength() > 1 )
- continue;
- }
-
- aCurString = aCurMainURL;
- if( eProt == INetProtocol::NotValid )
- {
- // try if text matches the scheme
- OUString aScheme( INetURLObject::GetScheme( aCurObj.GetProtocol() ) );
- if ( aScheme.startsWithIgnoreAsciiCase( aText ) && aText.getLength() < aScheme.getLength() )
- {
- if( bFull )
- aMatch = aCurObj.GetMainURL( INetURLObject::DecodeMechanism::NONE );
- else
- {
- aCurObj.SetMark( "" );
- aCurObj.SetParam( "" );
- aCurObj.SetURLPath( "" );
- aMatch = aCurObj.GetMainURL( INetURLObject::DecodeMechanism::NONE );
- }
-
- Insert( aMatch, aMatch );
- }
-
- // now try smart matching
- aCurString = aCurString.copy( aScheme.getLength() );
- }
-
- if( aCurString.startsWithIgnoreAsciiCase( aText ) )
- {
- if( bFull )
- aMatch = aCurObj.GetMainURL( INetURLObject::DecodeMechanism::NONE );
- else
- {
- aCurObj.SetMark( "" );
- aCurObj.SetParam( "" );
- aCurObj.SetURLPath( "" );
- aMatch = aCurObj.GetMainURL( INetURLObject::DecodeMechanism::NONE );
- }
-
- OUString aURL( aMatch );
- if( eProt == INetProtocol::NotValid )
- aMatch = aMatch.copy( INetURLObject::GetScheme( aCurObj.GetProtocol() ).getLength() );
-
- if( aText.getLength() < aMatch.getLength() )
- Insert( aMatch, aURL );
-
- continue;
- }
- break;
- }
- default:
- {
- if( bFull )
- continue;
-
- if( aCurMainURL.startsWith(aText) )
- {
- if( aText.getLength() < aCurMainURL.getLength() )
- Insert( aCurMainURL, aCurMainURL );
-
- continue;
- }
- break;
- }
- }
- }
-
- if( !bFull )
- bFull = true;
- else
- break;
- }
-}
-
-void MatchContext_Impl::doExecute()
-{
- ::osl::MutexGuard aGuard( theSvtMatchContextMutex::get() );
- {
- // have we been stopped while we were waiting for the mutex?
- osl::MutexGuard g(mutex_);
- if (stopped_) {
- return;
- }
- }
-
- // Reset match lists
- aCompletions.clear();
- aURLs.clear();
-
- // check for input
- if ( aText.isEmpty() )
- return;
-
- if( aText.indexOf( '*' ) != -1 || aText.indexOf( '?' ) != -1 )
- // no autocompletion for wildcards
- return;
-
- OUString aMatch;
- INetProtocol eProt = INetURLObject::CompareProtocolScheme( aText );
- INetProtocol eBaseProt = INetURLObject::CompareProtocolScheme( pBox->aBaseURL );
- if ( pBox->aBaseURL.isEmpty() )
- eBaseProt = INetURLObject::CompareProtocolScheme( SvtPathOptions().GetWorkPath() );
- INetProtocol eSmartProt = pBox->GetSmartProtocol();
-
- // if the user input is a valid URL, go on with it
- // otherwise it could be parsed smart with a predefined smart protocol
- // ( or if this is not set with the protocol of a predefined base URL )
- if( eProt == INetProtocol::NotValid || eProt == eSmartProt || (eSmartProt == INetProtocol::NotValid && eProt == eBaseProt) )
+ // if the user input is a valid URL, go on with it
+ // otherwise it could be parsed smart with a predefined smart protocol
+ // ( or if this is not set with the protocol of a predefined base URL )
+ if( eProt == INetProtocol::NotValid || eProt == eSmartProt || (eSmartProt == INetProtocol::NotValid && eProt == eBaseProt) )
{
// not stopped yet ?
if( schedule() )
{
if ( eProt == INetProtocol::NotValid )
- aMatch = SvtURLBox::ParseSmart( aText, pBox->aBaseURL );
+ aMatch = URLBox::ParseSmart( aText, pBox->aBaseURL );
else
aMatch = aText;
if ( !aMatch.isEmpty() )
@@ -1343,339 +672,6 @@ void MatchContext_Impl::doExecute()
}
}
-void SvtURLBox::TryAutoComplete()
-{
- if( Application::AnyInput( VclInputFlags::KEYBOARD ) ) return;
-
- OUString aCurText = GetText();
- Selection aSelection( GetSelection() );
- if( aSelection.Max() != aCurText.getLength() )
- return;
- sal_uInt16 nLen = static_cast<sal_uInt16>(aSelection.Min());
- aCurText = aCurText.copy( 0, nLen );
- if( !aCurText.isEmpty() )
- {
- if ( pCtx.is() )
- {
- pCtx->Stop();
- pCtx->join();
- pCtx.clear();
- }
- pCtx = new SvtMatchContext_Impl( this, aCurText );
- pCtx->launch();
- }
-}
-
-
-SvtURLBox::SvtURLBox( vcl::Window* pParent, INetProtocol eSmart, bool bSetDefaultHelpID )
- : ComboBox( pParent , WB_DROPDOWN | WB_AUTOHSCROLL ),
- eSmartProtocol( eSmart ),
- bAutoCompleteMode( false )
-{
- Init(bSetDefaultHelpID);
-
- if ( GetDesktopRectPixel().GetWidth() > 800 )
- SetSizePixel( Size( 300, 240 ) );
- else
- SetSizePixel( Size( 225, 240 ) );
-}
-
-
-void SvtURLBox::Init(bool bSetDefaultHelpID)
-{
- pImpl.reset( new SvtURLBox_Impl );
-
- if (bSetDefaultHelpID && GetHelpId().isEmpty())
- SetHelpId( ".uno:OpenURL" );
- EnableAutocomplete( false );
-
- SetText( OUString() );
-
- GetSubEdit()->SetAutocompleteHdl(LINK(this, SvtURLBox, AutoCompleteHdl_Impl));
- UpdatePicklistForSmartProtocol_Impl();
-
- EnableAutoSize(true);
-}
-
-SvtURLBox::~SvtURLBox()
-{
- disposeOnce();
-}
-
-void SvtURLBox::dispose()
-{
- if( pCtx.is() )
- {
- pCtx->Stop();
- pCtx->join();
- }
-
- pImpl.reset();
- ComboBox::dispose();
-}
-
-void SvtURLBox::UpdatePicklistForSmartProtocol_Impl()
-{
- Clear();
-
- // read history pick list
- const Sequence< Sequence< PropertyValue > > seqPicklist = SvtHistoryOptions().GetList( ePICKLIST );
- INetURLObject aCurObj;
-
- for( const Sequence< PropertyValue >& rPropertySet : seqPicklist )
- {
- auto pProperty = std::find_if(rPropertySet.begin(), rPropertySet.end(),
- [](const PropertyValue& rProperty) { return rProperty.Name == HISTORY_PROPERTYNAME_URL; });
- if (pProperty != rPropertySet.end())
- {
- OUString sURL;
-
- pProperty->Value >>= sURL;
- aCurObj.SetURL( sURL );
-
- if ( !sURL.isEmpty() && ( eSmartProtocol != INetProtocol::NotValid ) )
- {
- if( aCurObj.GetProtocol() != eSmartProtocol )
- continue;
- }
-
- OUString aURL( aCurObj.GetMainURL( INetURLObject::DecodeMechanism::WithCharset ) );
-
- if ( !aURL.isEmpty() )
- {
- bool bFound = aURL.endsWith("/");
- if ( !bFound )
- {
- OUString aUpperURL = aURL.toAsciiUpperCase();
-
- bFound = ::std::any_of(pImpl->m_aFilters.begin(),
- pImpl->m_aFilters.end(),
- FilterMatch( aUpperURL ) );
- }
- if ( bFound )
- {
- OUString aFile;
- if (osl::FileBase::getSystemPathFromFileURL(aURL, aFile) == osl::FileBase::E_None)
- InsertEntry(aFile);
- else
- InsertEntry(aURL);
- }
- }
- }
- }
-}
-
-
-bool SvtURLBox::ProcessKey( const vcl::KeyCode& rKey )
-{
- // every key input stops the current matching thread
- if( pCtx.is() )
- {
- pCtx->Stop();
- pCtx->join();
- pCtx.clear();
- }
-
- vcl::KeyCode aCode( rKey.GetCode() );
- if ( aCode == KEY_RETURN && !GetText().isEmpty() )
- {
- // wait for completion of matching thread
- ::osl::MutexGuard aGuard( theSvtMatchContextMutex::get() );
-
- if ( bAutoCompleteMode )
- {
- // reset picklist
- bAutoCompleteMode = false;
- Selection aSelection( GetSelection() );
- SetSelection( Selection( aSelection.Min(), aSelection.Min() ) );
- UpdatePicklistForSmartProtocol_Impl();
- Resize();
- }
-
- bool bHandled = false;
- if ( GetOpenHdl().IsSet() )
- {
- bHandled = true;
- GetOpenHdl().Call(this);
- }
- else if ( GetSelectHdl().IsSet() )
- {
- bHandled = true;
- GetSelectHdl().Call(*this);
- }
-
- ClearModifyFlag();
- return bHandled;
- }
- else if ( aCode == KEY_RETURN && GetText().isEmpty() && GetOpenHdl().IsSet() )
- {
- // for file dialog
- bAutoCompleteMode = false;
- GetOpenHdl().Call(this);
- return true;
- }
- else if( aCode == KEY_ESCAPE )
- {
- Selection aSelection( GetSelection() );
- if ( bAutoCompleteMode || aSelection.Min() != aSelection.Max() )
- {
- SetSelection( Selection( aSelection.Min(), aSelection.Min() ) );
- UpdatePicklistForSmartProtocol_Impl();
- Resize();
- }
- else
- {
- return false;
- }
-
- bAutoCompleteMode = false;
- return true;
- }
- else
- {
- return false;
- }
-}
-
-
-bool SvtURLBox::PreNotify( NotifyEvent& rNEvt )
-{
- if( rNEvt.GetWindow() == GetSubEdit() && rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
- {
-
- const KeyEvent& rEvent = *rNEvt.GetKeyEvent();
- const vcl::KeyCode& rKey = rEvent.GetKeyCode();
- vcl::KeyCode aCode( rKey.GetCode() );
- if( ProcessKey( rKey ) )
- {
- return true;
- }
- else if( ( aCode == KEY_UP || aCode == KEY_DOWN ) && !rKey.IsMod2() )
- {
- Selection aSelection( GetSelection() );
- sal_uInt16 nLen = static_cast<sal_uInt16>(aSelection.Min());
- GetSubEdit()->KeyInput( rEvent );
- SetSelection( Selection( nLen, GetText().getLength() ) );
- return true;
- }
- }
-
- return ComboBox::PreNotify( rNEvt );
-}
-
-IMPL_LINK_NOARG(SvtURLBox, AutoCompleteHdl_Impl, Edit&, void)
-{
- TryAutoComplete();
-}
-
-bool SvtURLBox::EventNotify( NotifyEvent &rEvt )
-{
- if ( MouseNotifyEvent::GETFOCUS == rEvt.GetType() )
- {
-#ifndef UNX
- // pb: don't select automatically on unix #93251#
- SetSelection( Selection( 0, GetText().getLength() ) );
-#endif
- }
- else if ( MouseNotifyEvent::LOSEFOCUS == rEvt.GetType() )
- {
- if( GetText().isEmpty() )
- ClearModifyFlag();
- if ( pCtx.is() )
- {
- pCtx->Stop();
- pCtx->join();
- pCtx.clear();
- }
- }
-
- return ComboBox::EventNotify( rEvt );
-}
-
-
-void SvtURLBox::Select()
-{
- ComboBox::Select();
- ClearModifyFlag();
-}
-
-
-OUString SvtURLBox::GetURL()
-{
- // wait for end of autocompletion
- ::osl::MutexGuard aGuard( theSvtMatchContextMutex::get() );
-
- OUString aText( GetText() );
-
- // try to get the right case preserving URL from the list of URLs
- for(std::vector<OUString>::iterator i = pImpl->aCompletions.begin(), j = pImpl->aURLs.begin(); i != pImpl->aCompletions.end() && j != pImpl->aURLs.end(); ++i, ++j)
- {
- if((*i) == aText)
- return *j;
- }
-
-#ifdef _WIN32
- // erase trailing spaces on Windows since they are invalid on this OS and
- // most of the time they are inserted by accident via copy / paste
- aText = comphelper::string::stripEnd(aText, ' ');
- if ( aText.isEmpty() )
- return aText;
- // #i9739#
-#endif
-
- INetURLObject aObj( aText );
- if( aText.indexOf( '*' ) != -1 || aText.indexOf( '?' ) != -1 )
- {
- // no autocompletion for wildcards
- INetURLObject aTempObj;
- if ( eSmartProtocol != INetProtocol::NotValid )
- aTempObj.SetSmartProtocol( eSmartProtocol );
- if ( aTempObj.SetSmartURL( aText ) )
- return aTempObj.GetMainURL( INetURLObject::DecodeMechanism::NONE );
- else
- return aText;
- }
-
- if ( aObj.GetProtocol() == INetProtocol::NotValid )
- {
- OUString aName = ParseSmart( aText, "" );
- aObj.SetURL(aName);
- OUString aURL( aObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ) );
- if ( aURL.isEmpty() )
- // aText itself is invalid, and even together with aBaseURL, it could not
- // made valid -> no chance
- return aText;
-
- bool bSlash = aObj.hasFinalSlash();
- {
- const OUString aPropName("CasePreservingURL");
-
- OUString aFileURL;
-
- Any aAny = UCBContentHelper::GetProperty(aURL, aPropName);
- bool success = (aAny >>= aFileURL);
- OUString aTitle;
- if(success)
- aTitle = INetURLObject(aFileURL).getName(
- INetURLObject::LAST_SEGMENT,
- true,
- INetURLObject::DecodeMechanism::WithCharset );
- else
- success =
- UCBContentHelper::GetTitle(aURL,&aTitle);
-
- if( success && aTitle != "/" && aTitle != "." )
- {
- aObj.setName( aTitle );
- if ( bSlash )
- aObj.setFinalSlash();
- }
- }
- }
-
- return aObj.GetMainURL( INetURLObject::DecodeMechanism::NONE );
-}
-
/** Parse leading ~ for Unix systems,
does nothing for Windows
*/
diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx
index c82c64fd58a7..335be47a3561 100644
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.hxx
@@ -13,7 +13,7 @@
manual changes will be rewritten by the next run of update_pch.sh (which presumably
also fixes all possible problems, so it's usually better to use it).
- Generated on 2020-02-05 20:47:16 using:
+ Generated on 2020-02-07 12:03:14 using:
./bin/update_pch svx svx --cutoff=3 --exclude:system --exclude:module --include:local
If after updating build fails, use the following command to locate conflicting headers:
@@ -76,14 +76,12 @@
#include <vcl/alpha.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/builder.hxx>
-#include <vcl/combobox.hxx>
#include <vcl/commandevent.hxx>
#include <vcl/commandinfoprovider.hxx>
#include <vcl/ctrl.hxx>
#include <vcl/customweld.hxx>
#include <vcl/dllapi.h>
#include <vcl/dockwin.hxx>
-#include <vcl/edit.hxx>
#include <vcl/errcode.hxx>
#include <vcl/errinf.hxx>
#include <vcl/event.hxx>
More information about the Libreoffice-commits
mailing list