Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
57200e6a
Kaydet (Commit)
57200e6a
authored
Mar 02, 2016
tarafından
Michael Stahl
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
sd: replace boost::bind with C++11 lambdas
Change-Id: I17328cd13b44b4406013ec06521246ad8363b5a3
üst
f3ff67d3
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
26 additions
and
24 deletions
+26
-24
ConfigurationControllerResourceManager.cxx
.../configuration/ConfigurationControllerResourceManager.cxx
+6
-5
ConfigurationUpdater.cxx
...ource/ui/framework/configuration/ConfigurationUpdater.cxx
+1
-2
ResourceFactoryManager.cxx
...rce/ui/framework/configuration/ResourceFactoryManager.cxx
+2
-5
BasicPaneFactory.cxx
sd/source/ui/framework/factories/BasicPaneFactory.cxx
+7
-6
BasicViewFactory.cxx
sd/source/ui/framework/factories/BasicViewFactory.cxx
+3
-2
ModuleController.cxx
sd/source/ui/framework/module/ModuleController.cxx
+6
-3
AsynchronousCall.hxx
sd/source/ui/inc/tools/AsynchronousCall.hxx
+1
-1
No files found.
sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
Dosyayı görüntüle @
57200e6a
...
...
@@ -24,7 +24,6 @@
#include <com/sun/star/lang/DisposedException.hpp>
#include <tools/diagnose_ex.h>
#include <algorithm>
#include <boost/bind.hpp>
using
namespace
::
com
::
sun
::
star
;
using
namespace
::
com
::
sun
::
star
::
uno
;
...
...
@@ -70,8 +69,9 @@ void ConfigurationControllerResourceManager::ActivateResources (
::
std
::
for_each
(
rResources
.
begin
(),
rResources
.
end
(),
::
boost
::
bind
(
&
ConfigurationControllerResourceManager
::
ActivateResource
,
this
,
_1
,
rxConfiguration
));
[
&
]
(
Reference
<
XResourceId
>
const
&
xResource
)
{
return
this
->
ActivateResource
(
xResource
,
rxConfiguration
);
}
);
}
void
ConfigurationControllerResourceManager
::
DeactivateResources
(
...
...
@@ -85,8 +85,9 @@ void ConfigurationControllerResourceManager::DeactivateResources (
::
std
::
for_each
(
rResources
.
rbegin
(),
rResources
.
rend
(),
::
boost
::
bind
(
&
ConfigurationControllerResourceManager
::
DeactivateResource
,
this
,
_1
,
rxConfiguration
));
[
&
]
(
Reference
<
XResourceId
>
const
&
xResource
)
{
return
this
->
DeactivateResource
(
xResource
,
rxConfiguration
);
}
);
}
/* In this method we do following steps.
...
...
sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
Dosyayı görüntüle @
57200e6a
...
...
@@ -27,7 +27,6 @@
#include <comphelper/scopeguard.hxx>
#include <tools/diagnose_ex.h>
#include <boost/bind.hpp>
using
namespace
::
com
::
sun
::
star
;
using
namespace
::
com
::
sun
::
star
::
uno
;
...
...
@@ -132,7 +131,7 @@ void ConfigurationUpdater::UpdateConfiguration()
SAL_INFO
(
"sd.fwk"
,
OSL_THIS_FUNC
<<
": UpdateConfiguration update"
);
SetUpdateBeingProcessed
(
true
);
comphelper
::
ScopeGuard
aScopeGuard
(
::
boost
::
bind
(
&
ConfigurationUpdater
::
SetUpdateBeingProcessed
,
this
,
false
)
);
[
this
]
()
{
return
this
->
SetUpdateBeingProcessed
(
false
);
}
);
try
{
...
...
sd/source/ui/framework/configuration/ResourceFactoryManager.cxx
Dosyayı görüntüle @
57200e6a
...
...
@@ -24,7 +24,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/util/URLTransformer.hpp>
#include <comphelper/processfactory.hxx>
#include <boost/bind.hpp>
#include <algorithm>
using
namespace
::
com
::
sun
::
star
;
...
...
@@ -146,10 +146,7 @@ void ResourceFactoryManager::RemoveFactoryForReference(
std
::
remove_if
(
maFactoryPatternList
.
begin
(),
maFactoryPatternList
.
end
(),
::
boost
::
bind
(
std
::
equal_to
<
Reference
<
XResourceFactory
>
>
(),
::
boost
::
bind
(
&
FactoryPatternList
::
value_type
::
second
,
_1
),
rxFactory
)));
[
&
]
(
FactoryPatternList
::
value_type
const
&
it
)
{
return
it
.
second
==
rxFactory
;
}));
if
(
iNewEnd
!=
maFactoryPatternList
.
end
())
maFactoryPatternList
.
erase
(
iNewEnd
,
maFactoryPatternList
.
end
());
}
...
...
sd/source/ui/framework/factories/BasicPaneFactory.cxx
Dosyayı görüntüle @
57200e6a
...
...
@@ -34,7 +34,6 @@
#include "DrawController.hxx"
#include "DrawDocShell.hxx"
#include <com/sun/star/drawing/framework/XControllerManager.hpp>
#include <boost/bind.hpp>
using
namespace
::
com
::
sun
::
star
;
using
namespace
::
com
::
sun
::
star
::
uno
;
...
...
@@ -73,8 +72,8 @@ public:
bool
mbIsReleased
;
bool
mbIsChildWindow
;
bool
CompareURL
(
const
OUString
&
rsPaneURL
)
{
return
msPaneURL
.
equals
(
rsPaneURL
);
}
bool
ComparePane
(
const
Reference
<
XResource
>&
rxPane
)
{
return
mxPane
==
rxPane
;
}
bool
CompareURL
(
const
OUString
&
rsPaneURL
)
const
{
return
msPaneURL
.
equals
(
rsPaneURL
);
}
bool
ComparePane
(
const
Reference
<
XResource
>&
rxPane
)
const
{
return
mxPane
==
rxPane
;
}
};
class
BasicPaneFactory
::
PaneContainer
...
...
@@ -221,7 +220,9 @@ Reference<XResource> SAL_CALL BasicPaneFactory::createResource (
::
std
::
find_if
(
mpPaneContainer
->
begin
(),
mpPaneContainer
->
end
(),
::
boost
::
bind
(
&
PaneDescriptor
::
CompareURL
,
_1
,
rxPaneId
->
getResourceURL
())));
[
&
]
(
PaneDescriptor
const
&
rPane
)
{
return
rPane
.
CompareURL
(
rxPaneId
->
getResourceURL
());
}
));
if
(
iDescriptor
!=
mpPaneContainer
->
end
())
{
...
...
@@ -284,7 +285,7 @@ void SAL_CALL BasicPaneFactory::releaseResource (
::
std
::
find_if
(
mpPaneContainer
->
begin
(),
mpPaneContainer
->
end
(),
::
boost
::
bind
(
&
PaneDescriptor
::
ComparePane
,
_1
,
rxPane
)
));
[
&
]
(
PaneDescriptor
const
&
rPane
)
{
return
rPane
.
ComparePane
(
rxPane
);
}
));
if
(
iDescriptor
!=
mpPaneContainer
->
end
())
{
...
...
@@ -351,7 +352,7 @@ void SAL_CALL BasicPaneFactory::disposing (
::
std
::
find_if
(
mpPaneContainer
->
begin
(),
mpPaneContainer
->
end
(),
::
boost
::
bind
(
&
PaneDescriptor
::
ComparePane
,
_1
,
xPane
)
));
[
&
]
(
PaneDescriptor
const
&
rPane
)
{
return
rPane
.
ComparePane
(
xPane
);
}
));
if
(
iDescriptor
!=
mpPaneContainer
->
end
())
{
iDescriptor
->
mxPane
=
nullptr
;
...
...
sd/source/ui/framework/factories/BasicViewFactory.cxx
Dosyayı görüntüle @
57200e6a
...
...
@@ -41,7 +41,6 @@
#include <vcl/wrkwin.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <boost/bind.hpp>
using
namespace
::
com
::
sun
::
star
;
using
namespace
::
com
::
sun
::
star
::
uno
;
...
...
@@ -197,7 +196,9 @@ void SAL_CALL BasicViewFactory::releaseResource (const Reference<XResource>& rxV
::
std
::
find_if
(
mpViewShellContainer
->
begin
(),
mpViewShellContainer
->
end
(),
::
boost
::
bind
(
&
ViewDescriptor
::
CompareView
,
_1
,
rxView
)));
[
&
]
(
std
::
shared_ptr
<
ViewDescriptor
>
const
&
pVD
)
{
return
ViewDescriptor
::
CompareView
(
pVD
,
rxView
);
}
));
if
(
iViewShell
!=
mpViewShellContainer
->
end
())
{
std
::
shared_ptr
<
ViewShell
>
pViewShell
((
*
iViewShell
)
->
mpViewShell
);
...
...
sd/source/ui/framework/module/ModuleController.cxx
Dosyayı görüntüle @
57200e6a
...
...
@@ -21,7 +21,6 @@
#include "tools/ConfigurationAccess.hxx"
#include <comphelper/processfactory.hxx>
#include <boost/bind.hpp>
#include <unordered_map>
#include <tools/diagnose_ex.h>
...
...
@@ -105,7 +104,9 @@ void ModuleController::LoadFactories (const Reference<XComponentContext>& rxCont
ConfigurationAccess
::
ForAll
(
xFactories
,
aProperties
,
::
boost
::
bind
(
&
ModuleController
::
ProcessFactory
,
this
,
_2
));
[
this
]
(
OUString
const
&
,
::
std
::
vector
<
Any
>
const
&
xs
)
{
return
this
->
ProcessFactory
(
xs
);
}
);
}
catch
(
Exception
&
)
{
...
...
@@ -157,7 +158,9 @@ void ModuleController::InstantiateStartupServices()
tools
::
ConfigurationAccess
::
ForAll
(
xFactories
,
aProperties
,
::
boost
::
bind
(
&
ModuleController
::
ProcessStartupService
,
this
,
_2
));
[
this
]
(
OUString
const
&
,
::
std
::
vector
<
Any
>
const
&
xs
)
{
return
this
->
ProcessStartupService
(
xs
);
}
);
}
catch
(
Exception
&
)
{
...
...
sd/source/ui/inc/tools/AsynchronousCall.hxx
Dosyayı görüntüle @
57200e6a
...
...
@@ -38,7 +38,7 @@ namespace sd { namespace tools {
Use this class like this:
aInstanceOfAsynchronousCall.Post(
::
boost
::bind(
::
std
::bind(
::std::mem_fun(&DrawViewShell::SwitchPage),
pDrawViewShell,
11));
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment