tpcolor.cxx (2ee96f1c) tpcolor.cxx (b2b569f2)
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 629 unchanged lines hidden (view full) ---

638{
639 SvColorDialog* pColorDlg = new SvColorDialog( DLGWIN );
640
641 Color aTmpColor (aAktuellColor);
642 if (eCM != CM_RGB)
643 ConvertColorValues (aTmpColor, CM_RGB);
644
645 pColorDlg->SetColor (aTmpColor);
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 629 unchanged lines hidden (view full) ---

638{
639 SvColorDialog* pColorDlg = new SvColorDialog( DLGWIN );
640
641 Color aTmpColor (aAktuellColor);
642 if (eCM != CM_RGB)
643 ConvertColorValues (aTmpColor, CM_RGB);
644
645 pColorDlg->SetColor (aTmpColor);
646 pColorDlg->SetMode( svtools::ColorPickerMode_MODIFY );
646
647 if( pColorDlg->Execute() == RET_OK )
648 {
649 sal_uInt16 nK = 0;
650 Color aPreviewColor = pColorDlg->GetColor();
651 aAktuellColor = aPreviewColor;
652 if (eCM != CM_RGB)
653 ConvertColorValues (aAktuellColor, eCM);

--- 627 unchanged lines hidden --- 		647
648 if( pColorDlg->Execute() == RET_OK )
649 {
650 sal_uInt16 nK = 0;
651 Color aPreviewColor = pColorDlg->GetColor();
652 aAktuellColor = aPreviewColor;
653 if (eCM != CM_RGB)
654 ConvertColorValues (aAktuellColor, eCM);

--- 627 unchanged lines hidden ---